added Class and MethodTypeParameterName Checks