Improved migration smarts