Annexes refactoring