Updated tags, rules, keys