Migration improvements