Changed Node constructor to make better use of it