More speedup for migration