Better passing of node data