Updated Annotator
Following Annotator changes