Added DeliveryTemplates support and loaders;