Fix class constants. Refactor AnnotationContainer