Further annotator changes