Added include for waypoint