Added a Waypoint interface.