Added PrefixMatcher and SuffixMatcher