Updated according to changes in Annotation configuration class