Migration Batch Needs Improvement