Overhaul of node class