Updated batch processing