Fixed model generation