More model improvements