Modify handleBatch method
Finish 0.2