MatchTypes

I added matchtypes, which make it easy to add more types of matching
data.