Router refactoring