Added CategoryMatcher to the main solution.