Updated the delivery-core with refined address