Support more (optional) waypoints