Added node/comment exceptions