Persistent data management added