RouteManager fixes

More fixes and changes to RouteManager