Matcher rework