Lastest migration tool changes