Refactor persister.