Adding choices for modeltype/evaltype