Change data layer from Acid-State to Persistent
Fix compilation error with newest Persistent
Merge branch 'persistent'