Batch improvements