Finished the persistence manager for now