adjust to routing refactoring