Move MappingHelper inside MappingsManager