Refactor the get routes to match