Updated Matcher API