Refactoring (changed annotation)