Routing refactoring