RouteMapper refactoring