A bit more work on the annotator class