Refactored Routes