Small updates after Annotation packages refactoring