Refactoring: persistence