persistency-related logic moved to appropriate methods of models