Getting rid of the AnnotationDataBuilder.