Annotation improvements