Refactorings and addition of 'mappingsFor' and 'areMapped' features.
(See MappingData)