Start work on attribute checking
Extracted MatchPredicate
Use MatchPredicates in attribute matching impl