Adapted to new location of Node related classes.