Migration: more enhancements