Add back type_of_class_type injection