Added initial batchId to handleUpdateBatchId