Annotation : forgot to remove part of the refactoring