Better Annotation handling.