Simplify EML migration for MCM