IAttributeMatcher refactoring