refactored annotations