Added AnnotatedAdapter