refactoring for model-config