Refactored AnnotatedContextReader