Added the ability to save and update data