Refactor model controller in model-loader