Update for persistence support 2
Update for persistence support 3
Update for persistence support 3.1