added changes for persisting datas