Improve the rule-matcher