Improve automatic conversion of models.