Changed ModelGenerator to provide Models and StandardModels