Improved Model class.