Refactored Persistence classes