add more routing code together with associated commands