Annotations refactoring