last changes to work with AnnotatedXxx constructor changes