Add support for node_type