Refactoring Persister