Simplified waypoints