Updated rule set matcher