Updated annotations for models.