Routes refactored