CODE: MSF-7308 add support for new elements in MappingDefinition