Updated persistence managment...