Updated annotator java & xml files.