Changed model generator