Updates to reflect Annotator changes