diff --git a/internal/providers/pluginfw/products/catalog/data_functions.go b/internal/providers/pluginfw/products/catalog/data_functions.go
index 5c0ca3bea..a252f97a5 100644
--- a/internal/providers/pluginfw/products/catalog/data_functions.go
+++ b/internal/providers/pluginfw/products/catalog/data_functions.go
@@ -40,7 +40,7 @@ type FunctionsData struct {
 
 func (FunctionsData) GetComplexFieldTypes(context.Context) map[string]reflect.Type {
 	return map[string]reflect.Type{
-		"functions": reflect.TypeOf(catalog_tf.FunctionInfo{}),
+		"functions": reflect.TypeOf(catalog_tf.FunctionInfo_SdkV2{}),
 	}
 }
 
diff --git a/internal/providers/pluginfw/products/cluster/data_cluster.go b/internal/providers/pluginfw/products/cluster/data_cluster.go
index ffcf6a70d..c9a904a44 100644
--- a/internal/providers/pluginfw/products/cluster/data_cluster.go
+++ b/internal/providers/pluginfw/products/cluster/data_cluster.go
@@ -41,7 +41,7 @@ type ClusterInfo struct {
 
 func (ClusterInfo) GetComplexFieldTypes(context.Context) map[string]reflect.Type {
 	return map[string]reflect.Type{
-		"cluster_info": reflect.TypeOf(compute_tf.ClusterDetails{}),
+		"cluster_info": reflect.TypeOf(compute_tf.ClusterDetails_SdkV2{}),
 	}
 }
 
diff --git a/internal/providers/pluginfw/products/registered_model/data_registered_model_versions.go b/internal/providers/pluginfw/products/registered_model/data_registered_model_versions.go
index 5e3ab0c55..6cf39179c 100644
--- a/internal/providers/pluginfw/products/registered_model/data_registered_model_versions.go
+++ b/internal/providers/pluginfw/products/registered_model/data_registered_model_versions.go
@@ -33,7 +33,7 @@ type RegisteredModelVersionsData struct {
 
 func (RegisteredModelVersionsData) GetComplexFieldTypes(context.Context) map[string]reflect.Type {
 	return map[string]reflect.Type{
-		"model_versions": reflect.TypeOf(catalog_tf.ModelVersionInfo{}),
+		"model_versions": reflect.TypeOf(catalog_tf.ModelVersionInfo_SdkV2{}),
 	}
 }
 
diff --git a/internal/providers/pluginfw/products/serving/data_serving_endpoints.go b/internal/providers/pluginfw/products/serving/data_serving_endpoints.go
index 51c5e2c64..d1eaab1a0 100644
--- a/internal/providers/pluginfw/products/serving/data_serving_endpoints.go
+++ b/internal/providers/pluginfw/products/serving/data_serving_endpoints.go
@@ -32,7 +32,7 @@ type ServingEndpointsData struct {
 
 func (ServingEndpointsData) GetComplexFieldTypes(context.Context) map[string]reflect.Type {
 	return map[string]reflect.Type{
-		"endpoints": reflect.TypeOf(serving_tf.ServingEndpoint{}),
+		"endpoints": reflect.TypeOf(serving_tf.ServingEndpoint_SdkV2{}),
 	}
 }