Added Batch support