Refactored routes and helpers