Feature/node support

rebased pull request for further node_support