Changes for new Annotator