demand created and cached editing domain and refactored model access