more persistor refactoring