Updated Delivery & Payment bundles config to allow override