! Router refactoring