Reworked Node and CalcNode classes