Added RuleSet, fixed warning messages