Expansion state of nodes is now saved as well