Now using PersistenceStorage instead of internal methods