AnnotatorApplication refactoring