Added waypoint timeouts