Added model_class option