Fixed events with new PersistenceManager