Updated to use RoutingBundle