Improve class Node