Moved MAEC4.0 mapping