Rework EMKMapping