PersistenceOrchestrator refactoring