Annotate models

Fixed annotations