I think in that way you should @Override getCustomMetricsDataOldModel too, and return empty List (editable) as long as we cant find test group metrics in old model. It will save 1 database call (not really simple).