Added node support and better type tag