Added batch_id to deliveries