HV-779 Avoiding usage of Introspector