Added support for Generic models.