Added the waypoint field to the export formats