Some improvements on model fields.