Route refactor