Improvements on the migration