More improvements to model generation