Refactoring annotations
Doc revisions