FIXME: AnnotationsMap class integration