Topic/migrator changes