Improved PersistenceManager