some changes to persistance