DRY-up Waypoints