Extracted persistence layer