Renamed KeyValuePairMatcher
Initial version
Initial version
Refactoring