Feature/route refactor