Add WaypointCount