Better integrate the annotator.