refactoring in MatchEntryMapper