Added disable_delivery option