refactored EquivalencesMap