Removed the Node part for now to simplefy development