add basic waypoint support