Improved migration support