Add waypoint class