Improve rule set management