Topic/improve migrator