Improvements to AnnotationLoader