Few improvements to annotator