Improve class RouteMaker