Persist storage refactor