Refactored (improved) AnnotationHandler initialisation.