Refactoring Annotations & ajout base export des annotations