Improved the migration experience