Added DeliveryService Client/Server