Model class construction changes.