Simplified the model generator