Improved Annotation syntax