Some improvements on models.