Refactored persistence