Update to latest annotator code