Various additions to the rules to match recent structure changes