Update ruleset, report, and command modules to support ruleset overrides