Modified BasicAnnotationApi