Updated the route assembly