Annotation refactoring finished