Modify to avoid illegal makePersistent in DatabaseManager