Follow Annotator changes