Added ability to load/save rest of data