Adapt to OAAnnotation refactor in annotator-store