Add annotation package. Refactoring