The definition of a rule and the actual rule are now defined together, which should be easier to manage and ensure messages and rules are consistent