removed AnnotationOption and added options to AnnotationType