Added disable_delivery functionality.