Added node support