bug fixed: remove Generic support for AnnotatedModel, no need.