Updated AnnotationBuilder to use metadata *only*