Added additional node type elements