Update save and load methods