Further updates to ruleset