Fixed annotations in entities