Remove explicit list of models in favor of more flexible implementation