Addition of an AnnotationIntext class and some re-naming