Add generics to IAnnotationFinder