Work on node integration