Updated migrator