Lots of additions to Node organization