Updated annotator, and followed API changes