Refactor persisters