Updated with new /registertypewithannotation support