CalviDeliveryManager Changes