refactored mapping of MapEntries