Improved annotator