Added update and save methods