Updated annotator
Updated annotator
Fix HL mode by following Annotator changes