Updated RouteManager