Fixed annotations and documentation