Refactored annotations