Add generics to some models.