Change architecture of migrator