Updated annotator (merged latest)