Added delivery-core