Add support for waypoints