Added type and @type to Annotation.