Annotation refactored