Adding node support (maybe)