Annotation support expanded