MapSet and Mapping

To avoid conflicts, added a temporary structure MapSet to keep
the interface intact (findMatchesR converts MapSet to Mapping).