Refactored Domain Specific Matchers into separate package and class