PHOENIX-40: Add support for batching