Refactoring persistence classes