Refactored routes