Updates to Save/Get Functions