Added the proper node structure