Handle more things in migrator