Initial implementation of AnnotationContext idea