Refactored some class names and created the PostMatcher proxy class