Enhance the rule builder