Renamed AbstractPersistent to DataPersistence