Node class improved