Added additional options for model generation