ProxyModelCoverage refactoring