Fix annotations for multiple models.
Merge pull request #82 from tsherif/annotation-fix

Fix annotations for multiple models.