Added waypoint class