Annotation handling within class search