Refactored: scoping routes