Added save funcionality