adds annotation partial refactorings