Migration enhancements