Adding support for node type