Added the batching support