Fixed annotations and timestamp code