#302 major refactoring of MappingCreationProcessor