Better integrate the Annotator