Refactoring over to process over persisted data