Refactor AnnotationAnnotateCommand