Waypoints class added