Updated model generator.