Minor refactoring. Forgot to add Waypoints list to result.