Support for waypoint type