Final edit for PersistentStorage. This is best way.