Improve model generator USAGE grammar