Waypoints struct added