Somewhat enhanced generated models