Refactored saveAnnotation() method