Convert to choices to Choices and added AnnotationManager using InheritanceManager