AnnotationDriver refactoring
AnnotationDriver refactoring