Add back Annotator changes