Update save and load implementation