Adjusted to latest UniversalMatcher changes