Updated for passing Ids of route and waypoints