Add uncommited changes for NodeType