Added save and load functionality