update with new handling for Object<*,*>