Changed storing of nodes