Refactoring routes per issue #1100