Add waypoints to ride form as nested elements