Minor refactoring. Forgot to add Waypoints list to result.

Forgot to add Waypoint list to output.