Updated to work with updated 'Node.h' file