diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md
index 3ecf522a66..1b05e256d8 100644
--- a/MIGRATION_GUIDE.md
+++ b/MIGRATION_GUIDE.md
@@ -7,61 +7,146 @@ across different versions.
 > [!TIP]
 > We highly recommend upgrading the versions one by one instead of bulk upgrades.
 
+## v1.0.0 ➞ v1.0.1
+
+### Fixes in account parameters
+As a follow-up of reworked `snowflake_account_parameter`, this version has several improvements regarding handling parameters.
+
+#### Add missing parameters based on the docs and output of SHOW PARAMETERS IN ACCOUNT
+Based on [parameters docs](https://docs.snowflake.com/en/sql-reference/parameters) and `SHOW PARAMETERS IN ACCOUNT`, we established a list of supported parameters. New supported or fixed parameters in `snowflake_account_parameter`:
+- `ACTIVE_PYTHON_PROFILER`
+- `CLIENT_ENABLE_LOG_INFO_STATEMENT_PARAMETERS`
+- `CORTEX_ENABLED_CROSS_REGION`
+- `CSV_TIMESTAMP_FORMAT`
+- `ENABLE_PERSONAL_DATABASE`
+- `ENABLE_UNHANDLED_EXCEPTIONS_REPORTING`
+- `ENFORCE_NETWORK_RULES_FOR_INTERNAL_STAGES`
+- `HYBRID_TABLE_LOCK_TIMEOUT`
+- `JS_TREAT_INTEGER_AS_BIGINT`
+- `PREVENT_UNLOAD_TO_INLINE_URL`
+- `PREVENT_UNLOAD_TO_INTERNAL_STAGES`
+- `PYTHON_PROFILER_MODULES`
+- `PYTHON_PROFILER_TARGET_STAGE`
+- `STORAGE_SERIALIZATION_POLICY`
+- `TASK_AUTO_RETRY_ATTEMPTS`
+
+#### Adjusted validations
+Validations for number parameters are now relaxed. This is because a few of the value limits are soft limits in Snowflake, and can be changed externally.
+We decided to keep validations for non-negative values. Affected parameters:
+- `QUERY_TAG`
+- `TWO_DIGIT_CENTURY_START`
+- `WEEK_OF_YEAR_POLICY`
+- `WEEK_START`
+- `USER_TASK_TIMEOUT_MS`
+
+We added non-negative validations for the following parameters:
+- `CLIENT_PREFETCH_THREADS`
+- `CLIENT_RESULT_CHUNK_SIZE`
+- `CLIENT_SESSION_KEEP_ALIVE_HEARTBEAT_FREQUENCY`
+- `HYBRID_TABLE_LOCK_TIMEOUT`
+- `JSON_INDENT`
+- `STATEMENT_QUEUED_TIMEOUT_IN_SECONDS`
+- `STATEMENT_TIMEOUT_IN_SECONDS`
+- `TASK_AUTO_RETRY_ATTEMPTS`
+- `USER_TASK_MINIMUM_TRIGGER_INTERVAL_IN_SECONDS`
+
+Note that enum parameters are still not validated by the provider - they are only validated in Snowflake. We will handle this during a small rework of the parameters in the future.
+
+### Add missing preview features to config
+
+Values:
+- `snowflake_functions_datasource`
+- `snowflake_procedures_datasource`
+- `snowflake_tables_datasource`
+  were missing in the `preview_features_enabled` attribute in the provider's config. They were added.
+
+References: #3302
+
+### functions and procedures docs updated
+
+Argument names are automatically wrapped in double quotes, so:
+- uppercase names should be used or
+- argument name should be quoted in the procedure/function definition.
+
+Updated the docs and the previous migration guide entry.
+
+References: #3298
+
+### python procedure docs updated
+
+Importing python procedure is currently limited to procedures with snowflake-snowpark-python version explicitly set in Snowflake. Docs were updated.
+
+References: #3303
+
 ## v0.100.0 ➞ v1.0.0
 
 ### Preview features flag
 All of the preview features objects are now disabled by default. This includes:
 - Resources
-	- `snowflake_account_password_policy_attachment`
-	- `snowflake_alert`
-	- `snowflake_api_integration`
-	- `snowflake_cortex_search_service`
-	- `snowflake_dynamic_table`
-	- `snowflake_external_function`
-	- `snowflake_external_table`
-	- `snowflake_external_volume`
-	- `snowflake_failover_group`
-	- `snowflake_file_format`
-	- `snowflake_managed_account`
-	- `snowflake_materialized_view`
-	- `snowflake_network_policy_attachment`
-	- `snowflake_network_rule`
-	- `snowflake_email_notification_integration`
-	- `snowflake_notification_integration`
-	- `snowflake_object_parameter`
-	- `snowflake_password_policy`
-	- `snowflake_pipe`
-	- `snowflake_sequence`
-	- `snowflake_share`
-	- `snowflake_stage`
-	- `snowflake_storage_integration`
-	- `snowflake_table_column_masking_policy_application`
-	- `snowflake_table_constraint`
-	- `snowflake_user_public_keys`
-	- `snowflake_user_password_policy_attachment`
+  - `snowflake_account_password_policy_attachment`
+  - `snowflake_alert`
+  - `snowflake_api_integration`
+  - `snowflake_cortex_search_service`
+  - `snowflake_dynamic_table`
+  - `snowflake_external_function`
+  - `snowflake_external_table`
+  - `snowflake_external_volume`
+  - `snowflake_failover_group`
+  - `snowflake_file_format`
+  - `snowflake_function_java`
+  - `snowflake_function_javascript`
+  - `snowflake_function_python`
+  - `snowflake_function_scala`
+  - `snowflake_function_sql`
+  - `snowflake_managed_account`
+  - `snowflake_materialized_view`
+  - `snowflake_network_policy_attachment`
+  - `snowflake_network_rule`
+  - `snowflake_email_notification_integration`
+  - `snowflake_notification_integration`
+  - `snowflake_object_parameter`
+  - `snowflake_password_policy`
+  - `snowflake_pipe`
+  - `snowflake_procedure_java`
+  - `snowflake_procedure_javascript`
+  - `snowflake_procedure_python`
+  - `snowflake_procedure_scala`
+  - `snowflake_procedure_sql`
+  - `snowflake_sequence`
+  - `snowflake_share`
+  - `snowflake_stage`
+  - `snowflake_storage_integration`
+  - `snowflake_table`
+  - `snowflake_table_column_masking_policy_application`
+  - `snowflake_table_constraint`
+  - `snowflake_user_public_keys`
+  - `snowflake_user_password_policy_attachment`
 - Data sources
-	- `snowflake_current_account`
-	- `snowflake_alerts`
-	- `snowflake_cortex_search_services`
-	- `snowflake_database`
-	- `snowflake_database_role`
-	- `snowflake_dynamic_tables`
-	- `snowflake_external_functions`
-	- `snowflake_external_tables`
-	- `snowflake_failover_groups`
-	- `snowflake_file_formats`
-	- `snowflake_materialized_views`
-	- `snowflake_pipes`
-	- `snowflake_current_role`
-	- `snowflake_sequences`
-	- `snowflake_shares`
-	- `snowflake_parameters`
-	- `snowflake_stages`
-	- `snowflake_storage_integrations`
-	- `snowflake_system_generate_scim_access_token`
-	- `snowflake_system_get_aws_sns_iam_policy`
-	- `snowflake_system_get_privatelink_config`
-	- `snowflake_system_get_snowflake_platform_info`
+  - `snowflake_current_account`
+  - `snowflake_alerts`
+  - `snowflake_cortex_search_services`
+  - `snowflake_database`
+  - `snowflake_database_role`
+  - `snowflake_dynamic_tables`
+  - `snowflake_external_functions`
+  - `snowflake_external_tables`
+  - `snowflake_failover_groups`
+  - `snowflake_file_formats`
+  - `snowflake_functions`
+  - `snowflake_materialized_views`
+  - `snowflake_pipes`
+  - `snowflake_procedures`
+  - `snowflake_current_role`
+  - `snowflake_sequences`
+  - `snowflake_shares`
+  - `snowflake_parameters`
+  - `snowflake_stages`
+  - `snowflake_storage_integrations`
+  - `snowflake_system_generate_scim_access_token`
+  - `snowflake_system_get_aws_sns_iam_policy`
+  - `snowflake_system_get_privatelink_config`
+  - `snowflake_system_get_snowflake_platform_info`
+  - `snowflake_tables`
 
 If you want to have them enabled, add the feature name to the provider configuration (with `_datasource` or `_resource` suffix), like this:
 ```terraform
@@ -125,6 +210,8 @@ The new resources are more aligned with current features like:
 - secrets support
 - argument default values
 
+**Note**: argument names are now quoted automatically by the provider so remember about this while writing the function definition (argument name should be quoted or uppercase should be used for the argument name).
+
 `snowflake_procedure` is now deprecated in favor of 5 new preview resources:
 
 - `snowflake_procedure_java`
@@ -141,6 +228,8 @@ The new resources are more aligned with current features like:
 - secrets support
 - argument default values
 
+**Note**: argument names are now quoted automatically by the provider so remember about this while writing the procedure definition (argument name should be quoted or uppercase should be used for the argument name).
+
 ### *(new feature)* Account role data source
 Added a new `snowflake_account_roles` data source for account roles. Now it reflects It's based on `snowflake_roles` data source.
 `account_roles` field now organizes output of show under `show_output` field.
diff --git a/docs/index.md b/docs/index.md
index 31fc8211d8..bc11401f91 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -97,7 +97,7 @@ provider "snowflake" {
 - `passcode_in_password` (Boolean) False by default. Set to true if the MFA passcode is embedded to the configured password. Can also be sourced from the `SNOWFLAKE_PASSCODE_IN_PASSWORD` environment variable.
 - `password` (String, Sensitive) Password for user + password auth. Cannot be used with `private_key` and `private_key_passphrase`. Can also be sourced from the `SNOWFLAKE_PASSWORD` environment variable.
 - `port` (Number) Specifies a custom port value used by the driver for privatelink connections. Can also be sourced from the `SNOWFLAKE_PORT` environment variable.
-- `preview_features_enabled` (Set of String) A list of preview features that are handled by the provider. See [preview features list](https://github.com/Snowflake-Labs/terraform-provider-snowflake/blob/main/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md). Preview features may have breaking changes in future releases, even without raising the major version. This field can not be set with environmental variables. Valid options are: `snowflake_current_account_datasource` | `snowflake_account_authentication_policy_attachment_resource` | `snowflake_account_password_policy_attachment_resource` | `snowflake_alert_resource` | `snowflake_alerts_datasource` | `snowflake_api_integration_resource` | `snowflake_authentication_policy_resource` | `snowflake_cortex_search_service_resource` | `snowflake_cortex_search_services_datasource` | `snowflake_database_datasource` | `snowflake_database_role_datasource` | `snowflake_dynamic_table_resource` | `snowflake_dynamic_tables_datasource` | `snowflake_external_function_resource` | `snowflake_external_functions_datasource` | `snowflake_external_table_resource` | `snowflake_external_tables_datasource` | `snowflake_external_volume_resource` | `snowflake_failover_group_resource` | `snowflake_failover_groups_datasource` | `snowflake_file_format_resource` | `snowflake_file_formats_datasource` | `snowflake_function_java_resource` | `snowflake_function_javascript_resource` | `snowflake_function_python_resource` | `snowflake_function_scala_resource` | `snowflake_function_sql_resource` | `snowflake_managed_account_resource` | `snowflake_materialized_view_resource` | `snowflake_materialized_views_datasource` | `snowflake_network_policy_attachment_resource` | `snowflake_network_rule_resource` | `snowflake_email_notification_integration_resource` | `snowflake_notification_integration_resource` | `snowflake_object_parameter_resource` | `snowflake_password_policy_resource` | `snowflake_pipe_resource` | `snowflake_pipes_datasource` | `snowflake_current_role_datasource` | `snowflake_sequence_resource` | `snowflake_sequences_datasource` | `snowflake_share_resource` | `snowflake_shares_datasource` | `snowflake_parameters_datasource` | `snowflake_procedure_java_resource` | `snowflake_procedure_javascript_resource` | `snowflake_procedure_python_resource` | `snowflake_procedure_scala_resource` | `snowflake_procedure_sql_resource` | `snowflake_stage_resource` | `snowflake_stages_datasource` | `snowflake_storage_integration_resource` | `snowflake_storage_integrations_datasource` | `snowflake_system_generate_scim_access_token_datasource` | `snowflake_system_get_aws_sns_iam_policy_datasource` | `snowflake_system_get_privatelink_config_datasource` | `snowflake_system_get_snowflake_platform_info_datasource` | `snowflake_table_column_masking_policy_application_resource` | `snowflake_table_constraint_resource` | `snowflake_table_resource` | `snowflake_user_authentication_policy_attachment_resource` | `snowflake_user_public_keys_resource` | `snowflake_user_password_policy_attachment_resource`.
+- `preview_features_enabled` (Set of String) A list of preview features that are handled by the provider. See [preview features list](https://github.com/Snowflake-Labs/terraform-provider-snowflake/blob/main/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md). Preview features may have breaking changes in future releases, even without raising the major version. This field can not be set with environmental variables. Valid options are: `snowflake_current_account_datasource` | `snowflake_account_authentication_policy_attachment_resource` | `snowflake_account_password_policy_attachment_resource` | `snowflake_alert_resource` | `snowflake_alerts_datasource` | `snowflake_api_integration_resource` | `snowflake_authentication_policy_resource` | `snowflake_cortex_search_service_resource` | `snowflake_cortex_search_services_datasource` | `snowflake_database_datasource` | `snowflake_database_role_datasource` | `snowflake_dynamic_table_resource` | `snowflake_dynamic_tables_datasource` | `snowflake_external_function_resource` | `snowflake_external_functions_datasource` | `snowflake_external_table_resource` | `snowflake_external_tables_datasource` | `snowflake_external_volume_resource` | `snowflake_failover_group_resource` | `snowflake_failover_groups_datasource` | `snowflake_file_format_resource` | `snowflake_file_formats_datasource` | `snowflake_function_java_resource` | `snowflake_function_javascript_resource` | `snowflake_function_python_resource` | `snowflake_function_scala_resource` | `snowflake_function_sql_resource` | `snowflake_functions_datasource` | `snowflake_managed_account_resource` | `snowflake_materialized_view_resource` | `snowflake_materialized_views_datasource` | `snowflake_network_policy_attachment_resource` | `snowflake_network_rule_resource` | `snowflake_email_notification_integration_resource` | `snowflake_notification_integration_resource` | `snowflake_object_parameter_resource` | `snowflake_password_policy_resource` | `snowflake_pipe_resource` | `snowflake_pipes_datasource` | `snowflake_current_role_datasource` | `snowflake_sequence_resource` | `snowflake_sequences_datasource` | `snowflake_share_resource` | `snowflake_shares_datasource` | `snowflake_parameters_datasource` | `snowflake_procedure_java_resource` | `snowflake_procedure_javascript_resource` | `snowflake_procedure_python_resource` | `snowflake_procedure_scala_resource` | `snowflake_procedure_sql_resource` | `snowflake_procedures_datasource` | `snowflake_stage_resource` | `snowflake_stages_datasource` | `snowflake_storage_integration_resource` | `snowflake_storage_integrations_datasource` | `snowflake_system_generate_scim_access_token_datasource` | `snowflake_system_get_aws_sns_iam_policy_datasource` | `snowflake_system_get_privatelink_config_datasource` | `snowflake_system_get_snowflake_platform_info_datasource` | `snowflake_table_column_masking_policy_application_resource` | `snowflake_table_constraint_resource` | `snowflake_table_resource` | `snowflake_tables_datasource` | `snowflake_user_authentication_policy_attachment_resource` | `snowflake_user_public_keys_resource` | `snowflake_user_password_policy_attachment_resource`.
 - `private_key` (String, Sensitive) Private Key for username+private-key auth. Cannot be used with `password`. Can also be sourced from the `SNOWFLAKE_PRIVATE_KEY` environment variable.
 - `private_key_passphrase` (String, Sensitive) Supports the encryption ciphers aes-128-cbc, aes-128-gcm, aes-192-cbc, aes-192-gcm, aes-256-cbc, aes-256-gcm, and des-ede3-cbc. Can also be sourced from the `SNOWFLAKE_PRIVATE_KEY_PASSPHRASE` environment variable.
 - `profile` (String) Sets the profile to read from ~/.snowflake/config file. Can also be sourced from the `SNOWFLAKE_PROFILE` environment variable.
diff --git a/docs/resources/account_parameter.md b/docs/resources/account_parameter.md
index 07b49e485f..c5fee04863 100644
--- a/docs/resources/account_parameter.md
+++ b/docs/resources/account_parameter.md
@@ -34,7 +34,7 @@ resource "snowflake_account_parameter" "p2" {
 
 ### Required
 
-- `key` (String) Name of account parameter. Valid values are (case-insensitive): `ALLOW_CLIENT_MFA_CACHING` | `ALLOW_ID_TOKEN` | `CLIENT_ENCRYPTION_KEY_SIZE` | `ENABLE_IDENTIFIER_FIRST_LOGIN` | `ENABLE_INTERNAL_STAGES_PRIVATELINK` | `ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_IMAGE_REPOSITORY` | `ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_SPCS_BLOCK_STORAGE` | `EVENT_TABLE` | `EXTERNAL_OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST` | `INITIAL_REPLICATION_SIZE_LIMIT_IN_TB` | `MIN_DATA_RETENTION_TIME_IN_DAYS` | `NETWORK_POLICY` | `OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST` | `PERIODIC_DATA_REKEYING` | `PREVENT_LOAD_FROM_INLINE_URL` | `PREVENT_UNLOAD_TO_INLINE_URL` | `PREVENT_UNLOAD_TO_INTERNAL_STAGES` | `REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_CREATION` | `REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_OPERATION` | `SSO_LOGIN_PAGE` | `ABORT_DETACHED_QUERY` | `AUTOCOMMIT` | `BINARY_INPUT_FORMAT` | `BINARY_OUTPUT_FORMAT` | `CLIENT_MEMORY_LIMIT` | `CLIENT_METADATA_REQUEST_USE_CONNECTION_CTX` | `CLIENT_METADATA_USE_SESSION_DATABASE` | `CLIENT_PREFETCH_THREADS` | `CLIENT_RESULT_CHUNK_SIZE` | `CLIENT_SESSION_KEEP_ALIVE` | `CLIENT_SESSION_KEEP_ALIVE_HEARTBEAT_FREQUENCY` | `CLIENT_TIMESTAMP_TYPE_MAPPING` | `ENABLE_UNLOAD_PHYSICAL_TYPE_OPTIMIZATION` | `CLIENT_RESULT_COLUMN_CASE_INSENSITIVE` | `DATE_INPUT_FORMAT` | `DATE_OUTPUT_FORMAT` | `ERROR_ON_NONDETERMINISTIC_MERGE` | `ERROR_ON_NONDETERMINISTIC_UPDATE` | `GEOGRAPHY_OUTPUT_FORMAT` | `GEOMETRY_OUTPUT_FORMAT` | `JDBC_TREAT_DECIMAL_AS_INT` | `JDBC_TREAT_TIMESTAMP_NTZ_AS_UTC` | `JDBC_USE_SESSION_TIMEZONE` | `JSON_INDENT` | `LOCK_TIMEOUT` | `MULTI_STATEMENT_COUNT` | `NOORDER_SEQUENCE_AS_DEFAULT` | `ODBC_TREAT_DECIMAL_AS_INT` | `QUERY_TAG` | `QUOTED_IDENTIFIERS_IGNORE_CASE` | `ROWS_PER_RESULTSET` | `S3_STAGE_VPCE_DNS_NAME` | `SEARCH_PATH` | `SIMULATED_DATA_SHARING_CONSUMER` | `STATEMENT_TIMEOUT_IN_SECONDS` | `STRICT_JSON_OUTPUT` | `TIME_INPUT_FORMAT` | `TIME_OUTPUT_FORMAT` | `TIMESTAMP_DAY_IS_ALWAYS_24H` | `TIMESTAMP_INPUT_FORMAT` | `TIMESTAMP_LTZ_OUTPUT_FORMAT` | `TIMESTAMP_NTZ_OUTPUT_FORMAT` | `TIMESTAMP_OUTPUT_FORMAT` | `TIMESTAMP_TYPE_MAPPING` | `TIMESTAMP_TZ_OUTPUT_FORMAT` | `TIMEZONE` | `TRANSACTION_ABORT_ON_ERROR` | `TRANSACTION_DEFAULT_ISOLATION_LEVEL` | `TWO_DIGIT_CENTURY_START` | `UNSUPPORTED_DDL_ACTION` | `USE_CACHED_RESULT` | `WEEK_OF_YEAR_POLICY` | `WEEK_START` | `CATALOG` | `DATA_RETENTION_TIME_IN_DAYS` | `DEFAULT_DDL_COLLATION` | `EXTERNAL_VOLUME` | `LOG_LEVEL` | `MAX_CONCURRENCY_LEVEL` | `MAX_DATA_EXTENSION_TIME_IN_DAYS` | `PIPE_EXECUTION_PAUSED` | `PREVENT_UNLOAD_TO_INTERNAL_STAGES` | `REPLACE_INVALID_CHARACTERS` | `STATEMENT_QUEUED_TIMEOUT_IN_SECONDS` | `STORAGE_SERIALIZATION_POLICY` | `SHARE_RESTRICTIONS` | `SUSPEND_TASK_AFTER_NUM_FAILURES` | `TRACE_LEVEL` | `USER_TASK_MANAGED_INITIAL_WAREHOUSE_SIZE` | `USER_TASK_TIMEOUT_MS` | `TASK_AUTO_RETRY_ATTEMPTS` | `USER_TASK_MINIMUM_TRIGGER_INTERVAL_IN_SECONDS` | `METRIC_LEVEL` | `ENABLE_CONSOLE_OUTPUT` | `ENABLE_UNREDACTED_QUERY_SYNTAX_ERROR`.
+- `key` (String) Name of account parameter. Valid values are (case-insensitive): `ALLOW_CLIENT_MFA_CACHING` | `ALLOW_ID_TOKEN` | `CLIENT_ENCRYPTION_KEY_SIZE` | `CORTEX_ENABLED_CROSS_REGION` | `ENABLE_IDENTIFIER_FIRST_LOGIN` | `ENABLE_INTERNAL_STAGES_PRIVATELINK` | `ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_IMAGE_REPOSITORY` | `ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_SPCS_BLOCK_STORAGE` | `ENABLE_UNHANDLED_EXCEPTIONS_REPORTING` | `ENFORCE_NETWORK_RULES_FOR_INTERNAL_STAGES` | `EVENT_TABLE` | `EXTERNAL_OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST` | `INITIAL_REPLICATION_SIZE_LIMIT_IN_TB` | `MIN_DATA_RETENTION_TIME_IN_DAYS` | `NETWORK_POLICY` | `OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST` | `PERIODIC_DATA_REKEYING` | `PREVENT_LOAD_FROM_INLINE_URL` | `PREVENT_UNLOAD_TO_INLINE_URL` | `REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_CREATION` | `REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_OPERATION` | `SSO_LOGIN_PAGE` | `ABORT_DETACHED_QUERY` | `ACTIVE_PYTHON_PROFILER` | `AUTOCOMMIT` | `BINARY_INPUT_FORMAT` | `BINARY_OUTPUT_FORMAT` | `CLIENT_ENABLE_LOG_INFO_STATEMENT_PARAMETERS` | `CLIENT_MEMORY_LIMIT` | `CLIENT_METADATA_REQUEST_USE_CONNECTION_CTX` | `CLIENT_METADATA_USE_SESSION_DATABASE` | `CLIENT_PREFETCH_THREADS` | `CLIENT_RESULT_CHUNK_SIZE` | `CLIENT_SESSION_KEEP_ALIVE` | `CLIENT_SESSION_KEEP_ALIVE_HEARTBEAT_FREQUENCY` | `CLIENT_TIMESTAMP_TYPE_MAPPING` | `ENABLE_UNLOAD_PHYSICAL_TYPE_OPTIMIZATION` | `CLIENT_RESULT_COLUMN_CASE_INSENSITIVE` | `CSV_TIMESTAMP_FORMAT` | `DATE_INPUT_FORMAT` | `DATE_OUTPUT_FORMAT` | `ERROR_ON_NONDETERMINISTIC_MERGE` | `ERROR_ON_NONDETERMINISTIC_UPDATE` | `GEOGRAPHY_OUTPUT_FORMAT` | `GEOMETRY_OUTPUT_FORMAT` | `HYBRID_TABLE_LOCK_TIMEOUT` | `JDBC_TREAT_DECIMAL_AS_INT` | `JDBC_TREAT_TIMESTAMP_NTZ_AS_UTC` | `JDBC_USE_SESSION_TIMEZONE` | `JSON_INDENT` | `JS_TREAT_INTEGER_AS_BIGINT` | `LOCK_TIMEOUT` | `MULTI_STATEMENT_COUNT` | `NOORDER_SEQUENCE_AS_DEFAULT` | `ODBC_TREAT_DECIMAL_AS_INT` | `PYTHON_PROFILER_MODULES` | `PYTHON_PROFILER_TARGET_STAGE` | `QUERY_TAG` | `QUOTED_IDENTIFIERS_IGNORE_CASE` | `ROWS_PER_RESULTSET` | `S3_STAGE_VPCE_DNS_NAME` | `SEARCH_PATH` | `SIMULATED_DATA_SHARING_CONSUMER` | `STATEMENT_TIMEOUT_IN_SECONDS` | `STRICT_JSON_OUTPUT` | `TIME_INPUT_FORMAT` | `TIME_OUTPUT_FORMAT` | `TIMESTAMP_DAY_IS_ALWAYS_24H` | `TIMESTAMP_INPUT_FORMAT` | `TIMESTAMP_LTZ_OUTPUT_FORMAT` | `TIMESTAMP_NTZ_OUTPUT_FORMAT` | `TIMESTAMP_OUTPUT_FORMAT` | `TIMESTAMP_TYPE_MAPPING` | `TIMESTAMP_TZ_OUTPUT_FORMAT` | `TIMEZONE` | `TRANSACTION_ABORT_ON_ERROR` | `TRANSACTION_DEFAULT_ISOLATION_LEVEL` | `TWO_DIGIT_CENTURY_START` | `UNSUPPORTED_DDL_ACTION` | `USE_CACHED_RESULT` | `WEEK_OF_YEAR_POLICY` | `WEEK_START` | `CATALOG` | `DATA_RETENTION_TIME_IN_DAYS` | `DEFAULT_DDL_COLLATION` | `EXTERNAL_VOLUME` | `LOG_LEVEL` | `MAX_CONCURRENCY_LEVEL` | `MAX_DATA_EXTENSION_TIME_IN_DAYS` | `PIPE_EXECUTION_PAUSED` | `PREVENT_UNLOAD_TO_INTERNAL_STAGES` | `REPLACE_INVALID_CHARACTERS` | `STATEMENT_QUEUED_TIMEOUT_IN_SECONDS` | `STORAGE_SERIALIZATION_POLICY` | `SHARE_RESTRICTIONS` | `SUSPEND_TASK_AFTER_NUM_FAILURES` | `TRACE_LEVEL` | `USER_TASK_MANAGED_INITIAL_WAREHOUSE_SIZE` | `USER_TASK_TIMEOUT_MS` | `TASK_AUTO_RETRY_ATTEMPTS` | `USER_TASK_MINIMUM_TRIGGER_INTERVAL_IN_SECONDS` | `METRIC_LEVEL` | `ENABLE_CONSOLE_OUTPUT` | `ENABLE_UNREDACTED_QUERY_SYNTAX_ERROR` | `ENABLE_PERSONAL_DATABASE`. Deprecated parameters are not supported in the provider.
 - `value` (String) Value of account parameter, as a string. Constraints are the same as those for the parameters in Snowflake documentation. The parameter values are validated in Snowflake.
 
 ### Read-Only
diff --git a/docs/resources/function_java.md b/docs/resources/function_java.md
index 5570e2575e..2ad592c726 100644
--- a/docs/resources/function_java.md
+++ b/docs/resources/function_java.md
@@ -40,7 +40,13 @@ resource "snowflake_function_java" "w" {
   }
   return_type         = "VARCHAR(100)"
   handler             = "TestFunc.echoVarchar"
-  function_definition = "\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  function_definition = <<EOT
+  class TestFunc {
+    public static String echoVarchar(String x) {
+      return x;
+    }
+  }
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -90,7 +96,7 @@ resource "snowflake_function_java" "w" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/function_javascript.md b/docs/resources/function_javascript.md
index 9333693081..c587e4b9a9 100644
--- a/docs/resources/function_javascript.md
+++ b/docs/resources/function_javascript.md
@@ -39,10 +39,14 @@ resource "snowflake_function_javascript" "minimal" {
     arg_data_type = "VARIANT"
     arg_name      = "x"
   }
-  function_definition = <<EOF
-    return x;
-  EOF
   return_type         = "VARIANT"
+  function_definition = <<EOT
+  if (x == 0) {
+    return 1;
+  } else {
+    return 2;
+  }
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -85,7 +89,7 @@ resource "snowflake_function_javascript" "minimal" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/function_python.md b/docs/resources/function_python.md
index a2cf487db5..249a4d8ebc 100644
--- a/docs/resources/function_python.md
+++ b/docs/resources/function_python.md
@@ -42,12 +42,15 @@ resource "snowflake_function_python" "minimal" {
     arg_data_type = "NUMBER(36, 2)"
     arg_name      = "x"
   }
-  function_definition = <<EOF
-    def some_function(x):
-      return x
-  EOF
-  handler             = "some_function"
   return_type         = "NUMBER(36, 2)"
+  handler             = "some_function"
+  function_definition = <<EOT
+def some_function(x):
+  result = ''
+  for a in range(5):
+    result += x
+  return result
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -97,7 +100,7 @@ resource "snowflake_function_python" "minimal" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/function_scala.md b/docs/resources/function_scala.md
index 9a03c90548..9cea381089 100644
--- a/docs/resources/function_scala.md
+++ b/docs/resources/function_scala.md
@@ -37,16 +37,16 @@ resource "snowflake_function_scala" "minimal" {
     arg_data_type = "VARCHAR(100)"
     arg_name      = "x"
   }
-  function_definition = <<EOF
+  return_type         = "VARCHAR(100)"
+  runtime_version     = "2.12"
+  handler             = "TestFunc.echoVarchar"
+  function_definition = <<EOT
   class TestFunc {
     def echoVarchar(x : String): String = {
       return x
     }
   }
-  EOF
-  runtime_version     = "2.12"
-  handler             = "TestFunc.echoVarchar"
-  return_type         = "VARCHAR(100)"
+EOT
 }
 
 # Complete
@@ -61,13 +61,13 @@ resource "snowflake_function_scala" "complete" {
   }
   comment                      = "some comment"
   external_access_integrations = ["external_access_integration_name", "external_access_integration_name_2"]
-  function_definition          = <<EOF
+  function_definition          = <<EOT
   class TestFunc {
     def echoVarchar(x : String): String = {
       return x
     }
   }
-  EOF
+EOT
   handler                      = "TestFunc.echoVarchar"
   null_input_behavior          = "CALLED ON NULL INPUT"
   return_results_behavior      = "VOLATILE"
@@ -143,7 +143,7 @@ resource "snowflake_function_scala" "complete" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/function_sql.md b/docs/resources/function_sql.md
index 66124dc89f..9374f1044c 100644
--- a/docs/resources/function_sql.md
+++ b/docs/resources/function_sql.md
@@ -39,10 +39,10 @@ resource "snowflake_function_sql" "minimal" {
     arg_data_type = "FLOAT"
     arg_name      = "arg_name"
   }
-  function_definition = <<EOF
-    arg_name
-  EOF
   return_type         = "FLOAT"
+  function_definition = <<EOT
+arg_name
+EOT
 }
 
 # Complete
@@ -55,10 +55,10 @@ resource "snowflake_function_sql" "complete" {
     arg_data_type = "FLOAT"
     arg_name      = "arg_name"
   }
-  function_definition     = <<EOF
-    arg_name
-  EOF
   return_type             = "FLOAT"
+  function_definition     = <<EOT
+arg_name
+EOT
   return_results_behavior = "VOLATILE"
   comment                 = "some comment"
 }
@@ -102,7 +102,7 @@ resource "snowflake_function_sql" "complete" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_java.md b/docs/resources/procedure_java.md
index 3dd3858f89..545cd1efed 100644
--- a/docs/resources/procedure_java.md
+++ b/docs/resources/procedure_java.md
@@ -41,7 +41,14 @@ resource "snowflake_procedure_java" "basic" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.*;\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(Session session, String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+  import com.snowflake.snowpark_java.*;
+  class TestFunc {
+    public static String echoVarchar(Session session, String x) {
+      return x;
+    }
+  }
+EOT
   runtime_version      = "11"
   snowpark_package     = "1.14.0"
 }
@@ -57,7 +64,14 @@ resource "snowflake_procedure_java" "full" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.*;\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(Session session, String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+    import com.snowflake.snowpark_java.*;
+  class TestFunc {
+    public static String echoVarchar(Session session, String x) {
+      return x;
+    }
+  }
+EOT
   runtime_version      = "11"
   snowpark_package     = "1.14.0"
 
@@ -139,7 +153,7 @@ resource "snowflake_procedure_java" "full" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_javascript.md b/docs/resources/procedure_javascript.md
index fd50fab116..8b2c7c201d 100644
--- a/docs/resources/procedure_javascript.md
+++ b/docs/resources/procedure_javascript.md
@@ -40,7 +40,13 @@ resource "snowflake_procedure_javascript" "basic" {
     arg_name      = "x"
   }
   return_type          = "VARCHAR(100)"
-  procedure_definition = "\n\tif (x \u003c= 0) {\n\t\treturn 1;\n\t} else {\n\t\tvar result = 1;\n\t\tfor (var i = 2; i \u003c= x; i++) {\n\t\t\tresult = result * i;\n\t\t}\n\t\treturn result;\n\t}\n"
+  procedure_definition = <<EOT
+  if (x == 0) {
+    return 1;
+  } else {
+    return 2;
+  }
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -83,7 +89,7 @@ resource "snowflake_procedure_javascript" "basic" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_python.md b/docs/resources/procedure_python.md
index 76d9495fd4..0ad0eb5505 100644
--- a/docs/resources/procedure_python.md
+++ b/docs/resources/procedure_python.md
@@ -7,6 +7,8 @@ description: |-
 
 !> **Caution: Preview Feature** This feature is considered a preview feature in the provider, regardless of the state of the resource in Snowflake. We do not guarantee its stability. It will be reworked and marked as a stable feature in future releases. Breaking changes are expected, even without bumping the major version. To use this feature, add the relevant feature name to `preview_features_enabled field` in the [provider configuration](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs#schema). Please always refer to the [Getting Help](https://github.com/Snowflake-Labs/terraform-provider-snowflake?tab=readme-ov-file#getting-help) section in our Github repo to best determine how to get help for your questions.
 
+!> **Caution: Import limitation** To import the python procedure, snowflake-snowpark-python version must be explicitly set in Snowflake (i.e. `snowflake-snowpark-python==1.14.0`). You can verify it by running `DESCRIBE PROCEDURE <your_procedure>` and checking the `packages`. Check [#3303](https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/3303) for reference.
+
 -> **Note** External changes to `is_secure` and `null_input_behavior` are not currently supported. They will be handled in the following versions of the provider which may still affect this resource.
 
 -> **Note** `COPY GRANTS` and `OR REPLACE` are not currently supported.
@@ -42,7 +44,13 @@ resource "snowflake_procedure_python" "w" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "echoVarchar"
-  procedure_definition = "\ndef echoVarchar(x):\n\tresult = \"\"\n\tfor a in range(5):\n\t\tresult += x\n\treturn result\n"
+  procedure_definition = <<EOT
+  def echoVarchar(x):
+  result = ''
+  for a in range(5):
+    result += x
+  return result
+EOT
   runtime_version      = "3.8"
   snowpark_package     = "1.14.0"
 }
@@ -94,7 +102,7 @@ resource "snowflake_procedure_python" "w" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_scala.md b/docs/resources/procedure_scala.md
index 0b6cf82659..f119d62a4b 100644
--- a/docs/resources/procedure_scala.md
+++ b/docs/resources/procedure_scala.md
@@ -38,7 +38,14 @@ resource "snowflake_procedure_scala" "w" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.Session\n\n\tclass TestFunc {\n\t\tdef echoVarchar(session : Session, x : String): String = {\n\t\t\treturn x\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+  import com.snowflake.snowpark_java.Session
+  class TestFunc {
+    def echoVarchar(session : Session, x : String): String = {
+      return x
+    }
+  }
+EOT
   runtime_version      = "2.12"
   snowpark_package     = "1.14.0"
 }
@@ -91,7 +98,7 @@ resource "snowflake_procedure_scala" "w" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_sql.md b/docs/resources/procedure_sql.md
index 6aefb8e115..fcf7441ee8 100644
--- a/docs/resources/procedure_sql.md
+++ b/docs/resources/procedure_sql.md
@@ -37,7 +37,11 @@ resource "snowflake_procedure_sql" "w" {
     arg_name      = "x"
   }
   return_type          = "VARCHAR(100)"
-  procedure_definition = "\nBEGIN\n  RETURN message;\nEND;\n"
+  procedure_definition = <<EOT
+BEGIN
+  RETURN message;
+END;
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -80,7 +84,7 @@ resource "snowflake_procedure_sql" "w" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/examples/resources/snowflake_function_java/resource.tf b/examples/resources/snowflake_function_java/resource.tf
index a34d6af477..2be224de9c 100644
--- a/examples/resources/snowflake_function_java/resource.tf
+++ b/examples/resources/snowflake_function_java/resource.tf
@@ -8,5 +8,11 @@ resource "snowflake_function_java" "w" {
   }
   return_type         = "VARCHAR(100)"
   handler             = "TestFunc.echoVarchar"
-  function_definition = "\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  function_definition = <<EOT
+  class TestFunc {
+    public static String echoVarchar(String x) {
+      return x;
+    }
+  }
+EOT
 }
diff --git a/examples/resources/snowflake_function_javascript/resource.tf b/examples/resources/snowflake_function_javascript/resource.tf
index 9cff28c6e0..4816e46191 100644
--- a/examples/resources/snowflake_function_javascript/resource.tf
+++ b/examples/resources/snowflake_function_javascript/resource.tf
@@ -7,8 +7,12 @@ resource "snowflake_function_javascript" "minimal" {
     arg_data_type = "VARIANT"
     arg_name      = "x"
   }
-  function_definition = <<EOF
-    return x;
-  EOF
   return_type         = "VARIANT"
+  function_definition = <<EOT
+  if (x == 0) {
+    return 1;
+  } else {
+    return 2;
+  }
+EOT
 }
diff --git a/examples/resources/snowflake_function_python/resource.tf b/examples/resources/snowflake_function_python/resource.tf
index 50a450a239..463c4ff36e 100644
--- a/examples/resources/snowflake_function_python/resource.tf
+++ b/examples/resources/snowflake_function_python/resource.tf
@@ -8,10 +8,13 @@ resource "snowflake_function_python" "minimal" {
     arg_data_type = "NUMBER(36, 2)"
     arg_name      = "x"
   }
-  function_definition = <<EOF
-    def some_function(x):
-      return x
-  EOF
-  handler             = "some_function"
   return_type         = "NUMBER(36, 2)"
+  handler             = "some_function"
+  function_definition = <<EOT
+def some_function(x):
+  result = ''
+  for a in range(5):
+    result += x
+  return result
+EOT
 }
diff --git a/examples/resources/snowflake_function_scala/resource.tf b/examples/resources/snowflake_function_scala/resource.tf
index 0fa07b79ff..206ceebc81 100644
--- a/examples/resources/snowflake_function_scala/resource.tf
+++ b/examples/resources/snowflake_function_scala/resource.tf
@@ -7,16 +7,16 @@ resource "snowflake_function_scala" "minimal" {
     arg_data_type = "VARCHAR(100)"
     arg_name      = "x"
   }
-  function_definition = <<EOF
+  return_type         = "VARCHAR(100)"
+  runtime_version     = "2.12"
+  handler             = "TestFunc.echoVarchar"
+  function_definition = <<EOT
   class TestFunc {
     def echoVarchar(x : String): String = {
       return x
     }
   }
-  EOF
-  runtime_version     = "2.12"
-  handler             = "TestFunc.echoVarchar"
-  return_type         = "VARCHAR(100)"
+EOT
 }
 
 # Complete
@@ -31,13 +31,13 @@ resource "snowflake_function_scala" "complete" {
   }
   comment                      = "some comment"
   external_access_integrations = ["external_access_integration_name", "external_access_integration_name_2"]
-  function_definition          = <<EOF
+  function_definition          = <<EOT
   class TestFunc {
     def echoVarchar(x : String): String = {
       return x
     }
   }
-  EOF
+EOT
   handler                      = "TestFunc.echoVarchar"
   null_input_behavior          = "CALLED ON NULL INPUT"
   return_results_behavior      = "VOLATILE"
diff --git a/examples/resources/snowflake_function_sql/resource.tf b/examples/resources/snowflake_function_sql/resource.tf
index 16a91889dd..6561687c41 100644
--- a/examples/resources/snowflake_function_sql/resource.tf
+++ b/examples/resources/snowflake_function_sql/resource.tf
@@ -7,10 +7,10 @@ resource "snowflake_function_sql" "minimal" {
     arg_data_type = "FLOAT"
     arg_name      = "arg_name"
   }
-  function_definition = <<EOF
-    arg_name
-  EOF
   return_type         = "FLOAT"
+  function_definition = <<EOT
+arg_name
+EOT
 }
 
 # Complete
@@ -23,10 +23,10 @@ resource "snowflake_function_sql" "complete" {
     arg_data_type = "FLOAT"
     arg_name      = "arg_name"
   }
-  function_definition     = <<EOF
-    arg_name
-  EOF
   return_type             = "FLOAT"
+  function_definition     = <<EOT
+arg_name
+EOT
   return_results_behavior = "VOLATILE"
   comment                 = "some comment"
 }
diff --git a/examples/resources/snowflake_procedure_java/resource.tf b/examples/resources/snowflake_procedure_java/resource.tf
index 6f3bc051b9..6393b3adf7 100644
--- a/examples/resources/snowflake_procedure_java/resource.tf
+++ b/examples/resources/snowflake_procedure_java/resource.tf
@@ -9,7 +9,14 @@ resource "snowflake_procedure_java" "basic" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.*;\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(Session session, String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+  import com.snowflake.snowpark_java.*;
+  class TestFunc {
+    public static String echoVarchar(Session session, String x) {
+      return x;
+    }
+  }
+EOT
   runtime_version      = "11"
   snowpark_package     = "1.14.0"
 }
@@ -25,7 +32,14 @@ resource "snowflake_procedure_java" "full" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.*;\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(Session session, String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+    import com.snowflake.snowpark_java.*;
+  class TestFunc {
+    public static String echoVarchar(Session session, String x) {
+      return x;
+    }
+  }
+EOT
   runtime_version      = "11"
   snowpark_package     = "1.14.0"
 
diff --git a/examples/resources/snowflake_procedure_javascript/resource.tf b/examples/resources/snowflake_procedure_javascript/resource.tf
index 5ad3f42b62..cec5f08560 100644
--- a/examples/resources/snowflake_procedure_javascript/resource.tf
+++ b/examples/resources/snowflake_procedure_javascript/resource.tf
@@ -8,5 +8,11 @@ resource "snowflake_procedure_javascript" "basic" {
     arg_name      = "x"
   }
   return_type          = "VARCHAR(100)"
-  procedure_definition = "\n\tif (x \u003c= 0) {\n\t\treturn 1;\n\t} else {\n\t\tvar result = 1;\n\t\tfor (var i = 2; i \u003c= x; i++) {\n\t\t\tresult = result * i;\n\t\t}\n\t\treturn result;\n\t}\n"
+  procedure_definition = <<EOT
+  if (x == 0) {
+    return 1;
+  } else {
+    return 2;
+  }
+EOT
 }
diff --git a/examples/resources/snowflake_procedure_python/resource.tf b/examples/resources/snowflake_procedure_python/resource.tf
index 3f4987d36b..14642e6f6a 100644
--- a/examples/resources/snowflake_procedure_python/resource.tf
+++ b/examples/resources/snowflake_procedure_python/resource.tf
@@ -8,7 +8,13 @@ resource "snowflake_procedure_python" "w" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "echoVarchar"
-  procedure_definition = "\ndef echoVarchar(x):\n\tresult = \"\"\n\tfor a in range(5):\n\t\tresult += x\n\treturn result\n"
+  procedure_definition = <<EOT
+  def echoVarchar(x):
+  result = ''
+  for a in range(5):
+    result += x
+  return result
+EOT
   runtime_version      = "3.8"
   snowpark_package     = "1.14.0"
 }
diff --git a/examples/resources/snowflake_procedure_scala/resource.tf b/examples/resources/snowflake_procedure_scala/resource.tf
index 889473e122..becdca1717 100644
--- a/examples/resources/snowflake_procedure_scala/resource.tf
+++ b/examples/resources/snowflake_procedure_scala/resource.tf
@@ -8,7 +8,14 @@ resource "snowflake_procedure_scala" "w" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.Session\n\n\tclass TestFunc {\n\t\tdef echoVarchar(session : Session, x : String): String = {\n\t\t\treturn x\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+  import com.snowflake.snowpark_java.Session
+  class TestFunc {
+    def echoVarchar(session : Session, x : String): String = {
+      return x
+    }
+  }
+EOT
   runtime_version      = "2.12"
   snowpark_package     = "1.14.0"
 }
diff --git a/examples/resources/snowflake_procedure_sql/resource.tf b/examples/resources/snowflake_procedure_sql/resource.tf
index 77258c73d9..a10b403b59 100644
--- a/examples/resources/snowflake_procedure_sql/resource.tf
+++ b/examples/resources/snowflake_procedure_sql/resource.tf
@@ -7,5 +7,9 @@ resource "snowflake_procedure_sql" "w" {
     arg_name      = "x"
   }
   return_type          = "VARCHAR(100)"
-  procedure_definition = "\nBEGIN\n  RETURN message;\nEND;\n"
+  procedure_definition = <<EOT
+BEGIN
+  RETURN message;
+END;
+EOT
 }
diff --git a/pkg/acceptance/bettertestspoc/config/config.go b/pkg/acceptance/bettertestspoc/config/config.go
index 3174d20fca..9a7a900bda 100644
--- a/pkg/acceptance/bettertestspoc/config/config.go
+++ b/pkg/acceptance/bettertestspoc/config/config.go
@@ -1,8 +1,6 @@
 package config
 
 import (
-	"encoding/json"
-	"fmt"
 	"reflect"
 	"strings"
 	"testing"
@@ -67,7 +65,8 @@ func ProviderFromModel(t *testing.T, model ProviderModel) string {
 	return hcl
 }
 
-// FromModels allows to combine multiple models.
+// FromModels should be used in terraform acceptance tests for Config attribute to get string config from all models.
+// FromModels allows to combine multiple model types.
 // TODO [SNOW-1501905]: introduce some common interface for all three existing models (ResourceModel, DatasourceModel, and ProviderModel)
 func FromModels(t *testing.T, models ...any) string {
 	t.Helper()
@@ -91,50 +90,6 @@ func FromModels(t *testing.T, models ...any) string {
 	return sb.String()
 }
 
-// FromModel should be used in terraform acceptance tests for Config attribute to get string config from ResourceModel.
-// Current implementation is really straightforward but it could be improved and tested. It may not handle all cases (like objects, lists, sets) correctly.
-// TODO [SNOW-1501905]: use reflection to build config directly from model struct (or some other different way)
-// TODO [SNOW-1501905]: add support for config.TestStepConfigFunc (to use as ConfigFile); the naive implementation would be to just create a tmp directory and save file there
-// TODO [SNOW-1501905]: add generating MarshalJSON() function
-// TODO [SNOW-1501905]: migrate resources to new config generation method (above needed first)
-// Use ResourceFromModel, DatasourceFromModel, ProviderFromModel, and FromModels instead.
-func FromModel(t *testing.T, model ResourceModel) string {
-	t.Helper()
-
-	b, err := json.Marshal(model)
-	require.NoError(t, err)
-
-	var objMap map[string]json.RawMessage
-	err = json.Unmarshal(b, &objMap)
-	require.NoError(t, err)
-
-	var sb strings.Builder
-	sb.WriteString(fmt.Sprintf(`resource "%s" "%s" {`, model.Resource(), model.ResourceName()))
-	sb.WriteRune('\n')
-	for k, v := range objMap {
-		sb.WriteString(fmt.Sprintf("\t%s = %s\n", k, v))
-	}
-	if len(model.DependsOn()) > 0 {
-		sb.WriteString(fmt.Sprintf("\tdepends_on = [%s]\n", strings.Join(model.DependsOn(), ", ")))
-	}
-	sb.WriteString(`}`)
-	sb.WriteRune('\n')
-	s := sb.String()
-	t.Logf("Generated config:\n%s", s)
-	return s
-}
-
-// FromModelsDeprecated allows to combine multiple resource models.
-// Use FromModels instead.
-func FromModelsDeprecated(t *testing.T, models ...ResourceModel) string {
-	t.Helper()
-	var sb strings.Builder
-	for _, model := range models {
-		sb.WriteString(FromModel(t, model) + "\n")
-	}
-	return sb.String()
-}
-
 // ConfigVariablesFromModel constructs config.Variables needed in acceptance tests that are using ConfigVariables in
 // combination with ConfigDirectory. It's necessary for cases not supported by FromModel, like lists of objects.
 // Use ResourceFromModel, DatasourceFromModel, ProviderFromModel, and FromModels instead.
diff --git a/pkg/acceptance/bettertestspoc/config/config_test.go b/pkg/acceptance/bettertestspoc/config/config_test.go
index f061058adc..5c6959012d 100644
--- a/pkg/acceptance/bettertestspoc/config/config_test.go
+++ b/pkg/acceptance/bettertestspoc/config/config_test.go
@@ -35,6 +35,9 @@ resource "snowflake_share" "test" {
 				Item{IntField: 2, StringField: "second item"},
 			).
 			WithSingleObject("one", 2).
+			WithTextFieldExplicitNull().
+			WithListFieldEmpty().
+			WithMultilineField("some\nmultiline\ncontent").
 			WithDependsOn("some_other_resource.some_name", "other_resource.some_other_name", "third_resource.third_name")
 		expectedOutput := strings.TrimPrefix(`
 resource "snowflake_share" "test" {
@@ -54,6 +57,13 @@ resource "snowflake_share" "test" {
     a = "one"
     b = 2
   }
+  text_field = null
+  list_field = []
+  multiline_field = <<EOT
+some
+multiline
+content
+EOT
   depends_on = [some_other_resource.some_name, other_resource.some_other_name, third_resource.third_name]
 }
 `, "\n")
diff --git a/pkg/acceptance/bettertestspoc/config/custom_variables.go b/pkg/acceptance/bettertestspoc/config/custom_variables.go
index 4fb26cc040..2f8a0f722c 100644
--- a/pkg/acceptance/bettertestspoc/config/custom_variables.go
+++ b/pkg/acceptance/bettertestspoc/config/custom_variables.go
@@ -1,15 +1,46 @@
 package config
 
-import "encoding/json"
+import (
+	"encoding/json"
+	"fmt"
+)
 
-type nullVariable struct{}
+type emptyListVariable struct{}
 
-// MarshalJSON returns the JSON encoding of nullVariable.
-func (v nullVariable) MarshalJSON() ([]byte, error) {
-	return json.Marshal(nil)
+// MarshalJSON returns the JSON encoding of emptyListVariable.
+func (v emptyListVariable) MarshalJSON() ([]byte, error) {
+	return json.Marshal([]any{})
 }
 
-// NullVariable returns nullVariable which implements Variable.
-func NullVariable() nullVariable {
-	return nullVariable{}
+// EmptyListVariable returns Variable representing an empty list. This is because the current hcl parser handles empty SetVariable incorrectly.
+func EmptyListVariable() emptyListVariable {
+	return emptyListVariable{}
+}
+
+type replacementPlaceholderVariable struct {
+	placeholder ReplacementPlaceholder
+}
+
+// MarshalJSON returns the JSON encoding of replacementPlaceholderVariable.
+func (v replacementPlaceholderVariable) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.placeholder)
+}
+
+// ReplacementPlaceholderVariable returns Variable containing one of the ReplacementPlaceholder which is later replaced by HclFormatter.
+func ReplacementPlaceholderVariable(placeholder ReplacementPlaceholder) replacementPlaceholderVariable {
+	return replacementPlaceholderVariable{placeholder}
+}
+
+type multilineWrapperVariable struct {
+	content string
+}
+
+// MarshalJSON returns the JSON encoding of multilineWrapperVariable.
+func (v multilineWrapperVariable) MarshalJSON() ([]byte, error) {
+	return json.Marshal(fmt.Sprintf(`%[1]s%[2]s%[1]s`, SnowflakeProviderConfigMultilineMarker, v.content))
+}
+
+// MultilineWrapperVariable returns Variable containing multiline content wrapped with SnowflakeProviderConfigMultilineMarker later replaced by HclFormatter.
+func MultilineWrapperVariable(content string) multilineWrapperVariable {
+	return multilineWrapperVariable{content}
 }
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/accounts_model_gen.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/accounts_model_gen.go
index 382a0d2e28..f21a456df8 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/accounts_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/accounts_model_gen.go
@@ -3,6 +3,8 @@
 package datasourcemodel
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -10,8 +12,9 @@ import (
 )
 
 type AccountsModel struct {
-	Accounts tfconfig.Variable `json:"accounts,omitempty"`
-	Pattern  tfconfig.Variable `json:"pattern,omitempty"`
+	Accounts    tfconfig.Variable `json:"accounts,omitempty"`
+	Like        tfconfig.Variable `json:"like,omitempty"`
+	WithHistory tfconfig.Variable `json:"with_history,omitempty"`
 
 	*config.DatasourceModelMeta
 }
@@ -32,14 +35,39 @@ func AccountsWithDefaultMeta() *AccountsModel {
 	return a
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (a *AccountsModel) MarshalJSON() ([]byte, error) {
+	type Alias AccountsModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(a),
+		DependsOn: a.DependsOn(),
+	})
+}
+
+func (a *AccountsModel) WithDependsOn(values ...string) *AccountsModel {
+	a.SetDependsOn(values...)
+	return a
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
 
 // accounts attribute type is not yet supported, so WithAccounts can't be generated
 
-func (a *AccountsModel) WithPattern(pattern string) *AccountsModel {
-	a.Pattern = tfconfig.StringVariable(pattern)
+func (a *AccountsModel) WithLike(like string) *AccountsModel {
+	a.Like = tfconfig.StringVariable(like)
+	return a
+}
+
+func (a *AccountsModel) WithWithHistory(withHistory bool) *AccountsModel {
+	a.WithHistory = tfconfig.BoolVariable(withHistory)
 	return a
 }
 
@@ -52,7 +80,12 @@ func (a *AccountsModel) WithAccountsValue(value tfconfig.Variable) *AccountsMode
 	return a
 }
 
-func (a *AccountsModel) WithPatternValue(value tfconfig.Variable) *AccountsModel {
-	a.Pattern = value
+func (a *AccountsModel) WithLikeValue(value tfconfig.Variable) *AccountsModel {
+	a.Like = value
+	return a
+}
+
+func (a *AccountsModel) WithWithHistoryValue(value tfconfig.Variable) *AccountsModel {
+	a.WithHistory = value
 	return a
 }
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_ext.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_ext.go
deleted file mode 100644
index 96e4ec2d28..0000000000
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_ext.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package datasourcemodel
-
-import (
-	"encoding/json"
-)
-
-// Based on https://medium.com/picus-security-engineering/custom-json-marshaller-in-go-and-common-pitfalls-c43fa774db05.
-func (d *DatabaseModel) MarshalJSON() ([]byte, error) {
-	type Alias DatabaseModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(d),
-		DependsOn: d.DependsOn(),
-	})
-}
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_gen.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_gen.go
index dd99002397..7ecb98bf7d 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_gen.go
@@ -3,6 +3,8 @@
 package datasourcemodel
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -44,6 +46,26 @@ func DatabaseWithDefaultMeta(
 	return d
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (d *DatabaseModel) MarshalJSON() ([]byte, error) {
+	type Alias DatabaseModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(d),
+		DependsOn: d.DependsOn(),
+	})
+}
+
+func (d *DatabaseModel) WithDependsOn(values ...string) *DatabaseModel {
+	d.SetDependsOn(values...)
+	return d
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_ext.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_ext.go
index 1e19163087..53b23120a4 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_ext.go
@@ -1,28 +1,9 @@
 package datasourcemodel
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-// Based on https://medium.com/picus-security-engineering/custom-json-marshaller-in-go-and-common-pitfalls-c43fa774db05.
-func (d *DatabasesModel) MarshalJSON() ([]byte, error) {
-	type Alias DatabasesModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(d),
-		DependsOn: d.DependsOn(),
-	})
-}
-
-func (d *DatabasesModel) WithDependsOn(values ...string) *DatabasesModel {
-	d.SetDependsOn(values...)
-	return d
-}
-
 func (d *DatabasesModel) WithLimit(rows int) *DatabasesModel {
 	return d.WithLimitValue(
 		tfconfig.ObjectVariable(map[string]tfconfig.Variable{
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_gen.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_gen.go
index f2adf41b91..bab46b9750 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_gen.go
@@ -3,6 +3,8 @@
 package datasourcemodel
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -36,6 +38,26 @@ func DatabasesWithDefaultMeta() *DatabasesModel {
 	return d
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (d *DatabasesModel) MarshalJSON() ([]byte, error) {
+	type Alias DatabasesModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(d),
+		DependsOn: d.DependsOn(),
+	})
+}
+
+func (d *DatabasesModel) WithDependsOn(values ...string) *DatabasesModel {
+	d.SetDependsOn(values...)
+	return d
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates.go
index 0c0da8794d..1b4931c3cf 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates.go
@@ -23,6 +23,14 @@ var (
 		genhelpers.SnakeCaseToCamel,
 	)).Parse(definitionTemplateContent)
 
+	//go:embed templates/marshal_json.tmpl
+	marshalJsonTemplateContent string
+	MarshalJsonTemplate, _     = template.New("marshalJsonTemplate").Funcs(genhelpers.BuildTemplateFuncMap(
+		genhelpers.FirstLetterLowercase,
+		genhelpers.FirstLetter,
+		genhelpers.SnakeCaseToCamel,
+	)).Parse(marshalJsonTemplateContent)
+
 	// TODO [SNOW-1501905]: consider duplicating the builders template from resource (currently same template used for datasources and provider which limits the customization possibilities for just one block type)
-	AllTemplates = []*template.Template{PreambleTemplate, DefinitionTemplate, resourcemodel.BuildersTemplate}
+	AllTemplates = []*template.Template{PreambleTemplate, DefinitionTemplate, MarshalJsonTemplate, resourcemodel.BuildersTemplate}
 )
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates/marshal_json.tmpl b/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates/marshal_json.tmpl
new file mode 100644
index 0000000000..96c00d6e1b
--- /dev/null
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates/marshal_json.tmpl
@@ -0,0 +1,24 @@
+{{- /*gotype: github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model/gen.ResourceConfigBuilderModel*/ -}}
+
+{{- $modelName := .Name | printf "%sModel" -}}
+{{- $nameLowerCase := FirstLetterLowercase .Name -}}
+{{- $modelVar := FirstLetter $nameLowerCase }}
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func ({{ $modelVar }} *{{ $modelName }}) MarshalJSON() ([]byte, error) {
+    type Alias {{ $modelName }}
+    return json.Marshal(&struct {
+        *Alias
+        DependsOn []string `json:"depends_on,omitempty"`
+    }{
+        Alias:     (*Alias)({{ $modelVar }}),
+        DependsOn: {{ $modelVar }}.DependsOn(),
+    })
+}
+
+func ({{ $modelVar }} *{{ $modelName }}) WithDependsOn(values ...string) *{{ $modelName }} {
+    {{ $modelVar }}.SetDependsOn(values...)
+    return {{ $modelVar }}
+}
diff --git a/pkg/acceptance/bettertestspoc/config/hcl_config_provider.go b/pkg/acceptance/bettertestspoc/config/hcl_config_provider.go
index 632e2d502e..e96fe57d16 100644
--- a/pkg/acceptance/bettertestspoc/config/hcl_config_provider.go
+++ b/pkg/acceptance/bettertestspoc/config/hcl_config_provider.go
@@ -10,7 +10,7 @@ import (
 	hclv1parser "github.com/hashicorp/hcl/json/parser"
 )
 
-var DefaultHclConfigProvider = NewHclV1ConfigProvider(unquoteBlockType, fixBlockArguments, fixMultilinePrivateKey, unquoteArguments, unquoteArguments, removeDoubleNewlines, unquoteDependsOnReferences)
+var DefaultHclConfigProvider = NewHclV1ConfigProvider(replaceNullPlaceholders, unquoteBlockType, fixBlockArguments, replaceMultilinePlaceholders, unquoteArguments, unquoteArguments, removeDoubleNewlines, unquoteDependsOnReferences)
 
 // HclConfigProvider defines methods to generate .tf config from .tf.json configs.
 type HclConfigProvider interface {
@@ -79,20 +79,25 @@ func fixBlockArguments(s string) (string, error) {
 	return argumentRegex.ReplaceAllString(s, `$1$2$3$4`), nil
 }
 
-// TODO [SNOW-1501905]: fix new lines replacement totally in this method, consider better placeholders (now there can't be multilinekeys for private key)
-func fixMultilinePrivateKey(s string) (string, error) {
-	argumentRegex := regexp.MustCompile(fmt.Sprintf(`"%[1]s(.*)%[1]s"`, SnowflakeProviderConfigPrivateKey))
+func replaceNullPlaceholders(s string) (string, error) {
+	argumentRegex := regexp.MustCompile(fmt.Sprintf(`"%[1]s"`, SnowflakeProviderConfigNull))
 	submatches := argumentRegex.FindStringSubmatch(s)
 	if len(submatches) < 1 {
 		return s, nil
 	} else {
-		return argumentRegex.ReplaceAllString(s, fmt.Sprintf(`<<EOT
-%s
-EOT`, strings.ReplaceAll(submatches[1], `\n`, `
-`))), nil
+		return argumentRegex.ReplaceAllString(s, `null`), nil
 	}
 }
 
+// TODO [SNOW-1501905]: fix new lines replacement totally in this method
+func replaceMultilinePlaceholders(s string) (string, error) {
+	argumentRegex := regexp.MustCompile(fmt.Sprintf(`"%[1]s(.*?)%[1]s"`, SnowflakeProviderConfigMultilineMarker))
+	return strings.ReplaceAll(argumentRegex.ReplaceAllString(s, `<<EOT
+$1
+EOT`), `\n`, `
+`), nil
+}
+
 // Conversion to HCL using hcl v1  does not unquote arguments.
 // Check experiments subpackage for details.
 func unquoteArguments(s string) (string, error) {
diff --git a/pkg/acceptance/bettertestspoc/config/hcl_config_provider_test.go b/pkg/acceptance/bettertestspoc/config/hcl_config_provider_test.go
index ddd1187d32..431e6c3681 100644
--- a/pkg/acceptance/bettertestspoc/config/hcl_config_provider_test.go
+++ b/pkg/acceptance/bettertestspoc/config/hcl_config_provider_test.go
@@ -35,7 +35,8 @@ func Test_HclProvider(t *testing.T) {
                             "prop1": 1,
                             "prop2": "two"
                         },
-						"multiline_string": "SF_TF_TEST_MULTILINE_PLACEHOLDER_PRIVATE_KEY-----BEGIN PRIVATE KEY-----\nabc\ndef\nghj\n-----END PRIVATE KEY-----\nSF_TF_TEST_MULTILINE_PLACEHOLDER_PRIVATE_KEY",
+						"multiline_string": "SF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER-----BEGIN PRIVATE KEY-----\nabc\ndef\nghj\n-----END PRIVATE KEY-----\nSF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER",
+						"multiline_string2": "SF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER-----BEGIN PRIVATE KEY-----\nklm\nnop\nqrs\n-----END PRIVATE KEY-----\nSF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER",
                         "depends_on": [
                             "some_other_resource.some_name",
                             "other_resource.some_other_name",
@@ -69,6 +70,13 @@ abc
 def
 ghj
 -----END PRIVATE KEY-----
+EOT
+  multiline_string2 = <<EOT
+-----BEGIN PRIVATE KEY-----
+klm
+nop
+qrs
+-----END PRIVATE KEY-----
 EOT
   depends_on = [some_other_resource.some_name, other_resource.some_other_name, data.some_datasource.some_fancy_datasource]
 }
@@ -80,4 +88,19 @@ EOT
 
 		fmt.Printf("%s", result)
 	})
+
+	t.Run("document improper null handling", func(t *testing.T) {
+		resourceJson := `{
+            "resource": {
+                "snowflake_share": {
+                    "test": {
+                        "attribute": null
+                    }
+                }
+            }
+        }`
+
+		_, err := config.DefaultHclConfigProvider.HclFromJson([]byte(resourceJson))
+		require.ErrorContains(t, err, "object expected closing RBRACE got: EOF")
+	})
 }
diff --git a/pkg/acceptance/bettertestspoc/config/json_config_provider_test.go b/pkg/acceptance/bettertestspoc/config/json_config_provider_test.go
index a5584008df..0d8850dc20 100644
--- a/pkg/acceptance/bettertestspoc/config/json_config_provider_test.go
+++ b/pkg/acceptance/bettertestspoc/config/json_config_provider_test.go
@@ -1,6 +1,7 @@
 package config_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -31,6 +32,43 @@ func Test_JsonConfigProvider(t *testing.T) {
 		assert.Equal(t, expectedResult, string(result))
 	})
 
+	t.Run("test special variables", func(t *testing.T) {
+		model := Some("some_name", "abc").WithTextFieldExplicitNull().WithListFieldEmpty()
+		expectedResult := fmt.Sprintf(`{
+    "resource": {
+        "snowflake_share": {
+            "some_name": {
+                "name": "abc",
+                "text_field": "%[1]s",
+                "list_field": []
+            }
+        }
+    }
+}`, config.SnowflakeProviderConfigNull)
+
+		result, err := config.DefaultJsonConfigProvider.ResourceJsonFromModel(model)
+		require.NoError(t, err)
+		assert.Equal(t, expectedResult, string(result))
+	})
+
+	t.Run("test multiline variable", func(t *testing.T) {
+		model := Some("some_name", "abc").WithMultilineField("some\nmultiline\ncontent")
+		expectedResult := fmt.Sprintf(`{
+    "resource": {
+        "snowflake_share": {
+            "some_name": {
+                "name": "abc",
+                "multiline_field": "%[1]s%[2]s%[1]s"
+            }
+        }
+    }
+}`, config.SnowflakeProviderConfigMultilineMarker, "some\\nmultiline\\ncontent")
+
+		result, err := config.DefaultJsonConfigProvider.ResourceJsonFromModel(model)
+		require.NoError(t, err)
+		assert.Equal(t, expectedResult, string(result))
+	})
+
 	t.Run("test resource json config when proper marshaller is absent", func(t *testing.T) {
 		model := SomeOther("some_name", "abc").WithDependsOn("abc.def")
 		expectedResult := `{
diff --git a/pkg/acceptance/bettertestspoc/config/model/account_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/account_model_gen.go
index b1000b7931..88cac4abc3 100644
--- a/pkg/acceptance/bettertestspoc/config/model/account_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/account_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -67,6 +69,26 @@ func AccountWithDefaultMeta(
 	return a
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (a *AccountModel) MarshalJSON() ([]byte, error) {
+	type Alias AccountModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(a),
+		DependsOn: a.DependsOn(),
+	})
+}
+
+func (a *AccountModel) WithDependsOn(values ...string) *AccountModel {
+	a.SetDependsOn(values...)
+	return a
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/account_parameter_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/account_parameter_model_gen.go
index 9fc1cff42a..f906dd1bef 100644
--- a/pkg/acceptance/bettertestspoc/config/model/account_parameter_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/account_parameter_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -41,6 +43,26 @@ func AccountParameterWithDefaultMeta(
 	return a
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (a *AccountParameterModel) MarshalJSON() ([]byte, error) {
+	type Alias AccountParameterModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(a),
+		DependsOn: a.DependsOn(),
+	})
+}
+
+func (a *AccountParameterModel) WithDependsOn(values ...string) *AccountParameterModel {
+	a.SetDependsOn(values...)
+	return a
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/database_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/database_model_gen.go
index 813b6b96e3..f9ca857fdb 100644
--- a/pkg/acceptance/bettertestspoc/config/model/database_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/database_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -57,6 +59,26 @@ func DatabaseWithDefaultMeta(
 	return d
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (d *DatabaseModel) MarshalJSON() ([]byte, error) {
+	type Alias DatabaseModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(d),
+		DependsOn: d.DependsOn(),
+	})
+}
+
+func (d *DatabaseModel) WithDependsOn(values ...string) *DatabaseModel {
+	d.SetDependsOn(values...)
+	return d
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/database_role_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/database_role_model_gen.go
index df3106e1cc..bf59bd4583 100644
--- a/pkg/acceptance/bettertestspoc/config/model/database_role_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/database_role_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -43,6 +45,26 @@ func DatabaseRoleWithDefaultMeta(
 	return d
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (d *DatabaseRoleModel) MarshalJSON() ([]byte, error) {
+	type Alias DatabaseRoleModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(d),
+		DependsOn: d.DependsOn(),
+	})
+}
+
+func (d *DatabaseRoleModel) WithDependsOn(values ...string) *DatabaseRoleModel {
+	d.SetDependsOn(values...)
+	return d
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go
index 0174c4dc10..3b2acbc841 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go
@@ -1,27 +1,16 @@
 package model
 
 import (
-	"encoding/json"
 	"strings"
 
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *FunctionJavaModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionJavaModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionJavaBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -29,7 +18,7 @@ func FunctionJavaBasicInline(
 	handler string,
 	functionDefinition string,
 ) *FunctionJavaModel {
-	return FunctionJava(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), id.SchemaName()).WithFunctionDefinition(functionDefinition)
+	return FunctionJava(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), id.SchemaName()).WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func FunctionJavaBasicStaged(
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_java_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_java_model_gen.go
index 309a53b0a9..a4c20306ee 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_java_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_java_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -74,6 +76,26 @@ func FunctionJavaWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionJavaModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionJavaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionJavaModel) WithDependsOn(values ...string) *FunctionJavaModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go
index c1429191a6..3c25076aab 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go
@@ -1,34 +1,16 @@
 package model
 
 import (
-	"encoding/json"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (f *FunctionJavascriptModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionJavascriptModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionJavascriptInline(resourceName string, id sdk.SchemaObjectIdentifierWithArguments, functionDefinition string, returnType string) *FunctionJavascriptModel {
-	f := &FunctionJavascriptModel{ResourceModelMeta: config.Meta(resourceName, resources.FunctionJavascript)}
-	f.WithDatabase(id.DatabaseName())
-	f.WithFunctionDefinition(functionDefinition)
-	f.WithName(id.Name())
-	f.WithReturnType(returnType)
-	f.WithSchema(id.SchemaName())
-	return f
+	return FunctionJavascript(resourceName, id.DatabaseName(), functionDefinition, id.Name(), returnType, id.SchemaName()).
+		WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func (f *FunctionJavascriptModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionJavascriptModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_gen.go
index 742dee099b..e9397ff9b3 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -67,6 +69,26 @@ func FunctionJavascriptWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionJavascriptModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionJavascriptModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionJavascriptModel) WithDependsOn(values ...string) *FunctionJavascriptModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go
index f68dec8871..ad420f07ef 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go
@@ -1,27 +1,16 @@
 package model
 
 import (
-	"encoding/json"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (f *FunctionPythonModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionPythonModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionPythonBasicInline(resourceName string, id sdk.SchemaObjectIdentifierWithArguments, runtimeVersion string, returnType datatypes.DataType, handler string, functionDefinition string) *FunctionPythonModel {
-	return FunctionPython(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinition(functionDefinition)
+	return FunctionPython(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func (f *FunctionPythonModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionPythonModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_python_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_python_model_gen.go
index 17ae5eccaf..8c0ca5904e 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_python_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_python_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -78,6 +80,26 @@ func FunctionPythonWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionPythonModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionPythonModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionPythonModel) WithDependsOn(values ...string) *FunctionPythonModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go
index bb7fcf2847..bf81948f58 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go
@@ -1,26 +1,16 @@
 package model
 
 import (
-	"encoding/json"
 	"strings"
 
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (f *FunctionScalaModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionScalaModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionScalaBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -29,7 +19,7 @@ func FunctionScalaBasicInline(
 	handler string,
 	functionDefinition string,
 ) *FunctionScalaModel {
-	return FunctionScala(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinition(functionDefinition)
+	return FunctionScala(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func (f *FunctionScalaModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionScalaModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_gen.go
index 070933fd4e..a3f338847a 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -78,6 +80,26 @@ func FunctionScalaWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionScalaModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionScalaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionScalaModel) WithDependsOn(values ...string) *FunctionScalaModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go
index f01b2e8ffe..32c1cc7325 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go
@@ -1,34 +1,16 @@
 package model
 
 import (
-	"encoding/json"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (f *FunctionSqlModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionSqlModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionSqlBasicInline(resourceName string, id sdk.SchemaObjectIdentifierWithArguments, functionDefinition string, returnType string) *FunctionSqlModel {
-	f := &FunctionSqlModel{ResourceModelMeta: config.Meta(resourceName, resources.FunctionSql)}
-	f.WithDatabase(id.DatabaseName())
-	f.WithFunctionDefinition(functionDefinition)
-	f.WithName(id.Name())
-	f.WithReturnType(returnType)
-	f.WithSchema(id.SchemaName())
-	return f
+	return FunctionSql(resourceName, id.DatabaseName(), functionDefinition, id.Name(), returnType, id.SchemaName()).
+		WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func (f *FunctionSqlModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionSqlModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_gen.go
index 0733c2add4..acc101088a 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -21,7 +23,6 @@ type FunctionSqlModel struct {
 	LogLevel              tfconfig.Variable `json:"log_level,omitempty"`
 	MetricLevel           tfconfig.Variable `json:"metric_level,omitempty"`
 	Name                  tfconfig.Variable `json:"name,omitempty"`
-	NullInputBehavior     tfconfig.Variable `json:"null_input_behavior,omitempty"`
 	ReturnResultsBehavior tfconfig.Variable `json:"return_results_behavior,omitempty"`
 	ReturnType            tfconfig.Variable `json:"return_type,omitempty"`
 	Schema                tfconfig.Variable `json:"schema,omitempty"`
@@ -67,6 +68,26 @@ func FunctionSqlWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionSqlModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionSqlModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionSqlModel) WithDependsOn(values ...string) *FunctionSqlModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
@@ -123,11 +144,6 @@ func (f *FunctionSqlModel) WithName(name string) *FunctionSqlModel {
 	return f
 }
 
-func (f *FunctionSqlModel) WithNullInputBehavior(nullInputBehavior string) *FunctionSqlModel {
-	f.NullInputBehavior = tfconfig.StringVariable(nullInputBehavior)
-	return f
-}
-
 func (f *FunctionSqlModel) WithReturnResultsBehavior(returnResultsBehavior string) *FunctionSqlModel {
 	f.ReturnResultsBehavior = tfconfig.StringVariable(returnResultsBehavior)
 	return f
@@ -207,11 +223,6 @@ func (f *FunctionSqlModel) WithNameValue(value tfconfig.Variable) *FunctionSqlMo
 	return f
 }
 
-func (f *FunctionSqlModel) WithNullInputBehaviorValue(value tfconfig.Variable) *FunctionSqlModel {
-	f.NullInputBehavior = value
-	return f
-}
-
 func (f *FunctionSqlModel) WithReturnResultsBehaviorValue(value tfconfig.Variable) *FunctionSqlModel {
 	f.ReturnResultsBehavior = value
 	return f
diff --git a/pkg/acceptance/bettertestspoc/config/model/gen/model.go b/pkg/acceptance/bettertestspoc/config/model/gen/model.go
index 4d4065eee1..2d2908468c 100644
--- a/pkg/acceptance/bettertestspoc/config/model/gen/model.go
+++ b/pkg/acceptance/bettertestspoc/config/model/gen/model.go
@@ -70,7 +70,7 @@ func ModelFromResourceSchemaDetails(resourceSchemaDetails genhelpers.ResourceSch
 		Attributes: attributes,
 		PreambleModel: PreambleModel{
 			PackageName:               packageWithGenerateDirective,
-			AdditionalStandardImports: []string{},
+			AdditionalStandardImports: []string{"encoding/json"},
 		},
 	}
 }
diff --git a/pkg/acceptance/bettertestspoc/config/model/gen/templates.go b/pkg/acceptance/bettertestspoc/config/model/gen/templates.go
index cbb70fff04..4e0bc918d4 100644
--- a/pkg/acceptance/bettertestspoc/config/model/gen/templates.go
+++ b/pkg/acceptance/bettertestspoc/config/model/gen/templates.go
@@ -21,6 +21,14 @@ var (
 		genhelpers.SnakeCaseToCamel,
 	)).Parse(definitionTemplateContent)
 
+	//go:embed templates/marshal_json.tmpl
+	marshalJsonTemplateContent string
+	MarshalJsonTemplate, _     = template.New("marshalJsonTemplate").Funcs(genhelpers.BuildTemplateFuncMap(
+		genhelpers.FirstLetterLowercase,
+		genhelpers.FirstLetter,
+		genhelpers.SnakeCaseToCamel,
+	)).Parse(marshalJsonTemplateContent)
+
 	//go:embed templates/builders.tmpl
 	buildersTemplateContent string
 	BuildersTemplate, _     = template.New("buildersTemplate").Funcs(genhelpers.BuildTemplateFuncMap(
@@ -29,5 +37,5 @@ var (
 		genhelpers.SnakeCaseToCamel,
 	)).Parse(buildersTemplateContent)
 
-	AllTemplates = []*template.Template{PreambleTemplate, DefinitionTemplate, BuildersTemplate}
+	AllTemplates = []*template.Template{PreambleTemplate, DefinitionTemplate, MarshalJsonTemplate, BuildersTemplate}
 )
diff --git a/pkg/acceptance/bettertestspoc/config/model/gen/templates/marshal_json.tmpl b/pkg/acceptance/bettertestspoc/config/model/gen/templates/marshal_json.tmpl
new file mode 100644
index 0000000000..96c00d6e1b
--- /dev/null
+++ b/pkg/acceptance/bettertestspoc/config/model/gen/templates/marshal_json.tmpl
@@ -0,0 +1,24 @@
+{{- /*gotype: github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model/gen.ResourceConfigBuilderModel*/ -}}
+
+{{- $modelName := .Name | printf "%sModel" -}}
+{{- $nameLowerCase := FirstLetterLowercase .Name -}}
+{{- $modelVar := FirstLetter $nameLowerCase }}
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func ({{ $modelVar }} *{{ $modelName }}) MarshalJSON() ([]byte, error) {
+    type Alias {{ $modelName }}
+    return json.Marshal(&struct {
+        *Alias
+        DependsOn []string `json:"depends_on,omitempty"`
+    }{
+        Alias:     (*Alias)({{ $modelVar }}),
+        DependsOn: {{ $modelVar }}.DependsOn(),
+    })
+}
+
+func ({{ $modelVar }} *{{ $modelName }}) WithDependsOn(values ...string) *{{ $modelName }} {
+    {{ $modelVar }}.SetDependsOn(values...)
+    return {{ $modelVar }}
+}
diff --git a/pkg/acceptance/bettertestspoc/config/model/legacy_service_user_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/legacy_service_user_model_gen.go
index cfa415e5aa..cd169d1dd2 100644
--- a/pkg/acceptance/bettertestspoc/config/model/legacy_service_user_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/legacy_service_user_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -111,6 +113,26 @@ func LegacyServiceUserWithDefaultMeta(
 	return l
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (l *LegacyServiceUserModel) MarshalJSON() ([]byte, error) {
+	type Alias LegacyServiceUserModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(l),
+		DependsOn: l.DependsOn(),
+	})
+}
+
+func (l *LegacyServiceUserModel) WithDependsOn(values ...string) *LegacyServiceUserModel {
+	l.SetDependsOn(values...)
+	return l
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_ext.go
index 76079cbde3..e95ea04d8c 100644
--- a/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_ext.go
@@ -1,9 +1,10 @@
 package model
 
 import (
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/config"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
 func (p *MaskingPolicyModel) WithArgument(argument []sdk.TableColumnSignature) *MaskingPolicyModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_gen.go
index 2f9f7213fa..53f4b800e9 100644
--- a/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -65,6 +67,26 @@ func MaskingPolicyWithDefaultMeta(
 	return m
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (m *MaskingPolicyModel) MarshalJSON() ([]byte, error) {
+	type Alias MaskingPolicyModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(m),
+		DependsOn: m.DependsOn(),
+	})
+}
+
+func (m *MaskingPolicyModel) WithDependsOn(values ...string) *MaskingPolicyModel {
+	m.SetDependsOn(values...)
+	return m
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_custom_clients_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_custom_clients_model_gen.go
index db5cf93efc..dac9701685 100644
--- a/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_custom_clients_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_custom_clients_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -26,6 +28,7 @@ type OauthIntegrationForCustomClientsModel struct {
 	OauthRefreshTokenValidity   tfconfig.Variable `json:"oauth_refresh_token_validity,omitempty"`
 	OauthUseSecondaryRoles      tfconfig.Variable `json:"oauth_use_secondary_roles,omitempty"`
 	PreAuthorizedRolesList      tfconfig.Variable `json:"pre_authorized_roles_list,omitempty"`
+	RelatedParameters           tfconfig.Variable `json:"related_parameters,omitempty"`
 
 	*config.ResourceModelMeta
 }
@@ -59,6 +62,26 @@ func OauthIntegrationForCustomClientsWithDefaultMeta(
 	return o
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (o *OauthIntegrationForCustomClientsModel) MarshalJSON() ([]byte, error) {
+	type Alias OauthIntegrationForCustomClientsModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(o),
+		DependsOn: o.DependsOn(),
+	})
+}
+
+func (o *OauthIntegrationForCustomClientsModel) WithDependsOn(values ...string) *OauthIntegrationForCustomClientsModel {
+	o.SetDependsOn(values...)
+	return o
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
@@ -137,6 +160,8 @@ func (o *OauthIntegrationForCustomClientsModel) WithOauthUseSecondaryRoles(oauth
 
 // pre_authorized_roles_list attribute type is not yet supported, so WithPreAuthorizedRolesList can't be generated
 
+// related_parameters attribute type is not yet supported, so WithRelatedParameters can't be generated
+
 //////////////////////////////////////////
 // below it's possible to set any value //
 //////////////////////////////////////////
@@ -220,3 +245,8 @@ func (o *OauthIntegrationForCustomClientsModel) WithPreAuthorizedRolesListValue(
 	o.PreAuthorizedRolesList = value
 	return o
 }
+
+func (o *OauthIntegrationForCustomClientsModel) WithRelatedParametersValue(value tfconfig.Variable) *OauthIntegrationForCustomClientsModel {
+	o.RelatedParameters = value
+	return o
+}
diff --git a/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_partner_applications_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_partner_applications_model_gen.go
index b433aaee4c..240d44952a 100644
--- a/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_partner_applications_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_partner_applications_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -50,6 +52,26 @@ func OauthIntegrationForPartnerApplicationsWithDefaultMeta(
 	return o
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (o *OauthIntegrationForPartnerApplicationsModel) MarshalJSON() ([]byte, error) {
+	type Alias OauthIntegrationForPartnerApplicationsModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(o),
+		DependsOn: o.DependsOn(),
+	})
+}
+
+func (o *OauthIntegrationForPartnerApplicationsModel) WithDependsOn(values ...string) *OauthIntegrationForPartnerApplicationsModel {
+	o.SetDependsOn(values...)
+	return o
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/primary_connection_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/primary_connection_model_gen.go
index 3cbb735d91..cdbe9e2c8e 100644
--- a/pkg/acceptance/bettertestspoc/config/model/primary_connection_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/primary_connection_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -40,6 +42,26 @@ func PrimaryConnectionWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *PrimaryConnectionModel) MarshalJSON() ([]byte, error) {
+	type Alias PrimaryConnectionModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *PrimaryConnectionModel) WithDependsOn(values ...string) *PrimaryConnectionModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go
index b8a1602f79..3440012ee5 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go
@@ -1,27 +1,14 @@
 package model
 
 import (
-	"encoding/json"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedureJavaModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedureJavaModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedureJavaBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -30,7 +17,7 @@ func ProcedureJavaBasicInline(
 	procedureDefinition string,
 ) *ProcedureJavaModel {
 	return ProcedureJava(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), "11", id.SchemaName(), "1.14.0").
-		WithProcedureDefinition(procedureDefinition)
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func ProcedureJavaBasicStaged(
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_gen.go
index ed2be8286e..3bbc9cf011 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -83,6 +85,26 @@ func ProcedureJavaWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedureJavaModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedureJavaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedureJavaModel) WithDependsOn(values ...string) *ProcedureJavaModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go
index 4952c06d38..5e1af42056 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go
@@ -1,32 +1,21 @@
 package model
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedureJavascriptModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedureJavascriptModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedureJavascriptBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
 	returnType datatypes.DataType,
 	procedureDefinition string,
 ) *ProcedureJavascriptModel {
-	return ProcedureJavascript(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName())
+	return ProcedureJavascript(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName()).
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func (f *ProcedureJavascriptModel) WithArgument(argName string, argDataType datatypes.DataType) *ProcedureJavascriptModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_gen.go
index c90c47d6fb..4ff708234e 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -67,6 +69,26 @@ func ProcedureJavascriptWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedureJavascriptModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedureJavascriptModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedureJavascriptModel) WithDependsOn(values ...string) *ProcedureJavascriptModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go
index 3ebd87eca7..fa65b15d42 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go
@@ -1,26 +1,14 @@
 package model
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedurePythonModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedurePythonModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedurePythonBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -29,7 +17,7 @@ func ProcedurePythonBasicInline(
 	procedureDefinition string,
 ) *ProcedurePythonModel {
 	return ProcedurePython(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), "3.8", id.SchemaName(), "1.14.0").
-		WithProcedureDefinition(procedureDefinition)
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func (f *ProcedurePythonModel) WithArgument(argName string, argDataType datatypes.DataType) *ProcedurePythonModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_gen.go
index c69dcab167..330e269b45 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -82,6 +84,26 @@ func ProcedurePythonWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedurePythonModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedurePythonModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedurePythonModel) WithDependsOn(values ...string) *ProcedurePythonModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go
index c78de9dbcc..a307f5b198 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go
@@ -1,26 +1,14 @@
 package model
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedureScalaModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedureScalaModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedureScalaBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -29,7 +17,7 @@ func ProcedureScalaBasicInline(
 	procedureDefinition string,
 ) *ProcedureScalaModel {
 	return ProcedureScala(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), "2.12", id.SchemaName(), "1.14.0").
-		WithProcedureDefinition(procedureDefinition)
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func ProcedureScalaBasicStaged(
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_gen.go
index 9df0441308..4ec12d5ebf 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -83,6 +85,26 @@ func ProcedureScalaWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedureScalaModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedureScalaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedureScalaModel) WithDependsOn(values ...string) *ProcedureScalaModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go
index 0cb2a2bf8c..a266504b2f 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go
@@ -1,32 +1,21 @@
 package model
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedureSqlModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedureSqlModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedureSqlBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
 	returnType datatypes.DataType,
 	procedureDefinition string,
 ) *ProcedureSqlModel {
-	return ProcedureSql(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName())
+	return ProcedureSql(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName()).
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func (f *ProcedureSqlModel) WithArgument(argName string, argDataType datatypes.DataType) *ProcedureSqlModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_gen.go
index 274dfc5b50..1d020ac852 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -67,6 +69,26 @@ func ProcedureSqlWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedureSqlModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedureSqlModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedureSqlModel) WithDependsOn(values ...string) *ProcedureSqlModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/resource_monitor_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/resource_monitor_model_gen.go
index e2ccebc599..fbe44e834d 100644
--- a/pkg/acceptance/bettertestspoc/config/model/resource_monitor_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/resource_monitor_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -45,6 +47,26 @@ func ResourceMonitorWithDefaultMeta(
 	return r
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (r *ResourceMonitorModel) MarshalJSON() ([]byte, error) {
+	type Alias ResourceMonitorModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(r),
+		DependsOn: r.DependsOn(),
+	})
+}
+
+func (r *ResourceMonitorModel) WithDependsOn(values ...string) *ResourceMonitorModel {
+	r.SetDependsOn(values...)
+	return r
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/row_access_policy_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/row_access_policy_model_gen.go
index 7ede96b9e0..3419c5198d 100644
--- a/pkg/acceptance/bettertestspoc/config/model/row_access_policy_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/row_access_policy_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -59,6 +61,26 @@ func RowAccessPolicyWithDefaultMeta(
 	return r
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (r *RowAccessPolicyModel) MarshalJSON() ([]byte, error) {
+	type Alias RowAccessPolicyModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(r),
+		DependsOn: r.DependsOn(),
+	})
+}
+
+func (r *RowAccessPolicyModel) WithDependsOn(values ...string) *RowAccessPolicyModel {
+	r.SetDependsOn(values...)
+	return r
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/schema_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/schema_model_gen.go
index e83ac5058d..c541248b2b 100644
--- a/pkg/acceptance/bettertestspoc/config/model/schema_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/schema_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -62,6 +64,26 @@ func SchemaWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SchemaModel) MarshalJSON() ([]byte, error) {
+	type Alias SchemaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SchemaModel) WithDependsOn(values ...string) *SchemaModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secondary_connection_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secondary_connection_model_gen.go
index f1ee4f7024..2adb3f537f 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secondary_connection_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secondary_connection_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -44,6 +46,26 @@ func SecondaryConnectionWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecondaryConnectionModel) MarshalJSON() ([]byte, error) {
+	type Alias SecondaryConnectionModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecondaryConnectionModel) WithDependsOn(values ...string) *SecondaryConnectionModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secret_with_authorization_code_grant_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secret_with_authorization_code_grant_model_gen.go
index 144a4fc212..c17f2dda82 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secret_with_authorization_code_grant_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secret_with_authorization_code_grant_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -64,6 +66,26 @@ func SecretWithAuthorizationCodeGrantWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecretWithAuthorizationCodeGrantModel) MarshalJSON() ([]byte, error) {
+	type Alias SecretWithAuthorizationCodeGrantModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecretWithAuthorizationCodeGrantModel) WithDependsOn(values ...string) *SecretWithAuthorizationCodeGrantModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secret_with_basic_authentication_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secret_with_basic_authentication_model_gen.go
index b3c0f4ee83..461a025dda 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secret_with_basic_authentication_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secret_with_basic_authentication_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -59,6 +61,26 @@ func SecretWithBasicAuthenticationWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecretWithBasicAuthenticationModel) MarshalJSON() ([]byte, error) {
+	type Alias SecretWithBasicAuthenticationModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecretWithBasicAuthenticationModel) WithDependsOn(values ...string) *SecretWithBasicAuthenticationModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secret_with_client_credentials_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secret_with_client_credentials_model_gen.go
index bd69bffbb2..3f9a1fd5a2 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secret_with_client_credentials_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secret_with_client_credentials_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -59,6 +61,26 @@ func SecretWithClientCredentialsWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecretWithClientCredentialsModel) MarshalJSON() ([]byte, error) {
+	type Alias SecretWithClientCredentialsModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecretWithClientCredentialsModel) WithDependsOn(values ...string) *SecretWithClientCredentialsModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secret_with_generic_string_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secret_with_generic_string_model_gen.go
index c1cbe7d05e..9c25164528 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secret_with_generic_string_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secret_with_generic_string_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -54,6 +56,26 @@ func SecretWithGenericStringWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecretWithGenericStringModel) MarshalJSON() ([]byte, error) {
+	type Alias SecretWithGenericStringModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecretWithGenericStringModel) WithDependsOn(values ...string) *SecretWithGenericStringModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/service_user_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/service_user_model_gen.go
index 930ec8f644..d98651c133 100644
--- a/pkg/acceptance/bettertestspoc/config/model/service_user_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/service_user_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -109,6 +111,26 @@ func ServiceUserWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *ServiceUserModel) MarshalJSON() ([]byte, error) {
+	type Alias ServiceUserModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *ServiceUserModel) WithDependsOn(values ...string) *ServiceUserModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/stream_on_directory_table_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/stream_on_directory_table_model_gen.go
index cc2270d46c..8d8c8220ae 100644
--- a/pkg/acceptance/bettertestspoc/config/model/stream_on_directory_table_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/stream_on_directory_table_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -56,6 +58,26 @@ func StreamOnDirectoryTableWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *StreamOnDirectoryTableModel) MarshalJSON() ([]byte, error) {
+	type Alias StreamOnDirectoryTableModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *StreamOnDirectoryTableModel) WithDependsOn(values ...string) *StreamOnDirectoryTableModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/stream_on_external_table_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/stream_on_external_table_model_gen.go
index de66941879..3ee74c0414 100644
--- a/pkg/acceptance/bettertestspoc/config/model/stream_on_external_table_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/stream_on_external_table_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -59,6 +61,26 @@ func StreamOnExternalTableWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *StreamOnExternalTableModel) MarshalJSON() ([]byte, error) {
+	type Alias StreamOnExternalTableModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *StreamOnExternalTableModel) WithDependsOn(values ...string) *StreamOnExternalTableModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/stream_on_table_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/stream_on_table_model_gen.go
index 3c337e9e9a..65905b66bc 100644
--- a/pkg/acceptance/bettertestspoc/config/model/stream_on_table_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/stream_on_table_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -60,6 +62,26 @@ func StreamOnTableWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *StreamOnTableModel) MarshalJSON() ([]byte, error) {
+	type Alias StreamOnTableModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *StreamOnTableModel) WithDependsOn(values ...string) *StreamOnTableModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/stream_on_view_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/stream_on_view_model_gen.go
index d4942dd8a6..5e71b69066 100644
--- a/pkg/acceptance/bettertestspoc/config/model/stream_on_view_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/stream_on_view_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -60,6 +62,26 @@ func StreamOnViewWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *StreamOnViewModel) MarshalJSON() ([]byte, error) {
+	type Alias StreamOnViewModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *StreamOnViewModel) WithDependsOn(values ...string) *StreamOnViewModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/tag_association_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/tag_association_model_gen.go
index 12457d4973..5ced2b4984 100644
--- a/pkg/acceptance/bettertestspoc/config/model/tag_association_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/tag_association_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -54,6 +56,26 @@ func TagAssociationWithDefaultMeta(
 	return t
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (t *TagAssociationModel) MarshalJSON() ([]byte, error) {
+	type Alias TagAssociationModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(t),
+		DependsOn: t.DependsOn(),
+	})
+}
+
+func (t *TagAssociationModel) WithDependsOn(values ...string) *TagAssociationModel {
+	t.SetDependsOn(values...)
+	return t
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/tag_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/tag_model_gen.go
index a649154cb2..908ff3dd76 100644
--- a/pkg/acceptance/bettertestspoc/config/model/tag_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/tag_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -50,6 +52,26 @@ func TagWithDefaultMeta(
 	return t
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (t *TagModel) MarshalJSON() ([]byte, error) {
+	type Alias TagModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(t),
+		DependsOn: t.DependsOn(),
+	})
+}
+
+func (t *TagModel) WithDependsOn(values ...string) *TagModel {
+	t.SetDependsOn(values...)
+	return t
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/task_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/task_model_gen.go
index 306c525fad..dea8c6c679 100644
--- a/pkg/acceptance/bettertestspoc/config/model/task_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/task_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -124,6 +126,26 @@ func TaskWithDefaultMeta(
 	return t
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (t *TaskModel) MarshalJSON() ([]byte, error) {
+	type Alias TaskModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(t),
+		DependsOn: t.DependsOn(),
+	})
+}
+
+func (t *TaskModel) WithDependsOn(values ...string) *TaskModel {
+	t.SetDependsOn(values...)
+	return t
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/user_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/user_model_ext.go
index 9bf0cc44de..39d5865205 100644
--- a/pkg/acceptance/bettertestspoc/config/model/user_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/user_model_ext.go
@@ -63,7 +63,7 @@ func (u *UserModel) WithNetworkPolicyId(networkPolicy sdk.AccountObjectIdentifie
 }
 
 func (u *UserModel) WithNullPassword() *UserModel {
-	return u.WithPasswordValue(config.NullVariable())
+	return u.WithPasswordValue(config.ReplacementPlaceholderVariable(config.SnowflakeProviderConfigNull))
 }
 
 func (u *UserModel) WithDefaultSecondaryRolesOptionEnum(option sdk.SecondaryRolesOption) *UserModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/user_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/user_model_gen.go
index 32eb8218ee..f2c945fbf3 100644
--- a/pkg/acceptance/bettertestspoc/config/model/user_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/user_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -116,6 +118,26 @@ func UserWithDefaultMeta(
 	return u
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (u *UserModel) MarshalJSON() ([]byte, error) {
+	type Alias UserModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(u),
+		DependsOn: u.DependsOn(),
+	})
+}
+
+func (u *UserModel) WithDependsOn(values ...string) *UserModel {
+	u.SetDependsOn(values...)
+	return u
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/view_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/view_model_ext.go
index 3d213bf0b8..b7a1a3675f 100644
--- a/pkg/acceptance/bettertestspoc/config/model/view_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/view_model_ext.go
@@ -1,29 +1,11 @@
 package model
 
 import (
-	"encoding/json"
-
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (v *ViewModel) MarshalJSON() ([]byte, error) {
-	type Alias ViewModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(v),
-		DependsOn: v.DependsOn(),
-	})
-}
-
-func (v *ViewModel) WithDependsOn(values ...string) *ViewModel {
-	v.SetDependsOn(values...)
-	return v
-}
-
 func (v *ViewModel) WithColumnNames(columnNames ...string) *ViewModel {
 	return v.WithColumnValue(config.TupleVariable(
 		collections.Map(columnNames, func(columnName string) config.Variable {
diff --git a/pkg/acceptance/bettertestspoc/config/model/view_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/view_model_gen.go
index 1afe8859d8..856bd7556b 100644
--- a/pkg/acceptance/bettertestspoc/config/model/view_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/view_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -63,6 +65,26 @@ func ViewWithDefaultMeta(
 	return v
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (v *ViewModel) MarshalJSON() ([]byte, error) {
+	type Alias ViewModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(v),
+		DependsOn: v.DependsOn(),
+	})
+}
+
+func (v *ViewModel) WithDependsOn(values ...string) *ViewModel {
+	v.SetDependsOn(values...)
+	return v
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/warehouse_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/warehouse_model_gen.go
index 388b71ce33..a2ea994661 100644
--- a/pkg/acceptance/bettertestspoc/config/model/warehouse_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/warehouse_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -52,6 +54,26 @@ func WarehouseWithDefaultMeta(
 	return w
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (w *WarehouseModel) MarshalJSON() ([]byte, error) {
+	type Alias WarehouseModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(w),
+		DependsOn: w.DependsOn(),
+	})
+}
+
+func (w *WarehouseModel) WithDependsOn(values ...string) *WarehouseModel {
+	w.SetDependsOn(values...)
+	return w
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/placeholders.go b/pkg/acceptance/bettertestspoc/config/placeholders.go
index 21b5fe10e6..c54e892d79 100644
--- a/pkg/acceptance/bettertestspoc/config/placeholders.go
+++ b/pkg/acceptance/bettertestspoc/config/placeholders.go
@@ -2,4 +2,7 @@ package config
 
 type ReplacementPlaceholder string
 
-const SnowflakeProviderConfigPrivateKey ReplacementPlaceholder = "SF_TF_TEST_MULTILINE_PLACEHOLDER_PRIVATE_KEY"
+const (
+	SnowflakeProviderConfigNull            ReplacementPlaceholder = "SF_TF_TEST_NULL_PLACEHOLDER"
+	SnowflakeProviderConfigMultilineMarker ReplacementPlaceholder = "SF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER"
+)
diff --git a/pkg/acceptance/bettertestspoc/config/providermodel/snowflake_model_ext.go b/pkg/acceptance/bettertestspoc/config/providermodel/snowflake_model_ext.go
index e66051c0ae..942961149d 100644
--- a/pkg/acceptance/bettertestspoc/config/providermodel/snowflake_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/providermodel/snowflake_model_ext.go
@@ -2,7 +2,6 @@ package providermodel
 
 import (
 	"encoding/json"
-	"fmt"
 
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
@@ -40,7 +39,7 @@ func (m *SnowflakeModel) WithAuthenticatorType(authenticationType sdk.Authentica
 }
 
 func (m *SnowflakeModel) WithPrivateKeyMultiline(privateKey string) *SnowflakeModel {
-	return m.WithPrivateKey(fmt.Sprintf(`%[1]s%[2]s%[1]s`, config.SnowflakeProviderConfigPrivateKey, privateKey))
+	return m.WithPrivateKeyValue(config.MultilineWrapperVariable(privateKey))
 }
 
 func (m *SnowflakeModel) WithClientStoreTemporaryCredentialBool(clientStoreTemporaryCredential bool) *SnowflakeModel {
diff --git a/pkg/acceptance/bettertestspoc/config/resource_model_test.go b/pkg/acceptance/bettertestspoc/config/resource_model_test.go
index 1d30583f6a..aa88f7b45d 100644
--- a/pkg/acceptance/bettertestspoc/config/resource_model_test.go
+++ b/pkg/acceptance/bettertestspoc/config/resource_model_test.go
@@ -26,6 +26,10 @@ type SomeModel struct {
 	ObjectList   tfconfig.Variable `json:"object_list,omitempty"`
 	SingleObject tfconfig.Variable `json:"single_object,omitempty"`
 
+	TextField      tfconfig.Variable `json:"text_field,omitempty"`
+	ListField      tfconfig.Variable `json:"list_field,omitempty"`
+	MultilineField tfconfig.Variable `json:"multiline_field,omitempty"`
+
 	*config.ResourceModelMeta
 }
 
@@ -91,6 +95,21 @@ func (m *SomeModel) WithSingleObject(a string, b int) *SomeModel {
 	return m
 }
 
+func (m *SomeModel) WithTextFieldExplicitNull() *SomeModel {
+	m.TextField = config.ReplacementPlaceholderVariable(config.SnowflakeProviderConfigNull)
+	return m
+}
+
+func (m *SomeModel) WithListFieldEmpty() *SomeModel {
+	m.ListField = config.EmptyListVariable()
+	return m
+}
+
+func (m *SomeModel) WithMultilineField(multilineContent string) *SomeModel {
+	m.MultilineField = config.MultilineWrapperVariable(multilineContent)
+	return m
+}
+
 func (m *SomeModel) WithDependsOn(values ...string) *SomeModel {
 	m.SetDependsOn(values...)
 	return m
diff --git a/pkg/acceptance/helpers/function_client.go b/pkg/acceptance/helpers/function_client.go
index 600027fe2c..98fd9464e0 100644
--- a/pkg/acceptance/helpers/function_client.go
+++ b/pkg/acceptance/helpers/function_client.go
@@ -3,6 +3,7 @@ package helpers
 import (
 	"context"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testdatatypes"
@@ -200,92 +201,95 @@ func (c *FunctionClient) DescribeDetails(t *testing.T, id sdk.SchemaObjectIdenti
 	return c.client().DescribeDetails(ctx, id)
 }
 
+// formatFunctionDefinition removes the first newline and replaces all tabs with spaces.
+func (c *FunctionClient) formatFunctionDefinition(definition string) string {
+	return strings.Replace(strings.ReplaceAll(definition, "\t", "  "), "\n", "", 1)
+}
+
 func (c *FunctionClient) SampleJavaDefinition(t *testing.T, className string, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 	class %[1]s {
 		public static String %[2]s(String %[3]s) {
 			return %[3]s;
 		}
 	}
-`, className, funcName, argName)
+`, className, funcName, argName))
 }
 
 func (c *FunctionClient) SampleJavaDefinitionNoArgs(t *testing.T, className string, funcName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 	class %[1]s {
 		public static String %[2]s() {
-			return "hello";
+			return null;
 		}
 	}
-`, className, funcName)
+`, className, funcName))
 }
 
 func (c *FunctionClient) SampleJavascriptDefinition(t *testing.T, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
-	if (%[1]s <= 0) {
+	return c.formatFunctionDefinition(fmt.Sprintf(`
+	if (%[1]s == 0) {
 		return 1;
 	} else {
-		var result = 1;
-		for (var i = 2; i <= %[1]s; i++) {
-			result = result * i;
-		}
-		return result;
+		return 2;
 	}
-`, argName)
+`, argName))
 }
 
 func (c *FunctionClient) SampleJavascriptDefinitionNoArgs(t *testing.T) string {
 	t.Helper()
-	return `return 1;`
+	return c.formatFunctionDefinition(`
+return 1;
+`)
 }
 
 func (c *FunctionClient) SamplePythonDefinition(t *testing.T, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 def %[1]s(%[2]s):
-	result = ""
+	result = ''
 	for a in range(5):
 		result += %[2]s
 	return result
-`, funcName, argName)
+`, funcName, argName))
 }
 
 func (c *FunctionClient) SampleScalaDefinition(t *testing.T, className string, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 	class %[1]s {
 		def %[2]s(%[3]s : String): String = {
 			return %[3]s
 		}
 	}
-`, className, funcName, argName)
+`, className, funcName, argName))
 }
 
 // TODO [SNOW-1850370]: use input argument like in other samples
 func (c *FunctionClient) SampleSqlDefinition(t *testing.T) string {
 	t.Helper()
 
-	return "3.141592654::FLOAT"
+	return c.formatFunctionDefinition("3.141592654::FLOAT")
 }
 
 func (c *FunctionClient) SampleSqlDefinitionWithArgument(t *testing.T, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 %s
-`, argName)
+`, argName))
 }
 
 func (c *FunctionClient) PythonIdentityDefinition(t *testing.T, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf("def %[1]s(%[2]s): %[2]s", funcName, argName)
+	return c.formatFunctionDefinition(fmt.Sprintf("def %[1]s(%[2]s): %[2]s", funcName, argName))
 }
diff --git a/pkg/acceptance/helpers/procedure_client.go b/pkg/acceptance/helpers/procedure_client.go
index b35f9239df..6fe9cd686a 100644
--- a/pkg/acceptance/helpers/procedure_client.go
+++ b/pkg/acceptance/helpers/procedure_client.go
@@ -3,6 +3,7 @@ package helpers
 import (
 	"context"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testdatatypes"
@@ -164,94 +165,94 @@ func (c *ProcedureClient) DescribeDetails(t *testing.T, id sdk.SchemaObjectIdent
 	return c.client().DescribeDetails(ctx, id)
 }
 
+// formatProcedureDefinition removes the first newline and replaces all tabs with spaces.
+func (c *ProcedureClient) formatProcedureDefinition(definition string) string {
+	return strings.Replace(strings.ReplaceAll(definition, "\t", "  "), "\n", "", 1)
+}
+
 // Session argument is needed: https://docs.snowflake.com/en/developer-guide/stored-procedure/stored-procedures-java#data-access-example
 // More references: https://docs.snowflake.com/en/developer-guide/stored-procedure/stored-procedures-java
 func (c *ProcedureClient) SampleJavaDefinition(t *testing.T, className string, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatProcedureDefinition(fmt.Sprintf(`
 	import com.snowflake.snowpark_java.*;
 	class %[1]s {
 		public static String %[2]s(Session session, String %[3]s) {
 			return %[3]s;
 		}
 	}
-`, className, funcName, argName)
+`, className, funcName, argName))
 }
 
 func (c *ProcedureClient) SampleJavaDefinitionNoArgs(t *testing.T, className string, funcName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatProcedureDefinition(fmt.Sprintf(`
 	import com.snowflake.snowpark_java.*;
 	class %[1]s {
 		public static String %[2]s(Session session) {
-			return "hello";
+			return null;
 		}
 	}
-`, className, funcName)
+`, className, funcName))
 }
 
 // For more references: https://docs.snowflake.com/en/developer-guide/stored-procedure/stored-procedures-javascript
 func (c *ProcedureClient) SampleJavascriptDefinition(t *testing.T, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
-	if (%[1]s <= 0) {
+	return c.formatProcedureDefinition(fmt.Sprintf(`
+	if (%[1]s == 0) {
 		return 1;
 	} else {
-		var result = 1;
-		for (var i = 2; i <= %[1]s; i++) {
-			result = result * i;
-		}
-		return result;
+		return 2;
 	}
-`, argName)
+`, argName))
 }
 
 func (c *ProcedureClient) SamplePythonDefinition(t *testing.T, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatProcedureDefinition(fmt.Sprintf(`
 def %[1]s(%[2]s):
-	result = ""
+	result = ''
 	for a in range(5):
 		result += %[2]s
 	return result
-`, funcName, argName)
+`, funcName, argName))
 }
 
 // https://docs.snowflake.com/en/developer-guide/stored-procedure/stored-procedures-scala
 func (c *ProcedureClient) SampleScalaDefinition(t *testing.T, className string, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatProcedureDefinition(fmt.Sprintf(`
 	import com.snowflake.snowpark_java.Session
-
 	class %[1]s {
 		def %[2]s(session : Session, %[3]s : String): String = {
 			return %[3]s
 		}
 	}
-`, className, funcName, argName)
+`, className, funcName, argName))
 }
 
 func (c *ProcedureClient) SampleSqlDefinition(t *testing.T) string {
 	t.Helper()
 
-	return `
+	return c.formatProcedureDefinition(`
 BEGIN
 	RETURN 3.141592654::FLOAT;
 END;
-`
+`)
 }
 
 func (c *ProcedureClient) SampleSqlDefinitionWithArgument(t *testing.T) string {
 	t.Helper()
 
-	return `
+	return c.formatProcedureDefinition(`
 BEGIN
   RETURN message;
 END;
-`
+`)
 }
diff --git a/pkg/datasources/connections_acceptance_test.go b/pkg/datasources/connections_acceptance_test.go
index 0e91f4b6bd..2ab5dfa1ca 100644
--- a/pkg/datasources/connections_acceptance_test.go
+++ b/pkg/datasources/connections_acceptance_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	accConfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -37,7 +37,7 @@ func TestAcc_Connections_Minimal(t *testing.T) {
 
 	primaryConnectionAsExternalId := sdk.NewExternalObjectIdentifier(accountId, id)
 
-	dataConnections := accConfig.FromModel(t, connectionModel) + connectionsData()
+	dataConnections := accconfig.FromModels(t, connectionModel) + connectionsData()
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -85,7 +85,7 @@ func TestAcc_Connections_Complete(t *testing.T) {
 
 	primaryConnectionAsExternalId := sdk.NewExternalObjectIdentifier(accountId, id)
 
-	dataConnections := accConfig.FromModel(t, connectionModel) + connectionsData()
+	dataConnections := accconfig.FromModels(t, connectionModel) + connectionsData()
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -135,9 +135,9 @@ func TestAcc_Connections_Filtering(t *testing.T) {
 	connectionModelTwo := model.PrimaryConnection("c2", idTwo.Name())
 	connectionModelThree := model.PrimaryConnection("c3", idThree.Name())
 
-	configWithLike := accConfig.FromModel(t, connectionModelOne) +
-		accConfig.FromModel(t, connectionModelTwo) +
-		accConfig.FromModel(t, connectionModelThree)
+	configWithLike := accconfig.FromModels(t, connectionModelOne) +
+		accconfig.FromModels(t, connectionModelTwo) +
+		accconfig.FromModels(t, connectionModelThree)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -181,8 +181,8 @@ func TestAcc_Connections_FilteringWithReplica(t *testing.T) {
 	connectionModelOne := model.PrimaryConnection("c1", idOne.Name())
 	connectionModelTwo := model.SecondaryConnection("c2", primaryConnectionAsExternalId.FullyQualifiedName(), idTwo.Name())
 
-	configWithLike := accConfig.FromModel(t, connectionModelOne) +
-		accConfig.FromModel(t, connectionModelTwo)
+	configWithLike := accconfig.FromModels(t, connectionModelOne) +
+		accconfig.FromModels(t, connectionModelTwo)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
diff --git a/pkg/datasources/functions_acceptance_test.go b/pkg/datasources/functions_acceptance_test.go
index c30ab58db1..4ac49882fe 100644
--- a/pkg/datasources/functions_acceptance_test.go
+++ b/pkg/datasources/functions_acceptance_test.go
@@ -1,40 +1,37 @@
 package datasources_test
 
 import (
+	"fmt"
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 
-	"github.com/hashicorp/terraform-plugin-testing/config"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testdatatypes"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_Functions(t *testing.T) {
-	functionNameOne := acc.TestClient().Ids.Alpha()
-	functionNameTwo := acc.TestClient().Ids.Alpha()
+	_ = testenvs.GetOrSkipTest(t, testenvs.EnableAcceptance)
+	acc.TestAccPreCheck(t)
+	t.Setenv(string(testenvs.ConfigureClientOnce), "")
+
 	dataSourceName := "data.snowflake_functions.functions"
 
-	m := func() map[string]config.Variable {
-		return map[string]config.Variable{
-			"database":          config.StringVariable(acc.TestDatabaseName),
-			"schema":            config.StringVariable(acc.TestSchemaName),
-			"function_name_one": config.StringVariable(functionNameOne),
-			"function_name_two": config.StringVariable(functionNameTwo),
-		}
-	}
-	variableSet1 := m()
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
 		PreCheck:                 func() { acc.TestAccPreCheck(t) },
 		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
 			tfversion.RequireAbove(tfversion.Version1_5_0),
 		},
-		CheckDestroy: nil,
+		CheckDestroy: acc.CheckDestroy(t, resources.FunctionJava),
 		Steps: []resource.TestStep{
 			{
-				ConfigDirectory: acc.ConfigurationDirectory("TestAcc_Functions/complete"),
-				ConfigVariables: variableSet1,
+				Config: functionsConfig(t),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(dataSourceName, "database", acc.TestDatabaseName),
 					resource.TestCheckResourceAttr(dataSourceName, "schema", acc.TestSchemaName),
@@ -44,3 +41,33 @@ func TestAcc_Functions(t *testing.T) {
 		},
 	})
 }
+
+// TODO [SNOW-1348103]: use generated config builder when reworking the datasource
+func functionsConfig(t *testing.T) string {
+	t.Helper()
+
+	className := "TestFunc"
+	funcName := "echoVarchar"
+	argName := "x"
+	dataType := testdatatypes.DataTypeVarchar_100
+
+	handler := fmt.Sprintf("%s.%s", className, funcName)
+	definition := acc.TestClient().Function.SampleJavaDefinition(t, className, funcName, argName)
+
+	id1 := acc.TestClient().Ids.RandomSchemaObjectIdentifierWithArgumentsNewDataTypes(dataType)
+	id2 := acc.TestClient().Ids.RandomSchemaObjectIdentifierWithArgumentsNewDataTypes(dataType)
+
+	functionsSetup := config.FromModels(t,
+		model.FunctionJavaBasicInline("f1", id1, dataType, handler, definition).WithArgument(argName, dataType),
+		model.FunctionJavaBasicInline("f2", id2, dataType, handler, definition).WithArgument(argName, dataType),
+	)
+
+	return fmt.Sprintf(`
+%s
+data "snowflake_functions" "functions" {
+  database   = "%s"
+  schema     = "%s"
+  depends_on = [snowflake_function_java.f1, snowflake_function_java.f2]
+}
+`, functionsSetup, acc.TestDatabaseName, acc.TestSchemaName)
+}
diff --git a/pkg/datasources/materialized_views.go b/pkg/datasources/materialized_views.go
index 9724e9a560..a462ed1551 100644
--- a/pkg/datasources/materialized_views.go
+++ b/pkg/datasources/materialized_views.go
@@ -68,7 +68,7 @@ func ReadMaterializedViews(ctx context.Context, d *schema.ResourceData, meta any
 
 	schemaId := sdk.NewDatabaseObjectIdentifier(databaseName, schemaName)
 	extractedMaterializedViews, err := client.MaterializedViews.Show(ctx, sdk.NewShowMaterializedViewRequest().WithIn(
-		&sdk.In{Schema: schemaId},
+		sdk.In{Schema: schemaId},
 	))
 	if err != nil {
 		log.Printf("[DEBUG] failed when searching materialized views in schema (%s), err = %s", schemaId.FullyQualifiedName(), err.Error())
diff --git a/pkg/datasources/procedures_acceptance_test.go b/pkg/datasources/procedures_acceptance_test.go
index ceb1a3cea5..cf055e5850 100644
--- a/pkg/datasources/procedures_acceptance_test.go
+++ b/pkg/datasources/procedures_acceptance_test.go
@@ -1,38 +1,38 @@
 package datasources_test
 
 import (
+	"fmt"
 	"testing"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	"github.com/hashicorp/terraform-plugin-testing/config"
+
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testdatatypes"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_Procedures(t *testing.T) {
-	procNameOne := acc.TestClient().Ids.Alpha()
-	procNameTwo := acc.TestClient().Ids.Alpha()
+	_ = testenvs.GetOrSkipTest(t, testenvs.EnableAcceptance)
+	acc.TestAccPreCheck(t)
+	t.Setenv(string(testenvs.ConfigureClientOnce), "")
+
 	dataSourceName := "data.snowflake_procedures.procedures"
-	m := func() map[string]config.Variable {
-		return map[string]config.Variable{
-			"database":      config.StringVariable(acc.TestDatabaseName),
-			"schema":        config.StringVariable(acc.TestSchemaName),
-			"proc_name_one": config.StringVariable(procNameOne),
-			"proc_name_two": config.StringVariable(procNameTwo),
-		}
-	}
-	configVariables := m()
+
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
 		PreCheck:                 func() { acc.TestAccPreCheck(t) },
 		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
 			tfversion.RequireAbove(tfversion.Version1_5_0),
 		},
-		CheckDestroy: nil,
+		CheckDestroy: acc.CheckDestroy(t, resources.ProcedureJava),
 		Steps: []resource.TestStep{
 			{
-				ConfigDirectory: acc.ConfigurationDirectory("TestAcc_Procedures/complete"),
-				ConfigVariables: configVariables,
+				Config: proceduresConfig(t),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(dataSourceName, "database", acc.TestDatabaseName),
 					resource.TestCheckResourceAttr(dataSourceName, "schema", acc.TestSchemaName),
@@ -44,3 +44,33 @@ func TestAcc_Procedures(t *testing.T) {
 		},
 	})
 }
+
+// TODO [SNOW-1348103]: use generated config builder when reworking the datasource
+func proceduresConfig(t *testing.T) string {
+	t.Helper()
+
+	className := "TestFunc"
+	funcName := "echoVarchar"
+	argName := "x"
+	dataType := testdatatypes.DataTypeVarchar_100
+
+	handler := fmt.Sprintf("%s.%s", className, funcName)
+	definition := acc.TestClient().Procedure.SampleJavaDefinition(t, className, funcName, argName)
+
+	id1 := acc.TestClient().Ids.RandomSchemaObjectIdentifierWithArgumentsNewDataTypes(dataType)
+	id2 := acc.TestClient().Ids.RandomSchemaObjectIdentifierWithArgumentsNewDataTypes(dataType)
+
+	functionsSetup := config.FromModels(t,
+		model.ProcedureJavaBasicInline("p1", id1, dataType, handler, definition).WithArgument(argName, dataType),
+		model.ProcedureJavaBasicInline("p2", id2, dataType, handler, definition).WithArgument(argName, dataType),
+	)
+
+	return fmt.Sprintf(`
+%s
+data "snowflake_procedures" "procedures" {
+  database   = "%s"
+  schema     = "%s"
+  depends_on = [snowflake_procedure_java.p1, snowflake_procedure_java.p2]
+}
+`, functionsSetup, acc.TestDatabaseName, acc.TestSchemaName)
+}
diff --git a/pkg/datasources/row_access_policies.go b/pkg/datasources/row_access_policies.go
index a5cd35ee87..18fc3c148b 100644
--- a/pkg/datasources/row_access_policies.go
+++ b/pkg/datasources/row_access_policies.go
@@ -128,12 +128,12 @@ func ReadRowAccessPolicies(ctx context.Context, d *schema.ResourceData, meta any
 	if v, ok := d.GetOk("in"); ok {
 		in := v.([]any)[0].(map[string]any)
 		if v, ok := in["account"]; ok && v.(bool) {
-			req.WithIn(&sdk.ExtendedIn{In: sdk.In{Account: sdk.Bool(true)}})
+			req.WithIn(sdk.ExtendedIn{In: sdk.In{Account: sdk.Bool(true)}})
 		}
 		if v, ok := in["database"]; ok {
 			database := v.(string)
 			if database != "" {
-				req.WithIn(&sdk.ExtendedIn{In: sdk.In{Database: sdk.NewAccountObjectIdentifier(database)}})
+				req.WithIn(sdk.ExtendedIn{In: sdk.In{Database: sdk.NewAccountObjectIdentifier(database)}})
 			}
 		}
 		if v, ok := in["schema"]; ok {
@@ -143,7 +143,7 @@ func ReadRowAccessPolicies(ctx context.Context, d *schema.ResourceData, meta any
 				if err != nil {
 					return diag.FromErr(err)
 				}
-				req.WithIn(&sdk.ExtendedIn{In: sdk.In{Schema: schemaId}})
+				req.WithIn(sdk.ExtendedIn{In: sdk.In{Schema: schemaId}})
 			}
 		}
 		if v, ok := in["application"]; ok {
@@ -159,7 +159,7 @@ func ReadRowAccessPolicies(ctx context.Context, d *schema.ResourceData, meta any
 	}
 
 	if likePattern, ok := d.GetOk("like"); ok {
-		req.WithLike(&sdk.Like{
+		req.WithLike(sdk.Like{
 			Pattern: sdk.String(likePattern.(string)),
 		})
 	}
diff --git a/pkg/datasources/secrets_acceptance_test.go b/pkg/datasources/secrets_acceptance_test.go
index 122755c052..c2c8d47bb2 100644
--- a/pkg/datasources/secrets_acceptance_test.go
+++ b/pkg/datasources/secrets_acceptance_test.go
@@ -8,9 +8,10 @@ import (
 	"time"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
-	accConfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
@@ -35,7 +36,7 @@ func TestAcc_Secrets_WithClientCredentials(t *testing.T) {
 
 	secretModel := model.SecretWithClientCredentials("test", integrationId.Name(), id.DatabaseName(), id.SchemaName(), id.Name(), []string{"username", "test_scope"})
 
-	dataSecretsClientCredentials := accConfig.FromModel(t, secretModel) + secretsData(secretModel, id)
+	dataSecretsClientCredentials := accconfig.FromModels(t, secretModel) + secretsData(secretModel, id)
 
 	dsName := "data.snowflake_secrets.test"
 	resource.Test(t, resource.TestCase{
@@ -90,7 +91,7 @@ func TestAcc_Secrets_WithAuthorizationCodeGrant(t *testing.T) {
 
 	secretModel := model.SecretWithAuthorizationCodeGrant("test", integrationId.Name(), id.DatabaseName(), id.SchemaName(), id.Name(), "test_token", time.Now().Add(24*time.Hour).Format(time.DateTime)).WithComment("test_comment")
 
-	dataSecretsAuthorizationCode := accConfig.FromModel(t, secretModel) + secretsData(secretModel, id)
+	dataSecretsAuthorizationCode := accconfig.FromModels(t, secretModel) + secretsData(secretModel, id)
 
 	dsName := "data.snowflake_secrets.test"
 	resource.Test(t, resource.TestCase{
@@ -131,7 +132,7 @@ func TestAcc_Secrets_WithBasicAuthentication(t *testing.T) {
 	id := acc.TestClient().Ids.RandomSchemaObjectIdentifier()
 
 	secretModel := model.SecretWithBasicAuthentication("test", id.DatabaseName(), id.Name(), "test_passwd", id.SchemaName(), "test_username")
-	dataSecretsAuthorizationCode := accConfig.FromModel(t, secretModel) + secretsData(secretModel, id)
+	dataSecretsAuthorizationCode := accconfig.FromModels(t, secretModel) + secretsData(secretModel, id)
 
 	dsName := "data.snowflake_secrets.test"
 	resource.Test(t, resource.TestCase{
@@ -172,7 +173,7 @@ func TestAcc_Secrets_WithGenericString(t *testing.T) {
 
 	secretModel := model.SecretWithGenericString("test", id.DatabaseName(), id.Name(), id.SchemaName(), "test_secret_string")
 
-	dataSecretsAuthorizationCode := accConfig.FromModel(t, secretModel) + secretsData(secretModel, id)
+	dataSecretsAuthorizationCode := accconfig.FromModels(t, secretModel) + secretsData(secretModel, id)
 
 	dsName := "data.snowflake_secrets.test"
 	resource.Test(t, resource.TestCase{
@@ -209,7 +210,7 @@ func TestAcc_Secrets_WithGenericString(t *testing.T) {
 	})
 }
 
-func secretsData(secretModel accConfig.ResourceModel, secretId sdk.SchemaObjectIdentifier) string {
+func secretsData(secretModel accconfig.ResourceModel, secretId sdk.SchemaObjectIdentifier) string {
 	return fmt.Sprintf(`
     data "snowflake_secrets" "test" {
         depends_on = [%s.test]
@@ -247,11 +248,11 @@ func TestAcc_Secrets_Filtering(t *testing.T) {
 	secretModelAuthorizationCodeGrant := model.SecretWithAuthorizationCodeGrant("s4", integrationId.Name(), idFour.DatabaseName(), idFour.SchemaName(), idFour.Name(), "test_token", time.Now().Add(24*time.Hour).Format(time.DateTime))
 	secretModelInDifferentSchema := model.SecretWithBasicAuthentication("s5", idFive.DatabaseName(), idFive.Name(), "test_passwd", idFive.SchemaName(), "test_username")
 
-	multipleSecretModels := accConfig.FromModel(t, secretModelBasicAuth) +
-		accConfig.FromModel(t, secretModelGenericString) +
-		accConfig.FromModel(t, secretModelClientCredentials) +
-		accConfig.FromModel(t, secretModelAuthorizationCodeGrant) +
-		accConfig.FromModel(t, secretModelInDifferentSchema)
+	multipleSecretModels := accconfig.FromModels(t, secretModelBasicAuth) +
+		accconfig.FromModels(t, secretModelGenericString) +
+		accconfig.FromModels(t, secretModelClientCredentials) +
+		accconfig.FromModels(t, secretModelAuthorizationCodeGrant) +
+		accconfig.FromModels(t, secretModelInDifferentSchema)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
diff --git a/pkg/datasources/sequences.go b/pkg/datasources/sequences.go
index e0d9b989e2..aa62caf826 100644
--- a/pkg/datasources/sequences.go
+++ b/pkg/datasources/sequences.go
@@ -65,7 +65,7 @@ func ReadSequences(ctx context.Context, d *schema.ResourceData, meta any) diag.D
 	databaseName := d.Get("database").(string)
 	schemaName := d.Get("schema").(string)
 
-	req := sdk.NewShowSequenceRequest().WithIn(&sdk.In{
+	req := sdk.NewShowSequenceRequest().WithIn(sdk.In{
 		Schema: sdk.NewDatabaseObjectIdentifier(databaseName, schemaName),
 	})
 	seqs, err := client.Sequences.Show(ctx, req)
diff --git a/pkg/datasources/stages.go b/pkg/datasources/stages.go
index bfbaa0997a..f79e0a7a00 100644
--- a/pkg/datasources/stages.go
+++ b/pkg/datasources/stages.go
@@ -73,7 +73,7 @@ func ReadStages(ctx context.Context, d *schema.ResourceData, meta any) diag.Diag
 	schemaName := d.Get("schema").(string)
 
 	stages, err := client.Stages.Show(ctx, sdk.NewShowStageRequest().WithIn(
-		&sdk.In{
+		sdk.In{
 			Schema: sdk.NewDatabaseObjectIdentifier(databaseName, schemaName),
 		},
 	))
diff --git a/pkg/datasources/streams_acceptance_test.go b/pkg/datasources/streams_acceptance_test.go
index 1b732d92c4..a119d03fcb 100644
--- a/pkg/datasources/streams_acceptance_test.go
+++ b/pkg/datasources/streams_acceptance_test.go
@@ -6,17 +6,17 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	testconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	testconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
@@ -130,7 +130,7 @@ func TestAcc_StreamOnTable(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, streamOnTable) + streamsDatasource(id.Name(), resourceName),
+				Config: config.FromModels(t, streamOnTable) + streamsDatasource(id.Name(), resourceName),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr(dsName, "streams.#", "1")),
 					resourceshowoutputassert.StreamsDatasourceShowOutput(t, "snowflake_streams.test").
@@ -195,7 +195,7 @@ func TestAcc_StreamOnExternalTable(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model) + streamsDatasource(id.Name(), resourceName),
+				Config: config.FromModels(t, model) + streamsDatasource(id.Name(), resourceName),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr(dsName, "streams.#", "1")),
 					resourceshowoutputassert.StreamsDatasourceShowOutput(t, "snowflake_streams.test").
@@ -254,7 +254,7 @@ func TestAcc_StreamOnDirectoryTable(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model) + streamsDatasource(id.Name(), resourceName),
+				Config: config.FromModels(t, model) + streamsDatasource(id.Name(), resourceName),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr(dsName, "streams.#", "1")),
 					resourceshowoutputassert.StreamsDatasourceShowOutput(t, "snowflake_streams.test").
@@ -317,7 +317,7 @@ func TestAcc_StreamOnView(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model) + streamsDatasource(id.Name(), resourceName),
+				Config: config.FromModels(t, model) + streamsDatasource(id.Name(), resourceName),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr(dsName, "streams.#", "1")),
 					resourceshowoutputassert.StreamsDatasourceShowOutput(t, "snowflake_streams.test").
@@ -390,13 +390,13 @@ func TestAcc_Streams_Filtering(t *testing.T) {
 		PreCheck: func() { acc.TestAccPreCheck(t) },
 		Steps: []resource.TestStep{
 			{
-				Config: testconfig.FromModel(t, model1) + testconfig.FromModel(t, model2) + testconfig.FromModel(t, model3) + streamsDatasourceLike(id1.Name()),
+				Config: testconfig.FromModels(t, model1) + testconfig.FromModels(t, model2) + testconfig.FromModels(t, model3) + streamsDatasourceLike(id1.Name()),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_streams.test", "streams.#", "1"),
 				),
 			},
 			{
-				Config: testconfig.FromModel(t, model1) + testconfig.FromModel(t, model2) + testconfig.FromModel(t, model3) + streamsDatasourceLike(prefix+"%"),
+				Config: testconfig.FromModels(t, model1) + testconfig.FromModels(t, model2) + testconfig.FromModels(t, model3) + streamsDatasourceLike(prefix+"%"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_streams.test", "streams.#", "2"),
 				),
diff --git a/pkg/datasources/tags_acceptance_test.go b/pkg/datasources/tags_acceptance_test.go
index a29eacc082..5f53e77e28 100644
--- a/pkg/datasources/tags_acceptance_test.go
+++ b/pkg/datasources/tags_acceptance_test.go
@@ -6,16 +6,16 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	testconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	testconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
-
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
@@ -93,13 +93,13 @@ func TestAcc_Tags_Filtering(t *testing.T) {
 		PreCheck: func() { acc.TestAccPreCheck(t) },
 		Steps: []resource.TestStep{
 			{
-				Config: testconfig.FromModel(t, model1) + testconfig.FromModel(t, model2) + testconfig.FromModel(t, model3) + tagsDatasourceLike(id1.Name()),
+				Config: testconfig.FromModels(t, model1) + testconfig.FromModels(t, model2) + testconfig.FromModels(t, model3) + tagsDatasourceLike(id1.Name()),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_tags.test", "tags.#", "1"),
 				),
 			},
 			{
-				Config: testconfig.FromModel(t, model1) + testconfig.FromModel(t, model2) + testconfig.FromModel(t, model3) + tagsDatasourceLike(prefix+"%"),
+				Config: testconfig.FromModels(t, model1) + testconfig.FromModels(t, model2) + testconfig.FromModels(t, model3) + tagsDatasourceLike(prefix+"%"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_tags.test", "tags.#", "2"),
 				),
diff --git a/pkg/datasources/testdata/TestAcc_Functions/complete/test.tf b/pkg/datasources/testdata/TestAcc_Functions/complete/test.tf
deleted file mode 100644
index 2baba5f105..0000000000
--- a/pkg/datasources/testdata/TestAcc_Functions/complete/test.tf
+++ /dev/null
@@ -1,33 +0,0 @@
-resource "snowflake_function" "test_function_one" {
-  name        = var.function_name_one
-  database    = var.database
-  schema      = var.schema
-  return_type = "VARCHAR"
-  language    = "JAVASCRIPT"
-  statement   = <<-EOF
-		return "Hi"
-	EOF
-}
-
-resource "snowflake_function" "test_function_two" {
-  name     = var.function_name_two
-  database = var.database
-  schema   = var.schema
-  arguments {
-    name = "arg1"
-    type = "varchar"
-  }
-  comment     = "Terraform acceptance test"
-  return_type = "varchar"
-  language    = "JAVASCRIPT"
-  statement   = <<-EOF
-		var x = 1
-		return x
-  EOF
-}
-
-data "snowflake_functions" "functions" {
-  database   = var.database
-  schema     = var.schema
-  depends_on = [snowflake_function.test_function_one, snowflake_function.test_function_two]
-}
diff --git a/pkg/datasources/testdata/TestAcc_Functions/complete/variables.tf b/pkg/datasources/testdata/TestAcc_Functions/complete/variables.tf
deleted file mode 100644
index af64399ad9..0000000000
--- a/pkg/datasources/testdata/TestAcc_Functions/complete/variables.tf
+++ /dev/null
@@ -1,15 +0,0 @@
-variable "function_name_one" {
-  type = string
-}
-
-variable "function_name_two" {
-  type = string
-}
-
-variable "database" {
-  type = string
-}
-
-variable "schema" {
-  type = string
-}
diff --git a/pkg/datasources/testdata/TestAcc_Procedures/complete/test.tf b/pkg/datasources/testdata/TestAcc_Procedures/complete/test.tf
deleted file mode 100644
index b91ba271a9..0000000000
--- a/pkg/datasources/testdata/TestAcc_Procedures/complete/test.tf
+++ /dev/null
@@ -1,47 +0,0 @@
-variable "proc_name_one" {
-  type = string
-}
-
-variable "proc_name_two" {
-  type = string
-}
-
-variable "database" {
-  type = string
-}
-
-variable "schema" {
-  type = string
-}
-
-resource "snowflake_procedure_javascript" "test_proc_one" {
-  name        = var.proc_name_one
-  database    = var.database
-  schema      = var.schema
-  return_type = "VARCHAR"
-  statement   = <<-EOF
-		return "Hi"
-	EOF
-}
-
-resource "snowflake_procedure_javascript" "test_proc_two" {
-  name     = var.proc_name_two
-  database = var.database
-  schema   = var.schema
-  arguments {
-    name = "arg1"
-    type = "varchar"
-  }
-  comment     = "Terraform acceptance test"
-  return_type = "varchar"
-  statement   = <<-EOF
-		var X=1
-		return X
-	EOF
-}
-
-data "snowflake_procedures" "procedures" {
-  database   = var.database
-  schema     = var.schema
-  depends_on = [snowflake_procedure_javascript.test_proc_one, snowflake_procedure_javascript.test_proc_two]
-}
diff --git a/pkg/datasources/usage_tracking_acceptance_test.go b/pkg/datasources/usage_tracking_acceptance_test.go
index a2146f7bed..17578114df 100644
--- a/pkg/datasources/usage_tracking_acceptance_test.go
+++ b/pkg/datasources/usage_tracking_acceptance_test.go
@@ -5,24 +5,21 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/datasources"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
-	"github.com/hashicorp/terraform-plugin-testing/terraform"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
-
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
-	"github.com/hashicorp/terraform-plugin-testing/tfversion"
-
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/datasources"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_CompleteUsageTracking(t *testing.T) {
@@ -57,7 +54,7 @@ func TestAcc_CompleteUsageTracking(t *testing.T) {
 		PreCheck: func() { acc.TestAccPreCheck(t) },
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, schemaModel) + schemaDatasourceConfigWithDependency(schemaModel.ResourceReference(), id),
+				Config: config.FromModels(t, schemaModel) + schemaDatasourceConfigWithDependency(schemaModel.ResourceReference(), id),
 				Check: assert.AssertThat(t,
 					resourceassert.SchemaResource(t, schemaModel.ResourceReference()).
 						HasNameString(id.Name()),
diff --git a/pkg/datasources/users_acceptance_test.go b/pkg/datasources/users_acceptance_test.go
index 109761d3b5..69b687a9cc 100644
--- a/pkg/datasources/users_acceptance_test.go
+++ b/pkg/datasources/users_acceptance_test.go
@@ -46,8 +46,8 @@ func TestAcc_Users_PersonUser(t *testing.T) {
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
 		WithMinsToBypassMfa(10).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment).
 		WithDisableMfa("true")
 
@@ -60,7 +60,7 @@ func TestAcc_Users_PersonUser(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModelAllAttributes) + datasourceWithLike(resources.User),
+				Config: config.FromModels(t, userModelAllAttributes) + datasourceWithLike(resources.User),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -122,7 +122,7 @@ func TestAcc_Users_PersonUser(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, userModelNoAttributes) + datasourceWithLike(resources.User),
+				Config: config.FromModels(t, userModelNoAttributes) + datasourceWithLike(resources.User),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -204,8 +204,8 @@ func TestAcc_Users_ServiceUser(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment)
 
 	resource.Test(t, resource.TestCase{
@@ -217,7 +217,7 @@ func TestAcc_Users_ServiceUser(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ServiceUser),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModelAllAttributes) + datasourceWithLike(resources.ServiceUser),
+				Config: config.FromModels(t, userModelAllAttributes) + datasourceWithLike(resources.ServiceUser),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -279,7 +279,7 @@ func TestAcc_Users_ServiceUser(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, userModelNoAttributes) + datasourceWithLike(resources.ServiceUser),
+				Config: config.FromModels(t, userModelNoAttributes) + datasourceWithLike(resources.ServiceUser),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -364,8 +364,8 @@ func TestAcc_Users_LegacyServiceUser(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment)
 
 	resource.Test(t, resource.TestCase{
@@ -377,7 +377,7 @@ func TestAcc_Users_LegacyServiceUser(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.LegacyServiceUser),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModelAllAttributes) + datasourceWithLike(resources.LegacyServiceUser),
+				Config: config.FromModels(t, userModelAllAttributes) + datasourceWithLike(resources.LegacyServiceUser),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -439,7 +439,7 @@ func TestAcc_Users_LegacyServiceUser(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, userModelNoAttributes) + datasourceWithLike(resources.LegacyServiceUser),
+				Config: config.FromModels(t, userModelNoAttributes) + datasourceWithLike(resources.LegacyServiceUser),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -512,7 +512,7 @@ func TestAcc_Users_DifferentFiltering(t *testing.T) {
 	user2Model := model.User("u2", id2.Name())
 	user3Model := model.User("u3", id3.Name())
 
-	allUsersConfig := config.FromModel(t, userModel) + config.FromModel(t, user2Model) + config.FromModel(t, user3Model)
+	allUsersConfig := config.FromModels(t, userModel) + config.FromModels(t, user2Model) + config.FromModels(t, user3Model)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
diff --git a/pkg/internal/tracking/context.go b/pkg/internal/tracking/context.go
index 412ff9eb77..371cd2fe49 100644
--- a/pkg/internal/tracking/context.go
+++ b/pkg/internal/tracking/context.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	CurrentSchemaVersion string = "1"
-	ProviderVersion      string = "v1.0.0" // TODO(SNOW-1814934): Currently hardcoded, make it computed
+	ProviderVersion      string = "v1.0.1" // TODO(SNOW-1814934): Currently hardcoded, make it computed
 	MetadataPrefix       string = "terraform_provider_usage_tracking"
 )
 
diff --git a/pkg/provider/previewfeatures/preview_features.go b/pkg/provider/previewfeatures/preview_features.go
index 112ac705e6..5988f260c6 100644
--- a/pkg/provider/previewfeatures/preview_features.go
+++ b/pkg/provider/previewfeatures/preview_features.go
@@ -105,6 +105,7 @@ var allPreviewFeatures = []feature{
 	FunctionPythonResource,
 	FunctionScalaResource,
 	FunctionSqlResource,
+	FunctionsDatasource,
 	ManagedAccountResource,
 	MaterializedViewResource,
 	MaterializedViewsDatasource,
@@ -127,6 +128,7 @@ var allPreviewFeatures = []feature{
 	ProcedurePythonResource,
 	ProcedureScalaResource,
 	ProcedureSqlResource,
+	ProceduresDatasource,
 	StageResource,
 	StagesDatasource,
 	StorageIntegrationResource,
@@ -138,6 +140,7 @@ var allPreviewFeatures = []feature{
 	TableColumnMaskingPolicyApplicationResource,
 	TableConstraintResource,
 	TableResource,
+	TablesDatasource,
 	UserAuthenticationPolicyAttachmentResource,
 	UserPublicKeysResource,
 	UserPasswordPolicyAttachmentResource,
diff --git a/pkg/provider/provider_acceptance_test.go b/pkg/provider/provider_acceptance_test.go
index e8fb41a1ca..415a81667a 100644
--- a/pkg/provider/provider_acceptance_test.go
+++ b/pkg/provider/provider_acceptance_test.go
@@ -12,7 +12,6 @@ import (
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	internalprovider "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/provider"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/previewfeatures"
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -23,6 +22,7 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testprofiles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/previewfeatures"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
diff --git a/pkg/resources/account_acceptance_test.go b/pkg/resources/account_acceptance_test.go
index 3b2e699d9f..96b4dcd781 100644
--- a/pkg/resources/account_acceptance_test.go
+++ b/pkg/resources/account_acceptance_test.go
@@ -5,25 +5,24 @@ import (
 	"regexp"
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -50,7 +49,7 @@ func TestAcc_Account_Minimal(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(id).
@@ -101,7 +100,7 @@ func TestAcc_Account_Minimal(t *testing.T) {
 			},
 			{
 				ResourceName: configModel.ResourceReference(),
-				Config:       config.FromModel(t, configModel),
+				Config:       config.FromModels(t, configModel),
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
 					resourceassert.ImportedAccountResource(t, helpers.EncodeResourceIdentifier(accountId)).
@@ -160,7 +159,7 @@ func TestAcc_Account_Complete(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(id).
@@ -211,7 +210,7 @@ func TestAcc_Account_Complete(t *testing.T) {
 			},
 			{
 				ResourceName: configModel.ResourceReference(),
-				Config:       config.FromModel(t, configModel),
+				Config:       config.FromModels(t, configModel),
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
 					resourceassert.ImportedAccountResource(t, helpers.EncodeResourceIdentifier(accountId)).
@@ -266,7 +265,7 @@ func TestAcc_Account_Rename(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(id).
@@ -283,7 +282,7 @@ func TestAcc_Account_Rename(t *testing.T) {
 						plancheck.ExpectResourceAction(newConfigModel.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, newConfigModel),
+				Config: config.FromModels(t, newConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, newConfigModel.ResourceReference()).
 						HasNameString(newId).
@@ -333,7 +332,7 @@ func TestAcc_Account_IsOrgAdmin(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Create with ORGADMIN enabled
 			{
-				Config: config.FromModel(t, configModelWithOrgAdminTrue),
+				Config: config.FromModels(t, configModelWithOrgAdminTrue),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModelWithOrgAdminTrue.ResourceReference()).
 						HasNameString(id).
@@ -353,7 +352,7 @@ func TestAcc_Account_IsOrgAdmin(t *testing.T) {
 						plancheck.ExpectResourceAction(configModelWithOrgAdminFalse.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, configModelWithOrgAdminFalse),
+				Config: config.FromModels(t, configModelWithOrgAdminFalse),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModelWithOrgAdminFalse.ResourceReference()).
 						HasNameString(id).
@@ -373,7 +372,7 @@ func TestAcc_Account_IsOrgAdmin(t *testing.T) {
 						plancheck.ExpectResourceAction(configModelWithoutOrgAdmin.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, configModelWithoutOrgAdmin),
+				Config: config.FromModels(t, configModelWithoutOrgAdmin),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModelWithoutOrgAdmin.ResourceReference()).
 						HasNameString(id).
@@ -401,7 +400,7 @@ func TestAcc_Account_IsOrgAdmin(t *testing.T) {
 						plancheck.ExpectResourceAction(configModelWithoutOrgAdmin.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, configModelWithoutOrgAdmin),
+				Config: config.FromModels(t, configModelWithoutOrgAdmin),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModelWithoutOrgAdmin.ResourceReference()).
 						HasNameString(id).
@@ -459,7 +458,7 @@ func TestAcc_Account_IgnoreUpdateAfterCreationOnCertainFields(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(id).
@@ -479,7 +478,7 @@ func TestAcc_Account_IgnoreUpdateAfterCreationOnCertainFields(t *testing.T) {
 						plancheck.ExpectResourceAction(newConfigModel.ResourceReference(), plancheck.ResourceActionNoop),
 					},
 				},
-				Config: config.FromModel(t, newConfigModel),
+				Config: config.FromModels(t, newConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, newConfigModel.ResourceReference()).
 						HasNameString(id).
@@ -521,7 +520,7 @@ func TestAcc_Account_TryToCreateWithoutOrgadmin(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config:      config.FromModel(t, configModel),
+				Config:      config.FromModels(t, configModel),
 				ExpectError: regexp.MustCompile("Error: current user doesn't have the orgadmin role in session"),
 			},
 		},
@@ -557,15 +556,15 @@ func TestAcc_Account_InvalidValues(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config:      config.FromModel(t, configModelInvalidUserType),
+				Config:      config.FromModels(t, configModelInvalidUserType),
 				ExpectError: regexp.MustCompile("invalid user type: invalid_user_type"),
 			},
 			{
-				Config:      config.FromModel(t, configModelInvalidAccountEdition),
+				Config:      config.FromModels(t, configModelInvalidAccountEdition),
 				ExpectError: regexp.MustCompile("unknown account edition: invalid_account_edition"),
 			},
 			{
-				Config:      config.FromModel(t, configModelInvalidGracePeriodInDays),
+				Config:      config.FromModels(t, configModelInvalidGracePeriodInDays),
 				ExpectError: regexp.MustCompile(`Error: expected grace_period_in_days to be at least \(3\), got 2`),
 			},
 		},
@@ -612,7 +611,7 @@ func TestAcc_Account_UpgradeFrom_v0_99_0(t *testing.T) {
 			},
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(name).
diff --git a/pkg/resources/account_parameter.go b/pkg/resources/account_parameter.go
index 2f8021c080..ca10e4a209 100644
--- a/pkg/resources/account_parameter.go
+++ b/pkg/resources/account_parameter.go
@@ -22,7 +22,7 @@ var accountParameterSchema = map[string]*schema.Schema{
 		ForceNew:         true,
 		ValidateDiagFunc: sdkValidation(sdk.ToAccountParameter),
 		DiffSuppressFunc: NormalizeAndCompare(sdk.ToAccountParameter),
-		Description:      fmt.Sprintf("Name of account parameter. Valid values are (case-insensitive): %s.", possibleValuesListed(sdk.AsStringList(sdk.AllAccountParameters))),
+		Description:      fmt.Sprintf("Name of account parameter. Valid values are (case-insensitive): %s. Deprecated parameters are not supported in the provider.", possibleValuesListed(sdk.AsStringList(sdk.AllAccountParameters))),
 	},
 	"value": {
 		Type:        schema.TypeString,
diff --git a/pkg/resources/account_parameter_acceptance_test.go b/pkg/resources/account_parameter_acceptance_test.go
index ab20439532..2df5a3a9dc 100644
--- a/pkg/resources/account_parameter_acceptance_test.go
+++ b/pkg/resources/account_parameter_acceptance_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
@@ -25,7 +25,7 @@ func TestAcc_AccountParameter(t *testing.T) {
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterAllowIDToken),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterAllowIDToken)).
 					HasValueString("true"),
@@ -46,7 +46,7 @@ func TestAcc_AccountParameter_PREVENT_LOAD_FROM_INLINE_URL(t *testing.T) {
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterPreventLoadFromInlineURL),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterPreventLoadFromInlineURL)).
 					HasValueString("true"),
@@ -67,7 +67,7 @@ func TestAcc_AccountParameter_REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_CREATION(t *
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterRequireStorageIntegrationForStageCreation),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterRequireStorageIntegrationForStageCreation)).
 					HasValueString("true"),
@@ -88,7 +88,7 @@ func TestAcc_AccountParameter_Issue2573(t *testing.T) {
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterTimezone),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterTimezone)).
 					HasValueString("Etc/UTC"),
@@ -115,7 +115,7 @@ func TestAcc_AccountParameter_Issue3025(t *testing.T) {
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterOAuthAddPrivilegedRolesToBlockedList),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterOAuthAddPrivilegedRolesToBlockedList)).
 					HasValueString("true"),
@@ -131,4 +131,46 @@ func TestAcc_AccountParameter_Issue3025(t *testing.T) {
 	})
 }
 
-// TODO(next pr): add more acc tests for the remaining parameters
+func TestAcc_AccountParameter_ENFORCE_NETWORK_RULES_FOR_INTERNAL_STAGES(t *testing.T) {
+	model := model.AccountParameter("test", string(sdk.AccountParameterRequireStorageIntegrationForStageCreation), "true")
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
+		PreCheck:                 func() { acc.TestAccPreCheck(t) },
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.RequireAbove(tfversion.Version1_5_0),
+		},
+		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterRequireStorageIntegrationForStageCreation),
+		Steps: []resource.TestStep{
+			{
+				Config: config.FromModels(t, model),
+				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
+					HasKeyString(string(sdk.AccountParameterRequireStorageIntegrationForStageCreation)).
+					HasValueString("true"),
+				),
+			},
+		},
+	})
+}
+
+func TestAcc_AccountParameter_INITIAL_REPLICATION_SIZE_LIMIT_IN_TB(t *testing.T) {
+	model := model.AccountParameter("test", string(sdk.AccountParameterInitialReplicationSizeLimitInTB), "3.0")
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
+		PreCheck:                 func() { acc.TestAccPreCheck(t) },
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.RequireAbove(tfversion.Version1_5_0),
+		},
+		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterInitialReplicationSizeLimitInTB),
+		Steps: []resource.TestStep{
+			{
+				Config: config.FromModels(t, model),
+				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
+					HasKeyString(string(sdk.AccountParameterInitialReplicationSizeLimitInTB)).
+					HasValueString("3.0"),
+				),
+			},
+		},
+	})
+}
+
+// TODO(SNOW-1866453): add more acc tests for the remaining parameters
diff --git a/pkg/resources/database_role_acceptance_test.go b/pkg/resources/database_role_acceptance_test.go
index 45ab1ddeac..879343352f 100644
--- a/pkg/resources/database_role_acceptance_test.go
+++ b/pkg/resources/database_role_acceptance_test.go
@@ -4,21 +4,19 @@ import (
 	"fmt"
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
-
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -38,7 +36,7 @@ func TestAcc_DatabaseRole(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.DatabaseRole),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, databaseRoleModel),
+				Config: config.FromModels(t, databaseRoleModel),
 				Check: assert.AssertThat(t,
 					resourceassert.DatabaseRoleResource(t, "snowflake_database_role.test").
 						HasNameString(id.Name()).
@@ -67,7 +65,7 @@ func TestAcc_DatabaseRole(t *testing.T) {
 			},
 			// set comment
 			{
-				Config: config.FromModel(t, databaseRoleModelWithComment),
+				Config: config.FromModels(t, databaseRoleModelWithComment),
 				Check: assert.AssertThat(t,
 					resourceassert.DatabaseRoleResource(t, "snowflake_database_role.test").
 						HasNameString(id.Name()).
@@ -96,7 +94,7 @@ func TestAcc_DatabaseRole(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, databaseRoleModel),
+				Config: config.FromModels(t, databaseRoleModel),
 				Check: assert.AssertThat(t,
 					resourceassert.DatabaseRoleResource(t, "snowflake_database_role.test").
 						HasNameString(id.Name()).
@@ -130,7 +128,7 @@ func TestAcc_DatabaseRole(t *testing.T) {
 						plancheck.ExpectResourceAction("snowflake_database_role.test", plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, databaseRoleModel.WithName(newId.Name())),
+				Config: config.FromModels(t, databaseRoleModel.WithName(newId.Name())),
 				Check: assert.AssertThat(t,
 					resourceassert.DatabaseRoleResource(t, "snowflake_database_role.test").
 						HasNameString(newId.Name()).
@@ -168,7 +166,7 @@ func TestAcc_DatabaseRole_migrateFromV0941_ensureSmoothUpgradeWithNewResourceId(
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, databaseRoleModelWithComment),
+				Config: config.FromModels(t, databaseRoleModelWithComment),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_database_role.test", "id", fmt.Sprintf(`%s|%s`, id.DatabaseName(), id.Name())),
 				),
@@ -176,7 +174,7 @@ func TestAcc_DatabaseRole_migrateFromV0941_ensureSmoothUpgradeWithNewResourceId(
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, databaseRoleModelWithComment),
+				Config:                   config.FromModels(t, databaseRoleModelWithComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_database_role.test", plancheck.ResourceActionNoop),
@@ -214,7 +212,7 @@ func TestAcc_DatabaseRole_IdentifierQuotingDiffSuppression(t *testing.T) {
 					},
 				},
 				ExpectNonEmptyPlan: true,
-				Config:             config.FromModel(t, databaseRoleModelWithComment),
+				Config:             config.FromModels(t, databaseRoleModelWithComment),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_database_role.test", "database", id.DatabaseName()),
 					resource.TestCheckResourceAttr("snowflake_database_role.test", "name", id.Name()),
@@ -224,7 +222,7 @@ func TestAcc_DatabaseRole_IdentifierQuotingDiffSuppression(t *testing.T) {
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, databaseRoleModelWithComment),
+				Config:                   config.FromModels(t, databaseRoleModelWithComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_database_role.test", plancheck.ResourceActionNoop),
diff --git a/pkg/resources/function_commons.go b/pkg/resources/function_commons.go
index c9c8bf05e6..89b675a7b7 100644
--- a/pkg/resources/function_commons.go
+++ b/pkg/resources/function_commons.go
@@ -226,7 +226,7 @@ func functionBaseSchema() map[string]schema.Schema {
 						Type:     schema.TypeString,
 						Required: true,
 						// TODO [SNOW-1348103]: adjust diff suppression accordingly.
-						Description: "The argument name.",
+						Description: "The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.",
 					},
 					// TODO [SNOW-1348103]: after testing weird names add limitations to the docs and add validation here
 					"arg_data_type": {
diff --git a/pkg/resources/function_java_acceptance_test.go b/pkg/resources/function_java_acceptance_test.go
index e210974888..7edf7905e3 100644
--- a/pkg/resources/function_java_acceptance_test.go
+++ b/pkg/resources/function_java_acceptance_test.go
@@ -77,6 +77,22 @@ func TestAcc_FunctionJava_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(functionModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Function.DropFunctionFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(functionModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, functionModel),
+				Check: assert.AssertThat(t,
+					resourceassert.FunctionJavaResource(t, functionModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// IMPORT
 			{
 				ResourceName:            functionModel.ResourceReference(),
@@ -183,6 +199,7 @@ func TestAcc_FunctionJava_InlineBasicDefaultArg(t *testing.T) {
 func TestAcc_FunctionJava_InlineFull(t *testing.T) {
 	_ = testenvs.GetOrSkipTest(t, testenvs.EnableAcceptance)
 	acc.TestAccPreCheck(t)
+	t.Setenv(string(testenvs.ConfigureClientOnce), "")
 
 	stage, stageCleanup := acc.TestClient().Stage.CreateStage(t)
 	t.Cleanup(stageCleanup)
diff --git a/pkg/resources/function_javascript_acceptance_test.go b/pkg/resources/function_javascript_acceptance_test.go
index 2ef1c7d7f7..5c87a1d047 100644
--- a/pkg/resources/function_javascript_acceptance_test.go
+++ b/pkg/resources/function_javascript_acceptance_test.go
@@ -4,20 +4,20 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testdatatypes"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -64,6 +64,22 @@ func TestAcc_FunctionJavascript_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(functionModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Function.DropFunctionFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(functionModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, functionModel),
+				Check: assert.AssertThat(t,
+					resourceassert.FunctionJavascriptResource(t, functionModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// RENAME
 			{
 				Config: config.FromModels(t, functionModelRenamed),
diff --git a/pkg/resources/function_python_acceptance_test.go b/pkg/resources/function_python_acceptance_test.go
index 04c82d91e5..24bee831dd 100644
--- a/pkg/resources/function_python_acceptance_test.go
+++ b/pkg/resources/function_python_acceptance_test.go
@@ -5,7 +5,6 @@ import (
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
@@ -19,10 +18,15 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_FunctionPython_InlineBasic(t *testing.T) {
+	_ = testenvs.GetOrSkipTest(t, testenvs.EnableAcceptance)
+	acc.TestAccPreCheck(t)
+	t.Setenv(string(testenvs.ConfigureClientOnce), "")
+
 	funcName := "some_function"
 	argName := "x"
 	dataType := testdatatypes.DataTypeNumber_36_2
@@ -64,6 +68,22 @@ func TestAcc_FunctionPython_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(functionModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Function.DropFunctionFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(functionModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, functionModel),
+				Check: assert.AssertThat(t,
+					resourceassert.FunctionPythonResource(t, functionModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// IMPORT
 			{
 				ResourceName:            functionModel.ResourceReference(),
@@ -94,6 +114,7 @@ func TestAcc_FunctionPython_InlineBasic(t *testing.T) {
 func TestAcc_FunctionPython_InlineFull(t *testing.T) {
 	_ = testenvs.GetOrSkipTest(t, testenvs.EnableAcceptance)
 	acc.TestAccPreCheck(t)
+	t.Setenv(string(testenvs.ConfigureClientOnce), "")
 
 	secretId := acc.TestClient().Ids.RandomSchemaObjectIdentifier()
 	secretId2 := acc.TestClient().Ids.RandomSchemaObjectIdentifier()
diff --git a/pkg/resources/function_scala_acceptance_test.go b/pkg/resources/function_scala_acceptance_test.go
index 2dbc466a4a..a8361b4f4e 100644
--- a/pkg/resources/function_scala_acceptance_test.go
+++ b/pkg/resources/function_scala_acceptance_test.go
@@ -69,6 +69,22 @@ func TestAcc_FunctionScala_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(functionModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Function.DropFunctionFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(functionModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, functionModel),
+				Check: assert.AssertThat(t,
+					resourceassert.FunctionScalaResource(t, functionModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// IMPORT
 			{
 				ResourceName:            functionModel.ResourceReference(),
@@ -99,6 +115,7 @@ func TestAcc_FunctionScala_InlineBasic(t *testing.T) {
 func TestAcc_FunctionScala_InlineFull(t *testing.T) {
 	_ = testenvs.GetOrSkipTest(t, testenvs.EnableAcceptance)
 	acc.TestAccPreCheck(t)
+	t.Setenv(string(testenvs.ConfigureClientOnce), "")
 
 	stage, stageCleanup := acc.TestClient().Stage.CreateStage(t)
 	t.Cleanup(stageCleanup)
diff --git a/pkg/resources/function_sql_acceptance_test.go b/pkg/resources/function_sql_acceptance_test.go
index c8df1348ed..f155f31e8a 100644
--- a/pkg/resources/function_sql_acceptance_test.go
+++ b/pkg/resources/function_sql_acceptance_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
@@ -12,12 +11,14 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testdatatypes"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -25,7 +26,7 @@ func TestAcc_FunctionSql_InlineBasic(t *testing.T) {
 	argName := "abc"
 	dataType := testdatatypes.DataTypeFloat
 	id := acc.TestClient().Ids.RandomSchemaObjectIdentifierWithArgumentsNewDataTypes(dataType)
-	idWithChangedNameButTheSameDataType := acc.TestClient().Ids.RandomSchemaObjectIdentifierWithArgumentsNewDataTypes()
+	idWithChangedNameButTheSameDataType := acc.TestClient().Ids.RandomSchemaObjectIdentifierWithArgumentsNewDataTypes(dataType)
 
 	definition := acc.TestClient().Function.SampleSqlDefinitionWithArgument(t, argName)
 
@@ -60,12 +61,28 @@ func TestAcc_FunctionSql_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(functionModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Function.DropFunctionFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(functionModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, functionModel),
+				Check: assert.AssertThat(t,
+					resourceassert.FunctionSqlResource(t, functionModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// IMPORT
 			{
 				ResourceName:            functionModel.ResourceReference(),
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{},
+				ImportStateVerifyIgnore: []string{"is_secure"},
 				ImportStateCheck: assert.AssertThatImport(t,
 					resourceassert.ImportedFunctionSqlResource(t, id.FullyQualifiedName()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()),
diff --git a/pkg/resources/legacy_service_user_acceptance_test.go b/pkg/resources/legacy_service_user_acceptance_test.go
index 55c0033448..1931d4a1dc 100644
--- a/pkg/resources/legacy_service_user_acceptance_test.go
+++ b/pkg/resources/legacy_service_user_acceptance_test.go
@@ -56,8 +56,8 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment)
 
 	userModelAllAttributesChanged := func(loginName string) *model.LegacyServiceUserModel {
@@ -74,8 +74,8 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			WithDefaultNamespace("one_part_namespace").
 			WithDefaultRole("other_role").
 			WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-			WithRsaPublicKey(key2).
-			WithRsaPublicKey2(key1).
+			WithRsaPublicKeyValue(config.MultilineWrapperVariable(key2)).
+			WithRsaPublicKey2Value(config.MultilineWrapperVariable(key1)).
 			WithComment(newComment)
 	}
 
@@ -89,7 +89,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 		Steps: []resource.TestStep{
 			// CREATE WITHOUT ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -116,7 +116,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			},
 			// RENAME AND CHANGE ONE PROP
 			{
-				Config: config.FromModel(t, userModelNoAttributesRenamed),
+				Config: config.FromModels(t, userModelNoAttributesRenamed),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id2.Name()).
@@ -143,12 +143,12 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			},
 			// DESTROY
 			{
-				Config:  config.FromModel(t, userModelNoAttributes),
+				Config:  config.FromModels(t, userModelNoAttributes),
 				Destroy: true,
 			},
 			// CREATE WITH ALL ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelAllAttributes),
+				Config: config.FromModels(t, userModelAllAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelAllAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -172,7 +172,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			},
 			// CHANGE PROPERTIES
 			{
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelAllAttributesChanged(id.Name()+"_other_login").ResourceReference()).
 						HasNameString(id.Name()).
@@ -211,7 +211,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetLoginName(t, id, id.Name()+"_different_login")
 				},
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -220,7 +220,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			},
 			// UNSET ALL
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -327,7 +327,7 @@ func TestAcc_LegacyServiceUser_AllParameters(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create with default values for all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -347,7 +347,7 @@ func TestAcc_LegacyServiceUser_AllParameters(t *testing.T) {
 			},
 			// set all parameters
 			{
-				Config: config.FromModel(t, userModelWithAllParametersSet),
+				Config: config.FromModels(t, userModelWithAllParametersSet),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAbortDetachedQuery(true).
@@ -537,7 +537,7 @@ func TestAcc_LegacyServiceUser_AllParameters(t *testing.T) {
 			},
 			// unset all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -564,7 +564,7 @@ func TestAcc_LegacyServiceUser_handleExternalTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.LegacyServiceUser),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).HasNameString(userId.Name()).HasUserTypeString("LEGACY_SERVICE"),
 					resourceshowoutputassert.UserShowOutput(t, userModel.ResourceReference()).HasType("LEGACY_SERVICE"),
@@ -575,7 +575,7 @@ func TestAcc_LegacyServiceUser_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.SetType(t, userId, sdk.UserTypeService)
 					objectassert.User(t, userId).HasType(string(sdk.UserTypeService))
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -591,7 +591,7 @@ func TestAcc_LegacyServiceUser_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.UnsetType(t, userId)
 					objectassert.User(t, userId).HasType("")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/oauth_integration_for_custom_clients_acceptance_test.go b/pkg/resources/oauth_integration_for_custom_clients_acceptance_test.go
index a6ffa8205b..b5f8f06687 100644
--- a/pkg/resources/oauth_integration_for_custom_clients_acceptance_test.go
+++ b/pkg/resources/oauth_integration_for_custom_clients_acceptance_test.go
@@ -6,24 +6,22 @@ import (
 	"strings"
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	resourcehelpers "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-
+	resourcenames "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	tfjson "github.com/hashicorp/terraform-json"
 
-	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
-	resourcenames "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
-
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -791,7 +789,7 @@ func TestAcc_OauthIntegrationForCustomClients_WithPrivilegedRolesBlockedList(t *
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, modelWithBlockedRole),
+				Config: accconfig.FromModels(t, modelWithBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.#", "1"),
 					resource.TestCheckTypeSetElemAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.*", role.ID().Name()),
@@ -801,7 +799,7 @@ func TestAcc_OauthIntegrationForCustomClients_WithPrivilegedRolesBlockedList(t *
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, modelWithoutBlockedRole),
+				Config: accconfig.FromModels(t, modelWithoutBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "blocked_roles_list.#", "0"),
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "name", id.Name()),
@@ -814,7 +812,7 @@ func TestAcc_OauthIntegrationForCustomClients_WithPrivilegedRolesBlockedList(t *
 					// Do not revert, because the revert is setup above.
 					acc.TestClient().Parameter.UpdateAccountParameterTemporarily(t, sdk.AccountParameterOAuthAddPrivilegedRolesToBlockedList, "false")
 				},
-				Config: accconfig.FromModel(t, modelWithBlockedRole),
+				Config: accconfig.FromModels(t, modelWithBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.#", "1"),
 					resource.TestCheckTypeSetElemAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.*", role.ID().Name()),
@@ -824,7 +822,7 @@ func TestAcc_OauthIntegrationForCustomClients_WithPrivilegedRolesBlockedList(t *
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, modelWithoutBlockedRole),
+				Config: accconfig.FromModels(t, modelWithoutBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "blocked_roles_list.#", "0"),
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "name", id.Name()),
diff --git a/pkg/resources/oauth_integration_for_partner_applications_acceptance_test.go b/pkg/resources/oauth_integration_for_partner_applications_acceptance_test.go
index 975b47b7b7..cc251e8f86 100644
--- a/pkg/resources/oauth_integration_for_partner_applications_acceptance_test.go
+++ b/pkg/resources/oauth_integration_for_partner_applications_acceptance_test.go
@@ -6,24 +6,21 @@ import (
 	"strings"
 	"testing"
 
-	resourcehelpers "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
+	resourcehelpers "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	tfjson "github.com/hashicorp/terraform-json"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
-
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -798,7 +795,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_WithPrivilegedRolesBlockedLi
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, modelWithBlockedRole),
+				Config: accconfig.FromModels(t, modelWithBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.#", "1"),
 					resource.TestCheckTypeSetElemAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.*", role.ID().Name()),
@@ -808,7 +805,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_WithPrivilegedRolesBlockedLi
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, modelWithoutBlockedRole),
+				Config: accconfig.FromModels(t, modelWithoutBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "blocked_roles_list.#", "0"),
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "name", id.Name()),
@@ -821,7 +818,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_WithPrivilegedRolesBlockedLi
 					// Do not revert, because the revert is setup above.
 					acc.TestClient().Parameter.UpdateAccountParameterTemporarily(t, sdk.AccountParameterOAuthAddPrivilegedRolesToBlockedList, "false")
 				},
-				Config: accconfig.FromModel(t, modelWithBlockedRole),
+				Config: accconfig.FromModels(t, modelWithBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.#", "1"),
 					resource.TestCheckTypeSetElemAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.*", role.ID().Name()),
@@ -831,7 +828,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_WithPrivilegedRolesBlockedLi
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, modelWithoutBlockedRole),
+				Config: accconfig.FromModels(t, modelWithoutBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "blocked_roles_list.#", "0"),
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "name", id.Name()),
diff --git a/pkg/resources/object_renaming_acceptance_test.go b/pkg/resources/object_renaming_acceptance_test.go
index 15be4da721..afdbe48536 100644
--- a/pkg/resources/object_renaming_acceptance_test.go
+++ b/pkg/resources/object_renaming_acceptance_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
@@ -197,13 +198,13 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedInternally(t *testing.T) {
 				CheckDestroy: acc.CheckDestroy(t, resources.Schema),
 				Steps: []resource.TestStep{
 					{
-						Config: config.FromModel(t, databaseConfigModel) + configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.Dependency, databaseId.Name(), schemaName),
+						Config: config.FromModels(t, databaseConfigModel) + configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.Dependency, databaseId.Name(), schemaName),
 					},
 					{
 						ConfigPlanChecks: resource.ConfigPlanChecks{
 							PreApply: preApplyChecksAfterRename,
 						},
-						Config: config.FromModel(t, databaseConfigModelWithNewId) + schemaConfigAfterRename,
+						Config: config.FromModels(t, databaseConfigModelWithNewId) + schemaConfigAfterRename,
 					},
 				},
 			})
@@ -249,9 +250,9 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally(t *testing.T) {
 			var schemaConfigAfterRename string
 
 			if testCase.IsRenamedDatabaseReferencedAfterRenameInDatabase {
-				databaseConfigAfterRename = config.FromModel(t, databaseConfigModelWithNewId)
+				databaseConfigAfterRename = config.FromModels(t, databaseConfigModelWithNewId)
 			} else {
-				databaseConfigAfterRename = config.FromModel(t, databaseConfigModel)
+				databaseConfigAfterRename = config.FromModels(t, databaseConfigModel)
 			}
 
 			switch testCase.Dependency {
@@ -273,7 +274,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally(t *testing.T) {
 				CheckDestroy: acc.CheckDestroy(t, resources.Schema),
 				Steps: []resource.TestStep{
 					{
-						Config: config.FromModel(t, databaseConfigModel) + configSchemaWithDatabaseReference(databaseConfigModel.ResourceReference(), schemaName),
+						Config: config.FromModels(t, databaseConfigModel) + configSchemaWithDatabaseReference(databaseConfigModel.ResourceReference(), schemaName),
 					},
 					{
 						PreConfig: func() {
@@ -318,7 +319,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally_WithoutDependency_Aft
 		CheckDestroy: acc.CheckDestroy(t, resources.Schema),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModelsDeprecated(t, databaseConfigModel, schemaModelConfig),
+				Config: config.FromModels(t, databaseConfigModel, schemaModelConfig),
 			},
 			{
 				// This step has inconsistent results, and it depends on the Terraform execution order which seems to be non-deterministic in this case
@@ -333,7 +334,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally_WithoutDependency_Aft
 						plancheck.ExpectResourceAction("snowflake_schema.test", plancheck.ResourceActionCreate),
 					},
 				},
-				Config: config.FromModelsDeprecated(t, databaseConfigModel, schemaModelConfig),
+				Config: config.FromModels(t, databaseConfigModel, schemaModelConfig),
 				// ExpectError: regexp.MustCompile("does not exist or not authorized"),
 			},
 		},
@@ -362,7 +363,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally_WithoutDependency_Aft
 		CheckDestroy: acc.CheckDestroy(t, resources.Schema),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModelsDeprecated(t, schemaModelConfig, databaseConfigModel),
+				Config: config.FromModels(t, schemaModelConfig, databaseConfigModel),
 			},
 			{
 				PreConfig: func() {
@@ -376,7 +377,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally_WithoutDependency_Aft
 						plancheck.ExpectResourceAction("snowflake_schema.test", plancheck.ResourceActionCreate),
 					},
 				},
-				Config:      config.FromModelsDeprecated(t, schemaModelConfig, databaseConfigModel),
+				Config:      config.FromModels(t, schemaModelConfig, databaseConfigModel),
 				ExpectError: regexp.MustCompile("does not exist or not authorized"),
 			},
 		},
@@ -422,7 +423,7 @@ func TestAcc_ShallowHierarchy_IsNotInConfig_RenamedExternally(t *testing.T) {
 							_, databaseCleanup := acc.TestClient().Database.CreateDatabaseWithIdentifier(t, databaseId)
 							t.Cleanup(databaseCleanup)
 						},
-						Config: config.FromModel(t, schemaModelConfig),
+						Config: config.FromModels(t, schemaModelConfig),
 					},
 					{
 						PreConfig: func() {
@@ -496,7 +497,7 @@ func TestAcc_DeepHierarchy_AreInConfig_DatabaseRenamedInternally(t *testing.T) {
 
 			testSteps := []resource.TestStep{
 				{
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseInSchemaDependency, databaseId.Name(), schemaName) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), schemaName, tableName),
 					ExpectError: testCase.ExpectedFirstStepError,
@@ -513,7 +514,7 @@ func TestAcc_DeepHierarchy_AreInConfig_DatabaseRenamedInternally(t *testing.T) {
 								plancheck.ExpectResourceAction("snowflake_table.test", plancheck.ResourceActionDestroyBeforeCreate),
 							},
 						},
-						Config: config.FromModel(t, databaseConfigModelWithNewId) +
+						Config: config.FromModels(t, databaseConfigModelWithNewId) +
 							configSchemaWithReferences(t, databaseConfigModelWithNewId.ResourceReference(), testCase.DatabaseInSchemaDependency, newDatabaseId.Name(), schemaName) +
 							configTableWithReferences(t, databaseConfigModelWithNewId.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, newDatabaseId.Name(), schemaName, tableName),
 					},
@@ -566,7 +567,7 @@ func TestAcc_DeepHierarchy_AreInConfig_SchemaRenamedInternally(t *testing.T) {
 
 			testSteps := []resource.TestStep{
 				{
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), ImplicitDependency, databaseId.Name(), schemaName) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), schemaName, tableName),
 					ExpectError: testCase.ExpectedFirstStepError,
@@ -583,7 +584,7 @@ func TestAcc_DeepHierarchy_AreInConfig_SchemaRenamedInternally(t *testing.T) {
 								plancheck.ExpectResourceAction("snowflake_table.test", plancheck.ResourceActionDestroyBeforeCreate),
 							},
 						},
-						Config: config.FromModel(t, databaseConfigModel) +
+						Config: config.FromModels(t, databaseConfigModel) +
 							configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), ImplicitDependency, databaseId.Name(), newSchemaName) +
 							configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), newSchemaName, tableName),
 					},
@@ -639,7 +640,7 @@ func TestAcc_DeepHierarchy_AreInConfig_DatabaseRenamedExternally(t *testing.T) {
 
 			testSteps := []resource.TestStep{
 				{
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseInSchemaDependency, databaseId.Name(), schemaName) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), schemaName, tableName),
 					ExpectError: testCase.ExpectedFirstStepError,
@@ -653,7 +654,7 @@ func TestAcc_DeepHierarchy_AreInConfig_DatabaseRenamedExternally(t *testing.T) {
 							NewName: &newDatabaseId,
 						})
 					},
-					Config: config.FromModel(t, databaseConfigModelWithNewId) +
+					Config: config.FromModels(t, databaseConfigModelWithNewId) +
 						configSchemaWithReferences(t, databaseConfigModelWithNewId.ResourceReference(), testCase.DatabaseInSchemaDependency, newDatabaseId.Name(), schemaName) +
 						configTableWithReferences(t, databaseConfigModelWithNewId.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, newDatabaseId.Name(), schemaName, tableName),
 					ExpectError: testCase.ExpectedSecondStepError,
@@ -709,7 +710,7 @@ func TestAcc_DeepHierarchy_AreInConfig_SchemaRenamedExternally(t *testing.T) {
 
 			testSteps := []resource.TestStep{
 				{
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseInSchemaDependency, databaseId.Name(), schemaId.Name()) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), schemaId.Name(), tableName),
 					ExpectError: testCase.ExpectedFirstStepError,
@@ -723,7 +724,7 @@ func TestAcc_DeepHierarchy_AreInConfig_SchemaRenamedExternally(t *testing.T) {
 							NewName: &newSchemaId,
 						})
 					},
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseInSchemaDependency, databaseId.Name(), newSchemaId.Name()) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), newSchemaId.Name(), tableName),
 					ExpectError: testCase.ExpectedSecondStepError,
diff --git a/pkg/resources/primary_connection_acceptance_test.go b/pkg/resources/primary_connection_acceptance_test.go
index 8c2241a328..d1f6dc274d 100644
--- a/pkg/resources/primary_connection_acceptance_test.go
+++ b/pkg/resources/primary_connection_acceptance_test.go
@@ -5,6 +5,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -17,7 +19,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -51,7 +52,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModel.ResourceReference()).
@@ -78,7 +79,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 			},
 			// set comment
 			{
-				Config: config.FromModel(t, connectionModelWithComment),
+				Config: config.FromModels(t, connectionModelWithComment),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModelWithComment.ResourceReference()).
@@ -104,7 +105,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModel.ResourceReference()).
@@ -117,7 +118,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 			},
 			// enable failover to second account
 			{
-				Config: config.FromModel(t, connectionModelWithFailover),
+				Config: config.FromModels(t, connectionModelWithFailover),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModelWithFailover.ResourceReference()).
@@ -133,7 +134,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 			},
 			// disable failover to second account
 			{
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModel.ResourceReference()).
@@ -176,7 +177,7 @@ func TestAcc_PrimaryConnection_ExternalChanges(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModel.ResourceReference()).
@@ -205,7 +206,7 @@ func TestAcc_PrimaryConnection_ExternalChanges(t *testing.T) {
 						WithSet(*sdk.NewConnectionSetRequest().
 							WithComment("external comment")))
 				},
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(connectionModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -229,7 +230,7 @@ func TestAcc_PrimaryConnection_ExternalChanges(t *testing.T) {
 							[]sdk.AccountIdentifier{secondaryAccountId})),
 					)
 				},
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(connectionModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -256,7 +257,7 @@ func TestAcc_PrimaryConnection_ExternalChanges(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().Connection.Alter(t, sdk.NewAlterConnectionRequest(id).WithDisableConnectionFailover(*sdk.NewDisableConnectionFailoverRequest()))
 				},
-				Config: config.FromModel(t, connectionModelWithFailover),
+				Config: config.FromModels(t, connectionModelWithFailover),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(connectionModelWithFailover.ResourceReference(), plancheck.ResourceActionUpdate),
diff --git a/pkg/resources/procedure_commons.go b/pkg/resources/procedure_commons.go
index 1cd819647b..f87b694b47 100644
--- a/pkg/resources/procedure_commons.go
+++ b/pkg/resources/procedure_commons.go
@@ -217,7 +217,7 @@ func procedureBaseSchema() map[string]schema.Schema {
 						Type:     schema.TypeString,
 						Required: true,
 						// TODO [SNOW-1348103]: adjust diff suppression accordingly.
-						Description: "The argument name.",
+						Description: "The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.",
 					},
 					"arg_data_type": {
 						Type:             schema.TypeString,
diff --git a/pkg/resources/procedure_java_acceptance_test.go b/pkg/resources/procedure_java_acceptance_test.go
index 651e1e35c5..b8d8dbb79b 100644
--- a/pkg/resources/procedure_java_acceptance_test.go
+++ b/pkg/resources/procedure_java_acceptance_test.go
@@ -76,6 +76,22 @@ func TestAcc_ProcedureJava_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(procedureModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Procedure.DropProcedureFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(procedureModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, procedureModel),
+				Check: assert.AssertThat(t,
+					resourceassert.ProcedureJavaResource(t, procedureModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// IMPORT
 			{
 				ResourceName:            procedureModel.ResourceReference(),
diff --git a/pkg/resources/procedure_javascript_acceptance_test.go b/pkg/resources/procedure_javascript_acceptance_test.go
index 3a6bf5efd8..9040cfd225 100644
--- a/pkg/resources/procedure_javascript_acceptance_test.go
+++ b/pkg/resources/procedure_javascript_acceptance_test.go
@@ -62,6 +62,22 @@ func TestAcc_ProcedureJavascript_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(procedureModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Procedure.DropProcedureFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(procedureModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, procedureModel),
+				Check: assert.AssertThat(t,
+					resourceassert.ProcedureJavascriptResource(t, procedureModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// IMPORT
 			{
 				ResourceName:            procedureModel.ResourceReference(),
diff --git a/pkg/resources/procedure_python_acceptance_test.go b/pkg/resources/procedure_python_acceptance_test.go
index 7932a83381..b9f4b681b5 100644
--- a/pkg/resources/procedure_python_acceptance_test.go
+++ b/pkg/resources/procedure_python_acceptance_test.go
@@ -65,6 +65,22 @@ func TestAcc_ProcedurePython_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(procedureModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Procedure.DropProcedureFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(procedureModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, procedureModel),
+				Check: assert.AssertThat(t,
+					resourceassert.ProcedurePythonResource(t, procedureModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// IMPORT
 			{
 				ResourceName:            procedureModel.ResourceReference(),
diff --git a/pkg/resources/procedure_scala_acceptance_test.go b/pkg/resources/procedure_scala_acceptance_test.go
index a45a717b63..dcbfe7eda7 100644
--- a/pkg/resources/procedure_scala_acceptance_test.go
+++ b/pkg/resources/procedure_scala_acceptance_test.go
@@ -74,6 +74,22 @@ func TestAcc_ProcedureScala_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(procedureModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Procedure.DropProcedureFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(procedureModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, procedureModel),
+				Check: assert.AssertThat(t,
+					resourceassert.ProcedureScalaResource(t, procedureModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// IMPORT
 			{
 				ResourceName:            procedureModel.ResourceReference(),
diff --git a/pkg/resources/procedure_sql_acceptance_test.go b/pkg/resources/procedure_sql_acceptance_test.go
index f00eb1003f..79fbb5bb98 100644
--- a/pkg/resources/procedure_sql_acceptance_test.go
+++ b/pkg/resources/procedure_sql_acceptance_test.go
@@ -62,6 +62,22 @@ func TestAcc_ProcedureSql_InlineBasic(t *testing.T) {
 					assert.Check(resource.TestCheckResourceAttr(procedureModel.ResourceReference(), "arguments.0.arg_default_value", "")),
 				),
 			},
+			// REMOVE EXTERNALLY (CHECK RECREATION)
+			{
+				PreConfig: func() {
+					acc.TestClient().Procedure.DropProcedureFunc(t, id)()
+				},
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(procedureModel.ResourceReference(), plancheck.ResourceActionCreate),
+					},
+				},
+				Config: config.FromModels(t, procedureModel),
+				Check: assert.AssertThat(t,
+					resourceassert.ProcedureSqlResource(t, procedureModel.ResourceReference()).
+						HasNameString(id.Name()),
+				),
+			},
 			// IMPORT
 			{
 				ResourceName:            procedureModel.ResourceReference(),
diff --git a/pkg/resources/resource_monitor_acceptance_test.go b/pkg/resources/resource_monitor_acceptance_test.go
index 742d1ecafb..5844d1a56f 100644
--- a/pkg/resources/resource_monitor_acceptance_test.go
+++ b/pkg/resources/resource_monitor_acceptance_test.go
@@ -37,7 +37,7 @@ func TestAcc_ResourceMonitor_Basic(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -111,7 +111,7 @@ func TestAcc_ResourceMonitor_Complete(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -146,7 +146,7 @@ func TestAcc_ResourceMonitor_Complete(t *testing.T) {
 			{
 				ResourceName: "snowflake_resource_monitor.test",
 				ImportState:  true,
-				Config:       config.FromModel(t, configModel),
+				Config:       config.FromModels(t, configModel),
 				ImportStateCheck: assert.AssertThatImport(t,
 					resourceassert.ImportedResourceMonitorResource(t, helpers.EncodeResourceIdentifier(id)).
 						HasNameString(id.Name()).
@@ -211,7 +211,7 @@ func TestAcc_ResourceMonitor_Updates(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModelNothingSet),
+				Config: config.FromModels(t, configModelNothingSet),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -242,7 +242,7 @@ func TestAcc_ResourceMonitor_Updates(t *testing.T) {
 			},
 			// Set
 			{
-				Config: config.FromModel(t, configModelEverythingSet),
+				Config: config.FromModels(t, configModelEverythingSet),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -276,7 +276,7 @@ func TestAcc_ResourceMonitor_Updates(t *testing.T) {
 			},
 			// Update
 			{
-				Config: config.FromModel(t, configModelUpdated),
+				Config: config.FromModels(t, configModelUpdated),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -311,7 +311,7 @@ func TestAcc_ResourceMonitor_Updates(t *testing.T) {
 			},
 			// Unset
 			{
-				Config: config.FromModel(t, configModelEverythingUnset),
+				Config: config.FromModels(t, configModelEverythingUnset),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -382,7 +382,7 @@ func TestAcc_ResourceMonitor_ExternalChanges(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModelEverythingSet),
+				Config: config.FromModels(t, configModelEverythingSet),
 			},
 			// Update externally, but match the updated configuration (expected updates to the same values)
 			{
@@ -426,7 +426,7 @@ func TestAcc_ResourceMonitor_ExternalChanges(t *testing.T) {
 						planchecks.PrintPlanDetails(configModelUpdated.ResourceReference(), "credit_quota", "end_timestamp", "frequency", "fully_qualified_name", "name", "notify_triggers", "notify_users", "start_timestamp", "suspend_immediate_trigger", "suspend_trigger", r.ShowOutputAttributeName),
 					},
 				},
-				Config: config.FromModel(t, configModelUpdated),
+				Config: config.FromModels(t, configModelUpdated),
 			},
 		},
 	})
@@ -454,10 +454,10 @@ func TestAcc_ResourceMonitor_PartialUpdate(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 			},
 			{
-				Config:      config.FromModel(t, configModelInvalidUpdate),
+				Config:      config.FromModels(t, configModelInvalidUpdate),
 				ExpectError: regexp.MustCompile("Invalid date/time format string"),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
@@ -468,7 +468,7 @@ func TestAcc_ResourceMonitor_PartialUpdate(t *testing.T) {
 			// The following was printed (indicating the invalid value was saved into the state):
 			// ComputedIfAnyAttributeChanged: changed key: end_timestamp old: 2024-11-19 10:11abc new: 2024-11-09 10:11
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -488,7 +488,7 @@ func TestAcc_ResourceMonitor_PartialUpdate(t *testing.T) {
 // It can be fixed with them.
 func TestAcc_ResourceMonitor_issue2167(t *testing.T) {
 	id := acc.TestClient().Ids.RandomAccountObjectIdentifier()
-	configNoUsers := model.ResourceMonitor("test", id.Name()).WithNotifyUsersValue(configvariable.SetVariable())
+	configNoUsers := model.ResourceMonitor("test", id.Name()).WithNotifyUsersValue(config.EmptyListVariable())
 	configWithNonExistingUser := model.ResourceMonitor("test", id.Name()).WithNotifyUsersValue(configvariable.SetVariable(configvariable.StringVariable("non_existing_user")))
 
 	resource.Test(t, resource.TestCase{
@@ -500,13 +500,13 @@ func TestAcc_ResourceMonitor_issue2167(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configNoUsers),
+				Config: config.FromModels(t, configNoUsers),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_resource_monitor.test", "name", id.Name()),
 				),
 			},
 			{
-				Config:      config.FromModel(t, configWithNonExistingUser),
+				Config:      config.FromModels(t, configWithNonExistingUser),
 				ExpectError: regexp.MustCompile(`.*090268 \(22023\): User non_existing_user does not exist.*`),
 			},
 		},
@@ -534,7 +534,7 @@ func TestAcc_ResourceMonitor_Issue1990_RemovingResourceMonitorOutsideOfTerraform
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 			},
 			// Same configuration, but we drop resource monitor externally
 			{
@@ -547,7 +547,7 @@ func TestAcc_ResourceMonitor_Issue1990_RemovingResourceMonitorOutsideOfTerraform
 				PreConfig: func() {
 					acc.TestClient().ResourceMonitor.DropResourceMonitorFunc(t, id)()
 				},
-				Config:      config.FromModel(t, configModel),
+				Config:      config.FromModels(t, configModel),
 				ExpectError: regexp.MustCompile("object does not exist or not authorized"),
 			},
 			// Same configuration, but it's the last version where it's still not working
@@ -558,14 +558,14 @@ func TestAcc_ResourceMonitor_Issue1990_RemovingResourceMonitorOutsideOfTerraform
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config:      config.FromModel(t, configModel),
+				Config:      config.FromModels(t, configModel),
 				ExpectError: regexp.MustCompile("object does not exist or not authorized"),
 			},
 			// Same configuration, but it's the latest version of the provider (0.96.0 and above)
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 			},
 		},
 	})
@@ -606,7 +606,7 @@ func TestAcc_ResourceMonitor_Issue_TimestampInfinitePlan(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 			},
 			// Alter resource timestamps to have the following format: 2006-01-02 (produces a plan because of the format difference)
 			{
@@ -616,7 +616,7 @@ func TestAcc_ResourceMonitor_Issue_TimestampInfinitePlan(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config:             config.FromModel(t, configModelWithDateStartTimestamp),
+				Config:             config.FromModels(t, configModelWithDateStartTimestamp),
 				ExpectNonEmptyPlan: true,
 			},
 			// Alter resource timestamps to have the following format: 2006-01-02 15:04 (won't produce plan because of the internal format mapping to this exact format)
@@ -627,7 +627,7 @@ func TestAcc_ResourceMonitor_Issue_TimestampInfinitePlan(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModelWithDateTimeFormat),
+				Config: config.FromModels(t, configModelWithDateTimeFormat),
 			},
 			// Destroy the resource
 			{
@@ -637,24 +637,24 @@ func TestAcc_ResourceMonitor_Issue_TimestampInfinitePlan(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config:  config.FromModel(t, configModelWithDateTimeFormat),
+				Config:  config.FromModels(t, configModelWithDateTimeFormat),
 				Destroy: true,
 			},
 			// Create resource monitor without the timestamps
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 			},
 			// Alter resource timestamps to have the following format: 2006-01-02 (no plan produced)
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithDateStartTimestamp),
+				Config:                   config.FromModels(t, configModelWithDateStartTimestamp),
 			},
 			// Alter resource timestamps to have the following format: 2006-01-02 15:04 (no plan produced and the internal mapping is not applied in this version)
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithDateTimeFormat),
+				Config:                   config.FromModels(t, configModelWithDateTimeFormat),
 			},
 		},
 	})
@@ -687,14 +687,14 @@ func TestAcc_ResourceMonitor_Issue1500_CreatingWithOnlyTriggers(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config:      config.FromModel(t, configModel),
+				Config:      config.FromModels(t, configModel),
 				ExpectError: regexp.MustCompile("SQL compilation error"),
 			},
 			// Create resource monitor with only triggers (the latest version)
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 				ExpectError:              regexp.MustCompile("due to Snowflake limiltations you cannot create Resource Monitor with only triggers set"),
 			},
 		},
@@ -741,7 +741,7 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModelWithCreditQuota),
+				Config: config.FromModels(t, configModelWithCreditQuota),
 			},
 			// Update only triggers (not allowed in Snowflake)
 			{
@@ -751,7 +751,7 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModelWithUpdatedTriggers),
+				Config: config.FromModels(t, configModelWithUpdatedTriggers),
 				// For some reason, not returning error (SQL compilation error should be returned in this case; most likely update was handled incorrectly, or it was handled similarly as in the current version)
 			},
 			// Remove all triggers (not allowed in Snowflake)
@@ -762,7 +762,7 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModelWithoutTriggers),
+				Config: config.FromModels(t, configModelWithoutTriggers),
 				// For some reason, not returning the correct error (SQL compilation error should be returned in this case; most likely update was processed incorrectly)
 				ExpectError: regexp.MustCompile(`at least one of AlterResourceMonitorOptions fields \[Set Triggers] must be set`),
 			},
@@ -770,12 +770,12 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithCreditQuota),
+				Config:                   config.FromModels(t, configModelWithCreditQuota),
 			},
 			// Update only triggers (not allowed in Snowflake)
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithUpdatedTriggers),
+				Config:                   config.FromModels(t, configModelWithUpdatedTriggers),
 			},
 			// Update only triggers (not allowed in Snowflake; recreating)
 			{
@@ -785,7 +785,7 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 		},
 	})
@@ -831,7 +831,7 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 			// Config with all triggers
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithAllTriggers),
+				Config:                   config.FromModels(t, configModelWithAllTriggers),
 			},
 			// No triggers (force new expected)
 			{
@@ -841,12 +841,12 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 			// Config with only notify triggers
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithNotifyTriggers),
+				Config:                   config.FromModels(t, configModelWithNotifyTriggers),
 			},
 			// No triggers (force new expected)
 			{
@@ -856,12 +856,12 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 			// Config with only suspend trigger
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithSuspendTrigger),
+				Config:                   config.FromModels(t, configModelWithSuspendTrigger),
 			},
 			// No triggers (force new expected)
 			{
@@ -871,12 +871,12 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 			// Config with only suspend immediate trigger
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithSuspendImmediateTrigger),
+				Config:                   config.FromModels(t, configModelWithSuspendImmediateTrigger),
 			},
 			// No triggers (force new expected)
 			{
@@ -886,7 +886,7 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 		},
 	})
diff --git a/pkg/resources/secondary_connection_acceptance_test.go b/pkg/resources/secondary_connection_acceptance_test.go
index 380f3b49b5..8de71850b5 100644
--- a/pkg/resources/secondary_connection_acceptance_test.go
+++ b/pkg/resources/secondary_connection_acceptance_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -48,7 +49,7 @@ func TestAcc_SecondaryConnection_Basic(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.SecondaryConnection),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, secondartyConnectionModel),
+				Config: config.FromModels(t, secondartyConnectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecondaryConnectionResource(t, secondartyConnectionModel.ResourceReference()).
@@ -76,7 +77,7 @@ func TestAcc_SecondaryConnection_Basic(t *testing.T) {
 			},
 			// set comment
 			{
-				Config: config.FromModel(t, secondartyConnectionModelWithComment),
+				Config: config.FromModels(t, secondartyConnectionModelWithComment),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecondaryConnectionResource(t, secondartyConnectionModelWithComment.ResourceReference()).
@@ -101,7 +102,7 @@ func TestAcc_SecondaryConnection_Basic(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, secondartyConnectionModel),
+				Config: config.FromModels(t, secondartyConnectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecondaryConnectionResource(t, secondartyConnectionModel.ResourceReference()).
@@ -117,7 +118,7 @@ func TestAcc_SecondaryConnection_Basic(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().Connection.Alter(t, sdk.NewAlterConnectionRequest(id).WithPrimary(true))
 				},
-				Config: config.FromModel(t, secondartyConnectionModel),
+				Config: config.FromModels(t, secondartyConnectionModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secondartyConnectionModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/secret_with_basic_authentication_acceptance_test.go b/pkg/resources/secret_with_basic_authentication_acceptance_test.go
index 3e3b09de19..ae9b1a96f2 100644
--- a/pkg/resources/secret_with_basic_authentication_acceptance_test.go
+++ b/pkg/resources/secret_with_basic_authentication_acceptance_test.go
@@ -4,6 +4,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -15,7 +17,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -43,7 +44,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithBasicAuthenticationResource(t, secretName).
@@ -78,7 +79,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 			},
 			// set username, password and comment
 			{
-				Config: config.FromModel(t, secretModelDifferentCredentialsWithComment),
+				Config: config.FromModels(t, secretModelDifferentCredentialsWithComment),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 
@@ -123,7 +124,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 						planchecks.ExpectChange(secretName, "username", tfjson.ActionUpdate, sdk.String("test_username"), sdk.String("bar")),
 					},
 				},
-				Config: config.FromModel(t, secretModelDifferentCredentialsWithComment),
+				Config: config.FromModels(t, secretModelDifferentCredentialsWithComment),
 				Check: assert.AssertThat(t,
 					resourceassert.SecretWithBasicAuthenticationResource(t, secretName).
 						HasNameString(name).
@@ -150,7 +151,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, secretModelWithoutComment),
+				Config: config.FromModels(t, secretModelWithoutComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -178,7 +179,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 			},
 			// set empty username and password
 			{
-				Config: config.FromModel(t, secretModelEmptyCredentials),
+				Config: config.FromModels(t, secretModelEmptyCredentials),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithBasicAuthenticationResource(t, secretName).
@@ -209,7 +210,7 @@ func TestAcc_SecretWithBasicAuthentication_CreateWithEmptyCredentials(t *testing
 		CheckDestroy: acc.CheckDestroy(t, resources.SecretWithBasicAuthentication),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, secretModelEmptyCredentials),
+				Config: config.FromModels(t, secretModelEmptyCredentials),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithBasicAuthenticationResource(t, secretModelEmptyCredentials.ResourceReference()).
@@ -241,7 +242,7 @@ func TestAcc_SecretWithBasicAuthentication_ExternalSecretTypeChange(t *testing.T
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithBasicAuthenticationResource(t, secretModel.ResourceReference()).
@@ -258,7 +259,7 @@ func TestAcc_SecretWithBasicAuthentication_ExternalSecretTypeChange(t *testing.T
 					_, cleanup := acc.TestClient().Secret.CreateWithGenericString(t, id, "test_secret_string")
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/secret_with_generic_string_acceptance_test.go b/pkg/resources/secret_with_generic_string_acceptance_test.go
index 8f57a8924d..ceee85e943 100644
--- a/pkg/resources/secret_with_generic_string_acceptance_test.go
+++ b/pkg/resources/secret_with_generic_string_acceptance_test.go
@@ -4,6 +4,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -15,7 +17,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -41,7 +42,7 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithGenericStringResource(t, secretModel.ResourceReference()).
@@ -75,7 +76,7 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 			},
 			// set secret_string and comment
 			{
-				Config: config.FromModel(t, secretModel.
+				Config: config.FromModels(t, secretModel.
 					WithSecretString("bar").
 					WithComment(comment),
 				),
@@ -106,7 +107,7 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 						),
 					)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -138,7 +139,7 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, secretModelEmptySecretString),
+				Config: config.FromModels(t, secretModelEmptySecretString),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -165,12 +166,12 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 			},
 			// destroy
 			{
-				Config:  config.FromModel(t, secretModel),
+				Config:  config.FromModels(t, secretModel),
 				Destroy: true,
 			},
 			// create with empty secret_string
 			{
-				Config: config.FromModel(t, secretModelEmptySecretString),
+				Config: config.FromModels(t, secretModelEmptySecretString),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithGenericStringResource(t, secretModelEmptySecretString.ResourceReference()).
@@ -201,7 +202,7 @@ func TestAcc_SecretWithGenericString_ExternalSecretTypeChange(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithGenericStringResource(t, secretModel.ResourceReference()).
@@ -218,7 +219,7 @@ func TestAcc_SecretWithGenericString_ExternalSecretTypeChange(t *testing.T) {
 					_, cleanup := acc.TestClient().Secret.CreateWithBasicAuthenticationFlow(t, id, "test_pswd", "test_usr")
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/secret_with_oauth_authorization_code_grant_acceptance_test.go b/pkg/resources/secret_with_oauth_authorization_code_grant_acceptance_test.go
index 82d8c163aa..93c74fa2fb 100644
--- a/pkg/resources/secret_with_oauth_authorization_code_grant_acceptance_test.go
+++ b/pkg/resources/secret_with_oauth_authorization_code_grant_acceptance_test.go
@@ -6,6 +6,9 @@ import (
 	"time"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -15,9 +18,7 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -53,7 +54,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_BasicFlow(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModel.ResourceReference()).
@@ -89,7 +90,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_BasicFlow(t *testing.T) {
 			},
 			// set all
 			{
-				Config: config.FromModel(t, secretModelAllSet),
+				Config: config.FromModels(t, secretModelAllSet),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -128,7 +129,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_BasicFlow(t *testing.T) {
 						),
 					))
 				},
-				Config: config.FromModel(t, secretModelAllSet),
+				Config: config.FromModels(t, secretModelAllSet),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -200,7 +201,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_DifferentTimeFormats(t *testing.T)
 		Steps: []resource.TestStep{
 			// create with DateOnly
 			{
-				Config: config.FromModel(t, secretModelDateOnly),
+				Config: config.FromModels(t, secretModelDateOnly),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModelDateOnly.ResourceReference()).
@@ -211,7 +212,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_DifferentTimeFormats(t *testing.T)
 			},
 			// update with DateTime without seconds
 			{
-				Config: config.FromModel(t, secretModelWithoutSeconds),
+				Config: config.FromModels(t, secretModelWithoutSeconds),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModelWithoutSeconds.ResourceReference()).
@@ -222,7 +223,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_DifferentTimeFormats(t *testing.T)
 			},
 			// update with DateTime
 			{
-				Config: config.FromModel(t, secretModelDateTime),
+				Config: config.FromModels(t, secretModelDateTime),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModelDateTime.ResourceReference()).
@@ -233,7 +234,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_DifferentTimeFormats(t *testing.T)
 			},
 			// update with DateTime with PDT timezone
 			{
-				Config: config.FromModel(t, secretModelWithPDT),
+				Config: config.FromModels(t, secretModelWithPDT),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModelWithPDT.ResourceReference()).
@@ -272,7 +273,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalRefreshTokenExpiryTimeChan
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModel.ResourceReference()).
@@ -305,7 +306,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalRefreshTokenExpiryTimeChan
 						),
 					)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -346,7 +347,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalSecretTypeChange(t *testin
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModel.ResourceReference()).
@@ -363,7 +364,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalSecretTypeChange(t *testin
 					_, cleanup := acc.TestClient().Secret.CreateWithBasicAuthenticationFlow(t, id, "test_pswd", "test_usr")
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -405,7 +406,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalSecretTypeChangeToOAuthCli
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModel.ResourceReference()).
@@ -424,7 +425,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalSecretTypeChangeToOAuthCli
 					_, cleanup := acc.TestClient().Secret.CreateWithOAuthClientCredentialsFlow(t, id, integrationId, []sdk.ApiIntegrationScope{})
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/secret_with_oauth_client_credentials_acceptance_test.go b/pkg/resources/secret_with_oauth_client_credentials_acceptance_test.go
index 69a46330f2..37154edecd 100644
--- a/pkg/resources/secret_with_oauth_client_credentials_acceptance_test.go
+++ b/pkg/resources/secret_with_oauth_client_credentials_acceptance_test.go
@@ -5,6 +5,8 @@ import (
 	"time"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -16,7 +18,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -51,7 +52,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.SecretWithClientCredentials),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, secretModel.ResourceReference()).
@@ -88,7 +89,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 			},
 			// set oauth_scopes and comment in config
 			{
-				Config: config.FromModel(t, secretModelTestInScopes),
+				Config: config.FromModels(t, secretModelTestInScopes),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -131,7 +132,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 					)
 					acc.TestClient().Secret.Alter(t, req)
 				},
-				Config: config.FromModel(t, secretModelFooInScopesWithComment),
+				Config: config.FromModels(t, secretModelFooInScopesWithComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -153,7 +154,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, secretModelFooInScopes),
+				Config: config.FromModels(t, secretModelFooInScopes),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModelFooInScopes.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -171,7 +172,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 					req := sdk.NewAlterSecretRequest(id).WithSet(*sdk.NewSecretSetRequest().WithComment(comment))
 					acc.TestClient().Secret.Alter(t, req)
 				},
-				Config: config.FromModel(t, secretModelWithoutComment),
+				Config: config.FromModels(t, secretModelWithoutComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -185,7 +186,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 			},
 			// create without comment
 			{
-				Config: config.FromModel(t, secretModelWithoutComment.WithOauthScopes([]string{"foo", "bar"})),
+				Config: config.FromModels(t, secretModelWithoutComment.WithOauthScopes([]string{"foo", "bar"})),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, "snowflake_secret_with_client_credentials.s").
@@ -243,7 +244,7 @@ func TestAcc_SecretWithClientCredentials_EmptyScopesList(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create secret without providing oauth_scopes value
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, secretModel.ResourceReference()).
@@ -258,7 +259,7 @@ func TestAcc_SecretWithClientCredentials_EmptyScopesList(t *testing.T) {
 			},
 			// Set oauth_scopes
 			{
-				Config: config.FromModel(t, secretModel.
+				Config: config.FromModels(t, secretModel.
 					WithOauthScopes([]string{"foo"}),
 				),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
@@ -279,7 +280,7 @@ func TestAcc_SecretWithClientCredentials_EmptyScopesList(t *testing.T) {
 			},
 			// Set empty oauth_scopes
 			{
-				Config: config.FromModel(t, secretModelEmptyScopes),
+				Config: config.FromModels(t, secretModelEmptyScopes),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -322,7 +323,7 @@ func TestAcc_SecretWithClientCredentials_ExternalSecretTypeChange(t *testing.T)
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, secretModel.ResourceReference()).
@@ -339,7 +340,7 @@ func TestAcc_SecretWithClientCredentials_ExternalSecretTypeChange(t *testing.T)
 					_, cleanup := acc.TestClient().Secret.CreateWithGenericString(t, id, "test_secret_string")
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -381,7 +382,7 @@ func TestAcc_SecretWithClientCredentials_ExternalSecretTypeChangeToOAuthAuthCode
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, secretModel.ResourceReference()).
@@ -402,7 +403,7 @@ func TestAcc_SecretWithClientCredentials_ExternalSecretTypeChangeToOAuthAuthCode
 					_, cleanup := acc.TestClient().Secret.CreateWithOAuthAuthorizationCodeFlow(t, id, integrationId, "test_refresh_token", time.Now().Add(24*time.Hour).Format(time.DateOnly))
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/service_user_acceptance_test.go b/pkg/resources/service_user_acceptance_test.go
index a314e774fd..319b8ab61c 100644
--- a/pkg/resources/service_user_acceptance_test.go
+++ b/pkg/resources/service_user_acceptance_test.go
@@ -51,8 +51,8 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment)
 
 	userModelAllAttributesChanged := func(loginName string) *model.ServiceUserModel {
@@ -67,8 +67,8 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			WithDefaultNamespace("one_part_namespace").
 			WithDefaultRole("other_role").
 			WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-			WithRsaPublicKey(key2).
-			WithRsaPublicKey2(key1).
+			WithRsaPublicKeyValue(config.MultilineWrapperVariable(key2)).
+			WithRsaPublicKey2Value(config.MultilineWrapperVariable(key1)).
 			WithComment(newComment)
 	}
 
@@ -82,7 +82,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 		Steps: []resource.TestStep{
 			// CREATE WITHOUT ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -107,7 +107,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			},
 			// RENAME AND CHANGE ONE PROP
 			{
-				Config: config.FromModel(t, userModelNoAttributesRenamed),
+				Config: config.FromModels(t, userModelNoAttributesRenamed),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id2.Name()).
@@ -133,12 +133,12 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			},
 			// DESTROY
 			{
-				Config:  config.FromModel(t, userModelNoAttributes),
+				Config:  config.FromModels(t, userModelNoAttributes),
 				Destroy: true,
 			},
 			// CREATE WITH ALL ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelAllAttributes),
+				Config: config.FromModels(t, userModelAllAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelAllAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -160,7 +160,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			},
 			// CHANGE PROPERTIES
 			{
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelAllAttributesChanged(id.Name()+"_other_login").ResourceReference()).
 						HasNameString(id.Name()).
@@ -197,7 +197,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetLoginName(t, id, id.Name()+"_different_login")
 				},
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -206,7 +206,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			},
 			// UNSET ALL
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -311,7 +311,7 @@ func TestAcc_ServiceUser_AllParameters(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create with default values for all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -331,7 +331,7 @@ func TestAcc_ServiceUser_AllParameters(t *testing.T) {
 			},
 			// set all parameters
 			{
-				Config: config.FromModel(t, userModelWithAllParametersSet),
+				Config: config.FromModels(t, userModelWithAllParametersSet),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAbortDetachedQuery(true).
@@ -521,7 +521,7 @@ func TestAcc_ServiceUser_AllParameters(t *testing.T) {
 			},
 			// unset all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -548,7 +548,7 @@ func TestAcc_ServiceUser_handleExternalTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ServiceUser),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModel.ResourceReference()).HasNameString(userId.Name()).HasUserTypeString("SERVICE"),
 					resourceshowoutputassert.UserShowOutput(t, userModel.ResourceReference()).HasType("SERVICE"),
@@ -559,7 +559,7 @@ func TestAcc_ServiceUser_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.SetType(t, userId, sdk.UserTypePerson)
 					objectassert.User(t, userId).HasType(string(sdk.UserTypePerson))
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -575,7 +575,7 @@ func TestAcc_ServiceUser_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.UnsetType(t, userId)
 					objectassert.User(t, userId).HasType("")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/stream_on_directory_table_acceptance_test.go b/pkg/resources/stream_on_directory_table_acceptance_test.go
index 0f61963f93..548c210667 100644
--- a/pkg/resources/stream_on_directory_table_acceptance_test.go
+++ b/pkg/resources/stream_on_directory_table_acceptance_test.go
@@ -6,6 +6,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -15,7 +17,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
@@ -54,7 +55,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// without optionals
 			{
-				Config: config.FromModel(t, baseModel()),
+				Config: config.FromModels(t, baseModel()),
 				Check: assert.AssertThat(t, resourceassert.StreamOnDirectoryTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -95,7 +96,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:       config.FromModel(t, baseModel()),
+				Config:       config.FromModels(t, baseModel()),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -109,7 +110,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 			},
 			// set all fields
 			{
-				Config: config.FromModel(t, modelWithExtraFields),
+				Config: config.FromModels(t, modelWithExtraFields),
 				Check: assert.AssertThat(t, resourceassert.StreamOnDirectoryTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -154,7 +155,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().Stream.Alter(t, sdk.NewAlterStreamRequest(id).WithSetComment("bar"))
 				},
-				Config: config.FromModel(t, modelWithExtraFields),
+				Config: config.FromModels(t, modelWithExtraFields),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -201,7 +202,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 			},
 			// update fields
 			{
-				Config: config.FromModel(t, modelWithExtraFieldsModified),
+				Config: config.FromModels(t, modelWithExtraFieldsModified),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -248,7 +249,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 			},
 			// import
 			{
-				Config:       config.FromModel(t, modelWithExtraFieldsModified),
+				Config:       config.FromModels(t, modelWithExtraFieldsModified),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -285,7 +286,7 @@ func TestAcc_StreamOnDirectoryTable_CopyGrants(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -295,7 +296,7 @@ func TestAcc_StreamOnDirectoryTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -307,7 +308,7 @@ func TestAcc_StreamOnDirectoryTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -350,7 +351,7 @@ func TestAcc_StreamOnDirectoryTable_CheckGrantsAfterRecreation(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					// there should be more than one privilege, because we applied grant all privileges and initially there's always one which is ownership
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
@@ -358,14 +359,14 @@ func TestAcc_StreamOnDirectoryTable_CheckGrantsAfterRecreation(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.1.privilege", "SELECT"),
 				),
 			},
 			{
-				Config:             config.FromModel(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config:             config.FromModels(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				ExpectNonEmptyPlan: true,
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
@@ -429,7 +430,7 @@ func TestAcc_StreamOnDirectoryTable_RecreateWhenStale(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnDirectoryTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -454,7 +455,7 @@ func TestAcc_StreamOnDirectoryTable_InvalidConfiguration(t *testing.T) {
 		Steps: []resource.TestStep{
 			// invalid stage id
 			{
-				Config:      config.FromModel(t, modelWithInvalidStageId),
+				Config:      config.FromModels(t, modelWithInvalidStageId),
 				ExpectError: regexp.MustCompile("Error: Invalid identifier type"),
 			},
 		},
@@ -476,7 +477,7 @@ func TestAcc_StreamOnDirectoryTable_ExternalStreamTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.StreamOnDirectoryTableResource(t, model.ResourceReference()).
@@ -496,7 +497,7 @@ func TestAcc_StreamOnDirectoryTable_ExternalStreamTypeChange(t *testing.T) {
 					t.Cleanup(cleanup)
 					require.Equal(t, sdk.StreamSourceTypeTable, *externalChangeStream.SourceType)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/stream_on_external_table_acceptance_test.go b/pkg/resources/stream_on_external_table_acceptance_test.go
index f3d9feb28f..db5f2dbda8 100644
--- a/pkg/resources/stream_on_external_table_acceptance_test.go
+++ b/pkg/resources/stream_on_external_table_acceptance_test.go
@@ -6,22 +6,23 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	tfjson "github.com/hashicorp/terraform-json"
+	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
-	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -77,7 +78,7 @@ func TestAcc_StreamOnExternalTable_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// without optionals
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.StreamOnExternalTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -123,7 +124,7 @@ func TestAcc_StreamOnExternalTable_Basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:       config.FromModel(t, baseModel),
+				Config:       config.FromModels(t, baseModel),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -338,7 +339,7 @@ func TestAcc_StreamOnExternalTable_Basic(t *testing.T) {
 			},
 			// import
 			{
-				Config:       config.FromModel(t, modelWithExtraFieldsModified),
+				Config:       config.FromModels(t, modelWithExtraFieldsModified),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -381,7 +382,7 @@ func TestAcc_StreamOnExternalTable_CopyGrants(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -391,7 +392,7 @@ func TestAcc_StreamOnExternalTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -403,7 +404,7 @@ func TestAcc_StreamOnExternalTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -456,7 +457,7 @@ func TestAcc_StreamOnExternalTable_CheckGrantsAfterRecreation(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnExternalTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					// there should be more than one privilege, because we applied grant all privileges and initially there's always one which is ownership
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
@@ -464,14 +465,14 @@ func TestAcc_StreamOnExternalTable_CheckGrantsAfterRecreation(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.1.privilege", "SELECT"),
 				),
 			},
 			{
-				Config:             config.FromModel(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config:             config.FromModels(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				ExpectNonEmptyPlan: true,
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
@@ -521,7 +522,7 @@ func TestAcc_StreamOnExternalTable_PermadiffWhenIsStaleAndHasNoRetentionTime(t *
 		Steps: []resource.TestStep{
 			// check that stale state is marked properly and forces an update
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -542,7 +543,7 @@ func TestAcc_StreamOnExternalTable_PermadiffWhenIsStaleAndHasNoRetentionTime(t *
 			// check that the resource was recreated
 			// note that it is stale again because we still have schema parameters set to 0, this results in a permadiff
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -601,7 +602,7 @@ func TestAcc_StreamOnExternalTable_StaleWithExternalChanges(t *testing.T) {
 		Steps: []resource.TestStep{
 			// initial creation does not lead to stale stream
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnExternalTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -636,7 +637,7 @@ func TestAcc_StreamOnExternalTable_StaleWithExternalChanges(t *testing.T) {
 						HasStale(false),
 					)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnExternalTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -885,7 +886,7 @@ func TestAcc_StreamOnExternalTable_InvalidConfiguration(t *testing.T) {
 			},
 			// invalid external table id
 			{
-				Config:      config.FromModel(t, modelWithInvalidExternalTableId),
+				Config:      config.FromModels(t, modelWithInvalidExternalTableId),
 				ExpectError: regexp.MustCompile("Error: Invalid identifier type"),
 			},
 		},
@@ -912,7 +913,7 @@ func TestAcc_StreamOnExternalTable_ExternalStreamTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.StreamOnExternalTableResource(t, model.ResourceReference()).
@@ -932,7 +933,7 @@ func TestAcc_StreamOnExternalTable_ExternalStreamTypeChange(t *testing.T) {
 					t.Cleanup(cleanup)
 					require.Equal(t, sdk.StreamSourceTypeTable, *externalChangeStream.SourceType)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/stream_on_table_acceptance_test.go b/pkg/resources/stream_on_table_acceptance_test.go
index bc71c43560..70762c169b 100644
--- a/pkg/resources/stream_on_table_acceptance_test.go
+++ b/pkg/resources/stream_on_table_acceptance_test.go
@@ -6,22 +6,23 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	tfjson "github.com/hashicorp/terraform-json"
+	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
-	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -67,7 +68,7 @@ func TestAcc_StreamOnTable_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// without optionals
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -109,7 +110,7 @@ func TestAcc_StreamOnTable_Basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:       config.FromModel(t, baseModel),
+				Config:       config.FromModels(t, baseModel),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -269,7 +270,7 @@ func TestAcc_StreamOnTable_Basic(t *testing.T) {
 			},
 			// import
 			{
-				Config:       config.FromModel(t, modelWithExtraFieldsDefaultMode),
+				Config:       config.FromModels(t, modelWithExtraFieldsDefaultMode),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -305,7 +306,7 @@ func TestAcc_StreamOnTable_CopyGrants(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -315,7 +316,7 @@ func TestAcc_StreamOnTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -327,7 +328,7 @@ func TestAcc_StreamOnTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -372,7 +373,7 @@ func TestAcc_StreamOnTable_CheckGrantsAfterRecreation(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnExternalTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					// there should be more than one privilege, because we applied grant all privileges and initially there's always one which is ownership
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
@@ -380,14 +381,14 @@ func TestAcc_StreamOnTable_CheckGrantsAfterRecreation(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.1.privilege", "SELECT"),
 				),
 			},
 			{
-				Config:             config.FromModel(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config:             config.FromModels(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				ExpectNonEmptyPlan: true,
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
@@ -432,7 +433,7 @@ func TestAcc_StreamOnTable_PermadiffWhenIsStaleAndHasNoRetentionTime(t *testing.
 		Steps: []resource.TestStep{
 			// check that stale state is marked properly and forces an update
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -453,7 +454,7 @@ func TestAcc_StreamOnTable_PermadiffWhenIsStaleAndHasNoRetentionTime(t *testing.
 			// check that the resource was recreated
 			// note that it is stale again because we still have schema parameters set to 0
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -507,7 +508,7 @@ func TestAcc_StreamOnTable_StaleWithExternalChanges(t *testing.T) {
 		Steps: []resource.TestStep{
 			// initial creation does not lead to stale stream
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -543,7 +544,7 @@ func TestAcc_StreamOnTable_StaleWithExternalChanges(t *testing.T) {
 						HasStale(false),
 					)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -830,7 +831,7 @@ func TestAcc_StreamOnTable_InvalidConfiguration(t *testing.T) {
 			},
 			// invalid table id
 			{
-				Config:      config.FromModel(t, modelWithInvalidTableId),
+				Config:      config.FromModels(t, modelWithInvalidTableId),
 				ExpectError: regexp.MustCompile("Error: Invalid identifier type"),
 			},
 		},
@@ -853,7 +854,7 @@ func TestAcc_StreamOnTable_ExternalStreamTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.StreamOnTableResource(t, model.ResourceReference()).
@@ -874,7 +875,7 @@ func TestAcc_StreamOnTable_ExternalStreamTypeChange(t *testing.T) {
 					t.Cleanup(cleanup)
 					require.Equal(t, sdk.StreamSourceTypeView, *externalChangeStream.SourceType)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/stream_on_view_acceptance_test.go b/pkg/resources/stream_on_view_acceptance_test.go
index 279fdb1371..791b9a34c2 100644
--- a/pkg/resources/stream_on_view_acceptance_test.go
+++ b/pkg/resources/stream_on_view_acceptance_test.go
@@ -6,22 +6,23 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	tfjson "github.com/hashicorp/terraform-json"
+	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
-	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -72,7 +73,7 @@ func TestAcc_StreamOnView_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// without optionals
 			{
-				Config: config.FromModel(t, baseModel()),
+				Config: config.FromModels(t, baseModel()),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -114,7 +115,7 @@ func TestAcc_StreamOnView_Basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:       config.FromModel(t, baseModel()),
+				Config:       config.FromModels(t, baseModel()),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -274,7 +275,7 @@ func TestAcc_StreamOnView_Basic(t *testing.T) {
 			},
 			// import
 			{
-				Config:       config.FromModel(t, modelWithExtraFieldsDefaultMode),
+				Config:       config.FromModels(t, modelWithExtraFieldsDefaultMode),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -314,7 +315,7 @@ func TestAcc_StreamOnView_CopyGrants(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnView),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -324,7 +325,7 @@ func TestAcc_StreamOnView_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -336,7 +337,7 @@ func TestAcc_StreamOnView_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -384,7 +385,7 @@ func TestAcc_StreamOnView_CheckGrantsAfterRecreation(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnExternalTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					// there should be more than one privilege, because we applied grant all privileges and initially there's always one which is ownership
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
@@ -392,14 +393,14 @@ func TestAcc_StreamOnView_CheckGrantsAfterRecreation(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.1.privilege", "SELECT"),
 				),
 			},
 			{
-				Config:             config.FromModel(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config:             config.FromModels(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				ExpectNonEmptyPlan: true,
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
@@ -448,7 +449,7 @@ func TestAcc_StreamOnView_PermadiffWhenIsStaleAndHasNoRetentionTime(t *testing.T
 		Steps: []resource.TestStep{
 			// check that stale state is marked properly and forces an update
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -469,7 +470,7 @@ func TestAcc_StreamOnView_PermadiffWhenIsStaleAndHasNoRetentionTime(t *testing.T
 			// check that the resource was recreated
 			// note that it is stale again because we still have schema parameters set to 0
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -527,7 +528,7 @@ func TestAcc_StreamOnView_StaleWithExternalChanges(t *testing.T) {
 		Steps: []resource.TestStep{
 			// initial creation does not lead to stale stream
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -563,7 +564,7 @@ func TestAcc_StreamOnView_StaleWithExternalChanges(t *testing.T) {
 						HasStale(false),
 					)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -856,7 +857,7 @@ func TestAcc_StreamOnView_InvalidConfiguration(t *testing.T) {
 			},
 			// invalid view id
 			{
-				Config:      config.FromModel(t, modelWithInvalidTableId),
+				Config:      config.FromModels(t, modelWithInvalidTableId),
 				ExpectError: regexp.MustCompile("Error: Invalid identifier type"),
 			},
 		},
@@ -882,7 +883,7 @@ func TestAcc_StreamOnView_ExternalStreamTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.StreamOnViewResource(t, model.ResourceReference()).
@@ -902,7 +903,7 @@ func TestAcc_StreamOnView_ExternalStreamTypeChange(t *testing.T) {
 					t.Cleanup(cleanup)
 					require.Equal(t, sdk.StreamSourceTypeTable, *externalChangeStream.SourceType)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/tag_acceptance_test.go b/pkg/resources/tag_acceptance_test.go
index 98ee76801e..58e7179c9f 100644
--- a/pkg/resources/tag_acceptance_test.go
+++ b/pkg/resources/tag_acceptance_test.go
@@ -5,6 +5,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -12,10 +14,8 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -59,7 +59,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// base model
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, baseModel.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -81,14 +81,14 @@ func TestAcc_Tag_basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:            config.FromModel(t, baseModel),
+				Config:            config.FromModels(t, baseModel),
 				ResourceName:      baseModel.ResourceReference(),
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
 			// set all fields
 			{
-				Config: config.FromModel(t, modelWithExtraFields),
+				Config: config.FromModels(t, modelWithExtraFields),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, modelWithExtraFields.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -120,7 +120,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().Tag.Alter(t, sdk.NewAlterTagRequest(id).WithDrop([]string{"foo"}))
 				},
-				Config: config.FromModel(t, modelWithExtraFields),
+				Config: config.FromModels(t, modelWithExtraFields),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, modelWithExtraFields.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -149,7 +149,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 			},
 			// different set ordering
 			{
-				Config: config.FromModel(t, modelWithDifferentListOrder),
+				Config: config.FromModels(t, modelWithDifferentListOrder),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(modelWithDifferentListOrder.ResourceReference(), plancheck.ResourceActionNoop),
@@ -183,7 +183,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 			},
 			// change some values
 			{
-				Config: config.FromModel(t, modelWithDifferentValues),
+				Config: config.FromModels(t, modelWithDifferentValues),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, modelWithDifferentValues.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -212,7 +212,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 			},
 			// unset optionals
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, baseModel.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -257,7 +257,7 @@ func TestAcc_Tag_complete(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Tag),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, model.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -285,7 +285,7 @@ func TestAcc_Tag_complete(t *testing.T) {
 				),
 			},
 			{
-				Config:            config.FromModel(t, model),
+				Config:            config.FromModels(t, model),
 				ResourceName:      model.ResourceReference(),
 				ImportState:       true,
 				ImportStateVerify: true,
@@ -310,7 +310,7 @@ func TestAcc_Tag_Rename(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Tag),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, modelWithOldId),
+				Config: config.FromModels(t, modelWithOldId),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, modelWithOldId.ResourceReference()).
 					HasNameString(oldId.Name()).
 					HasDatabaseString(oldId.DatabaseName()).
@@ -318,7 +318,7 @@ func TestAcc_Tag_Rename(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, modelWithNewId),
+				Config: config.FromModels(t, modelWithNewId),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(modelWithOldId.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -360,7 +360,7 @@ func TestAcc_Tag_migrateFromVersion_0_98_0(t *testing.T) {
 			},
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, model),
+				Config:                   config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionNoop),
diff --git a/pkg/resources/tag_association_acceptance_test.go b/pkg/resources/tag_association_acceptance_test.go
index 86e616e529..ca77f6d57b 100644
--- a/pkg/resources/tag_association_acceptance_test.go
+++ b/pkg/resources/tag_association_acceptance_test.go
@@ -7,16 +7,16 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/provider"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
@@ -186,7 +186,7 @@ func TestAcc_TagAssociation_objectIdentifiers(t *testing.T) {
 		),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model12),
+				Config: config.FromModels(t, model12),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, model12.ResourceReference()).
 					HasObjectTypeString(string(sdk.ObjectTypeDatabaseRole)).
 					HasTagIdString(tag.ID().FullyQualifiedName()).
@@ -197,7 +197,7 @@ func TestAcc_TagAssociation_objectIdentifiers(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model123),
+				Config: config.FromModels(t, model123),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, model12.ResourceReference()).
 					HasObjectTypeString(string(sdk.ObjectTypeDatabaseRole)).
 					HasTagIdString(tag.ID().FullyQualifiedName()).
@@ -209,7 +209,7 @@ func TestAcc_TagAssociation_objectIdentifiers(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model13),
+				Config: config.FromModels(t, model13),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, model13.ResourceReference()).
 					HasObjectTypeString(string(sdk.ObjectTypeDatabaseRole)).
 					HasTagIdString(tag.ID().FullyQualifiedName()).
@@ -248,7 +248,7 @@ func TestAcc_TagAssociation_objectType(t *testing.T) {
 		),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, baseModel.ResourceReference()).
 					HasObjectTypeString(string(sdk.ObjectTypeRole)).
 					HasTagIdString(tag.ID().FullyQualifiedName()).
@@ -257,7 +257,7 @@ func TestAcc_TagAssociation_objectType(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, modelWithDifferentObjectType),
+				Config: config.FromModels(t, modelWithDifferentObjectType),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(modelWithDifferentObjectType.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -332,7 +332,7 @@ func TestAcc_TagAssociation_lowercaseObjectType(t *testing.T) {
 		CheckDestroy: nil,
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, model.ResourceReference()).
 					HasIdString(helpers.EncodeSnowflakeID(tag.ID().FullyQualifiedName(), "foo", string(sdk.ObjectTypeSchema))).
 					HasObjectTypeString(string(sdk.ObjectTypeSchema)).
diff --git a/pkg/resources/task_acceptance_test.go b/pkg/resources/task_acceptance_test.go
index b2c50e76d6..46dbf626a3 100644
--- a/pkg/resources/task_acceptance_test.go
+++ b/pkg/resources/task_acceptance_test.go
@@ -7,24 +7,24 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectparametersassert"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceparametersassert"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	configvariable "github.com/hashicorp/terraform-plugin-testing/config"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectparametersassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceparametersassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -49,7 +49,7 @@ func TestAcc_Task_Basic(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -263,7 +263,7 @@ func TestAcc_Task_Updates(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -357,7 +357,7 @@ func TestAcc_Task_Updates(t *testing.T) {
 			},
 			// Unset
 			{
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(basicConfigModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -459,7 +459,7 @@ func TestAcc_Task_UpdatesInComplexDAG(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModel.ResourceReference()).
 						HasFullyQualifiedNameString(child3Id.FullyQualifiedName()).
@@ -480,7 +480,7 @@ func TestAcc_Task_UpdatesInComplexDAG(t *testing.T) {
 			},
 			// Update some fields in child3
 			{
-				Config: config.FromModel(t, basicConfigModelAfterUpdate),
+				Config: config.FromModels(t, basicConfigModelAfterUpdate),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModelAfterUpdate.ResourceReference()).
 						HasFullyQualifiedNameString(child3Id.FullyQualifiedName()).
@@ -527,7 +527,7 @@ func TestAcc_Task_StatementSpaces(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -545,7 +545,7 @@ func TestAcc_Task_StatementSpaces(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, configModelWithSpacesInStatements),
+				Config: config.FromModels(t, configModelWithSpacesInStatements),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -712,7 +712,7 @@ func TestAcc_Task_ExternalChanges(t *testing.T) {
 			},
 			// Unset optional values
 			{
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -774,7 +774,7 @@ func TestAcc_Task_ExternalChanges(t *testing.T) {
 						plancheck.ExpectResourceAction(basicConfigModel.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -839,7 +839,7 @@ func TestAcc_Task_CallingProcedure(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -2537,7 +2537,7 @@ func TestAcc_Task_StateUpgradeWithAfter(t *testing.T) {
 			},
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
diff --git a/pkg/resources/task_parameters.go b/pkg/resources/task_parameters.go
index 5609bca254..2f9a1595c8 100644
--- a/pkg/resources/task_parameters.go
+++ b/pkg/resources/task_parameters.go
@@ -298,7 +298,7 @@ func handleTaskParametersCreate(d *schema.ResourceData, createOpts *sdk.CreateTa
 		handleParameterCreateWithMapping(d, sdk.TaskParameterGeometryOutputFormat, &createOpts.SessionParameters.GeometryOutputFormat, stringToStringEnumProvider(sdk.ToGeometryOutputFormat)),
 		handleParameterCreate(d, sdk.TaskParameterJdbcTreatTimestampNtzAsUtc, &createOpts.SessionParameters.JdbcTreatTimestampNtzAsUtc),
 		handleParameterCreate(d, sdk.TaskParameterJdbcUseSessionTimezone, &createOpts.SessionParameters.JdbcUseSessionTimezone),
-		handleParameterCreate(d, sdk.TaskParameterJsonIndent, &createOpts.SessionParameters.JSONIndent),
+		handleParameterCreate(d, sdk.TaskParameterJsonIndent, &createOpts.SessionParameters.JsonIndent),
 		handleParameterCreate(d, sdk.TaskParameterLockTimeout, &createOpts.SessionParameters.LockTimeout),
 		handleParameterCreateWithMapping(d, sdk.TaskParameterLogLevel, &createOpts.SessionParameters.LogLevel, stringToStringEnumProvider(sdk.ToLogLevel)),
 		handleParameterCreate(d, sdk.TaskParameterMultiStatementCount, &createOpts.SessionParameters.MultiStatementCount),
@@ -311,7 +311,7 @@ func handleTaskParametersCreate(d *schema.ResourceData, createOpts *sdk.CreateTa
 		handleParameterCreate(d, sdk.TaskParameterSearchPath, &createOpts.SessionParameters.SearchPath),
 		handleParameterCreate(d, sdk.TaskParameterStatementQueuedTimeoutInSeconds, &createOpts.SessionParameters.StatementQueuedTimeoutInSeconds),
 		handleParameterCreate(d, sdk.TaskParameterStatementTimeoutInSeconds, &createOpts.SessionParameters.StatementTimeoutInSeconds),
-		handleParameterCreate(d, sdk.TaskParameterStrictJsonOutput, &createOpts.SessionParameters.StrictJSONOutput),
+		handleParameterCreate(d, sdk.TaskParameterStrictJsonOutput, &createOpts.SessionParameters.StrictJsonOutput),
 		handleParameterCreate(d, sdk.TaskParameterTimestampDayIsAlways24h, &createOpts.SessionParameters.TimestampDayIsAlways24h),
 		handleParameterCreate(d, sdk.TaskParameterTimestampInputFormat, &createOpts.SessionParameters.TimestampInputFormat),
 		handleParameterCreate(d, sdk.TaskParameterTimestampLtzOutputFormat, &createOpts.SessionParameters.TimestampLTZOutputFormat),
@@ -369,7 +369,7 @@ func handleTaskParametersUpdate(d *schema.ResourceData, set *sdk.TaskSetRequest,
 		handleParameterUpdateWithMapping(d, sdk.TaskParameterGeometryOutputFormat, &set.SessionParameters.GeometryOutputFormat, &unset.SessionParametersUnset.GeometryOutputFormat, stringToStringEnumProvider(sdk.ToGeometryOutputFormat)),
 		handleParameterUpdate(d, sdk.TaskParameterJdbcTreatTimestampNtzAsUtc, &set.SessionParameters.JdbcTreatTimestampNtzAsUtc, &unset.SessionParametersUnset.JdbcTreatTimestampNtzAsUtc),
 		handleParameterUpdate(d, sdk.TaskParameterJdbcUseSessionTimezone, &set.SessionParameters.JdbcUseSessionTimezone, &unset.SessionParametersUnset.JdbcUseSessionTimezone),
-		handleParameterUpdate(d, sdk.TaskParameterJsonIndent, &set.SessionParameters.JSONIndent, &unset.SessionParametersUnset.JSONIndent),
+		handleParameterUpdate(d, sdk.TaskParameterJsonIndent, &set.SessionParameters.JsonIndent, &unset.SessionParametersUnset.JsonIndent),
 		handleParameterUpdate(d, sdk.TaskParameterLockTimeout, &set.SessionParameters.LockTimeout, &unset.SessionParametersUnset.LockTimeout),
 		handleParameterUpdateWithMapping(d, sdk.TaskParameterLogLevel, &set.SessionParameters.LogLevel, &unset.SessionParametersUnset.LogLevel, stringToStringEnumProvider(sdk.ToLogLevel)),
 		handleParameterUpdate(d, sdk.TaskParameterMultiStatementCount, &set.SessionParameters.MultiStatementCount, &unset.SessionParametersUnset.MultiStatementCount),
@@ -382,7 +382,7 @@ func handleTaskParametersUpdate(d *schema.ResourceData, set *sdk.TaskSetRequest,
 		handleParameterUpdate(d, sdk.TaskParameterSearchPath, &set.SessionParameters.SearchPath, &unset.SessionParametersUnset.SearchPath),
 		handleParameterUpdate(d, sdk.TaskParameterStatementQueuedTimeoutInSeconds, &set.SessionParameters.StatementQueuedTimeoutInSeconds, &unset.SessionParametersUnset.StatementQueuedTimeoutInSeconds),
 		handleParameterUpdate(d, sdk.TaskParameterStatementTimeoutInSeconds, &set.SessionParameters.StatementTimeoutInSeconds, &unset.SessionParametersUnset.StatementTimeoutInSeconds),
-		handleParameterUpdate(d, sdk.TaskParameterStrictJsonOutput, &set.SessionParameters.StrictJSONOutput, &unset.SessionParametersUnset.StrictJSONOutput),
+		handleParameterUpdate(d, sdk.TaskParameterStrictJsonOutput, &set.SessionParameters.StrictJsonOutput, &unset.SessionParametersUnset.StrictJsonOutput),
 		handleParameterUpdate(d, sdk.TaskParameterTimestampDayIsAlways24h, &set.SessionParameters.TimestampDayIsAlways24h, &unset.SessionParametersUnset.TimestampDayIsAlways24h),
 		handleParameterUpdate(d, sdk.TaskParameterTimestampInputFormat, &set.SessionParameters.TimestampInputFormat, &unset.SessionParametersUnset.TimestampInputFormat),
 		handleParameterUpdate(d, sdk.TaskParameterTimestampLtzOutputFormat, &set.SessionParameters.TimestampLTZOutputFormat, &unset.SessionParametersUnset.TimestampLTZOutputFormat),
diff --git a/pkg/resources/testdata/TestAcc_ExternalFunction/complete/test.tf b/pkg/resources/testdata/TestAcc_ExternalFunction/complete/test.tf
index e1e950a78d..718812d8bb 100644
--- a/pkg/resources/testdata/TestAcc_ExternalFunction/complete/test.tf
+++ b/pkg/resources/testdata/TestAcc_ExternalFunction/complete/test.tf
@@ -6,41 +6,36 @@ resource "snowflake_api_integration" "test_api_int" {
   enabled              = true
 }
 
-resource "snowflake_function" "test_func_req_translator" {
+resource "snowflake_function_javascript" "test_func_req_translator" {
   name     = "${var.name}_request_translator"
   database = var.database
   schema   = var.schema
   arguments {
-    name = "EVENT"
-    type = "OBJECT"
+    arg_name      = "EVENT"
+    arg_data_type = "OBJECT"
   }
-  comment     = "Terraform acceptance test"
-  return_type = "OBJECT"
-  language    = "javascript"
-  statement   = <<EOH
+  return_type         = "OBJECT"
+  function_definition = <<EOT
 		  	let exeprimentName = EVENT.body.data[0][1]
 		  	return { "body": { "name": test }}
-	  	EOH
+	  	EOT
 }
 
 
-resource "snowflake_function" "test_func_res_translator" {
+resource "snowflake_function_javascript" "test_func_res_translator" {
   name     = "${var.name}_response_translator"
   database = var.database
   schema   = var.schema
   arguments {
-    name = "EVENT"
-    type = "OBJECT"
+    arg_name      = "EVENT"
+    arg_data_type = "OBJECT"
   }
-  comment     = "Terraform acceptance test"
-  return_type = "OBJECT"
-  language    = "javascript"
-  statement   = <<EOH
+  return_type         = "OBJECT"
+  function_definition = <<EOT
 			  return { "body": { "data" :  [[0, EVENT]] } };
-		  EOH
+		  EOT
 }
 
-
 resource "snowflake_external_function" "external_function" {
   name            = var.name
   database        = var.database
@@ -54,7 +49,7 @@ resource "snowflake_external_function" "external_function" {
     value = "snowflake"
   }
   max_batch_rows            = 500
-  request_translator        = "${var.database}.${var.schema}.${snowflake_function.test_func_req_translator.name}"
-  response_translator       = "${var.database}.${var.schema}.${snowflake_function.test_func_res_translator.name}"
+  request_translator        = "${var.database}.${var.schema}.${snowflake_function_javascript.test_func_req_translator.name}"
+  response_translator       = "${var.database}.${var.schema}.${snowflake_function_javascript.test_func_res_translator.name}"
   url_of_proxy_and_resource = var.url_of_proxy_and_resource
 }
diff --git a/pkg/resources/testdata/TestAcc_GrantOwnership/OnObject_Procedure_ToAccountRole/test.tf b/pkg/resources/testdata/TestAcc_GrantOwnership/OnObject_Procedure_ToAccountRole/test.tf
index f460e20ad6..8aff8d7098 100644
--- a/pkg/resources/testdata/TestAcc_GrantOwnership/OnObject_Procedure_ToAccountRole/test.tf
+++ b/pkg/resources/testdata/TestAcc_GrantOwnership/OnObject_Procedure_ToAccountRole/test.tf
@@ -16,14 +16,13 @@ resource "snowflake_procedure_javascript" "test" {
   database = snowflake_database.test.name
   schema   = snowflake_schema.test.name
   arguments {
-    name = "ARG1"
-    type = "FLOAT"
+    arg_name      = "ARG1"
+    arg_data_type = "FLOAT"
   }
-  return_type         = "FLOAT"
-  execute_as          = "CALLER"
-  return_behavior     = "VOLATILE"
-  null_input_behavior = "RETURNS NULL ON NULL INPUT"
-  statement           = <<EOT
+  return_type          = "FLOAT"
+  execute_as           = "CALLER"
+  null_input_behavior  = "RETURNS NULL ON NULL INPUT"
+  procedure_definition = <<EOT
 var X=1
 return X
 EOT
diff --git a/pkg/resources/testdata/TestAcc_GrantOwnership/OnObject_Procedure_ToDatabaseRole/test.tf b/pkg/resources/testdata/TestAcc_GrantOwnership/OnObject_Procedure_ToDatabaseRole/test.tf
index 0a0e43aa07..abc405c062 100644
--- a/pkg/resources/testdata/TestAcc_GrantOwnership/OnObject_Procedure_ToDatabaseRole/test.tf
+++ b/pkg/resources/testdata/TestAcc_GrantOwnership/OnObject_Procedure_ToDatabaseRole/test.tf
@@ -13,14 +13,13 @@ resource "snowflake_schema" "test" {
 }
 
 resource "snowflake_procedure_javascript" "test" {
-  name                = var.procedure_name
-  database            = snowflake_database.test.name
-  schema              = snowflake_schema.test.name
-  return_type         = "FLOAT"
-  execute_as          = "CALLER"
-  return_behavior     = "VOLATILE"
-  null_input_behavior = "RETURNS NULL ON NULL INPUT"
-  statement           = <<EOT
+  name                 = var.procedure_name
+  database             = snowflake_database.test.name
+  schema               = snowflake_schema.test.name
+  return_type          = "FLOAT"
+  execute_as           = "CALLER"
+  null_input_behavior  = "RETURNS NULL ON NULL INPUT"
+  procedure_definition = <<EOT
 var X=1
 return X
 EOT
diff --git a/pkg/resources/usage_tracking_acceptance_test.go b/pkg/resources/usage_tracking_acceptance_test.go
index fcd866afcd..7f5262e409 100644
--- a/pkg/resources/usage_tracking_acceptance_test.go
+++ b/pkg/resources/usage_tracking_acceptance_test.go
@@ -5,23 +5,21 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
-	"github.com/hashicorp/terraform-plugin-testing/terraform"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
-
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	"github.com/hashicorp/terraform-plugin-testing/tfversion"
-
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_CompleteUsageTracking(t *testing.T) {
@@ -61,7 +59,7 @@ func TestAcc_CompleteUsageTracking(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Create
 			{
-				Config: config.FromModel(t, schemaModel),
+				Config: config.FromModels(t, schemaModel),
 				Check: assert.AssertThat(t,
 					resourceassert.SchemaResource(t, schemaModel.ResourceReference()).
 						HasNameString(id.Name()).
@@ -83,7 +81,7 @@ func TestAcc_CompleteUsageTracking(t *testing.T) {
 			},
 			// Update + CustomDiff (parameters) + Read
 			{
-				Config: config.FromModel(t, schemaModelWithComment),
+				Config: config.FromModels(t, schemaModelWithComment),
 				Check: assert.AssertThat(t,
 					resourceassert.SchemaResource(t, schemaModelWithComment.ResourceReference()).
 						HasNameString(id.Name()).
@@ -95,7 +93,7 @@ func TestAcc_CompleteUsageTracking(t *testing.T) {
 			},
 			// Delete
 			{
-				Config:  config.FromModel(t, schemaModelWithComment),
+				Config:  config.FromModels(t, schemaModelWithComment),
 				Destroy: true,
 				Check: assert.AssertThat(t,
 					assert.Check(assertQueryMetadataExists(t, tracking.DeleteOperation, fmt.Sprintf(`DROP SCHEMA IF EXISTS %s`, id.FullyQualifiedName()))),
diff --git a/pkg/resources/user_acceptance_test.go b/pkg/resources/user_acceptance_test.go
index 952fd2d98d..373e5b6914 100644
--- a/pkg/resources/user_acceptance_test.go
+++ b/pkg/resources/user_acceptance_test.go
@@ -64,8 +64,8 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
 		WithMinsToBypassMfa(10).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment).
 		WithDisableMfa("true")
 
@@ -87,8 +87,8 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			WithDefaultRole("other_role").
 			WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
 			WithMinsToBypassMfa(14).
-			WithRsaPublicKey(key2).
-			WithRsaPublicKey2(key1).
+			WithRsaPublicKeyValue(config.MultilineWrapperVariable(key2)).
+			WithRsaPublicKey2Value(config.MultilineWrapperVariable(key1)).
 			WithComment(newComment).
 			WithDisableMfa("false")
 	}
@@ -103,7 +103,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 		Steps: []resource.TestStep{
 			// CREATE WITHOUT ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -135,7 +135,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			},
 			// RENAME AND CHANGE ONE PROP
 			{
-				Config: config.FromModel(t, userModelNoAttributesRenamed),
+				Config: config.FromModels(t, userModelNoAttributesRenamed),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id2.Name()).
@@ -162,12 +162,12 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			},
 			// DESTROY
 			{
-				Config:  config.FromModel(t, userModelNoAttributes),
+				Config:  config.FromModels(t, userModelNoAttributes),
 				Destroy: true,
 			},
 			// CREATE WITH ALL ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelAllAttributes),
+				Config: config.FromModels(t, userModelAllAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelAllAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -196,7 +196,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			},
 			// CHANGE PROPERTIES
 			{
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelAllAttributesChanged(id.Name()+"_other_login").ResourceReference()).
 						HasNameString(id.Name()).
@@ -240,7 +240,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetLoginName(t, id, id.Name()+"_different_login")
 				},
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -249,7 +249,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			},
 			// UNSET ALL
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -299,7 +299,7 @@ func TestAcc_User_RemovedOutsideOfTerraform(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -308,7 +308,7 @@ func TestAcc_User_RemovedOutsideOfTerraform(t *testing.T) {
 			},
 			{
 				PreConfig: acc.TestClient().User.DropUserFunc(t, userId),
-				Config:    config.FromModel(t, userModel),
+				Config:    config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectNonEmptyPlan(),
@@ -347,7 +347,7 @@ func TestAcc_User_issue2058(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel1),
+				Config: config.FromModels(t, userModel1),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel1.ResourceReference()).HasNameString(userId.Name()),
 				),
@@ -434,7 +434,7 @@ func TestAcc_User_AllParameters(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create with default values for all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -454,7 +454,7 @@ func TestAcc_User_AllParameters(t *testing.T) {
 			},
 			// set all parameters
 			{
-				Config: config.FromModel(t, userModelWithAllParametersSet),
+				Config: config.FromModels(t, userModelWithAllParametersSet),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAbortDetachedQuery(true).
@@ -644,7 +644,7 @@ func TestAcc_User_AllParameters(t *testing.T) {
 			},
 			// unset all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -674,7 +674,7 @@ func TestAcc_User_issue2836(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectassert.User(t, userId).
 						HasDefaultRole(defaultRole),
@@ -696,15 +696,15 @@ func TestAcc_User_issue2970(t *testing.T) {
 
 	userModel := model.User(resourceName, userId.Name()).
 		WithPassword(pass).
-		WithRsaPublicKey(key)
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key))
 
 	newUserModelIncorrectNewKey := model.User(resourceName, userId.Name()).
 		WithPassword(newPass).
-		WithRsaPublicKey(incorrectlyFormattedNewKey)
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(incorrectlyFormattedNewKey))
 
 	newUserModel := model.User(resourceName, userId.Name()).
 		WithPassword(newPass).
-		WithRsaPublicKey(newKey)
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(newKey))
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -715,7 +715,7 @@ func TestAcc_User_issue2970(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasPasswordString(pass).
@@ -723,7 +723,7 @@ func TestAcc_User_issue2970(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, newUserModelIncorrectNewKey),
+				Config: config.FromModels(t, newUserModelIncorrectNewKey),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(newUserModelIncorrectNewKey.ResourceReference(), "password", tfjson.ActionUpdate, sdk.String(pass), sdk.String(newPass)),
@@ -733,7 +733,7 @@ func TestAcc_User_issue2970(t *testing.T) {
 				ExpectError: regexp.MustCompile("New public key rejected by current policy"),
 			},
 			{
-				Config: config.FromModel(t, newUserModel),
+				Config: config.FromModels(t, newUserModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(newUserModel.ResourceReference(), "password", tfjson.ActionUpdate, sdk.String(pass), sdk.String(newPass)),
@@ -764,7 +764,7 @@ func TestAcc_User_issue1572(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasDisabledString(r.BooleanDefault),
@@ -776,7 +776,7 @@ func TestAcc_User_issue1572(t *testing.T) {
 					acc.TestClient().User.Disable(t, userId)
 					objectassert.User(t, userId).HasDisabled(true)
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectDrift(userModel.ResourceReference(), "disabled", sdk.String(r.BooleanDefault), sdk.String(r.BooleanTrue)),
@@ -812,14 +812,14 @@ func TestAcc_User_issue1535_withNullPassword(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasPasswordString(pass),
 				),
 			},
 			{
-				Config: config.FromModel(t, userWithNullPasswordModel),
+				Config: config.FromModels(t, userWithNullPasswordModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userWithNullPasswordModel.ResourceReference(), "password", tfjson.ActionUpdate, sdk.String(pass), nil),
@@ -852,14 +852,14 @@ func TestAcc_User_issue1535_withRemovedPassword(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasPasswordString(pass),
 				),
 			},
 			{
-				Config: config.FromModel(t, userWithoutPasswordModel),
+				Config: config.FromModels(t, userWithoutPasswordModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userWithoutPasswordModel.ResourceReference(), "password", tfjson.ActionUpdate, sdk.String(pass), nil),
@@ -892,7 +892,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 		Steps: []resource.TestStep{
 			// 1. create without days_to_expiry
 			{
-				Config: config.FromModel(t, userModelWithoutDaysToExpiry),
+				Config: config.FromModels(t, userModelWithoutDaysToExpiry),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithoutDaysToExpiry.ResourceReference()).HasNoDaysToExpiry(),
 					objectassert.User(t, userId).HasDaysToExpiryEmpty(),
@@ -900,7 +900,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 			},
 			// 2. change to 10 (no plan after)
 			{
-				Config: config.FromModel(t, userModelDaysToExpiry10),
+				Config: config.FromModels(t, userModelDaysToExpiry10),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelDaysToExpiry10.ResourceReference()).HasDaysToExpiryString("10"),
 					objectassert.User(t, userId).HasDaysToExpiryNotEmpty(),
@@ -911,7 +911,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetDaysToExpiry(t, userId, 2)
 				},
-				Config: config.FromModel(t, userModelDaysToExpiry10),
+				Config: config.FromModels(t, userModelDaysToExpiry10),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -923,7 +923,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetDaysToExpiry(t, userId, 0)
 				},
-				Config: config.FromModel(t, userModelDaysToExpiry10),
+				Config: config.FromModels(t, userModelDaysToExpiry10),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -932,7 +932,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 			},
 			// 5. change in config to 5 (change)
 			{
-				Config: config.FromModel(t, userModelDaysToExpiry5),
+				Config: config.FromModels(t, userModelDaysToExpiry5),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelDaysToExpiry5.ResourceReference(), "days_to_expiry", tfjson.ActionUpdate, sdk.String("10"), sdk.String("5")),
@@ -945,7 +945,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 			},
 			// 6. change in config to 0 (change)
 			{
-				Config: config.FromModel(t, userModelDaysToExpiry0),
+				Config: config.FromModels(t, userModelDaysToExpiry0),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelDaysToExpiry0.ResourceReference(), "days_to_expiry", tfjson.ActionUpdate, sdk.String("5"), sdk.String("0")),
@@ -958,7 +958,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 			},
 			// 7. remove from config (no change)
 			{
-				Config: config.FromModel(t, userModelWithoutDaysToExpiry),
+				Config: config.FromModels(t, userModelWithoutDaysToExpiry),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -987,7 +987,7 @@ func TestAcc_User_handleExternalTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).HasNameString(userId.Name()).HasUserTypeString(""),
 					resourceshowoutputassert.UserShowOutput(t, userModel.ResourceReference()).HasType(""),
@@ -998,7 +998,7 @@ func TestAcc_User_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.SetType(t, userId, sdk.UserTypeService)
 					objectassert.User(t, userId).HasType(string(sdk.UserTypeService))
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -1015,7 +1015,7 @@ func TestAcc_User_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.SetType(t, userId, sdk.UserTypePerson)
 					objectassert.User(t, userId).HasType("PERSON")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -1032,7 +1032,7 @@ func TestAcc_User_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.UnsetType(t, userId)
 					objectassert.User(t, userId).HasType("")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -1056,7 +1056,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 	userModelLowercaseValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("all")
 	userModelIncorrectValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("OTHER")
 	userModelEmptyValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("")
-	userModelNullValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOptionValue(config.NullVariable())
+	userModelNullValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOptionValue(config.ReplacementPlaceholderVariable(config.SnowflakeProviderConfigNull))
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -1068,7 +1068,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 		Steps: []resource.TestStep{
 			// 1. create without default secondary roles option set (DEFAULT will be used)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelEmpty.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionDefault),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(""),
@@ -1076,7 +1076,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 2. add default secondary roles NONE (expecting change because null != [] on Snowflake side)
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectNonEmptyPlan(),
@@ -1089,7 +1089,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 3. add default secondary roles ALL
 			{
-				Config: config.FromModel(t, userModelWithOptionAll),
+				Config: config.FromModels(t, userModelWithOptionAll),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithOptionAll.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionAll),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`["ALL"]`),
@@ -1097,7 +1097,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 4. change to lowercase (no changes)
 			{
-				Config: config.FromModel(t, userModelLowercaseValue),
+				Config: config.FromModels(t, userModelLowercaseValue),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -1109,7 +1109,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.UnsetDefaultSecondaryRoles(t, userId)
 				},
-				Config: config.FromModel(t, userModelWithOptionAll),
+				Config: config.FromModels(t, userModelWithOptionAll),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionAll.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("DEFAULT"), sdk.String("ALL")),
@@ -1122,7 +1122,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 6. unset in config (change)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelEmpty.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("ALL"), sdk.String("DEFAULT")),
@@ -1135,17 +1135,17 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 7. incorrect value used
 			{
-				Config:      config.FromModel(t, userModelIncorrectValue),
+				Config:      config.FromModels(t, userModelIncorrectValue),
 				ExpectError: regexp.MustCompile("invalid secondary roles option: OTHER"),
 			},
 			// 8. set to empty in config (invalid)
 			{
-				Config:      config.FromModel(t, userModelEmptyValue),
+				Config:      config.FromModels(t, userModelEmptyValue),
 				ExpectError: regexp.MustCompile("invalid secondary roles option: "),
 			},
 			// 9. set in config to NONE (change)
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionNone.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("DEFAULT"), sdk.String("NONE")),
@@ -1158,7 +1158,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 10. unset in config (change)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelEmpty.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("NONE"), sdk.String("DEFAULT")),
@@ -1171,7 +1171,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 11. add default secondary roles ALL
 			{
-				Config: config.FromModel(t, userModelWithOptionAll),
+				Config: config.FromModels(t, userModelWithOptionAll),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithOptionAll.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionAll),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`["ALL"]`),
@@ -1179,7 +1179,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 12. set to null value in config (change)
 			{
-				Config: config.FromModel(t, userModelNullValue),
+				Config: config.FromModels(t, userModelNullValue),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelNullValue.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("ALL"), sdk.String("DEFAULT")),
@@ -1203,7 +1203,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 	userModelLowercaseValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("all")
 	userModelIncorrectValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("OTHER")
 	userModelEmptyValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("")
-	userModelNullValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOptionValue(config.NullVariable())
+	userModelNullValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOptionValue(config.ReplacementPlaceholderVariable(config.SnowflakeProviderConfigNull))
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -1218,7 +1218,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().BcrBundles.EnableBcrBundle(t, "2024_07")
 				},
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelEmpty.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionDefault),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`["ALL"]`),
@@ -1231,11 +1231,11 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 						plancheck.ExpectEmptyPlan(),
 					},
 				},
-				Config: config.FromModel(t, userModelWithOptionAll),
+				Config: config.FromModels(t, userModelWithOptionAll),
 			},
 			// 3. change to lowercase (change because we have DEFAULT in state because previous step was suppressed so none of the suppressors NormalizeAndCompare nor IgnoreChangeToCurrentSnowflakeValueInShowWithMapping suppresses it; it can be made better later)
 			{
-				Config: config.FromModel(t, userModelLowercaseValue),
+				Config: config.FromModels(t, userModelLowercaseValue),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionNone.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("DEFAULT"), sdk.String("all")),
@@ -1248,7 +1248,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 4. add default secondary roles NONE
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithOptionNone.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionNone),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`[]`),
@@ -1259,7 +1259,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.UnsetDefaultSecondaryRoles(t, userId)
 				},
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionNone.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("ALL"), sdk.String("NONE")),
@@ -1272,7 +1272,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 6. unset in config (change)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelEmpty.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("NONE"), sdk.String("DEFAULT")),
@@ -1285,17 +1285,17 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 7. incorrect value used
 			{
-				Config:      config.FromModel(t, userModelIncorrectValue),
+				Config:      config.FromModels(t, userModelIncorrectValue),
 				ExpectError: regexp.MustCompile("invalid secondary roles option: OTHER"),
 			},
 			// 8. set to empty in config (invalid)
 			{
-				Config:      config.FromModel(t, userModelEmptyValue),
+				Config:      config.FromModels(t, userModelEmptyValue),
 				ExpectError: regexp.MustCompile("invalid secondary roles option: "),
 			},
 			// 9. set in config to NONE (change)
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionNone.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("DEFAULT"), sdk.String("NONE")),
@@ -1308,7 +1308,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 10. unset in config (change)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelEmpty.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("NONE"), sdk.String("DEFAULT")),
@@ -1321,7 +1321,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 11. add default secondary roles NONE
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelEmpty.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionNone),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`[]`),
@@ -1329,7 +1329,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 12. set to null value in config (change)
 			{
-				Config: config.FromModel(t, userModelNullValue),
+				Config: config.FromModels(t, userModelNullValue),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelEmpty.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionDefault),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`["ALL"]`),
@@ -1359,7 +1359,7 @@ func TestAcc_User_migrateFromVersion094_noDefaultSecondaryRolesSet(t *testing.T)
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(userModel.ResourceReference(), "name", id.Name()),
 					resource.TestCheckResourceAttr(userModel.ResourceReference(), "default_secondary_roles.#", "0"),
@@ -1368,7 +1368,7 @@ func TestAcc_User_migrateFromVersion094_noDefaultSecondaryRolesSet(t *testing.T)
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, userModel),
+				Config:                   config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						// we do not have a plancheck yet to validate no changes on the given field; this is a current alternative
@@ -1420,7 +1420,7 @@ resource "snowflake_user" "test" {
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, userModelWithOptionAll),
+				Config:                   config.FromModels(t, userModelWithOptionAll),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						// we do not have a plancheck yet to validate no changes on the given field; this is a current alternative
@@ -1459,7 +1459,7 @@ func TestAcc_User_ParameterValidationsAndDiffSuppressions(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasBinaryInputFormatString(string(sdk.BinaryInputFormatHex)).
@@ -1493,7 +1493,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Create without both set
 			{
-				Config: config.FromModel(t, userModelWithoutBoth),
+				Config: config.FromModels(t, userModelWithoutBoth),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithoutBoth.ResourceReference()).
 						HasNoDisplayName().
@@ -1505,7 +1505,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 			},
 			// Rename
 			{
-				Config: config.FromModel(t, userModelWithNewId),
+				Config: config.FromModels(t, userModelWithNewId),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithNewId.ResourceReference()).
 						HasNoDisplayName().
@@ -1517,7 +1517,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 			},
 			// Set both params
 			{
-				Config: config.FromModel(t, userModelWithBoth),
+				Config: config.FromModels(t, userModelWithBoth),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithBoth.ResourceReference()).
 						HasDisplayNameString("display_name").
@@ -1539,7 +1539,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 						},
 					})
 				},
-				Config: config.FromModel(t, userModelWithBoth),
+				Config: config.FromModels(t, userModelWithBoth),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithBoth.ResourceReference()).
 						HasDisplayNameString("display_name").
@@ -1551,7 +1551,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 			},
 			// Unset both params
 			{
-				Config: config.FromModel(t, userModelWithNewId),
+				Config: config.FromModels(t, userModelWithNewId),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithNewId.ResourceReference()).
 						HasDisplayNameString("").
@@ -1575,7 +1575,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 						},
 					})
 				},
-				Config: config.FromModel(t, userModelWithNewId),
+				Config: config.FromModels(t, userModelWithNewId),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithNewId.ResourceReference()).
 						HasDisplayNameString("").
@@ -1609,14 +1609,14 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_gh3125(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().BcrBundles.EnableBcrBundle(t, "2024_08")
 				},
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelNoAttributes.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionDefault),
 				),
 			},
 			{
-				Config: config.FromModel(t, userModelWithNoneDefaultSecondaryRoles),
+				Config: config.FromModels(t, userModelWithNoneDefaultSecondaryRoles),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithNoneDefaultSecondaryRoles.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionNone),
@@ -1647,7 +1647,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_gh3125_withbcr202407(t *tes
 					acc.TestClient().BcrBundles.EnableBcrBundle(t, "2024_07")
 					acc.TestClient().BcrBundles.EnableBcrBundle(t, "2024_08")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionNone),
@@ -1683,7 +1683,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_migration_bcr202407_enabled
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionDefault),
@@ -1695,7 +1695,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_migration_bcr202407_enabled
 					func() { acc.UnsetConfigPathEnv(t) }()
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, userModel),
+				Config:                   config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -1733,7 +1733,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_migration_bcr202407_disable
 					},
 				},
 				PreConfig: func() { acc.SetV097CompatibleConfigPathEnv(t) },
-				Config:    config.FromModel(t, userModel),
+				Config:    config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionDefault),
@@ -1745,7 +1745,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_migration_bcr202407_disable
 					func() { acc.UnsetConfigPathEnv(t) }()
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, userModel),
+				Config:                   config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectDrift(userModel.ResourceReference(), "default_secondary_roles_option", sdk.String(string(sdk.SecondaryRolesOptionDefault)), sdk.String(string(sdk.SecondaryRolesOptionAll))),
@@ -1790,7 +1790,7 @@ func TestAcc_User_importPassword(t *testing.T) {
 		Steps: []resource.TestStep{
 			// IMPORT
 			{
-				Config:        config.FromModel(t, userModel),
+				Config:        config.FromModels(t, userModel),
 				ResourceName:  userModel.ResourceReference(),
 				ImportState:   true,
 				ImportStateId: userId.Name(),
@@ -1802,7 +1802,7 @@ func TestAcc_User_importPassword(t *testing.T) {
 				ImportStatePersist: true,
 			},
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasNotEmptyPassword().
@@ -1815,7 +1815,7 @@ func TestAcc_User_importPassword(t *testing.T) {
 						plancheck.ExpectEmptyPlan(),
 					},
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasNotEmptyPassword().
diff --git a/pkg/resources/user_parameters.go b/pkg/resources/user_parameters.go
index 2c4f34f2ea..61ef7a24ff 100644
--- a/pkg/resources/user_parameters.go
+++ b/pkg/resources/user_parameters.go
@@ -290,7 +290,7 @@ func handleUserParametersCreate(d *schema.ResourceData, createOpts *sdk.CreateUs
 		handleParameterCreate(d, sdk.UserParameterJdbcTreatDecimalAsInt, &createOpts.SessionParameters.JdbcTreatDecimalAsInt),
 		handleParameterCreate(d, sdk.UserParameterJdbcTreatTimestampNtzAsUtc, &createOpts.SessionParameters.JdbcTreatTimestampNtzAsUtc),
 		handleParameterCreate(d, sdk.UserParameterJdbcUseSessionTimezone, &createOpts.SessionParameters.JdbcUseSessionTimezone),
-		handleParameterCreate(d, sdk.UserParameterJsonIndent, &createOpts.SessionParameters.JSONIndent),
+		handleParameterCreate(d, sdk.UserParameterJsonIndent, &createOpts.SessionParameters.JsonIndent),
 		handleParameterCreate(d, sdk.UserParameterLockTimeout, &createOpts.SessionParameters.LockTimeout),
 		handleParameterCreateWithMapping(d, sdk.UserParameterLogLevel, &createOpts.SessionParameters.LogLevel, stringToStringEnumProvider(sdk.ToLogLevel)),
 		handleParameterCreate(d, sdk.UserParameterMultiStatementCount, &createOpts.SessionParameters.MultiStatementCount),
@@ -304,7 +304,7 @@ func handleUserParametersCreate(d *schema.ResourceData, createOpts *sdk.CreateUs
 		handleParameterCreate(d, sdk.UserParameterSimulatedDataSharingConsumer, &createOpts.SessionParameters.SimulatedDataSharingConsumer),
 		handleParameterCreate(d, sdk.UserParameterStatementQueuedTimeoutInSeconds, &createOpts.SessionParameters.StatementQueuedTimeoutInSeconds),
 		handleParameterCreate(d, sdk.UserParameterStatementTimeoutInSeconds, &createOpts.SessionParameters.StatementTimeoutInSeconds),
-		handleParameterCreate(d, sdk.UserParameterStrictJsonOutput, &createOpts.SessionParameters.StrictJSONOutput),
+		handleParameterCreate(d, sdk.UserParameterStrictJsonOutput, &createOpts.SessionParameters.StrictJsonOutput),
 		handleParameterCreate(d, sdk.UserParameterTimestampDayIsAlways24h, &createOpts.SessionParameters.TimestampDayIsAlways24h),
 		handleParameterCreate(d, sdk.UserParameterTimestampInputFormat, &createOpts.SessionParameters.TimestampInputFormat),
 		handleParameterCreate(d, sdk.UserParameterTimestampLtzOutputFormat, &createOpts.SessionParameters.TimestampLTZOutputFormat),
@@ -353,7 +353,7 @@ func handleUserParametersUpdate(d *schema.ResourceData, set *sdk.UserSet, unset
 		handleParameterUpdate(d, sdk.UserParameterJdbcTreatDecimalAsInt, &set.SessionParameters.JdbcTreatDecimalAsInt, &unset.SessionParameters.JdbcTreatDecimalAsInt),
 		handleParameterUpdate(d, sdk.UserParameterJdbcTreatTimestampNtzAsUtc, &set.SessionParameters.JdbcTreatTimestampNtzAsUtc, &unset.SessionParameters.JdbcTreatTimestampNtzAsUtc),
 		handleParameterUpdate(d, sdk.UserParameterJdbcUseSessionTimezone, &set.SessionParameters.JdbcUseSessionTimezone, &unset.SessionParameters.JdbcUseSessionTimezone),
-		handleParameterUpdate(d, sdk.UserParameterJsonIndent, &set.SessionParameters.JSONIndent, &unset.SessionParameters.JSONIndent),
+		handleParameterUpdate(d, sdk.UserParameterJsonIndent, &set.SessionParameters.JsonIndent, &unset.SessionParameters.JsonIndent),
 		handleParameterUpdate(d, sdk.UserParameterLockTimeout, &set.SessionParameters.LockTimeout, &unset.SessionParameters.LockTimeout),
 		handleParameterUpdateWithMapping(d, sdk.UserParameterLogLevel, &set.SessionParameters.LogLevel, &unset.SessionParameters.LogLevel, stringToStringEnumProvider(sdk.ToLogLevel)),
 		handleParameterUpdate(d, sdk.UserParameterMultiStatementCount, &set.SessionParameters.MultiStatementCount, &unset.SessionParameters.MultiStatementCount),
@@ -367,7 +367,7 @@ func handleUserParametersUpdate(d *schema.ResourceData, set *sdk.UserSet, unset
 		handleParameterUpdate(d, sdk.UserParameterSimulatedDataSharingConsumer, &set.SessionParameters.SimulatedDataSharingConsumer, &unset.SessionParameters.SimulatedDataSharingConsumer),
 		handleParameterUpdate(d, sdk.UserParameterStatementQueuedTimeoutInSeconds, &set.SessionParameters.StatementQueuedTimeoutInSeconds, &unset.SessionParameters.StatementQueuedTimeoutInSeconds),
 		handleParameterUpdate(d, sdk.UserParameterStatementTimeoutInSeconds, &set.SessionParameters.StatementTimeoutInSeconds, &unset.SessionParameters.StatementTimeoutInSeconds),
-		handleParameterUpdate(d, sdk.UserParameterStrictJsonOutput, &set.SessionParameters.StrictJSONOutput, &unset.SessionParameters.StrictJSONOutput),
+		handleParameterUpdate(d, sdk.UserParameterStrictJsonOutput, &set.SessionParameters.StrictJsonOutput, &unset.SessionParameters.StrictJsonOutput),
 		handleParameterUpdate(d, sdk.UserParameterTimestampDayIsAlways24h, &set.SessionParameters.TimestampDayIsAlways24h, &unset.SessionParameters.TimestampDayIsAlways24h),
 		handleParameterUpdate(d, sdk.UserParameterTimestampInputFormat, &set.SessionParameters.TimestampInputFormat, &unset.SessionParameters.TimestampInputFormat),
 		handleParameterUpdate(d, sdk.UserParameterTimestampLtzOutputFormat, &set.SessionParameters.TimestampLTZOutputFormat, &unset.SessionParameters.TimestampLTZOutputFormat),
diff --git a/pkg/resources/view_acceptance_test.go b/pkg/resources/view_acceptance_test.go
index b72822016e..39dff6e829 100644
--- a/pkg/resources/view_acceptance_test.go
+++ b/pkg/resources/view_acceptance_test.go
@@ -451,7 +451,7 @@ func TestAcc_View_temporary(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.View),
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, viewModel.WithIsTemporary("true")),
+				Config: accconfig.FromModels(t, viewModel.WithIsTemporary("true")),
 				Check: assert.AssertThat(t, resourceassert.ViewResource(t, "snowflake_view.test").
 					HasNameString(id.Name()).
 					HasStatementString(statement).
@@ -949,7 +949,7 @@ func TestAcc_View_Issue3073(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.View),
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, viewModel),
+				Config: accconfig.FromModels(t, viewModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_view.test", plancheck.ResourceActionNoop),
@@ -973,7 +973,7 @@ func TestAcc_View_Issue3073(t *testing.T) {
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, viewModel),
+				Config: accconfig.FromModels(t, viewModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_view.test", plancheck.ResourceActionNoop),
@@ -1007,7 +1007,7 @@ func TestAcc_View_IncorrectColumnsWithOrReplace(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.View),
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, viewModel),
+				Config: accconfig.FromModels(t, viewModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_view.test", plancheck.ResourceActionNoop),
@@ -1022,7 +1022,7 @@ func TestAcc_View_IncorrectColumnsWithOrReplace(t *testing.T) {
 			},
 			// use columns without quotes in the statement
 			{
-				Config: accconfig.FromModel(t, viewLowercaseStatementModel),
+				Config: accconfig.FromModels(t, viewLowercaseStatementModel),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_view.test", "name", id.Name()),
 					resource.TestCheckResourceAttr("snowflake_view.test", "column.#", "2"),
@@ -1032,7 +1032,7 @@ func TestAcc_View_IncorrectColumnsWithOrReplace(t *testing.T) {
 			},
 			// add a new column to the statement
 			{
-				Config: accconfig.FromModel(t, viewLowercaseStatementModel3),
+				Config: accconfig.FromModels(t, viewLowercaseStatementModel3),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_view.test", "name", id.Name()),
 					resource.TestCheckResourceAttr("snowflake_view.test", "column.#", "3"),
diff --git a/pkg/resources/warehouse_acceptance_test.go b/pkg/resources/warehouse_acceptance_test.go
index 49f3d678ce..e481cb876f 100644
--- a/pkg/resources/warehouse_acceptance_test.go
+++ b/pkg/resources/warehouse_acceptance_test.go
@@ -7,8 +7,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	tfjson "github.com/hashicorp/terraform-json"
@@ -25,6 +23,7 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -59,7 +58,7 @@ func TestAcc_Warehouse_BasicFlows(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Warehouse),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, warehouseModel),
+				Config: config.FromModels(t, warehouseModel),
 				Check: assert.AssertThat(t,
 					resourceassert.WarehouseResource(t, "snowflake_warehouse.w").
 						HasNameString(name).
diff --git a/pkg/sdk/accounts_test.go b/pkg/sdk/accounts_test.go
index e072eabd71..4c66a4c6aa 100644
--- a/pkg/sdk/accounts_test.go
+++ b/pkg/sdk/accounts_test.go
@@ -111,7 +111,7 @@ func TestAccountAlter(t *testing.T) {
 						PreventUnloadToInternalStages: Bool(true),
 					},
 					SessionParameters: &SessionParameters{
-						JSONIndent: Int(16),
+						JsonIndent: Int(16),
 					},
 					ObjectParameters: &ObjectParameters{
 						MaxDataExtensionTimeInDays: Int(30),
diff --git a/pkg/sdk/api_integrations_def.go b/pkg/sdk/api_integrations_def.go
index 9625b23e72..83b1c588e9 100644
--- a/pkg/sdk/api_integrations_def.go
+++ b/pkg/sdk/api_integrations_def.go
@@ -151,7 +151,9 @@ var ApiIntegrationsDef = g.NewInterface(
 			SQL("API INTEGRATIONS").
 			OptionalLike(),
 	).
-	ShowByIdOperation().
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDLikeFiltering,
+	).
 	DescribeOperation(
 		g.DescriptionMappingKindSlice,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-integration",
diff --git a/pkg/sdk/api_integrations_dto_builders_gen.go b/pkg/sdk/api_integrations_dto_builders_gen.go
index 82d05298d7..1af9f50bcf 100644
--- a/pkg/sdk/api_integrations_dto_builders_gen.go
+++ b/pkg/sdk/api_integrations_dto_builders_gen.go
@@ -243,8 +243,8 @@ func NewShowApiIntegrationRequest() *ShowApiIntegrationRequest {
 	return &ShowApiIntegrationRequest{}
 }
 
-func (s *ShowApiIntegrationRequest) WithLike(Like *Like) *ShowApiIntegrationRequest {
-	s.Like = Like
+func (s *ShowApiIntegrationRequest) WithLike(Like Like) *ShowApiIntegrationRequest {
+	s.Like = &Like
 	return s
 }
 
diff --git a/pkg/sdk/api_integrations_impl_gen.go b/pkg/sdk/api_integrations_impl_gen.go
index 6de2304572..7c7d8f60d8 100644
--- a/pkg/sdk/api_integrations_impl_gen.go
+++ b/pkg/sdk/api_integrations_impl_gen.go
@@ -38,9 +38,9 @@ func (v *apiIntegrations) Show(ctx context.Context, request *ShowApiIntegrationR
 }
 
 func (v *apiIntegrations) ShowByID(ctx context.Context, id AccountObjectIdentifier) (*ApiIntegration, error) {
-	apiIntegrations, err := v.Show(ctx, NewShowApiIntegrationRequest().WithLike(&Like{
-		Pattern: String(id.Name()),
-	}))
+	request := NewShowApiIntegrationRequest().
+		WithLike(Like{Pattern: String(id.Name())})
+	apiIntegrations, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/application_packages_def.go b/pkg/sdk/application_packages_def.go
index 8f6bdbce65..6cf9cc3e51 100644
--- a/pkg/sdk/application_packages_def.go
+++ b/pkg/sdk/application_packages_def.go
@@ -163,4 +163,6 @@ var ApplicationPackagesDef = g.NewInterface(
 		OptionalLike().
 		OptionalStartsWith().
 		OptionalLimit(),
-).ShowByIdOperation()
+).ShowByIdOperationWithFiltering(
+	g.ShowByIDLikeFiltering,
+)
diff --git a/pkg/sdk/application_packages_dto_builders_gen.go b/pkg/sdk/application_packages_dto_builders_gen.go
index 36cbec358e..d9759675ed 100644
--- a/pkg/sdk/application_packages_dto_builders_gen.go
+++ b/pkg/sdk/application_packages_dto_builders_gen.go
@@ -275,8 +275,8 @@ func NewShowApplicationPackageRequest() *ShowApplicationPackageRequest {
 	return &ShowApplicationPackageRequest{}
 }
 
-func (s *ShowApplicationPackageRequest) WithLike(Like *Like) *ShowApplicationPackageRequest {
-	s.Like = Like
+func (s *ShowApplicationPackageRequest) WithLike(Like Like) *ShowApplicationPackageRequest {
+	s.Like = &Like
 	return s
 }
 
diff --git a/pkg/sdk/application_packages_impl_gen.go b/pkg/sdk/application_packages_impl_gen.go
index 36b23c8f47..12cd3ff0a6 100644
--- a/pkg/sdk/application_packages_impl_gen.go
+++ b/pkg/sdk/application_packages_impl_gen.go
@@ -38,7 +38,8 @@ func (v *applicationPackages) Show(ctx context.Context, request *ShowApplication
 }
 
 func (v *applicationPackages) ShowByID(ctx context.Context, id AccountObjectIdentifier) (*ApplicationPackage, error) {
-	request := NewShowApplicationPackageRequest().WithLike(&Like{String(id.Name())})
+	request := NewShowApplicationPackageRequest().
+		WithLike(Like{Pattern: String(id.Name())})
 	applicationPackages, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
diff --git a/pkg/sdk/applications_def.go b/pkg/sdk/applications_def.go
index d809e22d55..e03deba570 100644
--- a/pkg/sdk/applications_def.go
+++ b/pkg/sdk/applications_def.go
@@ -132,7 +132,9 @@ var ApplicationsDef = g.NewInterface(
 		OptionalLike().
 		OptionalStartsWith().
 		OptionalLimit(),
-).ShowByIdOperation().DescribeOperation(
+).ShowByIdOperationWithFiltering(
+	g.ShowByIDLikeFiltering,
+).DescribeOperation(
 	g.DescriptionMappingKindSlice,
 	"https://docs.snowflake.com/en/sql-reference/sql/desc-application",
 	g.DbStruct("applicationPropertyRow").
diff --git a/pkg/sdk/applications_dto_builders_gen.go b/pkg/sdk/applications_dto_builders_gen.go
index 8e20a566ab..398d48173f 100644
--- a/pkg/sdk/applications_dto_builders_gen.go
+++ b/pkg/sdk/applications_dto_builders_gen.go
@@ -184,8 +184,8 @@ func NewShowApplicationRequest() *ShowApplicationRequest {
 	return &ShowApplicationRequest{}
 }
 
-func (s *ShowApplicationRequest) WithLike(Like *Like) *ShowApplicationRequest {
-	s.Like = Like
+func (s *ShowApplicationRequest) WithLike(Like Like) *ShowApplicationRequest {
+	s.Like = &Like
 	return s
 }
 
diff --git a/pkg/sdk/applications_impl_gen.go b/pkg/sdk/applications_impl_gen.go
index dab57a9411..94000115d9 100644
--- a/pkg/sdk/applications_impl_gen.go
+++ b/pkg/sdk/applications_impl_gen.go
@@ -38,7 +38,8 @@ func (v *applications) Show(ctx context.Context, request *ShowApplicationRequest
 }
 
 func (v *applications) ShowByID(ctx context.Context, id AccountObjectIdentifier) (*Application, error) {
-	request := NewShowApplicationRequest().WithLike(&Like{String(id.Name())})
+	request := NewShowApplicationRequest().
+		WithLike(Like{Pattern: String(id.Name())})
 	applications, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
diff --git a/pkg/sdk/authentication_policies_def.go b/pkg/sdk/authentication_policies_def.go
index 9db18e06f4..7fb0a08d4f 100644
--- a/pkg/sdk/authentication_policies_def.go
+++ b/pkg/sdk/authentication_policies_def.go
@@ -170,7 +170,10 @@ var AuthenticationPoliciesDef = g.NewInterface(
 			OptionalStartsWith().
 			OptionalLimit(),
 	).
-	ShowByIdOperation().
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDLikeFiltering,
+		g.ShowByIDInFiltering,
+	).
 	DescribeOperation(
 		g.DescriptionMappingKindSlice,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-authentication-policy",
diff --git a/pkg/sdk/authentication_policies_impl_gen.go b/pkg/sdk/authentication_policies_impl_gen.go
index 5311be8ff0..163a80b27c 100644
--- a/pkg/sdk/authentication_policies_impl_gen.go
+++ b/pkg/sdk/authentication_policies_impl_gen.go
@@ -38,11 +38,10 @@ func (v *authenticationPolicies) Show(ctx context.Context, request *ShowAuthenti
 }
 
 func (v *authenticationPolicies) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*AuthenticationPolicy, error) {
-	authenticationPolicies, err := v.Show(ctx, NewShowAuthenticationPolicyRequest().WithIn(In{
-		Schema: id.SchemaId(),
-	}).WithLike(Like{
-		Pattern: String(id.Name()),
-	}))
+	request := NewShowAuthenticationPolicyRequest().
+		WithLike(Like{Pattern: String(id.Name())}).
+		WithIn(In{Schema: id.SchemaId()})
+	authenticationPolicies, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/config_test.go b/pkg/sdk/config_test.go
index af8a448061..7be95c1cd6 100644
--- a/pkg/sdk/config_test.go
+++ b/pkg/sdk/config_test.go
@@ -366,7 +366,6 @@ func Test_ToExtendedAuthenticatorType(t *testing.T) {
 		{input: "OAUTH", want: gosnowflake.AuthTypeOAuth},
 		{input: "EXTERNALBROWSER", want: gosnowflake.AuthTypeExternalBrowser},
 		{input: "OKTA", want: gosnowflake.AuthTypeOkta},
-		{input: "JWT", want: gosnowflake.AuthTypeJwt},
 		{input: "SNOWFLAKE_JWT", want: gosnowflake.AuthTypeJwt},
 		{input: "TOKENACCESSOR", want: gosnowflake.AuthTypeTokenAccessor},
 		{input: "USERNAMEPASSWORDMFA", want: gosnowflake.AuthTypeUsernamePasswordMFA},
@@ -376,6 +375,7 @@ func Test_ToExtendedAuthenticatorType(t *testing.T) {
 	invalid := []test{
 		{input: "   "},
 		{input: "foo"},
+		{input: "JWT"},
 	}
 
 	for _, tc := range valid {
diff --git a/pkg/sdk/cortex_search_services_def.go b/pkg/sdk/cortex_search_services_def.go
index e59dbebee0..87f514d11f 100644
--- a/pkg/sdk/cortex_search_services_def.go
+++ b/pkg/sdk/cortex_search_services_def.go
@@ -77,7 +77,10 @@ var CortexSearchServiceDef = g.NewInterface(
 		OptionalIn().
 		OptionalStartsWith().
 		OptionalLimitFrom(),
-).ShowByIdOperation().DescribeOperation(
+).ShowByIdOperationWithFiltering(
+	g.ShowByIDLikeFiltering,
+	g.ShowByIDInFiltering,
+).DescribeOperation(
 	g.DescriptionMappingKindSingleValue,
 	"https://docs.snowflake.com/LIMITEDACCESS/cortex-search/sql/desc-cortex-search",
 	g.DbStruct("cortexSearchServiceDetailsRow").
diff --git a/pkg/sdk/cortex_search_services_impl_gen.go b/pkg/sdk/cortex_search_services_impl_gen.go
index 320a5eaf40..89fe180dce 100644
--- a/pkg/sdk/cortex_search_services_impl_gen.go
+++ b/pkg/sdk/cortex_search_services_impl_gen.go
@@ -35,8 +35,8 @@ func (v *cortexSearchServices) Show(ctx context.Context, request *ShowCortexSear
 
 func (v *cortexSearchServices) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*CortexSearchService, error) {
 	request := NewShowCortexSearchServiceRequest().
-		WithIn(In{Schema: id.SchemaId()}).
-		WithLike(Like{Pattern: String(id.Name())})
+		WithLike(Like{Pattern: String(id.Name())}).
+		WithIn(In{Schema: id.SchemaId()})
 	cortexSearchServices, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
diff --git a/pkg/sdk/event_tables_def.go b/pkg/sdk/event_tables_def.go
index 6345c411b5..595ada7cc2 100644
--- a/pkg/sdk/event_tables_def.go
+++ b/pkg/sdk/event_tables_def.go
@@ -102,7 +102,10 @@ var EventTablesDef = g.NewInterface(
 		OptionalIn().
 		OptionalStartsWith().
 		OptionalLimit(),
-).ShowByIdOperation().DescribeOperation(
+).ShowByIdOperationWithFiltering(
+	g.ShowByIDInFiltering,
+	g.ShowByIDLikeFiltering,
+).DescribeOperation(
 	g.DescriptionMappingKindSingleValue,
 	"https://docs.snowflake.com/en/sql-reference/sql/desc-event-table",
 	g.DbStruct("eventTableDetailsRow").
diff --git a/pkg/sdk/event_tables_dto_builders_gen.go b/pkg/sdk/event_tables_dto_builders_gen.go
index c7ab428c05..efb266fc22 100644
--- a/pkg/sdk/event_tables_dto_builders_gen.go
+++ b/pkg/sdk/event_tables_dto_builders_gen.go
@@ -74,13 +74,13 @@ func (s *ShowEventTableRequest) WithTerse(Terse *bool) *ShowEventTableRequest {
 	return s
 }
 
-func (s *ShowEventTableRequest) WithLike(Like *Like) *ShowEventTableRequest {
-	s.Like = Like
+func (s *ShowEventTableRequest) WithLike(Like Like) *ShowEventTableRequest {
+	s.Like = &Like
 	return s
 }
 
-func (s *ShowEventTableRequest) WithIn(In *In) *ShowEventTableRequest {
-	s.In = In
+func (s *ShowEventTableRequest) WithIn(In In) *ShowEventTableRequest {
+	s.In = &In
 	return s
 }
 
diff --git a/pkg/sdk/event_tables_impl_gen.go b/pkg/sdk/event_tables_impl_gen.go
index 57b18fdbcb..676fc3d2b5 100644
--- a/pkg/sdk/event_tables_impl_gen.go
+++ b/pkg/sdk/event_tables_impl_gen.go
@@ -28,7 +28,9 @@ func (v *eventTables) Show(ctx context.Context, request *ShowEventTableRequest)
 }
 
 func (v *eventTables) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*EventTable, error) {
-	request := NewShowEventTableRequest().WithIn(&In{Schema: id.SchemaId()}).WithLike(&Like{String(id.Name())})
+	request := NewShowEventTableRequest().
+		WithIn(In{Schema: id.SchemaId()}).
+		WithLike(Like{Pattern: String(id.Name())})
 	eventTables, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
diff --git a/pkg/sdk/external_functions_def.go b/pkg/sdk/external_functions_def.go
index af7aeee9de..1a4c87825b 100644
--- a/pkg/sdk/external_functions_def.go
+++ b/pkg/sdk/external_functions_def.go
@@ -149,7 +149,10 @@ var ExternalFunctionsDef = g.NewInterface(
 		SQL("EXTERNAL FUNCTIONS").
 		OptionalLike().
 		OptionalIn(),
-).ShowByIdOperation().DescribeOperation(
+).ShowByIdOperationWithFiltering(
+	g.ShowByIDInFiltering,
+	g.ShowByIDLikeFiltering,
+).DescribeOperation(
 	g.DescriptionMappingKindSlice,
 	"https://docs.snowflake.com/en/sql-reference/sql/desc-function",
 	g.DbStruct("externalFunctionPropertyRow").
diff --git a/pkg/sdk/external_functions_impl_gen.go b/pkg/sdk/external_functions_impl_gen.go
index 51831541f1..1200be62e6 100644
--- a/pkg/sdk/external_functions_impl_gen.go
+++ b/pkg/sdk/external_functions_impl_gen.go
@@ -35,7 +35,10 @@ func (v *externalFunctions) Show(ctx context.Context, request *ShowExternalFunct
 }
 
 func (v *externalFunctions) ShowByID(ctx context.Context, id SchemaObjectIdentifierWithArguments) (*ExternalFunction, error) {
-	externalFunctions, err := v.Show(ctx, NewShowExternalFunctionRequest().WithIn(In{Schema: id.SchemaId()}).WithLike(Like{String(id.Name())}))
+	request := NewShowExternalFunctionRequest().
+		WithIn(In{Schema: id.SchemaId()}).
+		WithLike(Like{Pattern: String(id.Name())})
+	externalFunctions, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/external_volumes_def.go b/pkg/sdk/external_volumes_def.go
index ac6fb0124f..17c5e96f61 100644
--- a/pkg/sdk/external_volumes_def.go
+++ b/pkg/sdk/external_volumes_def.go
@@ -226,4 +226,6 @@ var ExternalVolumesDef = g.NewInterface(
 			SQL("EXTERNAL VOLUMES").
 			OptionalLike(),
 	).
-	ShowByIdOperation()
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDLikeFiltering,
+	)
diff --git a/pkg/sdk/functions_def.go b/pkg/sdk/functions_def.go
index 1c92cd4078..44f3ed59de 100644
--- a/pkg/sdk/functions_def.go
+++ b/pkg/sdk/functions_def.go
@@ -355,7 +355,10 @@ var FunctionsDef = g.NewInterface(
 		SQL("USER FUNCTIONS").
 		OptionalLike().
 		OptionalExtendedIn(),
-).ShowByIdOperation().DescribeOperation(
+).ShowByIdOperationWithFiltering(
+	g.ShowByIDExtendedInFiltering,
+	g.ShowByIDLikeFiltering,
+).DescribeOperation(
 	g.DescriptionMappingKindSlice,
 	"https://docs.snowflake.com/en/sql-reference/sql/desc-function",
 	g.DbStruct("functionDetailRow").
diff --git a/pkg/sdk/functions_impl_gen.go b/pkg/sdk/functions_impl_gen.go
index 051a8fc994..831ebe07a9 100644
--- a/pkg/sdk/functions_impl_gen.go
+++ b/pkg/sdk/functions_impl_gen.go
@@ -60,7 +60,10 @@ func (v *functions) Show(ctx context.Context, request *ShowFunctionRequest) ([]F
 }
 
 func (v *functions) ShowByID(ctx context.Context, id SchemaObjectIdentifierWithArguments) (*Function, error) {
-	functions, err := v.Show(ctx, NewShowFunctionRequest().WithIn(ExtendedIn{In: In{Schema: id.SchemaId()}}).WithLike(Like{String(id.Name())}))
+	request := NewShowFunctionRequest().
+		WithIn(ExtendedIn{In: In{Schema: id.SchemaId()}}).
+		WithLike(Like{Pattern: String(id.Name())})
+	functions, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/managed_accounts_def.go b/pkg/sdk/managed_accounts_def.go
index 2124b6e258..1f1958436b 100644
--- a/pkg/sdk/managed_accounts_def.go
+++ b/pkg/sdk/managed_accounts_def.go
@@ -67,4 +67,6 @@ var ManagedAccountsDef = g.NewInterface(
 			SQL("MANAGED ACCOUNTS").
 			OptionalLike(),
 	).
-	ShowByIdOperation()
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDLikeFiltering,
+	)
diff --git a/pkg/sdk/managed_accounts_dto_builders_gen.go b/pkg/sdk/managed_accounts_dto_builders_gen.go
index 7523608a2d..51e8e7f87b 100644
--- a/pkg/sdk/managed_accounts_dto_builders_gen.go
+++ b/pkg/sdk/managed_accounts_dto_builders_gen.go
@@ -41,7 +41,7 @@ func NewShowManagedAccountRequest() *ShowManagedAccountRequest {
 	return &ShowManagedAccountRequest{}
 }
 
-func (s *ShowManagedAccountRequest) WithLike(Like *Like) *ShowManagedAccountRequest {
-	s.Like = Like
+func (s *ShowManagedAccountRequest) WithLike(Like Like) *ShowManagedAccountRequest {
+	s.Like = &Like
 	return s
 }
diff --git a/pkg/sdk/managed_accounts_impl_gen.go b/pkg/sdk/managed_accounts_impl_gen.go
index f7a93b05d6..6298acf743 100644
--- a/pkg/sdk/managed_accounts_impl_gen.go
+++ b/pkg/sdk/managed_accounts_impl_gen.go
@@ -33,7 +33,9 @@ func (v *managedAccounts) Show(ctx context.Context, request *ShowManagedAccountR
 }
 
 func (v *managedAccounts) ShowByID(ctx context.Context, id AccountObjectIdentifier) (*ManagedAccount, error) {
-	managedAccounts, err := v.Show(ctx, NewShowManagedAccountRequest().WithLike(&Like{String(id.Name())}))
+	request := NewShowManagedAccountRequest().
+		WithLike(Like{Pattern: String(id.Name())})
+	managedAccounts, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/materialized_views_def.go b/pkg/sdk/materialized_views_def.go
index fedef1d829..2d9018cafe 100644
--- a/pkg/sdk/materialized_views_def.go
+++ b/pkg/sdk/materialized_views_def.go
@@ -175,7 +175,10 @@ var MaterializedViewsDef = g.NewInterface(
 			OptionalLike().
 			OptionalIn(),
 	).
-	ShowByIdOperation().
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDInFiltering,
+		g.ShowByIDLikeFiltering,
+	).
 	DescribeOperation(
 		g.DescriptionMappingKindSlice,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-materialized-view",
diff --git a/pkg/sdk/materialized_views_dto_builders_gen.go b/pkg/sdk/materialized_views_dto_builders_gen.go
index 5f8852b106..580497dea6 100644
--- a/pkg/sdk/materialized_views_dto_builders_gen.go
+++ b/pkg/sdk/materialized_views_dto_builders_gen.go
@@ -222,13 +222,13 @@ func NewShowMaterializedViewRequest() *ShowMaterializedViewRequest {
 	return &ShowMaterializedViewRequest{}
 }
 
-func (s *ShowMaterializedViewRequest) WithLike(Like *Like) *ShowMaterializedViewRequest {
-	s.Like = Like
+func (s *ShowMaterializedViewRequest) WithLike(Like Like) *ShowMaterializedViewRequest {
+	s.Like = &Like
 	return s
 }
 
-func (s *ShowMaterializedViewRequest) WithIn(In *In) *ShowMaterializedViewRequest {
-	s.In = In
+func (s *ShowMaterializedViewRequest) WithIn(In In) *ShowMaterializedViewRequest {
+	s.In = &In
 	return s
 }
 
diff --git a/pkg/sdk/materialized_views_impl_gen.go b/pkg/sdk/materialized_views_impl_gen.go
index 9f1393d30c..5700af27d0 100644
--- a/pkg/sdk/materialized_views_impl_gen.go
+++ b/pkg/sdk/materialized_views_impl_gen.go
@@ -39,7 +39,9 @@ func (v *materializedViews) Show(ctx context.Context, request *ShowMaterializedV
 }
 
 func (v *materializedViews) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*MaterializedView, error) {
-	request := NewShowMaterializedViewRequest().WithIn(&In{Schema: id.SchemaId()}).WithLike(&Like{String(id.Name())})
+	request := NewShowMaterializedViewRequest().
+		WithIn(In{Schema: id.SchemaId()}).
+		WithLike(Like{Pattern: String(id.Name())})
 	materializedViews, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
diff --git a/pkg/sdk/network_policies_def.go b/pkg/sdk/network_policies_def.go
index 77692c4ef5..05bf8dbb42 100644
--- a/pkg/sdk/network_policies_def.go
+++ b/pkg/sdk/network_policies_def.go
@@ -143,7 +143,9 @@ var (
 				SQL("NETWORK POLICIES").
 				OptionalLike(),
 		).
-		ShowByIdOperation().
+		ShowByIdOperationWithFiltering(
+			g.ShowByIDLikeFiltering,
+		).
 		DescribeOperation(
 			g.DescriptionMappingKindSlice,
 			"https://docs.snowflake.com/en/sql-reference/sql/desc-network-policy",
diff --git a/pkg/sdk/network_policies_impl_gen.go b/pkg/sdk/network_policies_impl_gen.go
index 950b9491e3..8571dacd17 100644
--- a/pkg/sdk/network_policies_impl_gen.go
+++ b/pkg/sdk/network_policies_impl_gen.go
@@ -38,7 +38,9 @@ func (v *networkPolicies) Show(ctx context.Context, request *ShowNetworkPolicyRe
 }
 
 func (v *networkPolicies) ShowByID(ctx context.Context, id AccountObjectIdentifier) (*NetworkPolicy, error) {
-	networkPolicies, err := v.Show(ctx, NewShowNetworkPolicyRequest().WithLike(Like{Pattern: String(id.Name())}))
+	request := NewShowNetworkPolicyRequest().
+		WithLike(Like{Pattern: String(id.Name())})
+	networkPolicies, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/network_rule_def.go b/pkg/sdk/network_rule_def.go
index 6e5bf918e7..5968bbadd5 100644
--- a/pkg/sdk/network_rule_def.go
+++ b/pkg/sdk/network_rule_def.go
@@ -108,7 +108,10 @@ var NetworkRuleDef = g.NewInterface(
 			OptionalStartsWith().
 			OptionalLimitFrom(),
 	).
-	ShowByIdOperation().
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDInFiltering,
+		g.ShowByIDLikeFiltering,
+	).
 	DescribeOperation(
 		g.DescriptionMappingKindSingleValue,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-network-rule",
diff --git a/pkg/sdk/network_rule_dto_builders_gen.go b/pkg/sdk/network_rule_dto_builders_gen.go
index 553e648568..ab5c2e930c 100644
--- a/pkg/sdk/network_rule_dto_builders_gen.go
+++ b/pkg/sdk/network_rule_dto_builders_gen.go
@@ -95,13 +95,13 @@ func NewShowNetworkRuleRequest() *ShowNetworkRuleRequest {
 	return &ShowNetworkRuleRequest{}
 }
 
-func (s *ShowNetworkRuleRequest) WithLike(Like *Like) *ShowNetworkRuleRequest {
-	s.Like = Like
+func (s *ShowNetworkRuleRequest) WithLike(Like Like) *ShowNetworkRuleRequest {
+	s.Like = &Like
 	return s
 }
 
-func (s *ShowNetworkRuleRequest) WithIn(In *In) *ShowNetworkRuleRequest {
-	s.In = In
+func (s *ShowNetworkRuleRequest) WithIn(In In) *ShowNetworkRuleRequest {
+	s.In = &In
 	return s
 }
 
diff --git a/pkg/sdk/network_rule_impl_gen.go b/pkg/sdk/network_rule_impl_gen.go
index a4f84e23ba..074376a37e 100644
--- a/pkg/sdk/network_rule_impl_gen.go
+++ b/pkg/sdk/network_rule_impl_gen.go
@@ -39,11 +39,10 @@ func (v *networkRules) Show(ctx context.Context, request *ShowNetworkRuleRequest
 }
 
 func (v *networkRules) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*NetworkRule, error) {
-	networkRules, err := v.Show(ctx, NewShowNetworkRuleRequest().WithIn(&In{
-		Schema: id.SchemaId(),
-	}).WithLike(&Like{
-		Pattern: String(id.Name()),
-	}))
+	request := NewShowNetworkRuleRequest().
+		WithIn(In{Schema: id.SchemaId()}).
+		WithLike(Like{Pattern: String(id.Name())})
+	networkRules, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/notification_integrations_def.go b/pkg/sdk/notification_integrations_def.go
index 5af67bc681..23b6a80e1d 100644
--- a/pkg/sdk/notification_integrations_def.go
+++ b/pkg/sdk/notification_integrations_def.go
@@ -181,7 +181,9 @@ var NotificationIntegrationsDef = g.NewInterface(
 			SQL("NOTIFICATION INTEGRATIONS").
 			OptionalLike(),
 	).
-	ShowByIdOperation().
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDLikeFiltering,
+	).
 	DescribeOperation(
 		g.DescriptionMappingKindSlice,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-integration",
diff --git a/pkg/sdk/notification_integrations_dto_builders_gen.go b/pkg/sdk/notification_integrations_dto_builders_gen.go
index e7f8584b3e..a68b38b6fb 100644
--- a/pkg/sdk/notification_integrations_dto_builders_gen.go
+++ b/pkg/sdk/notification_integrations_dto_builders_gen.go
@@ -2,8 +2,6 @@
 
 package sdk
 
-import ()
-
 func NewCreateNotificationIntegrationRequest(
 	name AccountObjectIdentifier,
 	Enabled bool,
@@ -275,8 +273,8 @@ func NewShowNotificationIntegrationRequest() *ShowNotificationIntegrationRequest
 	return &ShowNotificationIntegrationRequest{}
 }
 
-func (s *ShowNotificationIntegrationRequest) WithLike(Like *Like) *ShowNotificationIntegrationRequest {
-	s.Like = Like
+func (s *ShowNotificationIntegrationRequest) WithLike(Like Like) *ShowNotificationIntegrationRequest {
+	s.Like = &Like
 	return s
 }
 
diff --git a/pkg/sdk/notification_integrations_impl_gen.go b/pkg/sdk/notification_integrations_impl_gen.go
index aaf5f38433..5859ab27a1 100644
--- a/pkg/sdk/notification_integrations_impl_gen.go
+++ b/pkg/sdk/notification_integrations_impl_gen.go
@@ -38,9 +38,9 @@ func (v *notificationIntegrations) Show(ctx context.Context, request *ShowNotifi
 }
 
 func (v *notificationIntegrations) ShowByID(ctx context.Context, id AccountObjectIdentifier) (*NotificationIntegration, error) {
-	notificationIntegrations, err := v.Show(ctx, NewShowNotificationIntegrationRequest().WithLike(&Like{
-		Pattern: String(id.Name()),
-	}))
+	request := NewShowNotificationIntegrationRequest().
+		WithLike(Like{Pattern: String(id.Name())})
+	notificationIntegrations, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/parameters.go b/pkg/sdk/parameters.go
index 377d46a5fd..aea226a018 100644
--- a/pkg/sdk/parameters.go
+++ b/pkg/sdk/parameters.go
@@ -66,6 +66,8 @@ func (parameters *parameters) SetAccountParameter(ctx context.Context, parameter
 			return fmt.Errorf("CLIENT_ENCRYPTION_KEY_SIZE session parameter is an integer, got %v", value)
 		}
 		opts.Set.Parameters.AccountParameters.ClientEncryptionKeySize = Pointer(v)
+	case AccountParameterCortexEnabledCrossRegion:
+		opts.Set.Parameters.AccountParameters.CortexEnabledCrossRegion = &value
 	case AccountParameterEnableIdentifierFirstLogin:
 		b, err := parseBooleanParameter(string(parameter), value)
 		if err != nil {
@@ -78,6 +80,12 @@ func (parameters *parameters) SetAccountParameter(ctx context.Context, parameter
 			return err
 		}
 		opts.Set.Parameters.AccountParameters.AllowIDToken = b
+	case AccountParameterEnablePersonalDatabase:
+		b, err := parseBooleanParameter(string(parameter), value)
+		if err != nil {
+			return err
+		}
+		opts.Set.Parameters.AccountParameters.EnablePersonalDatabase = b
 	case AccountParameterEnableTriSecretAndRekeyOptOutForImageRepository:
 		b, err := parseBooleanParameter(string(parameter), value)
 		if err != nil {
@@ -90,6 +98,18 @@ func (parameters *parameters) SetAccountParameter(ctx context.Context, parameter
 			return err
 		}
 		opts.Set.Parameters.AccountParameters.EnableTriSecretAndRekeyOptOutForSpcsBlockStorage = b
+	case AccountParameterEnableUnhandledExceptionsReporting:
+		b, err := parseBooleanParameter(string(parameter), value)
+		if err != nil {
+			return err
+		}
+		opts.Set.Parameters.AccountParameters.EnableUnhandledExceptionsReporting = b
+	case AccountParameterEnforceNetworkRulesForInternalStages:
+		b, err := parseBooleanParameter(string(parameter), value)
+		if err != nil {
+			return err
+		}
+		opts.Set.Parameters.AccountParameters.EnforceNetworkRulesForInternalStages = b
 	case AccountParameterEventTable:
 		opts.Set.Parameters.AccountParameters.EventTable = &value
 	case AccountParameterEnableUnredactedQuerySyntaxError:
@@ -105,12 +125,7 @@ func (parameters *parameters) SetAccountParameter(ctx context.Context, parameter
 		}
 		opts.Set.Parameters.AccountParameters.ExternalOAuthAddPrivilegedRolesToBlockedList = b
 	case AccountParameterInitialReplicationSizeLimitInTB:
-		v, err := strconv.ParseFloat(value, 64)
-		if err != nil {
-			return fmt.Errorf("INITIAL_REPLICATION_SIZE_LIMIT_IN_TB session parameter is an integer, got %v", value)
-		}
-		opts.Set.Parameters.AccountParameters.InitialReplicationSizeLimitInTB = Pointer(v)
-
+		opts.Set.Parameters.AccountParameters.InitialReplicationSizeLimitInTB = &value
 	case AccountParameterMinDataRetentionTimeInDays:
 		v, err := strconv.Atoi(value)
 		if err != nil {
@@ -176,7 +191,7 @@ func (parameters *parameters) SetAccountParameter(ctx context.Context, parameter
 	return nil
 }
 
-// TODO(next pr): add integration tests
+// TODO(SNOW-1866453): add integration tests
 func (parameters *parameters) UnsetAccountParameter(ctx context.Context, parameter AccountParameter) error {
 	opts := AlterAccountOptions{
 		Unset: &AccountUnset{
@@ -192,6 +207,8 @@ func (parameters *parameters) UnsetAccountParameter(ctx context.Context, paramet
 		opts.Unset.Parameters.AccountParameters.AllowIDToken = Pointer(true)
 	case AccountParameterClientEncryptionKeySize:
 		opts.Unset.Parameters.AccountParameters.ClientEncryptionKeySize = Pointer(true)
+	case AccountParameterCortexEnabledCrossRegion:
+		opts.Unset.Parameters.AccountParameters.CortexEnabledCrossRegion = Pointer(true)
 	case AccountParameterEnableIdentifierFirstLogin:
 		opts.Unset.Parameters.AccountParameters.EnableIdentifierFirstLogin = Pointer(true)
 	case AccountParameterEnableInternalStagesPrivatelink:
@@ -200,8 +217,14 @@ func (parameters *parameters) UnsetAccountParameter(ctx context.Context, paramet
 		opts.Unset.Parameters.AccountParameters.EnableTriSecretAndRekeyOptOutForImageRepository = Pointer(true)
 	case AccountParameterEnableTriSecretAndRekeyOptOutForSpcsBlockStorage:
 		opts.Unset.Parameters.AccountParameters.EnableTriSecretAndRekeyOptOutForSpcsBlockStorage = Pointer(true)
+	case AccountParameterEnablePersonalDatabase:
+		opts.Unset.Parameters.AccountParameters.EnablePersonalDatabase = Pointer(true)
+	case AccountParameterEnableUnhandledExceptionsReporting:
+		opts.Unset.Parameters.AccountParameters.EnableUnhandledExceptionsReporting = Pointer(true)
 	case AccountParameterEnableUnredactedQuerySyntaxError:
 		opts.Unset.Parameters.AccountParameters.EnableUnredactedQuerySyntaxError = Pointer(true)
+	case AccountParameterEnforceNetworkRulesForInternalStages:
+		opts.Unset.Parameters.AccountParameters.EnforceNetworkRulesForInternalStages = Pointer(true)
 	case AccountParameterEventTable:
 		opts.Unset.Parameters.AccountParameters.EventTable = Pointer(true)
 	case AccountParameterExternalOAuthAddPrivilegedRolesToBlockedList:
@@ -290,7 +313,7 @@ func (parameters *parameters) SetObjectParameterOnAccount(ctx context.Context, p
 	case ObjectParameterDataRetentionTimeInDays:
 		v, err := strconv.Atoi(value)
 		if err != nil {
-			return fmt.Errorf("DATA_RETENTION_TIME_IN_DAYS session parameter is an integer, got %v", value)
+			return fmt.Errorf("DATA_RETENTION_TIME_IN_DAYS object parameter is an integer, got %v", value)
 		}
 		opts.Set.Parameters.ObjectParameters.DataRetentionTimeInDays = Pointer(v)
 	case ObjectParameterDefaultDDLCollation:
@@ -300,13 +323,13 @@ func (parameters *parameters) SetObjectParameterOnAccount(ctx context.Context, p
 	case ObjectParameterMaxConcurrencyLevel:
 		v, err := strconv.Atoi(value)
 		if err != nil {
-			return fmt.Errorf("MAX_CONCURRENCY_LEVEL session parameter is an integer, got %v", value)
+			return fmt.Errorf("MAX_CONCURRENCY_LEVEL object parameter is an integer, got %v", value)
 		}
 		opts.Set.Parameters.ObjectParameters.MaxConcurrencyLevel = Pointer(v)
 	case ObjectParameterMaxDataExtensionTimeInDays:
 		v, err := strconv.Atoi(value)
 		if err != nil {
-			return fmt.Errorf("MAX_DATA_EXTENSION_TIME_IN_DAYS session parameter is an integer, got %v", value)
+			return fmt.Errorf("MAX_DATA_EXTENSION_TIME_IN_DAYS object parameter is an integer, got %v", value)
 		}
 		opts.Set.Parameters.ObjectParameters.MaxDataExtensionTimeInDays = Pointer(v)
 	case ObjectParameterPipeExecutionPaused:
@@ -324,13 +347,13 @@ func (parameters *parameters) SetObjectParameterOnAccount(ctx context.Context, p
 	case ObjectParameterStatementQueuedTimeoutInSeconds:
 		v, err := strconv.Atoi(value)
 		if err != nil {
-			return fmt.Errorf("STATEMENT_QUEUED_TIMEOUT_IN_SECONDS session parameter is an integer, got %v", value)
+			return fmt.Errorf("STATEMENT_QUEUED_TIMEOUT_IN_SECONDS object parameter is an integer, got %v", value)
 		}
 		opts.Set.Parameters.ObjectParameters.StatementQueuedTimeoutInSeconds = Pointer(v)
 	case ObjectParameterStatementTimeoutInSeconds:
 		v, err := strconv.Atoi(value)
 		if err != nil {
-			return fmt.Errorf("STATEMENT_TIMEOUT_IN_SECONDS session parameter is an integer, got %v", value)
+			return fmt.Errorf("STATEMENT_TIMEOUT_IN_SECONDS object parameter is an integer, got %v", value)
 		}
 		opts.Set.Parameters.ObjectParameters.StatementTimeoutInSeconds = Pointer(v)
 	case ObjectParameterNetworkPolicy:
@@ -341,12 +364,20 @@ func (parameters *parameters) SetObjectParameterOnAccount(ctx context.Context, p
 			return err
 		}
 		opts.Set.Parameters.ObjectParameters.ShareRestrictions = b
+	case ObjectParameterStorageSerializationPolicy:
+		opts.Set.Parameters.ObjectParameters.StorageSerializationPolicy = &value
 	case ObjectParameterSuspendTaskAfterNumFailures:
 		v, err := strconv.Atoi(value)
 		if err != nil {
-			return fmt.Errorf("SUSPEND_TASK_AFTER_NUM_FAILURES session parameter is an integer, got %v", value)
+			return fmt.Errorf("SUSPEND_TASK_AFTER_NUM_FAILURES object parameter is an integer, got %v", value)
 		}
 		opts.Set.Parameters.ObjectParameters.SuspendTaskAfterNumFailures = Pointer(v)
+	case ObjectParameterTaskAutoRetryAttempts:
+		v, err := strconv.Atoi(value)
+		if err != nil {
+			return fmt.Errorf("TASK_AUTO_RETRY_ATTEMPTS object parameter is an integer, got %v", value)
+		}
+		opts.Set.Parameters.ObjectParameters.TaskAutoRetryAttempts = Pointer(v)
 	case ObjectParameterTraceLevel:
 		opts.Set.Parameters.ObjectParameters.TraceLevel = Pointer(TraceLevel(value))
 	case ObjectParameterUserTaskManagedInitialWarehouseSize:
@@ -354,7 +385,7 @@ func (parameters *parameters) SetObjectParameterOnAccount(ctx context.Context, p
 	case ObjectParameterUserTaskTimeoutMs:
 		v, err := strconv.Atoi(value)
 		if err != nil {
-			return fmt.Errorf("USER_TASK_TIMEOUT_MS session parameter is an integer, got %v", value)
+			return fmt.Errorf("USER_TASK_TIMEOUT_MS object parameter is an integer, got %v", value)
 		}
 		opts.Set.Parameters.ObjectParameters.UserTaskTimeoutMs = Pointer(v)
 	case ObjectParameterEnableUnredactedQuerySyntaxError:
@@ -402,8 +433,12 @@ func (parameters *parameters) UnsetObjectParameterOnAccount(ctx context.Context,
 		opts.Unset.Parameters.ObjectParameters.NetworkPolicy = Pointer(true)
 	case ObjectParameterShareRestrictions:
 		opts.Unset.Parameters.ObjectParameters.ShareRestrictions = Pointer(true)
+	case ObjectParameterStorageSerializationPolicy:
+		opts.Unset.Parameters.ObjectParameters.StorageSerializationPolicy = Pointer(true)
 	case ObjectParameterSuspendTaskAfterNumFailures:
 		opts.Unset.Parameters.ObjectParameters.SuspendTaskAfterNumFailures = Pointer(true)
+	case ObjectParameterTaskAutoRetryAttempts:
+		opts.Unset.Parameters.ObjectParameters.TaskAutoRetryAttempts = Pointer(true)
 	case ObjectParameterTraceLevel:
 		opts.Unset.Parameters.ObjectParameters.TraceLevel = Pointer(true)
 	case ObjectParameterUserTaskManagedInitialWarehouseSize:
@@ -465,15 +500,17 @@ type AccountParameter string
 // https://docs.snowflake.com/en/sql-reference/parameters#parameter-hierarchy-and-types
 // Account Parameters include Session Parameters, Object Parameters and User Parameters
 const (
-	// TODO(next pr): add remaining parameters; also in parameters_impl.go
 	// Account Parameters
 	AccountParameterAllowClientMFACaching                            AccountParameter = "ALLOW_CLIENT_MFA_CACHING"
 	AccountParameterAllowIDToken                                     AccountParameter = "ALLOW_ID_TOKEN" // #nosec G101
 	AccountParameterClientEncryptionKeySize                          AccountParameter = "CLIENT_ENCRYPTION_KEY_SIZE"
+	AccountParameterCortexEnabledCrossRegion                         AccountParameter = "CORTEX_ENABLED_CROSS_REGION"
 	AccountParameterEnableIdentifierFirstLogin                       AccountParameter = "ENABLE_IDENTIFIER_FIRST_LOGIN"
 	AccountParameterEnableInternalStagesPrivatelink                  AccountParameter = "ENABLE_INTERNAL_STAGES_PRIVATELINK"
 	AccountParameterEnableTriSecretAndRekeyOptOutForImageRepository  AccountParameter = "ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_IMAGE_REPOSITORY"   // #nosec G101
 	AccountParameterEnableTriSecretAndRekeyOptOutForSpcsBlockStorage AccountParameter = "ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_SPCS_BLOCK_STORAGE" // #nosec G101
+	AccountParameterEnableUnhandledExceptionsReporting               AccountParameter = "ENABLE_UNHANDLED_EXCEPTIONS_REPORTING"
+	AccountParameterEnforceNetworkRulesForInternalStages             AccountParameter = "ENFORCE_NETWORK_RULES_FOR_INTERNAL_STAGES"
 	AccountParameterEventTable                                       AccountParameter = "EVENT_TABLE"
 	AccountParameterExternalOAuthAddPrivilegedRolesToBlockedList     AccountParameter = "EXTERNAL_OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST"
 	AccountParameterInitialReplicationSizeLimitInTB                  AccountParameter = "INITIAL_REPLICATION_SIZE_LIMIT_IN_TB"
@@ -483,16 +520,17 @@ const (
 	AccountParameterPeriodicDataRekeying                             AccountParameter = "PERIODIC_DATA_REKEYING"
 	AccountParameterPreventLoadFromInlineURL                         AccountParameter = "PREVENT_LOAD_FROM_INLINE_URL"
 	AccountParameterPreventUnloadToInlineURL                         AccountParameter = "PREVENT_UNLOAD_TO_INLINE_URL"
-	AccountParameterPreventUnloadToInternalStages                    AccountParameter = "PREVENT_UNLOAD_TO_INTERNAL_STAGES"
 	AccountParameterRequireStorageIntegrationForStageCreation        AccountParameter = "REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_CREATION"
 	AccountParameterRequireStorageIntegrationForStageOperation       AccountParameter = "REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_OPERATION"
 	AccountParameterSSOLoginPage                                     AccountParameter = "SSO_LOGIN_PAGE"
 
 	// Session Parameters (inherited)
 	AccountParameterAbortDetachedQuery                       AccountParameter = "ABORT_DETACHED_QUERY"
+	AccountParameterActivePythonProfiler                     AccountParameter = "ACTIVE_PYTHON_PROFILER"
 	AccountParameterAutocommit                               AccountParameter = "AUTOCOMMIT"
 	AccountParameterBinaryInputFormat                        AccountParameter = "BINARY_INPUT_FORMAT"
 	AccountParameterBinaryOutputFormat                       AccountParameter = "BINARY_OUTPUT_FORMAT"
+	AccountParameterClientEnableLogInfoStatementParameters   AccountParameter = "CLIENT_ENABLE_LOG_INFO_STATEMENT_PARAMETERS"
 	AccountParameterClientMemoryLimit                        AccountParameter = "CLIENT_MEMORY_LIMIT"
 	AccountParameterClientMetadataRequestUseConnectionCtx    AccountParameter = "CLIENT_METADATA_REQUEST_USE_CONNECTION_CTX"
 	AccountParameterClientMetadataUseSessionDatabase         AccountParameter = "CLIENT_METADATA_USE_SESSION_DATABASE"
@@ -502,6 +540,7 @@ const (
 	AccountParameterClientSessionKeepAlive                   AccountParameter = "CLIENT_SESSION_KEEP_ALIVE"
 	AccountParameterClientSessionKeepAliveHeartbeatFrequency AccountParameter = "CLIENT_SESSION_KEEP_ALIVE_HEARTBEAT_FREQUENCY"
 	AccountParameterClientTimestampTypeMapping               AccountParameter = "CLIENT_TIMESTAMP_TYPE_MAPPING"
+	AccountParameterCsvTimestampFormat                       AccountParameter = "CSV_TIMESTAMP_FORMAT"
 	AccountParameterDateInputFormat                          AccountParameter = "DATE_INPUT_FORMAT"
 	AccountParameterDateOutputFormat                         AccountParameter = "DATE_OUTPUT_FORMAT"
 	AccountParameterEnableUnloadPhysicalTypeOptimization     AccountParameter = "ENABLE_UNLOAD_PHYSICAL_TYPE_OPTIMIZATION"
@@ -509,22 +548,25 @@ const (
 	AccountParameterErrorOnNondeterministicUpdate            AccountParameter = "ERROR_ON_NONDETERMINISTIC_UPDATE"
 	AccountParameterGeographyOutputFormat                    AccountParameter = "GEOGRAPHY_OUTPUT_FORMAT"
 	AccountParameterGeometryOutputFormat                     AccountParameter = "GEOMETRY_OUTPUT_FORMAT"
+	AccountParameterHybridTableLockTimeout                   AccountParameter = "HYBRID_TABLE_LOCK_TIMEOUT"
 	AccountParameterJdbcTreatDecimalAsInt                    AccountParameter = "JDBC_TREAT_DECIMAL_AS_INT"
 	AccountParameterJdbcTreatTimestampNtzAsUtc               AccountParameter = "JDBC_TREAT_TIMESTAMP_NTZ_AS_UTC"
 	AccountParameterJdbcUseSessionTimezone                   AccountParameter = "JDBC_USE_SESSION_TIMEZONE"
-	AccountParameterJSONIndent                               AccountParameter = "JSON_INDENT"
+	AccountParameterJsonIndent                               AccountParameter = "JSON_INDENT"
+	AccountParameterJsTreatIntegerAsBigInt                   AccountParameter = "JS_TREAT_INTEGER_AS_BIGINT"
 	AccountParameterLockTimeout                              AccountParameter = "LOCK_TIMEOUT"
 	AccountParameterMultiStatementCount                      AccountParameter = "MULTI_STATEMENT_COUNT"
 	AccountParameterNoorderSequenceAsDefault                 AccountParameter = "NOORDER_SEQUENCE_AS_DEFAULT"
 	AccountParameterOdbcTreatDecimalAsInt                    AccountParameter = "ODBC_TREAT_DECIMAL_AS_INT"
+	AccountParameterPythonProfilerModules                    AccountParameter = "PYTHON_PROFILER_MODULES"
+	AccountParameterPythonProfilerTargetStage                AccountParameter = "PYTHON_PROFILER_TARGET_STAGE"
 	AccountParameterQueryTag                                 AccountParameter = "QUERY_TAG"
 	AccountParameterQuotedIdentifiersIgnoreCase              AccountParameter = "QUOTED_IDENTIFIERS_IGNORE_CASE"
 	AccountParameterRowsPerResultset                         AccountParameter = "ROWS_PER_RESULTSET"
 	AccountParameterS3StageVpceDnsName                       AccountParameter = "S3_STAGE_VPCE_DNS_NAME"
 	AccountParameterSearchPath                               AccountParameter = "SEARCH_PATH"
 	AccountParameterSimulatedDataSharingConsumer             AccountParameter = "SIMULATED_DATA_SHARING_CONSUMER"
-	AccountParameterStatementTimeoutInSeconds                AccountParameter = "STATEMENT_TIMEOUT_IN_SECONDS"
-	AccountParameterStrictJSONOutput                         AccountParameter = "STRICT_JSON_OUTPUT"
+	AccountParameterStrictJsonOutput                         AccountParameter = "STRICT_JSON_OUTPUT"
 	AccountParameterTimeInputFormat                          AccountParameter = "TIME_INPUT_FORMAT"
 	AccountParameterTimeOutputFormat                         AccountParameter = "TIME_OUTPUT_FORMAT"
 	AccountParameterTimestampDayIsAlways24h                  AccountParameter = "TIMESTAMP_DAY_IS_ALWAYS_24H"
@@ -554,6 +596,7 @@ const (
 	AccountParameterPipeExecutionPaused                     AccountParameter = "PIPE_EXECUTION_PAUSED"
 	AccountParameterReplaceInvalidCharacters                AccountParameter = "REPLACE_INVALID_CHARACTERS"
 	AccountParameterStatementQueuedTimeoutInSeconds         AccountParameter = "STATEMENT_QUEUED_TIMEOUT_IN_SECONDS"
+	AccountParameterStatementTimeoutInSeconds               AccountParameter = "STATEMENT_TIMEOUT_IN_SECONDS"
 	AccountParameterStorageSerializationPolicy              AccountParameter = "STORAGE_SERIALIZATION_POLICY"
 	AccountParameterShareRestrictions                       AccountParameter = "SHARE_RESTRICTIONS"
 	AccountParameterSuspendTaskAfterNumFailures             AccountParameter = "SUSPEND_TASK_AFTER_NUM_FAILURES"
@@ -566,17 +609,22 @@ const (
 	AccountParameterEnableConsoleOutput                     AccountParameter = "ENABLE_CONSOLE_OUTPUT"
 
 	// User Parameters (inherited)
+	AccountParameterEnablePersonalDatabase           AccountParameter = "ENABLE_PERSONAL_DATABASE"
 	AccountParameterEnableUnredactedQuerySyntaxError AccountParameter = "ENABLE_UNREDACTED_QUERY_SYNTAX_ERROR"
+	AccountParameterPreventUnloadToInternalStages    AccountParameter = "PREVENT_UNLOAD_TO_INTERNAL_STAGES"
 )
 
 var AllAccountParameters = []AccountParameter{
 	AccountParameterAllowClientMFACaching,
 	AccountParameterAllowIDToken,
 	AccountParameterClientEncryptionKeySize,
+	AccountParameterCortexEnabledCrossRegion,
 	AccountParameterEnableIdentifierFirstLogin,
 	AccountParameterEnableInternalStagesPrivatelink,
 	AccountParameterEnableTriSecretAndRekeyOptOutForImageRepository,
 	AccountParameterEnableTriSecretAndRekeyOptOutForSpcsBlockStorage,
+	AccountParameterEnableUnhandledExceptionsReporting,
+	AccountParameterEnforceNetworkRulesForInternalStages,
 	AccountParameterEventTable,
 	AccountParameterExternalOAuthAddPrivilegedRolesToBlockedList,
 	AccountParameterInitialReplicationSizeLimitInTB,
@@ -586,14 +634,16 @@ var AllAccountParameters = []AccountParameter{
 	AccountParameterPeriodicDataRekeying,
 	AccountParameterPreventLoadFromInlineURL,
 	AccountParameterPreventUnloadToInlineURL,
-	AccountParameterPreventUnloadToInternalStages,
 	AccountParameterRequireStorageIntegrationForStageCreation,
 	AccountParameterRequireStorageIntegrationForStageOperation,
 	AccountParameterSSOLoginPage,
+
 	AccountParameterAbortDetachedQuery,
+	AccountParameterActivePythonProfiler,
 	AccountParameterAutocommit,
 	AccountParameterBinaryInputFormat,
 	AccountParameterBinaryOutputFormat,
+	AccountParameterClientEnableLogInfoStatementParameters,
 	AccountParameterClientMemoryLimit,
 	AccountParameterClientMetadataRequestUseConnectionCtx,
 	AccountParameterClientMetadataUseSessionDatabase,
@@ -604,20 +654,25 @@ var AllAccountParameters = []AccountParameter{
 	AccountParameterClientTimestampTypeMapping,
 	AccountParameterEnableUnloadPhysicalTypeOptimization,
 	AccountParameterClientResultColumnCaseInsensitive,
+	AccountParameterCsvTimestampFormat,
 	AccountParameterDateInputFormat,
 	AccountParameterDateOutputFormat,
 	AccountParameterErrorOnNondeterministicMerge,
 	AccountParameterErrorOnNondeterministicUpdate,
 	AccountParameterGeographyOutputFormat,
 	AccountParameterGeometryOutputFormat,
+	AccountParameterHybridTableLockTimeout,
 	AccountParameterJdbcTreatDecimalAsInt,
 	AccountParameterJdbcTreatTimestampNtzAsUtc,
 	AccountParameterJdbcUseSessionTimezone,
-	AccountParameterJSONIndent,
+	AccountParameterJsonIndent,
+	AccountParameterJsTreatIntegerAsBigInt,
 	AccountParameterLockTimeout,
 	AccountParameterMultiStatementCount,
 	AccountParameterNoorderSequenceAsDefault,
 	AccountParameterOdbcTreatDecimalAsInt,
+	AccountParameterPythonProfilerModules,
+	AccountParameterPythonProfilerTargetStage,
 	AccountParameterQueryTag,
 	AccountParameterQuotedIdentifiersIgnoreCase,
 	AccountParameterRowsPerResultset,
@@ -625,7 +680,7 @@ var AllAccountParameters = []AccountParameter{
 	AccountParameterSearchPath,
 	AccountParameterSimulatedDataSharingConsumer,
 	AccountParameterStatementTimeoutInSeconds,
-	AccountParameterStrictJSONOutput,
+	AccountParameterStrictJsonOutput,
 	AccountParameterTimeInputFormat,
 	AccountParameterTimeOutputFormat,
 	AccountParameterTimestampDayIsAlways24h,
@@ -643,6 +698,7 @@ var AllAccountParameters = []AccountParameter{
 	AccountParameterUseCachedResult,
 	AccountParameterWeekOfYearPolicy,
 	AccountParameterWeekStart,
+
 	AccountParameterCatalog,
 	AccountParameterDataRetentionTimeInDays,
 	AccountParameterDefaultDDLCollation,
@@ -665,6 +721,7 @@ var AllAccountParameters = []AccountParameter{
 	AccountParameterMetricLevel,
 	AccountParameterEnableConsoleOutput,
 	AccountParameterEnableUnredactedQuerySyntaxError,
+	AccountParameterEnablePersonalDatabase,
 }
 
 func ToAccountParameter(s string) (AccountParameter, error) {
@@ -679,9 +736,11 @@ type SessionParameter string
 
 const (
 	SessionParameterAbortDetachedQuery                       SessionParameter = "ABORT_DETACHED_QUERY"
+	SessionParameterActivePythonProfiler                     SessionParameter = "ACTIVE_PYTHON_PROFILER"
 	SessionParameterAutocommit                               SessionParameter = "AUTOCOMMIT"
 	SessionParameterBinaryInputFormat                        SessionParameter = "BINARY_INPUT_FORMAT"
 	SessionParameterBinaryOutputFormat                       SessionParameter = "BINARY_OUTPUT_FORMAT"
+	SessionParameterClientEnableLogInfoStatementParameters   SessionParameter = "CLIENT_ENABLE_LOG_INFO_STATEMENT_PARAMETERS"
 	SessionParameterClientMemoryLimit                        SessionParameter = "CLIENT_MEMORY_LIMIT"
 	SessionParameterClientMetadataRequestUseConnectionCtx    SessionParameter = "CLIENT_METADATA_REQUEST_USE_CONNECTION_CTX"
 	SessionParameterClientPrefetchThreads                    SessionParameter = "CLIENT_PREFETCH_THREADS"
@@ -691,6 +750,7 @@ const (
 	SessionParameterClientSessionKeepAlive                   SessionParameter = "CLIENT_SESSION_KEEP_ALIVE"
 	SessionParameterClientSessionKeepAliveHeartbeatFrequency SessionParameter = "CLIENT_SESSION_KEEP_ALIVE_HEARTBEAT_FREQUENCY"
 	SessionParameterClientTimestampTypeMapping               SessionParameter = "CLIENT_TIMESTAMP_TYPE_MAPPING"
+	SessionParameterCsvTimestampFormat                       SessionParameter = "CSV_TIMESTAMP_FORMAT"
 	SessionParameterDateInputFormat                          SessionParameter = "DATE_INPUT_FORMAT"
 	SessionParameterDateOutputFormat                         SessionParameter = "DATE_OUTPUT_FORMAT"
 	SessionParameterEnableUnloadPhysicalTypeOptimization     SessionParameter = "ENABLE_UNLOAD_PHYSICAL_TYPE_OPTIMIZATION"
@@ -698,15 +758,19 @@ const (
 	SessionParameterErrorOnNondeterministicUpdate            SessionParameter = "ERROR_ON_NONDETERMINISTIC_UPDATE"
 	SessionParameterGeographyOutputFormat                    SessionParameter = "GEOGRAPHY_OUTPUT_FORMAT"
 	SessionParameterGeometryOutputFormat                     SessionParameter = "GEOMETRY_OUTPUT_FORMAT"
+	SessionParameterHybridTableLockTimeout                   SessionParameter = "HYBRID_TABLE_LOCK_TIMEOUT"
 	SessionParameterJdbcTreatDecimalAsInt                    SessionParameter = "JDBC_TREAT_DECIMAL_AS_INT"
 	SessionParameterJdbcTreatTimestampNtzAsUtc               SessionParameter = "JDBC_TREAT_TIMESTAMP_NTZ_AS_UTC"
 	SessionParameterJdbcUseSessionTimezone                   SessionParameter = "JDBC_USE_SESSION_TIMEZONE"
-	SessionParameterJSONIndent                               SessionParameter = "JSON_INDENT"
+	SessionParameterJsonIndent                               SessionParameter = "JSON_INDENT"
+	SessionParameterJsTreatIntegerAsBigInt                   SessionParameter = "JS_TREAT_INTEGER_AS_BIGINT"
 	SessionParameterLockTimeout                              SessionParameter = "LOCK_TIMEOUT"
 	SessionParameterLogLevel                                 SessionParameter = "LOG_LEVEL"
 	SessionParameterMultiStatementCount                      SessionParameter = "MULTI_STATEMENT_COUNT"
 	SessionParameterNoorderSequenceAsDefault                 SessionParameter = "NOORDER_SEQUENCE_AS_DEFAULT"
 	SessionParameterOdbcTreatDecimalAsInt                    SessionParameter = "ODBC_TREAT_DECIMAL_AS_INT"
+	SessionParameterPythonProfilerModules                    SessionParameter = "PYTHON_PROFILER_MODULES"
+	SessionParameterPythonProfilerTargetStage                SessionParameter = "PYTHON_PROFILER_TARGET_STAGE"
 	SessionParameterQueryTag                                 SessionParameter = "QUERY_TAG"
 	SessionParameterQuotedIdentifiersIgnoreCase              SessionParameter = "QUOTED_IDENTIFIERS_IGNORE_CASE"
 	SessionParameterRowsPerResultset                         SessionParameter = "ROWS_PER_RESULTSET"
@@ -715,7 +779,7 @@ const (
 	SessionParameterSimulatedDataSharingConsumer             SessionParameter = "SIMULATED_DATA_SHARING_CONSUMER"
 	SessionParameterStatementQueuedTimeoutInSeconds          SessionParameter = "STATEMENT_QUEUED_TIMEOUT_IN_SECONDS"
 	SessionParameterStatementTimeoutInSeconds                SessionParameter = "STATEMENT_TIMEOUT_IN_SECONDS"
-	SessionParameterStrictJSONOutput                         SessionParameter = "STRICT_JSON_OUTPUT"
+	SessionParameterStrictJsonOutput                         SessionParameter = "STRICT_JSON_OUTPUT"
 	SessionParameterTimestampDayIsAlways24h                  SessionParameter = "TIMESTAMP_DAY_IS_ALWAYS_24H"
 	SessionParameterTimestampInputFormat                     SessionParameter = "TIMESTAMP_INPUT_FORMAT"
 	SessionParameterTimestampLTZOutputFormat                 SessionParameter = "TIMESTAMP_LTZ_OUTPUT_FORMAT"
@@ -1111,44 +1175,50 @@ var AllProcedureParameters = []ProcedureParameter{
 // AccountParameters is based on https://docs.snowflake.com/en/sql-reference/parameters#account-parameters.
 type AccountParameters struct {
 	// Account Parameters
-	AllowClientMFACaching                            *bool    `ddl:"parameter" sql:"ALLOW_CLIENT_MFA_CACHING"`
-	AllowIDToken                                     *bool    `ddl:"parameter" sql:"ALLOW_ID_TOKEN"`
-	ClientEncryptionKeySize                          *int     `ddl:"parameter" sql:"CLIENT_ENCRYPTION_KEY_SIZE"`
-	EnableIdentifierFirstLogin                       *bool    `ddl:"parameter" sql:"ENABLE_IDENTIFIER_FIRST_LOGIN"`
-	EnableInternalStagesPrivatelink                  *bool    `ddl:"parameter" sql:"ENABLE_INTERNAL_STAGES_PRIVATELINK"`
-	EnableUnredactedQuerySyntaxError                 *bool    `ddl:"parameter" sql:"ENABLE_UNREDACTED_QUERY_SYNTAX_ERROR"`
-	EnableTriSecretAndRekeyOptOutForImageRepository  *bool    `ddl:"parameter" sql:"ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_IMAGE_REPOSITORY"`
-	EnableTriSecretAndRekeyOptOutForSpcsBlockStorage *bool    `ddl:"parameter" sql:"ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_SPCS_BLOCK_STORAGE"`
-	EventTable                                       *string  `ddl:"parameter,single_quotes" sql:"EVENT_TABLE"`
-	ExternalOAuthAddPrivilegedRolesToBlockedList     *bool    `ddl:"parameter" sql:"EXTERNAL_OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST"`
-	InitialReplicationSizeLimitInTB                  *float64 `ddl:"parameter" sql:"INITIAL_REPLICATION_SIZE_LIMIT_IN_TB"`
-	MinDataRetentionTimeInDays                       *int     `ddl:"parameter" sql:"MIN_DATA_RETENTION_TIME_IN_DAYS"`
-	NetworkPolicy                                    *string  `ddl:"parameter,single_quotes" sql:"NETWORK_POLICY"`
-	OAuthAddPrivilegedRolesToBlockedList             *bool    `ddl:"parameter" sql:"OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST"`
-	PeriodicDataRekeying                             *bool    `ddl:"parameter" sql:"PERIODIC_DATA_REKEYING"`
-	PreventLoadFromInlineURL                         *bool    `ddl:"parameter" sql:"PREVENT_LOAD_FROM_INLINE_URL"`
-	PreventUnloadToInlineURL                         *bool    `ddl:"parameter" sql:"PREVENT_UNLOAD_TO_INLINE_URL"`
-	PreventUnloadToInternalStages                    *bool    `ddl:"parameter" sql:"PREVENT_UNLOAD_TO_INTERNAL_STAGES"`
-	RequireStorageIntegrationForStageCreation        *bool    `ddl:"parameter" sql:"REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_CREATION"`
-	RequireStorageIntegrationForStageOperation       *bool    `ddl:"parameter" sql:"REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_OPERATION"`
-	SSOLoginPage                                     *bool    `ddl:"parameter" sql:"SSO_LOGIN_PAGE"`
+	AllowClientMFACaching                            *bool   `ddl:"parameter" sql:"ALLOW_CLIENT_MFA_CACHING"`
+	AllowIDToken                                     *bool   `ddl:"parameter" sql:"ALLOW_ID_TOKEN"`
+	ClientEncryptionKeySize                          *int    `ddl:"parameter" sql:"CLIENT_ENCRYPTION_KEY_SIZE"`
+	CortexEnabledCrossRegion                         *string `ddl:"parameter,single_quotes" sql:"CORTEX_ENABLED_CROSS_REGION"`
+	EnableIdentifierFirstLogin                       *bool   `ddl:"parameter" sql:"ENABLE_IDENTIFIER_FIRST_LOGIN"`
+	EnableInternalStagesPrivatelink                  *bool   `ddl:"parameter" sql:"ENABLE_INTERNAL_STAGES_PRIVATELINK"`
+	EnablePersonalDatabase                           *bool   `ddl:"parameter" sql:"ENABLE_PERSONAL_DATABASE"`
+	EnableUnredactedQuerySyntaxError                 *bool   `ddl:"parameter" sql:"ENABLE_UNREDACTED_QUERY_SYNTAX_ERROR"`
+	EnableTriSecretAndRekeyOptOutForImageRepository  *bool   `ddl:"parameter" sql:"ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_IMAGE_REPOSITORY"`
+	EnableTriSecretAndRekeyOptOutForSpcsBlockStorage *bool   `ddl:"parameter" sql:"ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_SPCS_BLOCK_STORAGE"`
+	EnableUnhandledExceptionsReporting               *bool   `ddl:"parameter" sql:"ENABLE_UNHANDLED_EXCEPTIONS_REPORTING"`
+	EnforceNetworkRulesForInternalStages             *bool   `ddl:"keyword" sql:"ENFORCE_NETWORK_RULES_FOR_INTERNAL_STAGES"`
+	EventTable                                       *string `ddl:"parameter,single_quotes" sql:"EVENT_TABLE"`
+	ExternalOAuthAddPrivilegedRolesToBlockedList     *bool   `ddl:"parameter" sql:"EXTERNAL_OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST"`
+	// InitialReplicationSizeLimitInTB is a string because values like 3.0 get rounded to 3, resulting in an error in Snowflake.
+	// This is still validated below.
+	InitialReplicationSizeLimitInTB            *string `ddl:"parameter" sql:"INITIAL_REPLICATION_SIZE_LIMIT_IN_TB"`
+	MinDataRetentionTimeInDays                 *int    `ddl:"parameter" sql:"MIN_DATA_RETENTION_TIME_IN_DAYS"`
+	NetworkPolicy                              *string `ddl:"parameter,single_quotes" sql:"NETWORK_POLICY"`
+	OAuthAddPrivilegedRolesToBlockedList       *bool   `ddl:"parameter" sql:"OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST"`
+	PeriodicDataRekeying                       *bool   `ddl:"parameter" sql:"PERIODIC_DATA_REKEYING"`
+	PreventLoadFromInlineURL                   *bool   `ddl:"parameter" sql:"PREVENT_LOAD_FROM_INLINE_URL"`
+	PreventUnloadToInlineURL                   *bool   `ddl:"parameter" sql:"PREVENT_UNLOAD_TO_INLINE_URL"`
+	PreventUnloadToInternalStages              *bool   `ddl:"parameter" sql:"PREVENT_UNLOAD_TO_INTERNAL_STAGES"`
+	RequireStorageIntegrationForStageCreation  *bool   `ddl:"parameter" sql:"REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_CREATION"`
+	RequireStorageIntegrationForStageOperation *bool   `ddl:"parameter" sql:"REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_OPERATION"`
+	SSOLoginPage                               *bool   `ddl:"parameter" sql:"SSO_LOGIN_PAGE"`
 }
 
 func (v *AccountParameters) validate() error {
 	var errs []error
 	if valueSet(v.ClientEncryptionKeySize) {
-		if !(*v.ClientEncryptionKeySize == 128 || *v.ClientEncryptionKeySize == 256) {
-			errs = append(errs, fmt.Errorf("CLIENT_ENCRYPTION_KEY_SIZE must be either 128 or 256"))
+		if !slices.Contains([]int{128, 256}, *v.ClientEncryptionKeySize) {
+			errs = append(errs, fmt.Errorf("ClientEncryptionKeySize must be either 128 or 256, got %d", *v.ClientEncryptionKeySize))
 		}
 	}
 	if valueSet(v.InitialReplicationSizeLimitInTB) {
-		l := *v.InitialReplicationSizeLimitInTB
-		if l < 0.0 || (l < 0.0 && l < 1.0) {
-			errs = append(errs, fmt.Errorf("%v must be 0.0 and above with a scale of at least 1 (e.g. 20.5, 32.25, 33.333, etc.)", l))
+		value, err := strconv.ParseFloat(*v.InitialReplicationSizeLimitInTB, 64)
+		if err != nil || value < 0 {
+			return fmt.Errorf("InitialReplicationSizeLimitInTB must be a non-negative float, got %v", *v.InitialReplicationSizeLimitInTB)
 		}
 	}
 	if valueSet(v.MinDataRetentionTimeInDays) {
-		if !validateIntInRange(*v.MinDataRetentionTimeInDays, 0, 90) {
+		if !validateIntInRangeInclusive(*v.MinDataRetentionTimeInDays, 0, 90) {
 			errs = append(errs, errIntBetween("AccountParameters", "MinDataRetentionTimeInDays", 0, 90))
 		}
 	}
@@ -1159,12 +1229,16 @@ type AccountParametersUnset struct {
 	AllowClientMFACaching                            *bool `ddl:"keyword" sql:"ALLOW_CLIENT_MFA_CACHING"`
 	AllowIDToken                                     *bool `ddl:"keyword" sql:"ALLOW_ID_TOKEN"`
 	ClientEncryptionKeySize                          *bool `ddl:"keyword" sql:"CLIENT_ENCRYPTION_KEY_SIZE"`
+	CortexEnabledCrossRegion                         *bool `ddl:"keyword" sql:"CORTEX_ENABLED_CROSS_REGION"`
 	EnableIdentifierFirstLogin                       *bool `ddl:"keyword" sql:"ENABLE_IDENTIFIER_FIRST_LOGIN"`
 	EnableInternalStagesPrivatelink                  *bool `ddl:"keyword" sql:"ENABLE_INTERNAL_STAGES_PRIVATELINK"`
+	EnablePersonalDatabase                           *bool `ddl:"keyword" sql:"ENABLE_PERSONAL_DATABASE"`
 	EnableTriSecretAndRekeyOptOutForImageRepository  *bool `ddl:"keyword" sql:"ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_IMAGE_REPOSITORY"`
 	EnableTriSecretAndRekeyOptOutForSpcsBlockStorage *bool `ddl:"keyword" sql:"ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_SPCS_BLOCK_STORAGE"`
+	EnableUnhandledExceptionsReporting               *bool `ddl:"keyword" sql:"ENABLE_UNHANDLED_EXCEPTIONS_REPORTING"`
 	EventTable                                       *bool `ddl:"keyword" sql:"EVENT_TABLE"`
 	EnableUnredactedQuerySyntaxError                 *bool `ddl:"keyword" sql:"ENABLE_UNREDACTED_QUERY_SYNTAX_ERROR"`
+	EnforceNetworkRulesForInternalStages             *bool `ddl:"keyword" sql:"ENFORCE_NETWORK_RULES_FOR_INTERNAL_STAGES"`
 	ExternalOAuthAddPrivilegedRolesToBlockedList     *bool `ddl:"keyword" sql:"EXTERNAL_OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST"`
 	InitialReplicationSizeLimitInTB                  *bool `ddl:"keyword" sql:"INITIAL_REPLICATION_SIZE_LIMIT_IN_TB"`
 	MinDataRetentionTimeInDays                       *bool `ddl:"keyword" sql:"MIN_DATA_RETENTION_TIME_IN_DAYS"`
@@ -1179,6 +1253,24 @@ type AccountParametersUnset struct {
 	SSOLoginPage                                     *bool `ddl:"keyword" sql:"SSO_LOGIN_PAGE"`
 }
 
+type ActivePythonProfiler string
+
+const (
+	ActivePythonProfilerLine   ActivePythonProfiler = "LINE"
+	ActivePythonProfilerMemory ActivePythonProfiler = "MEMORY"
+)
+
+func ToActivePythonProfiler(s string) (ActivePythonProfiler, error) {
+	switch strings.ToUpper(s) {
+	case string(ActivePythonProfilerLine):
+		return ActivePythonProfilerLine, nil
+	case string(ActivePythonProfilerMemory):
+		return ActivePythonProfilerMemory, nil
+	default:
+		return "", fmt.Errorf("invalid active python profiler: %s", s)
+	}
+}
+
 type GeographyOutputFormat string
 
 const (
@@ -1347,9 +1439,11 @@ func ToUnsupportedDDLAction(s string) (UnsupportedDDLAction, error) {
 // SessionParameters is based on https://docs.snowflake.com/en/sql-reference/parameters#session-parameters.
 type SessionParameters struct {
 	AbortDetachedQuery                       *bool                             `ddl:"parameter" sql:"ABORT_DETACHED_QUERY"`
+	ActivePythonProfiler                     *ActivePythonProfiler             `ddl:"parameter,single_quotes" sql:"ACTIVE_PYTHON_PROFILER"`
 	Autocommit                               *bool                             `ddl:"parameter" sql:"AUTOCOMMIT"`
 	BinaryInputFormat                        *BinaryInputFormat                `ddl:"parameter,single_quotes" sql:"BINARY_INPUT_FORMAT"`
 	BinaryOutputFormat                       *BinaryOutputFormat               `ddl:"parameter,single_quotes" sql:"BINARY_OUTPUT_FORMAT"`
+	ClientEnableLogInfoStatementParameters   *bool                             `ddl:"parameter" sql:"CLIENT_ENABLE_LOG_INFO_STATEMENT_PARAMETERS"`
 	ClientMemoryLimit                        *int                              `ddl:"parameter" sql:"CLIENT_MEMORY_LIMIT"`
 	ClientMetadataRequestUseConnectionCtx    *bool                             `ddl:"parameter" sql:"CLIENT_METADATA_REQUEST_USE_CONNECTION_CTX"`
 	ClientPrefetchThreads                    *int                              `ddl:"parameter" sql:"CLIENT_PREFETCH_THREADS"`
@@ -1359,6 +1453,7 @@ type SessionParameters struct {
 	ClientSessionKeepAlive                   *bool                             `ddl:"parameter" sql:"CLIENT_SESSION_KEEP_ALIVE"`
 	ClientSessionKeepAliveHeartbeatFrequency *int                              `ddl:"parameter" sql:"CLIENT_SESSION_KEEP_ALIVE_HEARTBEAT_FREQUENCY"`
 	ClientTimestampTypeMapping               *ClientTimestampTypeMapping       `ddl:"parameter,single_quotes" sql:"CLIENT_TIMESTAMP_TYPE_MAPPING"`
+	CsvTimestampFormat                       *string                           `ddl:"parameter" sql:"CSV_TIMESTAMP_FORMAT"`
 	DateInputFormat                          *string                           `ddl:"parameter,single_quotes" sql:"DATE_INPUT_FORMAT"`
 	DateOutputFormat                         *string                           `ddl:"parameter,single_quotes" sql:"DATE_OUTPUT_FORMAT"`
 	EnableUnloadPhysicalTypeOptimization     *bool                             `ddl:"parameter" sql:"ENABLE_UNLOAD_PHYSICAL_TYPE_OPTIMIZATION"`
@@ -1366,15 +1461,19 @@ type SessionParameters struct {
 	ErrorOnNondeterministicUpdate            *bool                             `ddl:"parameter" sql:"ERROR_ON_NONDETERMINISTIC_UPDATE"`
 	GeographyOutputFormat                    *GeographyOutputFormat            `ddl:"parameter,single_quotes" sql:"GEOGRAPHY_OUTPUT_FORMAT"`
 	GeometryOutputFormat                     *GeometryOutputFormat             `ddl:"parameter,single_quotes" sql:"GEOMETRY_OUTPUT_FORMAT"`
+	HybridTableLockTimeout                   *int                              `ddl:"parameter" sql:"HYBRID_TABLE_LOCK_TIMEOUT"`
 	JdbcTreatDecimalAsInt                    *bool                             `ddl:"parameter" sql:"JDBC_TREAT_DECIMAL_AS_INT"`
 	JdbcTreatTimestampNtzAsUtc               *bool                             `ddl:"parameter" sql:"JDBC_TREAT_TIMESTAMP_NTZ_AS_UTC"`
 	JdbcUseSessionTimezone                   *bool                             `ddl:"parameter" sql:"JDBC_USE_SESSION_TIMEZONE"`
-	JSONIndent                               *int                              `ddl:"parameter" sql:"JSON_INDENT"`
+	JsonIndent                               *int                              `ddl:"parameter" sql:"JSON_INDENT"`
+	JsTreatIntegerAsBigInt                   *bool                             `ddl:"parameter" sql:"JS_TREAT_INTEGER_AS_BIGINT"`
 	LockTimeout                              *int                              `ddl:"parameter" sql:"LOCK_TIMEOUT"`
 	LogLevel                                 *LogLevel                         `ddl:"parameter" sql:"LOG_LEVEL"`
 	MultiStatementCount                      *int                              `ddl:"parameter" sql:"MULTI_STATEMENT_COUNT"`
 	NoorderSequenceAsDefault                 *bool                             `ddl:"parameter" sql:"NOORDER_SEQUENCE_AS_DEFAULT"`
 	OdbcTreatDecimalAsInt                    *bool                             `ddl:"parameter" sql:"ODBC_TREAT_DECIMAL_AS_INT"`
+	PythonProfilerModules                    *string                           `ddl:"parameter" sql:"PYTHON_PROFILER_MODULES"`
+	PythonProfilerTargetStage                *string                           `ddl:"parameter" sql:"PYTHON_PROFILER_TARGET_STAGE"`
 	QueryTag                                 *string                           `ddl:"parameter,single_quotes" sql:"QUERY_TAG"`
 	QuotedIdentifiersIgnoreCase              *bool                             `ddl:"parameter" sql:"QUOTED_IDENTIFIERS_IGNORE_CASE"`
 	RowsPerResultset                         *int                              `ddl:"parameter" sql:"ROWS_PER_RESULTSET"`
@@ -1383,7 +1482,7 @@ type SessionParameters struct {
 	SimulatedDataSharingConsumer             *string                           `ddl:"parameter,single_quotes" sql:"SIMULATED_DATA_SHARING_CONSUMER"`
 	StatementQueuedTimeoutInSeconds          *int                              `ddl:"parameter" sql:"STATEMENT_QUEUED_TIMEOUT_IN_SECONDS"`
 	StatementTimeoutInSeconds                *int                              `ddl:"parameter" sql:"STATEMENT_TIMEOUT_IN_SECONDS"`
-	StrictJSONOutput                         *bool                             `ddl:"parameter" sql:"STRICT_JSON_OUTPUT"`
+	StrictJsonOutput                         *bool                             `ddl:"parameter" sql:"STRICT_JSON_OUTPUT"`
 	TimestampDayIsAlways24h                  *bool                             `ddl:"parameter" sql:"TIMESTAMP_DAY_IS_ALWAYS_24H"`
 	TimestampInputFormat                     *string                           `ddl:"parameter,single_quotes" sql:"TIMESTAMP_INPUT_FORMAT"`
 	TimestampLTZOutputFormat                 *string                           `ddl:"parameter,single_quotes" sql:"TIMESTAMP_LTZ_OUTPUT_FORMAT"`
@@ -1406,9 +1505,31 @@ type SessionParameters struct {
 
 func (v *SessionParameters) validate() error {
 	var errs []error
-	if valueSet(v.JSONIndent) {
-		if !validateIntInRange(*v.JSONIndent, 0, 16) {
-			errs = append(errs, errIntBetween("SessionParameters", "JSONIndent", 0, 16))
+	// Do not validate input and output formats, because there are a lot of them, and may be not supported in Go itself.
+	// See https://docs.snowflake.com/en/sql-reference/date-time-input-output#supported-formats-for-auto-detection.
+	if valueSet(v.ClientPrefetchThreads) {
+		if !validateIntGreaterThanOrEqual(*v.ClientPrefetchThreads, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "ClientPrefetchThreads", IntErrGreaterOrEqual, 0))
+		}
+	}
+	if valueSet(v.ClientResultChunkSize) {
+		if !validateIntGreaterThanOrEqual(*v.ClientResultChunkSize, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "ClientResultChunkSize", IntErrGreaterOrEqual, 0))
+		}
+	}
+	if valueSet(v.ClientSessionKeepAliveHeartbeatFrequency) {
+		if !validateIntGreaterThanOrEqual(*v.ClientSessionKeepAliveHeartbeatFrequency, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "ClientSessionKeepAliveHeartbeatFrequency", IntErrGreaterOrEqual, 0))
+		}
+	}
+	if valueSet(v.HybridTableLockTimeout) {
+		if !validateIntGreaterThanOrEqual(*v.HybridTableLockTimeout, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "HybridTableLockTimeout", IntErrGreaterOrEqual, 0))
+		}
+	}
+	if valueSet(v.JsonIndent) {
+		if !validateIntGreaterThanOrEqual(*v.JsonIndent, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "JsonIndent", IntErrGreaterOrEqual, 0))
 		}
 	}
 	if valueSet(v.LockTimeout) {
@@ -1416,9 +1537,9 @@ func (v *SessionParameters) validate() error {
 			errs = append(errs, errIntValue("SessionParameters", "LockTimeout", IntErrGreaterOrEqual, 0))
 		}
 	}
-	if valueSet(v.QueryTag) {
-		if len(*v.QueryTag) > 2000 {
-			errs = append(errs, errIntValue("SessionParameters", "QueryTag", IntErrLess, 2000))
+	if valueSet(v.MultiStatementCount) {
+		if !validateIntGreaterThanOrEqual(*v.MultiStatementCount, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "MultiStatementCount", IntErrGreaterOrEqual, 0))
 		}
 	}
 	if valueSet(v.RowsPerResultset) {
@@ -1426,19 +1547,29 @@ func (v *SessionParameters) validate() error {
 			errs = append(errs, errIntValue("SessionParameters", "RowsPerResultset", IntErrGreaterOrEqual, 0))
 		}
 	}
+	if valueSet(v.StatementQueuedTimeoutInSeconds) {
+		if !validateIntGreaterThanOrEqual(*v.StatementQueuedTimeoutInSeconds, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "StatementQueuedTimeoutInSeconds", IntErrGreaterOrEqual, 0))
+		}
+	}
+	if valueSet(v.StatementTimeoutInSeconds) {
+		if !validateIntGreaterThanOrEqual(*v.StatementTimeoutInSeconds, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "StatementTimeoutInSeconds", IntErrGreaterOrEqual, 0))
+		}
+	}
 	if valueSet(v.TwoDigitCenturyStart) {
-		if !validateIntInRange(*v.TwoDigitCenturyStart, 1900, 2100) {
-			errs = append(errs, errIntBetween("SessionParameters", "TwoDigitCenturyStart", 1900, 2100))
+		if !validateIntGreaterThanOrEqual(*v.TwoDigitCenturyStart, 1900) {
+			errs = append(errs, errIntValue("SessionParameters", "TwoDigitCenturyStart", IntErrGreaterOrEqual, 1900))
 		}
 	}
 	if valueSet(v.WeekOfYearPolicy) {
-		if !validateIntInRange(*v.WeekOfYearPolicy, 0, 1) {
-			errs = append(errs, fmt.Errorf("WEEK_OF_YEAR_POLICY must be either 0 or 1"))
+		if !validateIntGreaterThanOrEqual(*v.WeekOfYearPolicy, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "WeekOfYearPolicy", IntErrGreaterOrEqual, 0))
 		}
 	}
 	if valueSet(v.WeekStart) {
-		if !validateIntInRange(*v.WeekStart, 0, 1) {
-			errs = append(errs, fmt.Errorf("WEEK_START must be either 0 or 1"))
+		if !validateIntGreaterThanOrEqual(*v.WeekStart, 0) {
+			errs = append(errs, errIntValue("SessionParameters", "WeekStart", IntErrGreaterOrEqual, 0))
 		}
 	}
 	return errors.Join(errs...)
@@ -1446,9 +1577,11 @@ func (v *SessionParameters) validate() error {
 
 type SessionParametersUnset struct {
 	AbortDetachedQuery                       *bool `ddl:"keyword" sql:"ABORT_DETACHED_QUERY"`
+	ActivePythonProfiler                     *bool `ddl:"keyword" sql:"ACTIVE_PYTHON_PROFILER"`
 	Autocommit                               *bool `ddl:"keyword" sql:"AUTOCOMMIT"`
 	BinaryInputFormat                        *bool `ddl:"keyword" sql:"BINARY_INPUT_FORMAT"`
 	BinaryOutputFormat                       *bool `ddl:"keyword" sql:"BINARY_OUTPUT_FORMAT"`
+	ClientEnableLogInfoStatementParameters   *bool `ddl:"keyword" sql:"CLIENT_ENABLE_LOG_INFO_STATEMENT_PARAMETERS"`
 	ClientMemoryLimit                        *bool `ddl:"keyword" sql:"CLIENT_MEMORY_LIMIT"`
 	ClientMetadataRequestUseConnectionCtx    *bool `ddl:"keyword" sql:"CLIENT_METADATA_REQUEST_USE_CONNECTION_CTX"`
 	ClientPrefetchThreads                    *bool `ddl:"keyword" sql:"CLIENT_PREFETCH_THREADS"`
@@ -1458,6 +1591,7 @@ type SessionParametersUnset struct {
 	ClientSessionKeepAlive                   *bool `ddl:"keyword" sql:"CLIENT_SESSION_KEEP_ALIVE"`
 	ClientSessionKeepAliveHeartbeatFrequency *bool `ddl:"keyword" sql:"CLIENT_SESSION_KEEP_ALIVE_HEARTBEAT_FREQUENCY"`
 	ClientTimestampTypeMapping               *bool `ddl:"keyword" sql:"CLIENT_TIMESTAMP_TYPE_MAPPING"`
+	CsvTimestampFormat                       *bool `ddl:"keyword" sql:"CSV_TIMESTAMP_FORMAT"`
 	DateInputFormat                          *bool `ddl:"keyword" sql:"DATE_INPUT_FORMAT"`
 	DateOutputFormat                         *bool `ddl:"keyword" sql:"DATE_OUTPUT_FORMAT"`
 	EnableUnloadPhysicalTypeOptimization     *bool `ddl:"keyword" sql:"ENABLE_UNLOAD_PHYSICAL_TYPE_OPTIMIZATION"`
@@ -1465,15 +1599,19 @@ type SessionParametersUnset struct {
 	ErrorOnNondeterministicUpdate            *bool `ddl:"keyword" sql:"ERROR_ON_NONDETERMINISTIC_UPDATE"`
 	GeographyOutputFormat                    *bool `ddl:"keyword" sql:"GEOGRAPHY_OUTPUT_FORMAT"`
 	GeometryOutputFormat                     *bool `ddl:"keyword" sql:"GEOMETRY_OUTPUT_FORMAT"`
+	HybridTableLockTimeout                   *bool `ddl:"keyword" sql:"HYBRID_TABLE_LOCK_TIMEOUT"`
 	JdbcTreatDecimalAsInt                    *bool `ddl:"keyword" sql:"JDBC_TREAT_DECIMAL_AS_INT"`
 	JdbcTreatTimestampNtzAsUtc               *bool `ddl:"keyword" sql:"JDBC_TREAT_TIMESTAMP_NTZ_AS_UTC"`
 	JdbcUseSessionTimezone                   *bool `ddl:"keyword" sql:"JDBC_USE_SESSION_TIMEZONE"`
-	JSONIndent                               *bool `ddl:"keyword" sql:"JSON_INDENT"`
+	JsonIndent                               *bool `ddl:"keyword" sql:"JSON_INDENT"`
+	JsTreatIntegerAsBigInt                   *bool `ddl:"keyword" sql:"JS_TREAT_INTEGER_AS_BIGINT"`
 	LockTimeout                              *bool `ddl:"keyword" sql:"LOCK_TIMEOUT"`
 	LogLevel                                 *bool `ddl:"keyword" sql:"LOG_LEVEL"`
 	MultiStatementCount                      *bool `ddl:"keyword" sql:"MULTI_STATEMENT_COUNT"`
 	NoorderSequenceAsDefault                 *bool `ddl:"keyword" sql:"NOORDER_SEQUENCE_AS_DEFAULT"`
 	OdbcTreatDecimalAsInt                    *bool `ddl:"keyword" sql:"ODBC_TREAT_DECIMAL_AS_INT"`
+	PythonProfilerModules                    *bool `ddl:"keyword" sql:"PYTHON_PROFILER_MODULES"`
+	PythonProfilerTargetStage                *bool `ddl:"keyword" sql:"PYTHON_PROFILER_TARGET_STAGE"`
 	QueryTag                                 *bool `ddl:"keyword" sql:"QUERY_TAG"`
 	QuotedIdentifiersIgnoreCase              *bool `ddl:"keyword" sql:"QUOTED_IDENTIFIERS_IGNORE_CASE"`
 	RowsPerResultset                         *bool `ddl:"keyword" sql:"ROWS_PER_RESULTSET"`
@@ -1482,7 +1620,7 @@ type SessionParametersUnset struct {
 	SimulatedDataSharingConsumer             *bool `ddl:"keyword" sql:"SIMULATED_DATA_SHARING_CONSUMER"`
 	StatementQueuedTimeoutInSeconds          *bool `ddl:"keyword" sql:"STATEMENT_QUEUED_TIMEOUT_IN_SECONDS"`
 	StatementTimeoutInSeconds                *bool `ddl:"keyword" sql:"STATEMENT_TIMEOUT_IN_SECONDS"`
-	StrictJSONOutput                         *bool `ddl:"keyword" sql:"STRICT_JSON_OUTPUT"`
+	StrictJsonOutput                         *bool `ddl:"keyword" sql:"STRICT_JSON_OUTPUT"`
 	TimestampDayIsAlways24h                  *bool `ddl:"keyword" sql:"TIMESTAMP_DAY_IS_ALWAYS_24H"`
 	TimestampInputFormat                     *bool `ddl:"keyword" sql:"TIMESTAMP_INPUT_FORMAT"`
 	TimestampLTZOutputFormat                 *bool `ddl:"keyword" sql:"TIMESTAMP_LTZ_OUTPUT_FORMAT"`
@@ -1504,37 +1642,40 @@ type SessionParametersUnset struct {
 }
 
 func (v *SessionParametersUnset) validate() error {
-	if !anyValueSet(v.AbortDetachedQuery, v.Autocommit, v.BinaryInputFormat, v.BinaryOutputFormat, v.ClientMemoryLimit, v.ClientMetadataRequestUseConnectionCtx, v.ClientPrefetchThreads, v.ClientResultChunkSize, v.ClientResultColumnCaseInsensitive, v.ClientMetadataUseSessionDatabase, v.ClientSessionKeepAlive, v.ClientSessionKeepAliveHeartbeatFrequency, v.ClientTimestampTypeMapping, v.DateInputFormat, v.DateOutputFormat, v.EnableUnloadPhysicalTypeOptimization, v.ErrorOnNondeterministicMerge, v.ErrorOnNondeterministicUpdate, v.GeographyOutputFormat, v.GeometryOutputFormat, v.JdbcTreatDecimalAsInt, v.JdbcTreatTimestampNtzAsUtc, v.JdbcUseSessionTimezone, v.JSONIndent, v.LockTimeout, v.LogLevel, v.MultiStatementCount, v.NoorderSequenceAsDefault, v.OdbcTreatDecimalAsInt, v.QueryTag, v.QuotedIdentifiersIgnoreCase, v.RowsPerResultset, v.S3StageVpceDnsName, v.SearchPath, v.SimulatedDataSharingConsumer, v.StatementQueuedTimeoutInSeconds, v.StatementTimeoutInSeconds, v.StrictJSONOutput, v.TimestampDayIsAlways24h, v.TimestampInputFormat, v.TimestampLTZOutputFormat, v.TimestampNTZOutputFormat, v.TimestampOutputFormat, v.TimestampTypeMapping, v.TimestampTZOutputFormat, v.Timezone, v.TimeInputFormat, v.TimeOutputFormat, v.TraceLevel, v.TransactionAbortOnError, v.TransactionDefaultIsolationLevel, v.TwoDigitCenturyStart, v.UnsupportedDDLAction, v.UseCachedResult, v.WeekOfYearPolicy, v.WeekStart) {
-		return errors.Join(errAtLeastOneOf("SessionParametersUnset", "AbortDetachedQuery", "Autocommit", "BinaryInputFormat", "BinaryOutputFormat", "ClientMemoryLimit", "ClientMetadataRequestUseConnectionCtx", "ClientPrefetchThreads", "ClientResultChunkSize", "ClientResultColumnCaseInsensitive", "ClientMetadataUseSessionDatabase", "ClientSessionKeepAlive", "ClientSessionKeepAliveHeartbeatFrequency", "ClientTimestampTypeMapping", "DateInputFormat", "DateOutputFormat", "EnableUnloadPhysicalTypeOptimization", "ErrorOnNondeterministicMerge", "ErrorOnNondeterministicUpdate", "GeographyOutputFormat", "GeometryOutputFormat", "JdbcTreatDecimalAsInt", "JdbcTreatTimestampNtzAsUtc", "JdbcUseSessionTimezone", "JSONIndent", "LockTimeout", "LogLevel", "MultiStatementCount", "NoorderSequenceAsDefault", "OdbcTreatDecimalAsInt", "QueryTag", "QuotedIdentifiersIgnoreCase", "RowsPerResultset", "S3StageVpceDnsName", "SearchPath", "SimulatedDataSharingConsumer", "StatementQueuedTimeoutInSeconds", "StatementTimeoutInSeconds", "StrictJSONOutput", "TimestampDayIsAlways24h", "TimestampInputFormat", "TimestampLTZOutputFormat", "TimestampNTZOutputFormat", "TimestampOutputFormat", "TimestampTypeMapping", "TimestampTZOutputFormat", "Timezone", "TimeInputFormat", "TimeOutputFormat", "TraceLevel", "TransactionAbortOnError", "TransactionDefaultIsolationLevel", "TwoDigitCenturyStart", "UnsupportedDDLAction", "UseCachedResult", "WeekOfYearPolicy", "WeekStart"))
+	if !anyValueSet(v.AbortDetachedQuery, v.ActivePythonProfiler, v.Autocommit, v.BinaryInputFormat, v.BinaryOutputFormat, v.ClientEnableLogInfoStatementParameters, v.ClientMemoryLimit, v.ClientMetadataRequestUseConnectionCtx, v.ClientPrefetchThreads, v.ClientResultChunkSize, v.ClientResultColumnCaseInsensitive, v.ClientMetadataUseSessionDatabase, v.ClientSessionKeepAlive, v.ClientSessionKeepAliveHeartbeatFrequency, v.ClientTimestampTypeMapping, v.CsvTimestampFormat, v.DateInputFormat, v.DateOutputFormat, v.EnableUnloadPhysicalTypeOptimization, v.ErrorOnNondeterministicMerge, v.ErrorOnNondeterministicUpdate, v.GeographyOutputFormat, v.GeometryOutputFormat, v.HybridTableLockTimeout, v.JdbcTreatDecimalAsInt, v.JdbcTreatTimestampNtzAsUtc, v.JdbcUseSessionTimezone, v.JsonIndent, v.JsTreatIntegerAsBigInt, v.LockTimeout, v.LogLevel, v.MultiStatementCount, v.NoorderSequenceAsDefault, v.OdbcTreatDecimalAsInt, v.PythonProfilerModules, v.PythonProfilerTargetStage, v.QueryTag, v.QuotedIdentifiersIgnoreCase, v.RowsPerResultset, v.S3StageVpceDnsName, v.SearchPath, v.SimulatedDataSharingConsumer, v.StatementQueuedTimeoutInSeconds, v.StatementTimeoutInSeconds, v.StrictJsonOutput, v.TimestampDayIsAlways24h, v.TimestampInputFormat, v.TimestampLTZOutputFormat, v.TimestampNTZOutputFormat, v.TimestampOutputFormat, v.TimestampTypeMapping, v.TimestampTZOutputFormat, v.Timezone, v.TimeInputFormat, v.TimeOutputFormat, v.TraceLevel, v.TransactionAbortOnError, v.TransactionDefaultIsolationLevel, v.TwoDigitCenturyStart, v.UnsupportedDDLAction, v.UseCachedResult, v.WeekOfYearPolicy, v.WeekStart) {
+		return errors.Join(errAtLeastOneOf("SessionParametersUnset", "AbortDetachedQuery", "ActivePythonProfiler", "Autocommit", "BinaryInputFormat", "BinaryOutputFormat", "ClientEnableLogInfoStatementParameters", "ClientMemoryLimit", "ClientMetadataRequestUseConnectionCtx", "ClientPrefetchThreads", "ClientResultChunkSize", "ClientResultColumnCaseInsensitive", "ClientMetadataUseSessionDatabase", "ClientSessionKeepAlive", "ClientSessionKeepAliveHeartbeatFrequency", "ClientTimestampTypeMapping", "CsvTimestampFormat", "DateInputFormat", "DateOutputFormat", "EnableUnloadPhysicalTypeOptimization", "ErrorOnNondeterministicMerge", "ErrorOnNondeterministicUpdate", "GeographyOutputFormat", "GeometryOutputFormat", "HybridTableLockTimeout", "JdbcTreatDecimalAsInt", "JdbcTreatTimestampNtzAsUtc", "JdbcUseSessionTimezone", "JsonIndent", "JsTreatIntegerAsBigInt", "LockTimeout", "LogLevel", "MultiStatementCount", "NoorderSequenceAsDefault", "OdbcTreatDecimalAsInt", "PythonProfilerModules", "PythonProfilerTargetStage", "QueryTag", "QuotedIdentifiersIgnoreCase", "RowsPerResultset", "S3StageVpceDnsName", "SearchPath", "SimulatedDataSharingConsumer", "StatementQueuedTimeoutInSeconds", "StatementTimeoutInSeconds", "StrictJsonOutput", "TimestampDayIsAlways24h", "TimestampInputFormat", "TimestampLTZOutputFormat", "TimestampNTZOutputFormat", "TimestampOutputFormat", "TimestampTypeMapping", "TimestampTZOutputFormat", "Timezone", "TimeInputFormat", "TimeOutputFormat", "TraceLevel", "TransactionAbortOnError", "TransactionDefaultIsolationLevel", "TwoDigitCenturyStart", "UnsupportedDDLAction", "UseCachedResult", "WeekOfYearPolicy", "WeekStart"))
 	}
 	return nil
 }
 
 // ObjectParameters is based on https://docs.snowflake.com/en/sql-reference/parameters#object-parameters.
 type ObjectParameters struct {
-	Catalog                             *string        `ddl:"parameter" sql:"CATALOG"`
-	DataRetentionTimeInDays             *int           `ddl:"parameter" sql:"DATA_RETENTION_TIME_IN_DAYS"`
-	DefaultDDLCollation                 *string        `ddl:"parameter,single_quotes" sql:"DEFAULT_DDL_COLLATION"`
-	EnableUnredactedQuerySyntaxError    *bool          `ddl:"parameter" sql:"ENABLE_UNREDACTED_QUERY_SYNTAX_ERROR"`
-	LogLevel                            *LogLevel      `ddl:"parameter" sql:"LOG_LEVEL"`
-	MaxConcurrencyLevel                 *int           `ddl:"parameter" sql:"MAX_CONCURRENCY_LEVEL"`
-	MaxDataExtensionTimeInDays          *int           `ddl:"parameter" sql:"MAX_DATA_EXTENSION_TIME_IN_DAYS"`
-	PipeExecutionPaused                 *bool          `ddl:"parameter" sql:"PIPE_EXECUTION_PAUSED"`
-	PreventUnloadToInternalStages       *bool          `ddl:"parameter" sql:"PREVENT_UNLOAD_TO_INTERNAL_STAGES"`
-	StatementQueuedTimeoutInSeconds     *int           `ddl:"parameter" sql:"STATEMENT_QUEUED_TIMEOUT_IN_SECONDS"`
-	StatementTimeoutInSeconds           *int           `ddl:"parameter" sql:"STATEMENT_TIMEOUT_IN_SECONDS"`
-	NetworkPolicy                       *string        `ddl:"parameter,single_quotes" sql:"NETWORK_POLICY"`
-	ShareRestrictions                   *bool          `ddl:"parameter" sql:"SHARE_RESTRICTIONS"`
-	SuspendTaskAfterNumFailures         *int           `ddl:"parameter" sql:"SUSPEND_TASK_AFTER_NUM_FAILURES"`
-	TraceLevel                          *TraceLevel    `ddl:"parameter" sql:"TRACE_LEVEL"`
-	UserTaskManagedInitialWarehouseSize *WarehouseSize `ddl:"parameter" sql:"USER_TASK_MANAGED_INITIAL_WAREHOUSE_SIZE"`
-	UserTaskTimeoutMs                   *int           `ddl:"parameter" sql:"USER_TASK_TIMEOUT_MS"`
+	Catalog                                 *string        `ddl:"parameter" sql:"CATALOG"`
+	DataRetentionTimeInDays                 *int           `ddl:"parameter" sql:"DATA_RETENTION_TIME_IN_DAYS"`
+	DefaultDDLCollation                     *string        `ddl:"parameter,single_quotes" sql:"DEFAULT_DDL_COLLATION"`
+	EnableUnredactedQuerySyntaxError        *bool          `ddl:"parameter" sql:"ENABLE_UNREDACTED_QUERY_SYNTAX_ERROR"`
+	LogLevel                                *LogLevel      `ddl:"parameter" sql:"LOG_LEVEL"`
+	MaxConcurrencyLevel                     *int           `ddl:"parameter" sql:"MAX_CONCURRENCY_LEVEL"`
+	MaxDataExtensionTimeInDays              *int           `ddl:"parameter" sql:"MAX_DATA_EXTENSION_TIME_IN_DAYS"`
+	PipeExecutionPaused                     *bool          `ddl:"parameter" sql:"PIPE_EXECUTION_PAUSED"`
+	PreventUnloadToInternalStages           *bool          `ddl:"parameter" sql:"PREVENT_UNLOAD_TO_INTERNAL_STAGES"`
+	StatementQueuedTimeoutInSeconds         *int           `ddl:"parameter" sql:"STATEMENT_QUEUED_TIMEOUT_IN_SECONDS"`
+	StatementTimeoutInSeconds               *int           `ddl:"parameter" sql:"STATEMENT_TIMEOUT_IN_SECONDS"`
+	NetworkPolicy                           *string        `ddl:"parameter,single_quotes" sql:"NETWORK_POLICY"`
+	ShareRestrictions                       *bool          `ddl:"parameter" sql:"SHARE_RESTRICTIONS"`
+	SuspendTaskAfterNumFailures             *int           `ddl:"parameter" sql:"SUSPEND_TASK_AFTER_NUM_FAILURES"`
+	StorageSerializationPolicy              *string        `ddl:"parameter" sql:"STORAGE_SERIALIZATION_POLICY"`
+	TraceLevel                              *TraceLevel    `ddl:"parameter" sql:"TRACE_LEVEL"`
+	TaskAutoRetryAttempts                   *int           `ddl:"parameter" sql:"TASK_AUTO_RETRY_ATTEMPTS"`
+	UserTaskManagedInitialWarehouseSize     *WarehouseSize `ddl:"parameter" sql:"USER_TASK_MANAGED_INITIAL_WAREHOUSE_SIZE"`
+	UserTaskMinimumTriggerIntervalInSeconds *int           `ddl:"parameter" sql:"USER_TASK_MINIMUM_TRIGGER_INTERVAL_IN_SECONDS"`
+	UserTaskTimeoutMs                       *int           `ddl:"parameter" sql:"USER_TASK_TIMEOUT_MS"`
 }
 
 func (v *ObjectParameters) validate() error {
 	var errs []error
 	if valueSet(v.DataRetentionTimeInDays) {
-		if !validateIntInRange(*v.DataRetentionTimeInDays, 0, 90) {
+		if !validateIntInRangeInclusive(*v.DataRetentionTimeInDays, 0, 90) {
 			errs = append(errs, errIntBetween("ObjectParameters", "DataRetentionTimeInDays", 0, 90))
 		}
 	}
@@ -1544,7 +1685,7 @@ func (v *ObjectParameters) validate() error {
 		}
 	}
 	if valueSet(v.MaxDataExtensionTimeInDays) {
-		if !validateIntInRange(*v.MaxDataExtensionTimeInDays, 0, 90) {
+		if !validateIntInRangeInclusive(*v.MaxDataExtensionTimeInDays, 0, 90) {
 			errs = append(errs, errIntBetween("ObjectParameters", "MaxDataExtensionTimeInDays", 0, 90))
 		}
 	}
@@ -1563,9 +1704,19 @@ func (v *ObjectParameters) validate() error {
 			errs = append(errs, errIntValue("ObjectParameters", "SuspendTaskAfterNumFailures", IntErrGreaterOrEqual, 0))
 		}
 	}
+	if valueSet(v.TaskAutoRetryAttempts) {
+		if !validateIntGreaterThanOrEqual(*v.TaskAutoRetryAttempts, 0) {
+			errs = append(errs, errIntValue("ObjectParameters", "SuspendTaskAfterNumFailures", IntErrGreaterOrEqual, 0))
+		}
+	}
+	if valueSet(v.UserTaskMinimumTriggerIntervalInSeconds) {
+		if !validateIntGreaterThanOrEqual(*v.UserTaskMinimumTriggerIntervalInSeconds, 0) {
+			errs = append(errs, errIntValue("ObjectParameters", "UserTaskMinimumTriggerIntervalInSeconds", IntErrGreaterOrEqual, 0))
+		}
+	}
 	if valueSet(v.UserTaskTimeoutMs) {
-		if !validateIntInRange(*v.UserTaskTimeoutMs, 0, 86400000) {
-			errs = append(errs, errIntBetween("ObjectParameters", "UserTaskTimeoutMs", 0, 86400000))
+		if !validateIntGreaterThanOrEqual(*v.UserTaskTimeoutMs, 0) {
+			errs = append(errs, errIntValue("ObjectParameters", "UserTaskTimeoutMs", IntErrGreaterOrEqual, 0))
 		}
 	}
 	return errors.Join(errs...)
@@ -1586,6 +1737,8 @@ type ObjectParametersUnset struct {
 	NetworkPolicy                       *bool `ddl:"keyword" sql:"NETWORK_POLICY"`
 	ShareRestrictions                   *bool `ddl:"keyword" sql:"SHARE_RESTRICTIONS"`
 	SuspendTaskAfterNumFailures         *bool `ddl:"keyword" sql:"SUSPEND_TASK_AFTER_NUM_FAILURES"`
+	StorageSerializationPolicy          *bool `ddl:"keyword" sql:"STORAGE_SERIALIZATION_POLICY"`
+	TaskAutoRetryAttempts               *bool `ddl:"keyword" sql:"TASK_AUTO_RETRY_ATTEMPTS"`
 	TraceLevel                          *bool `ddl:"keyword" sql:"TRACE_LEVEL"`
 	UserTaskManagedInitialWarehouseSize *bool `ddl:"keyword" sql:"USER_TASK_MANAGED_INITIAL_WAREHOUSE_SIZE"`
 	UserTaskTimeoutMs                   *bool `ddl:"keyword" sql:"USER_TASK_TIMEOUT_MS"`
diff --git a/pkg/sdk/parameters_impl.go b/pkg/sdk/parameters_impl.go
index d01af6d161..80600f292e 100644
--- a/pkg/sdk/parameters_impl.go
+++ b/pkg/sdk/parameters_impl.go
@@ -27,12 +27,16 @@ func (sessionParameters *SessionParameters) setParam(parameter SessionParameter,
 	switch parameter {
 	case SessionParameterAbortDetachedQuery:
 		err = setBooleanValue(parameter, value, &sessionParameters.AbortDetachedQuery)
+	case SessionParameterActivePythonProfiler:
+		sessionParameters.ActivePythonProfiler = Pointer(ActivePythonProfiler(value))
 	case SessionParameterAutocommit:
 		err = setBooleanValue(parameter, value, &sessionParameters.Autocommit)
 	case SessionParameterBinaryInputFormat:
 		sessionParameters.BinaryInputFormat = Pointer(BinaryInputFormat(value))
 	case SessionParameterBinaryOutputFormat:
 		sessionParameters.BinaryOutputFormat = Pointer(BinaryOutputFormat(value))
+	case SessionParameterClientEnableLogInfoStatementParameters:
+		err = setBooleanValue(parameter, value, &sessionParameters.ClientEnableLogInfoStatementParameters)
 	case SessionParameterClientMemoryLimit:
 		err = setIntegerValue(parameter, value, &sessionParameters.ClientMemoryLimit)
 	case SessionParameterClientMetadataRequestUseConnectionCtx:
@@ -51,6 +55,8 @@ func (sessionParameters *SessionParameters) setParam(parameter SessionParameter,
 		err = setIntegerValue(parameter, value, &sessionParameters.ClientSessionKeepAliveHeartbeatFrequency)
 	case SessionParameterClientTimestampTypeMapping:
 		sessionParameters.ClientTimestampTypeMapping = Pointer(ClientTimestampTypeMapping(value))
+	case SessionParameterCsvTimestampFormat:
+		sessionParameters.CsvTimestampFormat = &value
 	case SessionParameterDateInputFormat:
 		sessionParameters.DateInputFormat = &value
 	case SessionParameterDateOutputFormat:
@@ -65,14 +71,18 @@ func (sessionParameters *SessionParameters) setParam(parameter SessionParameter,
 		sessionParameters.GeographyOutputFormat = Pointer(GeographyOutputFormat(value))
 	case SessionParameterGeometryOutputFormat:
 		sessionParameters.GeometryOutputFormat = Pointer(GeometryOutputFormat(value))
+	case SessionParameterHybridTableLockTimeout:
+		err = setIntegerValue(parameter, value, &sessionParameters.HybridTableLockTimeout)
 	case SessionParameterJdbcTreatDecimalAsInt:
 		err = setBooleanValue(parameter, value, &sessionParameters.JdbcTreatDecimalAsInt)
 	case SessionParameterJdbcTreatTimestampNtzAsUtc:
 		err = setBooleanValue(parameter, value, &sessionParameters.JdbcTreatTimestampNtzAsUtc)
 	case SessionParameterJdbcUseSessionTimezone:
 		err = setBooleanValue(parameter, value, &sessionParameters.JdbcUseSessionTimezone)
-	case SessionParameterJSONIndent:
-		err = setIntegerValue(parameter, value, &sessionParameters.JSONIndent)
+	case SessionParameterJsonIndent:
+		err = setIntegerValue(parameter, value, &sessionParameters.JsonIndent)
+	case SessionParameterJsTreatIntegerAsBigInt:
+		err = setBooleanValue(parameter, value, &sessionParameters.JsTreatIntegerAsBigInt)
 	case SessionParameterLockTimeout:
 		err = setIntegerValue(parameter, value, &sessionParameters.LockTimeout)
 	case SessionParameterLogLevel:
@@ -83,6 +93,10 @@ func (sessionParameters *SessionParameters) setParam(parameter SessionParameter,
 		err = setBooleanValue(parameter, value, &sessionParameters.NoorderSequenceAsDefault)
 	case SessionParameterOdbcTreatDecimalAsInt:
 		err = setBooleanValue(parameter, value, &sessionParameters.OdbcTreatDecimalAsInt)
+	case SessionParameterPythonProfilerModules:
+		sessionParameters.PythonProfilerModules = &value
+	case SessionParameterPythonProfilerTargetStage:
+		sessionParameters.PythonProfilerTargetStage = &value
 	case SessionParameterQueryTag:
 		sessionParameters.QueryTag = &value
 	case SessionParameterQuotedIdentifiersIgnoreCase:
@@ -99,8 +113,8 @@ func (sessionParameters *SessionParameters) setParam(parameter SessionParameter,
 		err = setIntegerValue(parameter, value, &sessionParameters.StatementQueuedTimeoutInSeconds)
 	case SessionParameterStatementTimeoutInSeconds:
 		err = setIntegerValue(parameter, value, &sessionParameters.StatementTimeoutInSeconds)
-	case SessionParameterStrictJSONOutput:
-		err = setBooleanValue(parameter, value, &sessionParameters.StrictJSONOutput)
+	case SessionParameterStrictJsonOutput:
+		err = setBooleanValue(parameter, value, &sessionParameters.StrictJsonOutput)
 	case SessionParameterTimestampDayIsAlways24h:
 		err = setBooleanValue(parameter, value, &sessionParameters.TimestampDayIsAlways24h)
 	case SessionParameterTimestampInputFormat:
@@ -177,12 +191,16 @@ func (sessionParametersUnset *SessionParametersUnset) setParam(parameter Session
 	switch parameter {
 	case SessionParameterAbortDetachedQuery:
 		unsetField = &sessionParametersUnset.AbortDetachedQuery
+	case SessionParameterActivePythonProfiler:
+		unsetField = &sessionParametersUnset.ActivePythonProfiler
 	case SessionParameterAutocommit:
 		unsetField = &sessionParametersUnset.Autocommit
 	case SessionParameterBinaryInputFormat:
 		unsetField = &sessionParametersUnset.BinaryInputFormat
 	case SessionParameterBinaryOutputFormat:
 		unsetField = &sessionParametersUnset.BinaryOutputFormat
+	case SessionParameterClientEnableLogInfoStatementParameters:
+		unsetField = &sessionParametersUnset.ClientEnableLogInfoStatementParameters
 	case SessionParameterClientMemoryLimit:
 		unsetField = &sessionParametersUnset.ClientMemoryLimit
 	case SessionParameterClientMetadataRequestUseConnectionCtx:
@@ -201,6 +219,8 @@ func (sessionParametersUnset *SessionParametersUnset) setParam(parameter Session
 		unsetField = &sessionParametersUnset.ClientSessionKeepAliveHeartbeatFrequency
 	case SessionParameterClientTimestampTypeMapping:
 		unsetField = &sessionParametersUnset.ClientTimestampTypeMapping
+	case SessionParameterCsvTimestampFormat:
+		unsetField = &sessionParametersUnset.CsvTimestampFormat
 	case SessionParameterDateInputFormat:
 		unsetField = &sessionParametersUnset.DateInputFormat
 	case SessionParameterDateOutputFormat:
@@ -215,14 +235,18 @@ func (sessionParametersUnset *SessionParametersUnset) setParam(parameter Session
 		unsetField = &sessionParametersUnset.GeographyOutputFormat
 	case SessionParameterGeometryOutputFormat:
 		unsetField = &sessionParametersUnset.GeometryOutputFormat
+	case SessionParameterHybridTableLockTimeout:
+		unsetField = &sessionParametersUnset.HybridTableLockTimeout
 	case SessionParameterJdbcTreatDecimalAsInt:
 		unsetField = &sessionParametersUnset.JdbcTreatDecimalAsInt
 	case SessionParameterJdbcTreatTimestampNtzAsUtc:
 		unsetField = &sessionParametersUnset.JdbcTreatTimestampNtzAsUtc
 	case SessionParameterJdbcUseSessionTimezone:
 		unsetField = &sessionParametersUnset.JdbcUseSessionTimezone
-	case SessionParameterJSONIndent:
-		unsetField = &sessionParametersUnset.JSONIndent
+	case SessionParameterJsonIndent:
+		unsetField = &sessionParametersUnset.JsonIndent
+	case SessionParameterJsTreatIntegerAsBigInt:
+		unsetField = &sessionParametersUnset.JsTreatIntegerAsBigInt
 	case SessionParameterLockTimeout:
 		unsetField = &sessionParametersUnset.LockTimeout
 	case SessionParameterLogLevel:
@@ -233,6 +257,10 @@ func (sessionParametersUnset *SessionParametersUnset) setParam(parameter Session
 		unsetField = &sessionParametersUnset.NoorderSequenceAsDefault
 	case SessionParameterOdbcTreatDecimalAsInt:
 		unsetField = &sessionParametersUnset.OdbcTreatDecimalAsInt
+	case SessionParameterPythonProfilerModules:
+		unsetField = &sessionParametersUnset.PythonProfilerModules
+	case SessionParameterPythonProfilerTargetStage:
+		unsetField = &sessionParametersUnset.PythonProfilerTargetStage
 	case SessionParameterQueryTag:
 		unsetField = &sessionParametersUnset.QueryTag
 	case SessionParameterQuotedIdentifiersIgnoreCase:
@@ -249,8 +277,8 @@ func (sessionParametersUnset *SessionParametersUnset) setParam(parameter Session
 		unsetField = &sessionParametersUnset.StatementQueuedTimeoutInSeconds
 	case SessionParameterStatementTimeoutInSeconds:
 		unsetField = &sessionParametersUnset.StatementTimeoutInSeconds
-	case SessionParameterStrictJSONOutput:
-		unsetField = &sessionParametersUnset.StrictJSONOutput
+	case SessionParameterStrictJsonOutput:
+		unsetField = &sessionParametersUnset.StrictJsonOutput
 	case SessionParameterTimestampDayIsAlways24h:
 		unsetField = &sessionParametersUnset.TimestampDayIsAlways24h
 	case SessionParameterTimestampInputFormat:
diff --git a/pkg/sdk/parameters_impl_test.go b/pkg/sdk/parameters_impl_test.go
index d235a42a5e..b8859154d2 100644
--- a/pkg/sdk/parameters_impl_test.go
+++ b/pkg/sdk/parameters_impl_test.go
@@ -15,9 +15,11 @@ func TestSessionParameters_setParam(t *testing.T) {
 		accessor      func(*SessionParameters) any
 	}{
 		{parameter: SessionParameterAbortDetachedQuery, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.AbortDetachedQuery }},
+		{parameter: SessionParameterActivePythonProfiler, value: "LINE", expectedValue: ActivePythonProfilerLine, accessor: func(sp *SessionParameters) any { return *sp.ActivePythonProfiler }},
 		{parameter: SessionParameterAutocommit, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.Autocommit }},
 		{parameter: SessionParameterBinaryInputFormat, value: "some", expectedValue: BinaryInputFormat("some"), accessor: func(sp *SessionParameters) any { return *sp.BinaryInputFormat }},
 		{parameter: SessionParameterBinaryOutputFormat, value: "some", expectedValue: BinaryOutputFormat("some"), accessor: func(sp *SessionParameters) any { return *sp.BinaryOutputFormat }},
+		{parameter: SessionParameterClientEnableLogInfoStatementParameters, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.ClientEnableLogInfoStatementParameters }},
 		{parameter: SessionParameterClientMemoryLimit, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.ClientMemoryLimit }},
 		{parameter: SessionParameterClientMetadataRequestUseConnectionCtx, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.ClientMetadataRequestUseConnectionCtx }},
 		{parameter: SessionParameterClientPrefetchThreads, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.ClientPrefetchThreads }},
@@ -27,6 +29,7 @@ func TestSessionParameters_setParam(t *testing.T) {
 		{parameter: SessionParameterClientSessionKeepAlive, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.ClientSessionKeepAlive }},
 		{parameter: SessionParameterClientSessionKeepAliveHeartbeatFrequency, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.ClientSessionKeepAliveHeartbeatFrequency }},
 		{parameter: SessionParameterClientTimestampTypeMapping, value: "some", expectedValue: ClientTimestampTypeMapping("some"), accessor: func(sp *SessionParameters) any { return *sp.ClientTimestampTypeMapping }},
+		{parameter: SessionParameterCsvTimestampFormat, value: "some", expectedValue: "some", accessor: func(sp *SessionParameters) any { return *sp.CsvTimestampFormat }},
 		{parameter: SessionParameterDateInputFormat, value: "some", expectedValue: "some", accessor: func(sp *SessionParameters) any { return *sp.DateInputFormat }},
 		{parameter: SessionParameterDateOutputFormat, value: "some", expectedValue: "some", accessor: func(sp *SessionParameters) any { return *sp.DateOutputFormat }},
 		{parameter: SessionParameterEnableUnloadPhysicalTypeOptimization, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.EnableUnloadPhysicalTypeOptimization }},
@@ -34,15 +37,19 @@ func TestSessionParameters_setParam(t *testing.T) {
 		{parameter: SessionParameterErrorOnNondeterministicUpdate, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.ErrorOnNondeterministicUpdate }},
 		{parameter: SessionParameterGeographyOutputFormat, value: "some", expectedValue: GeographyOutputFormat("some"), accessor: func(sp *SessionParameters) any { return *sp.GeographyOutputFormat }},
 		{parameter: SessionParameterGeometryOutputFormat, value: "some", expectedValue: GeometryOutputFormat("some"), accessor: func(sp *SessionParameters) any { return *sp.GeometryOutputFormat }},
+		{parameter: SessionParameterHybridTableLockTimeout, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.HybridTableLockTimeout }},
 		{parameter: SessionParameterJdbcTreatDecimalAsInt, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.JdbcTreatDecimalAsInt }},
 		{parameter: SessionParameterJdbcTreatTimestampNtzAsUtc, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.JdbcTreatTimestampNtzAsUtc }},
 		{parameter: SessionParameterJdbcUseSessionTimezone, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.JdbcUseSessionTimezone }},
-		{parameter: SessionParameterJSONIndent, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.JSONIndent }},
+		{parameter: SessionParameterJsonIndent, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.JsonIndent }},
+		{parameter: SessionParameterJsTreatIntegerAsBigInt, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.JsTreatIntegerAsBigInt }},
 		{parameter: SessionParameterLockTimeout, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.LockTimeout }},
 		{parameter: SessionParameterLogLevel, value: "some", expectedValue: LogLevel("some"), accessor: func(sp *SessionParameters) any { return *sp.LogLevel }},
 		{parameter: SessionParameterMultiStatementCount, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.MultiStatementCount }},
 		{parameter: SessionParameterNoorderSequenceAsDefault, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.NoorderSequenceAsDefault }},
 		{parameter: SessionParameterOdbcTreatDecimalAsInt, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.OdbcTreatDecimalAsInt }},
+		{parameter: SessionParameterPythonProfilerModules, value: "some", expectedValue: "some", accessor: func(sp *SessionParameters) any { return *sp.PythonProfilerModules }},
+		{parameter: SessionParameterPythonProfilerTargetStage, value: "some", expectedValue: "some", accessor: func(sp *SessionParameters) any { return *sp.PythonProfilerTargetStage }},
 		{parameter: SessionParameterQueryTag, value: "some", expectedValue: "some", accessor: func(sp *SessionParameters) any { return *sp.QueryTag }},
 		{parameter: SessionParameterQuotedIdentifiersIgnoreCase, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.QuotedIdentifiersIgnoreCase }},
 		{parameter: SessionParameterRowsPerResultset, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.RowsPerResultset }},
@@ -51,7 +58,7 @@ func TestSessionParameters_setParam(t *testing.T) {
 		{parameter: SessionParameterSimulatedDataSharingConsumer, value: "some", expectedValue: "some", accessor: func(sp *SessionParameters) any { return *sp.SimulatedDataSharingConsumer }},
 		{parameter: SessionParameterStatementQueuedTimeoutInSeconds, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.StatementQueuedTimeoutInSeconds }},
 		{parameter: SessionParameterStatementTimeoutInSeconds, value: "1", expectedValue: 1, accessor: func(sp *SessionParameters) any { return *sp.StatementTimeoutInSeconds }},
-		{parameter: SessionParameterStrictJSONOutput, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.StrictJSONOutput }},
+		{parameter: SessionParameterStrictJsonOutput, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.StrictJsonOutput }},
 		{parameter: SessionParameterTimestampDayIsAlways24h, value: "true", expectedValue: true, accessor: func(sp *SessionParameters) any { return *sp.TimestampDayIsAlways24h }},
 		{parameter: SessionParameterTimestampInputFormat, value: "some", expectedValue: "some", accessor: func(sp *SessionParameters) any { return *sp.TimestampInputFormat }},
 		{parameter: SessionParameterTimestampLTZOutputFormat, value: "some", expectedValue: "some", accessor: func(sp *SessionParameters) any { return *sp.TimestampLTZOutputFormat }},
@@ -98,7 +105,7 @@ func TestSessionParameters_setParam(t *testing.T) {
 		// {parameter: SessionParameterDateOutputFormat, value: "some"}, // add validation
 		{parameter: SessionParameterErrorOnNondeterministicMerge, value: "true123"},
 		{parameter: SessionParameterErrorOnNondeterministicUpdate, value: "true123"},
-		{parameter: SessionParameterJSONIndent, value: "aaa"},
+		{parameter: SessionParameterJsonIndent, value: "aaa"},
 		{parameter: SessionParameterLockTimeout, value: "aaa"},
 		{parameter: SessionParameterMultiStatementCount, value: "aaa"},
 		// {parameter: SessionParameterQueryTag, value: "some"}, // add validation
@@ -106,7 +113,7 @@ func TestSessionParameters_setParam(t *testing.T) {
 		{parameter: SessionParameterRowsPerResultset, value: "aaa"},
 		// {parameter: SessionParameterSimulatedDataSharingConsumer, value: "some"}, // add validation
 		{parameter: SessionParameterStatementTimeoutInSeconds, value: "aaa"},
-		{parameter: SessionParameterStrictJSONOutput, value: "true123"},
+		{parameter: SessionParameterStrictJsonOutput, value: "true123"},
 		// {parameter: SessionParameterTimeInputFormat, value: "some"}, // add validation
 		// {parameter: SessionParameterTimeOutputFormat, value: "some"}, // add validation
 		{parameter: SessionParameterTimestampDayIsAlways24h, value: "true123"},
diff --git a/pkg/sdk/parameters_test.go b/pkg/sdk/parameters_test.go
index a288f9eee5..93592e1f1e 100644
--- a/pkg/sdk/parameters_test.go
+++ b/pkg/sdk/parameters_test.go
@@ -68,10 +68,13 @@ func TestToAccountParameter(t *testing.T) {
 		{input: "ALLOW_CLIENT_MFA_CACHING", want: AccountParameterAllowClientMFACaching},
 		{input: "ALLOW_ID_TOKEN", want: AccountParameterAllowIDToken},
 		{input: "CLIENT_ENCRYPTION_KEY_SIZE", want: AccountParameterClientEncryptionKeySize},
+		{input: "CORTEX_ENABLED_CROSS_REGION", want: AccountParameterCortexEnabledCrossRegion},
 		{input: "ENABLE_IDENTIFIER_FIRST_LOGIN", want: AccountParameterEnableIdentifierFirstLogin},
 		{input: "ENABLE_INTERNAL_STAGES_PRIVATELINK", want: AccountParameterEnableInternalStagesPrivatelink},
 		{input: "ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_IMAGE_REPOSITORY", want: AccountParameterEnableTriSecretAndRekeyOptOutForImageRepository},
 		{input: "ENABLE_TRI_SECRET_AND_REKEY_OPT_OUT_FOR_SPCS_BLOCK_STORAGE", want: AccountParameterEnableTriSecretAndRekeyOptOutForSpcsBlockStorage},
+		{input: "ENABLE_UNHANDLED_EXCEPTIONS_REPORTING", want: AccountParameterEnableUnhandledExceptionsReporting},
+		{input: "ENFORCE_NETWORK_RULES_FOR_INTERNAL_STAGES", want: AccountParameterEnforceNetworkRulesForInternalStages},
 		{input: "EVENT_TABLE", want: AccountParameterEventTable},
 		{input: "EXTERNAL_OAUTH_ADD_PRIVILEGED_ROLES_TO_BLOCKED_LIST", want: AccountParameterExternalOAuthAddPrivilegedRolesToBlockedList},
 		{input: "INITIAL_REPLICATION_SIZE_LIMIT_IN_TB", want: AccountParameterInitialReplicationSizeLimitInTB},
@@ -81,32 +84,53 @@ func TestToAccountParameter(t *testing.T) {
 		{input: "PERIODIC_DATA_REKEYING", want: AccountParameterPeriodicDataRekeying},
 		{input: "PREVENT_LOAD_FROM_INLINE_URL", want: AccountParameterPreventLoadFromInlineURL},
 		{input: "PREVENT_UNLOAD_TO_INLINE_URL", want: AccountParameterPreventUnloadToInlineURL},
-		{input: "PREVENT_UNLOAD_TO_INTERNAL_STAGES", want: AccountParameterPreventUnloadToInternalStages},
 		{input: "REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_CREATION", want: AccountParameterRequireStorageIntegrationForStageCreation},
 		{input: "REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_OPERATION", want: AccountParameterRequireStorageIntegrationForStageOperation},
 		{input: "SSO_LOGIN_PAGE", want: AccountParameterSSOLoginPage},
+
+		// Session Parameters (inherited)
 		{input: "ABORT_DETACHED_QUERY", want: AccountParameterAbortDetachedQuery},
+		{input: "ACTIVE_PYTHON_PROFILER", want: AccountParameterActivePythonProfiler},
 		{input: "AUTOCOMMIT", want: AccountParameterAutocommit},
 		{input: "BINARY_INPUT_FORMAT", want: AccountParameterBinaryInputFormat},
 		{input: "BINARY_OUTPUT_FORMAT", want: AccountParameterBinaryOutputFormat},
+		{input: "CLIENT_ENABLE_LOG_INFO_STATEMENT_PARAMETERS", want: AccountParameterClientEnableLogInfoStatementParameters},
+		{input: "CLIENT_MEMORY_LIMIT", want: AccountParameterClientMemoryLimit},
 		{input: "CLIENT_METADATA_REQUEST_USE_CONNECTION_CTX", want: AccountParameterClientMetadataRequestUseConnectionCtx},
 		{input: "CLIENT_METADATA_USE_SESSION_DATABASE", want: AccountParameterClientMetadataUseSessionDatabase},
+		{input: "CLIENT_PREFETCH_THREADS", want: AccountParameterClientPrefetchThreads},
+		{input: "CLIENT_RESULT_CHUNK_SIZE", want: AccountParameterClientResultChunkSize},
 		{input: "CLIENT_RESULT_COLUMN_CASE_INSENSITIVE", want: AccountParameterClientResultColumnCaseInsensitive},
+		{input: "CLIENT_SESSION_KEEP_ALIVE", want: AccountParameterClientSessionKeepAlive},
+		{input: "CLIENT_SESSION_KEEP_ALIVE_HEARTBEAT_FREQUENCY", want: AccountParameterClientSessionKeepAliveHeartbeatFrequency},
+		{input: "CLIENT_TIMESTAMP_TYPE_MAPPING", want: AccountParameterClientTimestampTypeMapping},
+		{input: "CSV_TIMESTAMP_FORMAT", want: AccountParameterCsvTimestampFormat},
 		{input: "DATE_INPUT_FORMAT", want: AccountParameterDateInputFormat},
 		{input: "DATE_OUTPUT_FORMAT", want: AccountParameterDateOutputFormat},
+		{input: "ENABLE_UNLOAD_PHYSICAL_TYPE_OPTIMIZATION", want: AccountParameterEnableUnloadPhysicalTypeOptimization},
 		{input: "ERROR_ON_NONDETERMINISTIC_MERGE", want: AccountParameterErrorOnNondeterministicMerge},
 		{input: "ERROR_ON_NONDETERMINISTIC_UPDATE", want: AccountParameterErrorOnNondeterministicUpdate},
 		{input: "GEOGRAPHY_OUTPUT_FORMAT", want: AccountParameterGeographyOutputFormat},
-		{input: "JSON_INDENT", want: AccountParameterJSONIndent},
+		{input: "GEOMETRY_OUTPUT_FORMAT", want: AccountParameterGeometryOutputFormat},
+		{input: "HYBRID_TABLE_LOCK_TIMEOUT", want: AccountParameterHybridTableLockTimeout},
+		{input: "JDBC_TREAT_DECIMAL_AS_INT", want: AccountParameterJdbcTreatDecimalAsInt},
+		{input: "JDBC_TREAT_TIMESTAMP_NTZ_AS_UTC", want: AccountParameterJdbcTreatTimestampNtzAsUtc},
+		{input: "JDBC_USE_SESSION_TIMEZONE", want: AccountParameterJdbcUseSessionTimezone},
+		{input: "JSON_INDENT", want: AccountParameterJsonIndent},
+		{input: "JS_TREAT_INTEGER_AS_BIGINT", want: AccountParameterJsTreatIntegerAsBigInt},
 		{input: "LOCK_TIMEOUT", want: AccountParameterLockTimeout},
 		{input: "MULTI_STATEMENT_COUNT", want: AccountParameterMultiStatementCount},
+		{input: "NOORDER_SEQUENCE_AS_DEFAULT", want: AccountParameterNoorderSequenceAsDefault},
+		{input: "ODBC_TREAT_DECIMAL_AS_INT", want: AccountParameterOdbcTreatDecimalAsInt},
+		{input: "PYTHON_PROFILER_MODULES", want: AccountParameterPythonProfilerModules},
+		{input: "PYTHON_PROFILER_TARGET_STAGE", want: AccountParameterPythonProfilerTargetStage},
 		{input: "QUERY_TAG", want: AccountParameterQueryTag},
 		{input: "QUOTED_IDENTIFIERS_IGNORE_CASE", want: AccountParameterQuotedIdentifiersIgnoreCase},
 		{input: "ROWS_PER_RESULTSET", want: AccountParameterRowsPerResultset},
 		{input: "S3_STAGE_VPCE_DNS_NAME", want: AccountParameterS3StageVpceDnsName},
+		{input: "SEARCH_PATH", want: AccountParameterSearchPath},
 		{input: "SIMULATED_DATA_SHARING_CONSUMER", want: AccountParameterSimulatedDataSharingConsumer},
-		{input: "STATEMENT_TIMEOUT_IN_SECONDS", want: AccountParameterStatementTimeoutInSeconds},
-		{input: "STRICT_JSON_OUTPUT", want: AccountParameterStrictJSONOutput},
+		{input: "STRICT_JSON_OUTPUT", want: AccountParameterStrictJsonOutput},
 		{input: "TIME_INPUT_FORMAT", want: AccountParameterTimeInputFormat},
 		{input: "TIME_OUTPUT_FORMAT", want: AccountParameterTimeOutputFormat},
 		{input: "TIMESTAMP_DAY_IS_ALWAYS_24H", want: AccountParameterTimestampDayIsAlways24h},
@@ -124,6 +148,8 @@ func TestToAccountParameter(t *testing.T) {
 		{input: "USE_CACHED_RESULT", want: AccountParameterUseCachedResult},
 		{input: "WEEK_OF_YEAR_POLICY", want: AccountParameterWeekOfYearPolicy},
 		{input: "WEEK_START", want: AccountParameterWeekStart},
+
+		// Object Parameters (inherited)
 		{input: "CATALOG", want: AccountParameterCatalog},
 		{input: "DATA_RETENTION_TIME_IN_DAYS", want: AccountParameterDataRetentionTimeInDays},
 		{input: "DEFAULT_DDL_COLLATION", want: AccountParameterDefaultDDLCollation},
@@ -134,6 +160,7 @@ func TestToAccountParameter(t *testing.T) {
 		{input: "PIPE_EXECUTION_PAUSED", want: AccountParameterPipeExecutionPaused},
 		{input: "REPLACE_INVALID_CHARACTERS", want: AccountParameterReplaceInvalidCharacters},
 		{input: "STATEMENT_QUEUED_TIMEOUT_IN_SECONDS", want: AccountParameterStatementQueuedTimeoutInSeconds},
+		{input: "STATEMENT_TIMEOUT_IN_SECONDS", want: AccountParameterStatementTimeoutInSeconds},
 		{input: "STORAGE_SERIALIZATION_POLICY", want: AccountParameterStorageSerializationPolicy},
 		{input: "SHARE_RESTRICTIONS", want: AccountParameterShareRestrictions},
 		{input: "SUSPEND_TASK_AFTER_NUM_FAILURES", want: AccountParameterSuspendTaskAfterNumFailures},
@@ -144,7 +171,11 @@ func TestToAccountParameter(t *testing.T) {
 		{input: "USER_TASK_MINIMUM_TRIGGER_INTERVAL_IN_SECONDS", want: AccountParameterUserTaskMinimumTriggerIntervalInSeconds},
 		{input: "METRIC_LEVEL", want: AccountParameterMetricLevel},
 		{input: "ENABLE_CONSOLE_OUTPUT", want: AccountParameterEnableConsoleOutput},
+
+		// User Parameters (inherited)
+		{input: "ENABLE_PERSONAL_DATABASE", want: AccountParameterEnablePersonalDatabase},
 		{input: "ENABLE_UNREDACTED_QUERY_SYNTAX_ERROR", want: AccountParameterEnableUnredactedQuerySyntaxError},
+		{input: "PREVENT_UNLOAD_TO_INTERNAL_STAGES", want: AccountParameterPreventUnloadToInternalStages},
 	}
 
 	invalid := []test{
diff --git a/pkg/sdk/poc/README.md b/pkg/sdk/poc/README.md
index eabaf74e55..c7f24fd5f5 100644
--- a/pkg/sdk/poc/README.md
+++ b/pkg/sdk/poc/README.md
@@ -11,7 +11,9 @@ There is an example file ready for generation [database_role_def.go](example/dat
 - [database_role_validations_gen.go](example/database_role_validations_gen.go) - options structs validations
 - [database_role_impl_gen.go](example/database_role_impl_gen.go) - SDK interface implementation
 - [database_role_gen_test.go](example/database_role_gen_test.go) - unit tests placeholders with guidance comments (at least for now)
-- [database_role_gen_integration_test.go](example/database_role_gen_integration_test.go) - integration test placeholder file
+
+Note:
+- for now integration tests files are not generated and they have to be created manually in the `pkg/sdk/testint` directory
 
 ### How it works
 ##### Creating object generation definition
@@ -49,10 +51,6 @@ also adding small changes is very challenging, e.g. for new validation rule you
 one new function, revert to old tests (the one with filled tests), copy new test case (of course we could add that one by hand
 but if we add one case, or modify more cases this becomes more challenging)
 - add support for Enums
-- generate `ShowID` function with 3 implementation variations (the last one is the rarest one and can be postponed)
-  - use `Show` function with Like
-  - use Show without any options and filter with Go for + if
-  - in some cases we could need more filters -> see alerts.go (but we can implement it later)
 - handle arrays
 - handle more validation types
 - write new `valueSet` function (see validations.go) that will have better defaults or more parameters that will determine
@@ -124,15 +122,6 @@ B := QueryStruct("B")
 ```
 - cannot re-generate when client.go is using generated interface
 - spaces in templates (especially nested validations)
-- request mapping fails (`.toOpts()`) when nested object is not optional (pointer) e.g.
-```go
-type NestedReq struct {
-}
-
-type SomeReq struct {
-    NestedReq NestedReq // Not a pointer and in toOpts right now we're always do a check if req.NestedReq != nil which is not correct for non pointer type
-}
-```
 
 ##### Known limitations
 - automatic array conversion is not recursive, so we're only supporting one level mapping
diff --git a/pkg/sdk/poc/generator/operation.go b/pkg/sdk/poc/generator/operation.go
index c8d0c7e422..dfc20ca034 100644
--- a/pkg/sdk/poc/generator/operation.go
+++ b/pkg/sdk/poc/generator/operation.go
@@ -161,12 +161,14 @@ func (i *Interface) ShowOperation(doc string, dbRepresentation *dbStruct, resour
 	return i
 }
 
-func (i *Interface) ShowByIdOperation() *Interface {
+// ShowByIdOperationWithNoFiltering adds a ShowByID operation to the interface without any filtering. Should be used for objects that do not implement any filtering options.
+func (i *Interface) ShowByIdOperationWithNoFiltering() *Interface {
 	op := newNoSqlOperation(string(OperationKindShowByID))
 	i.Operations = append(i.Operations, op)
 	return i
 }
 
+// ShowByIdOperationWithFiltering adds a ShowByID operation to the interface with filtering. Should be used for objects that implement filtering options e.g. Like or In.
 func (i *Interface) ShowByIdOperationWithFiltering(filter ShowByIDFilteringKind, filtering ...ShowByIDFilteringKind) *Interface {
 	op := newNoSqlOperation(string(OperationKindShowByID))
 	op.ObjectInterface = i
diff --git a/pkg/sdk/poc/generator/show_by_id_filtering.go b/pkg/sdk/poc/generator/show_by_id_filtering.go
index c80ec3aef3..646624b2ed 100644
--- a/pkg/sdk/poc/generator/show_by_id_filtering.go
+++ b/pkg/sdk/poc/generator/show_by_id_filtering.go
@@ -12,7 +12,6 @@ const (
 	ShowByIDInFiltering
 	ShowByIDExtendedInFiltering
 	ShowByIDApplicationNameFiltering
-	ShowByIDNoFiltering
 )
 
 type idPrefix string
@@ -58,10 +57,6 @@ func newShowByIDFiltering(name, kind, args string) ShowByIDFiltering {
 	}
 }
 
-func newShowByIDNoFiltering() ShowByIDFiltering {
-	return newShowByIDFiltering("NoFiltering", "", "")
-}
-
 func newShowByIDLikeFiltering() ShowByIDFiltering {
 	return newShowByIDFiltering("Like", "Like", "Pattern: String(id.Name())")
 }
@@ -103,8 +98,6 @@ func (s *Operation) withFiltering(filtering ...ShowByIDFilteringKind) *Operation
 			s.ShowByIDFiltering = append(s.ShowByIDFiltering, newShowByIDLikeFiltering())
 		case ShowByIDApplicationNameFiltering:
 			s.ShowByIDFiltering = append(s.ShowByIDFiltering, newShowByIDApplicationFiltering())
-		case ShowByIDNoFiltering:
-			s.ShowByIDFiltering = []ShowByIDFiltering{newShowByIDNoFiltering()}
 		default:
 			log.Println("No showByID filtering found for kind:", filteringKind)
 		}
diff --git a/pkg/sdk/poc/generator/template_executors.go b/pkg/sdk/poc/generator/template_executors.go
index 00b4678410..a2fba04cc7 100644
--- a/pkg/sdk/poc/generator/template_executors.go
+++ b/pkg/sdk/poc/generator/template_executors.go
@@ -92,11 +92,6 @@ func GenerateValidations(writer io.Writer, def *Interface) {
 	printTo(writer, ValidationsTemplate, def)
 }
 
-func GenerateIntegrationTests(writer io.Writer, def *Interface) {
-	generatePackageDirective(writer)
-	printTo(writer, IntegrationTestsTemplate, def)
-}
-
 func generatePackageDirective(writer io.Writer) {
 	printTo(writer, PackageTemplate, os.Getenv("GOPACKAGE"))
 }
diff --git a/pkg/sdk/poc/generator/templates.go b/pkg/sdk/poc/generator/templates.go
index 8d7d6b52b4..8e0188bcb2 100644
--- a/pkg/sdk/poc/generator/templates.go
+++ b/pkg/sdk/poc/generator/templates.go
@@ -32,10 +32,6 @@ var (
 	dtoStructsTemplateContent string
 	DtoDeclTemplate, _        = template.New("dtoTemplate").Parse(dtoStructsTemplateContent)
 
-	//go:embed templates/integration_tests.tmpl
-	integrationTestTemplateContent string
-	IntegrationTestsTemplate, _    = template.New("integrationTestsTemplate").Parse(integrationTestTemplateContent)
-
 	//go:embed templates/implementation.tmpl
 	implementationTemplateContent string
 	ImplementationTemplate        *template.Template
diff --git a/pkg/sdk/poc/generator/templates/integration_tests.tmpl b/pkg/sdk/poc/generator/templates/integration_tests.tmpl
deleted file mode 100644
index f814ba6f31..0000000000
--- a/pkg/sdk/poc/generator/templates/integration_tests.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- /*gotype: github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/poc/generator.Interface*/ -}}
-
-import "testing"
-
-func TestInt_{{ .Name }}(t *testing.T) {
-// TODO: prepare common resources
-
-{{ range .Operations }}
-    t.Run("{{ .Name }}", func(t *testing.T) {
-    // TODO: fill me
-    })
-{{ end -}}
-}
diff --git a/pkg/sdk/poc/generator/templates/sub_templates/implementation_functions.tmpl b/pkg/sdk/poc/generator/templates/sub_templates/implementation_functions.tmpl
index 60b0cc7e0d..7c89cefa99 100644
--- a/pkg/sdk/poc/generator/templates/sub_templates/implementation_functions.tmpl
+++ b/pkg/sdk/poc/generator/templates/sub_templates/implementation_functions.tmpl
@@ -16,10 +16,8 @@
     {{ else if eq .Name "ShowByID" }}
         func (v *{{ $impl }}) ShowByID(ctx context.Context, id {{ .ObjectInterface.IdentifierKind }}) (*{{ .ObjectInterface.NameSingular }}, error) {
             request := NewShow{{ .ObjectInterface.NameSingular }}Request()
-            {{- range .ShowByIDFiltering }}
-                {{- if not (eq .Name "NoFiltering") -}}.
-                    {{ .WithFiltering }}
-                {{- end }}
+            {{- range .ShowByIDFiltering }}.
+                {{ .WithFiltering }}
             {{- end }}
         {{ $impl }}, err := v.Show(ctx, request)
         if err != nil {
diff --git a/pkg/sdk/poc/main.go b/pkg/sdk/poc/main.go
index d7fd8c094a..fb7596ec9b 100644
--- a/pkg/sdk/poc/main.go
+++ b/pkg/sdk/poc/main.go
@@ -57,6 +57,7 @@ func main() {
 
 	// runAllTemplatesToStdOut(definition)
 	runAllTemplatesAndSave(definition, file)
+	fmt.Println("Integration tests should be added manually to the pkg/sdk/testint/ directory")
 }
 
 func getDefinition(file string) *generator.Interface {
@@ -94,7 +95,6 @@ func runAllTemplatesToStdOut(definition *generator.Interface) {
 	generator.GenerateImplementation(writer, definition)
 	generator.GenerateUnitTests(writer, definition)
 	generator.GenerateValidations(writer, definition)
-	generator.GenerateIntegrationTests(writer, definition)
 }
 
 func runAllTemplatesAndSave(definition *generator.Interface, file string) {
@@ -104,7 +104,6 @@ func runAllTemplatesAndSave(definition *generator.Interface, file string) {
 	runTemplateAndSave(definition, generator.GenerateImplementation, filenameFor(fileWithoutSuffix, "_impl"))
 	runTemplateAndSave(definition, generator.GenerateUnitTests, filename(fileWithoutSuffix, "_gen", "_test.go"))
 	runTemplateAndSave(definition, generator.GenerateValidations, filenameFor(fileWithoutSuffix, "_validations"))
-	runTemplateAndSave(definition, generator.GenerateIntegrationTests, filename(fileWithoutSuffix, "_gen_integration", "_test.go"))
 }
 
 func runTemplateAndSave(def *generator.Interface, genFunc func(io.Writer, *generator.Interface), fileName string) {
diff --git a/pkg/sdk/procedures_def.go b/pkg/sdk/procedures_def.go
index 636da06187..1779da568b 100644
--- a/pkg/sdk/procedures_def.go
+++ b/pkg/sdk/procedures_def.go
@@ -355,7 +355,10 @@ var ProceduresDef = g.NewInterface(
 		SQL("PROCEDURES").
 		OptionalLike().
 		OptionalExtendedIn(),
-).ShowByIdOperation().DescribeOperation(
+).ShowByIdOperationWithFiltering(
+	g.ShowByIDInFiltering,
+	g.ShowByIDLikeFiltering,
+).DescribeOperation(
 	g.DescriptionMappingKindSlice,
 	"https://docs.snowflake.com/en/sql-reference/sql/desc-procedure",
 	g.DbStruct("procedureDetailRow").
diff --git a/pkg/sdk/procedures_impl_gen.go b/pkg/sdk/procedures_impl_gen.go
index 5a7e1ce84e..9772688a3d 100644
--- a/pkg/sdk/procedures_impl_gen.go
+++ b/pkg/sdk/procedures_impl_gen.go
@@ -60,7 +60,10 @@ func (v *procedures) Show(ctx context.Context, request *ShowProcedureRequest) ([
 }
 
 func (v *procedures) ShowByID(ctx context.Context, id SchemaObjectIdentifierWithArguments) (*Procedure, error) {
-	procedures, err := v.Show(ctx, NewShowProcedureRequest().WithIn(ExtendedIn{In: In{Schema: id.SchemaId()}}).WithLike(Like{String(id.Name())}))
+	request := NewShowProcedureRequest().
+		WithIn(ExtendedIn{In: In{Schema: id.SchemaId()}}).
+		WithLike(Like{Pattern: String(id.Name())})
+	procedures, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/row_access_policies_def.go b/pkg/sdk/row_access_policies_def.go
index 02d42c0dbb..a6f1fd5453 100644
--- a/pkg/sdk/row_access_policies_def.go
+++ b/pkg/sdk/row_access_policies_def.go
@@ -90,7 +90,10 @@ var RowAccessPoliciesDef = g.NewInterface(
 			OptionalExtendedIn().
 			OptionalLimitFrom(),
 	).
-	ShowByIdOperation().
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDExtendedInFiltering,
+		g.ShowByIDLikeFiltering,
+	).
 	DescribeOperation(
 		g.DescriptionMappingKindSingleValue,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-row-access-policy",
diff --git a/pkg/sdk/row_access_policies_dto_builders_gen.go b/pkg/sdk/row_access_policies_dto_builders_gen.go
index ffdc0454dd..ef23517847 100644
--- a/pkg/sdk/row_access_policies_dto_builders_gen.go
+++ b/pkg/sdk/row_access_policies_dto_builders_gen.go
@@ -100,13 +100,13 @@ func NewShowRowAccessPolicyRequest() *ShowRowAccessPolicyRequest {
 	return &ShowRowAccessPolicyRequest{}
 }
 
-func (s *ShowRowAccessPolicyRequest) WithLike(Like *Like) *ShowRowAccessPolicyRequest {
-	s.Like = Like
+func (s *ShowRowAccessPolicyRequest) WithLike(Like Like) *ShowRowAccessPolicyRequest {
+	s.Like = &Like
 	return s
 }
 
-func (s *ShowRowAccessPolicyRequest) WithIn(In *ExtendedIn) *ShowRowAccessPolicyRequest {
-	s.In = In
+func (s *ShowRowAccessPolicyRequest) WithIn(In ExtendedIn) *ShowRowAccessPolicyRequest {
+	s.In = &In
 	return s
 }
 
diff --git a/pkg/sdk/row_access_policies_impl_gen.go b/pkg/sdk/row_access_policies_impl_gen.go
index f6f0f1e905..03dbab8e7d 100644
--- a/pkg/sdk/row_access_policies_impl_gen.go
+++ b/pkg/sdk/row_access_policies_impl_gen.go
@@ -39,7 +39,9 @@ func (v *rowAccessPolicies) Show(ctx context.Context, request *ShowRowAccessPoli
 }
 
 func (v *rowAccessPolicies) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*RowAccessPolicy, error) {
-	request := NewShowRowAccessPolicyRequest().WithIn(&ExtendedIn{In: In{Schema: id.SchemaId()}}).WithLike(&Like{String(id.Name())})
+	request := NewShowRowAccessPolicyRequest().
+		WithIn(ExtendedIn{In: In{Schema: id.SchemaId()}}).
+		WithLike(Like{Pattern: String(id.Name())})
 	rowAccessPolicies, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
diff --git a/pkg/sdk/security_integrations_def.go b/pkg/sdk/security_integrations_def.go
index 1fb48d58cf..e027084493 100644
--- a/pkg/sdk/security_integrations_def.go
+++ b/pkg/sdk/security_integrations_def.go
@@ -976,4 +976,6 @@ var SecurityIntegrationsDef = g.NewInterface(
 			SQL("SECURITY INTEGRATIONS").
 			OptionalLike(),
 	).
-	ShowByIdOperation()
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDLikeFiltering,
+	)
diff --git a/pkg/sdk/security_integrations_impl_gen.go b/pkg/sdk/security_integrations_impl_gen.go
index d430bbc2d9..3c1bf90a29 100644
--- a/pkg/sdk/security_integrations_impl_gen.go
+++ b/pkg/sdk/security_integrations_impl_gen.go
@@ -119,9 +119,9 @@ func (v *securityIntegrations) Show(ctx context.Context, request *ShowSecurityIn
 }
 
 func (v *securityIntegrations) ShowByID(ctx context.Context, id AccountObjectIdentifier) (*SecurityIntegration, error) {
-	securityIntegrations, err := v.Show(ctx, NewShowSecurityIntegrationRequest().WithLike(Like{
-		Pattern: String(id.Name()),
-	}))
+	request := NewShowSecurityIntegrationRequest().
+		WithLike(Like{Pattern: String(id.Name())})
+	securityIntegrations, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/sequences_def.go b/pkg/sdk/sequences_def.go
index c73ea4d506..95bcbeb9e3 100644
--- a/pkg/sdk/sequences_def.go
+++ b/pkg/sdk/sequences_def.go
@@ -78,7 +78,10 @@ var SequencesDef = g.NewInterface(
 		SQL("SEQUENCES").
 		OptionalLike().
 		OptionalIn(),
-).ShowByIdOperation().DescribeOperation(
+).ShowByIdOperationWithFiltering(
+	g.ShowByIDInFiltering,
+	g.ShowByIDLikeFiltering,
+).DescribeOperation(
 	g.DescriptionMappingKindSingleValue,
 	"https://docs.snowflake.com/en/sql-reference/sql/desc-sequence",
 	g.DbStruct("sequenceDetailRow").
diff --git a/pkg/sdk/sequences_dto_builders_gen.go b/pkg/sdk/sequences_dto_builders_gen.go
index 95b0355f95..1967527f5c 100644
--- a/pkg/sdk/sequences_dto_builders_gen.go
+++ b/pkg/sdk/sequences_dto_builders_gen.go
@@ -2,8 +2,6 @@
 
 package sdk
 
-import ()
-
 func NewCreateSequenceRequest(
 	name SchemaObjectIdentifier,
 ) *CreateSequenceRequest {
@@ -93,13 +91,13 @@ func NewShowSequenceRequest() *ShowSequenceRequest {
 	return &ShowSequenceRequest{}
 }
 
-func (s *ShowSequenceRequest) WithLike(Like *Like) *ShowSequenceRequest {
-	s.Like = Like
+func (s *ShowSequenceRequest) WithLike(Like Like) *ShowSequenceRequest {
+	s.Like = &Like
 	return s
 }
 
-func (s *ShowSequenceRequest) WithIn(In *In) *ShowSequenceRequest {
-	s.In = In
+func (s *ShowSequenceRequest) WithIn(In In) *ShowSequenceRequest {
+	s.In = &In
 	return s
 }
 
diff --git a/pkg/sdk/sequences_impl_gen.go b/pkg/sdk/sequences_impl_gen.go
index 202f61b605..e2a4a4a6dc 100644
--- a/pkg/sdk/sequences_impl_gen.go
+++ b/pkg/sdk/sequences_impl_gen.go
@@ -33,7 +33,9 @@ func (v *sequences) Show(ctx context.Context, request *ShowSequenceRequest) ([]S
 }
 
 func (v *sequences) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*Sequence, error) {
-	request := NewShowSequenceRequest().WithIn(&In{Schema: id.SchemaId()}).WithLike(&Like{String(id.Name())})
+	request := NewShowSequenceRequest().
+		WithIn(In{Schema: id.SchemaId()}).
+		WithLike(Like{Pattern: String(id.Name())})
 	sequences, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
diff --git a/pkg/sdk/session_policies_def.go b/pkg/sdk/session_policies_def.go
index 3b172f5562..f892ffd038 100644
--- a/pkg/sdk/session_policies_def.go
+++ b/pkg/sdk/session_policies_def.go
@@ -89,9 +89,7 @@ var SessionPoliciesDef = g.NewInterface(
 			Show().
 			SQL("SESSION POLICIES"),
 	).
-	ShowByIdOperationWithFiltering(
-		g.ShowByIDNoFiltering,
-	).
+	ShowByIdOperationWithNoFiltering().
 	DescribeOperation(
 		g.DescriptionMappingKindSingleValue,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-session-policy",
diff --git a/pkg/sdk/stages_def.go b/pkg/sdk/stages_def.go
index a71688d92e..abb686e161 100644
--- a/pkg/sdk/stages_def.go
+++ b/pkg/sdk/stages_def.go
@@ -398,4 +398,7 @@ var StagesDef = g.NewInterface(
 			OptionalLike().
 			OptionalIn(),
 	).
-	ShowByIdOperation()
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDLikeFiltering,
+		g.ShowByIDInFiltering,
+	)
diff --git a/pkg/sdk/stages_dto_builders_gen.go b/pkg/sdk/stages_dto_builders_gen.go
index 9aec793e27..31fb4d67a3 100644
--- a/pkg/sdk/stages_dto_builders_gen.go
+++ b/pkg/sdk/stages_dto_builders_gen.go
@@ -826,12 +826,12 @@ func NewShowStageRequest() *ShowStageRequest {
 	return &ShowStageRequest{}
 }
 
-func (s *ShowStageRequest) WithLike(Like *Like) *ShowStageRequest {
-	s.Like = Like
+func (s *ShowStageRequest) WithLike(Like Like) *ShowStageRequest {
+	s.Like = &Like
 	return s
 }
 
-func (s *ShowStageRequest) WithIn(In *In) *ShowStageRequest {
-	s.In = In
+func (s *ShowStageRequest) WithIn(In In) *ShowStageRequest {
+	s.In = &In
 	return s
 }
diff --git a/pkg/sdk/stages_impl_gen.go b/pkg/sdk/stages_impl_gen.go
index 9797678aa5..661173144f 100644
--- a/pkg/sdk/stages_impl_gen.go
+++ b/pkg/sdk/stages_impl_gen.go
@@ -94,13 +94,10 @@ func (v *stages) Show(ctx context.Context, request *ShowStageRequest) ([]Stage,
 }
 
 func (v *stages) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*Stage, error) {
-	stages, err := v.Show(ctx, NewShowStageRequest().
-		WithLike(&Like{
-			Pattern: String(id.Name()),
-		}).
-		WithIn(&In{
-			Schema: id.SchemaId(),
-		}))
+	request := NewShowStageRequest().
+		WithLike(Like{Pattern: String(id.Name())}).
+		WithIn(In{Schema: id.SchemaId()})
+	stages, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/storage_integration_def.go b/pkg/sdk/storage_integration_def.go
index 04e24c37da..3e89c8b584 100644
--- a/pkg/sdk/storage_integration_def.go
+++ b/pkg/sdk/storage_integration_def.go
@@ -151,7 +151,9 @@ var StorageIntegrationDef = g.NewInterface(
 			SQL("STORAGE INTEGRATIONS").
 			OptionalLike(),
 	).
-	ShowByIdOperation().
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDLikeFiltering,
+	).
 	DescribeOperation(
 		g.DescriptionMappingKindSlice,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-integration",
diff --git a/pkg/sdk/storage_integration_impl_gen.go b/pkg/sdk/storage_integration_impl_gen.go
index 9ac54949d8..47aa686b01 100644
--- a/pkg/sdk/storage_integration_impl_gen.go
+++ b/pkg/sdk/storage_integration_impl_gen.go
@@ -38,9 +38,9 @@ func (v *storageIntegrations) Show(ctx context.Context, request *ShowStorageInte
 }
 
 func (v *storageIntegrations) ShowByID(ctx context.Context, id AccountObjectIdentifier) (*StorageIntegration, error) {
-	storageIntegrations, err := v.Show(ctx, NewShowStorageIntegrationRequest().WithLike(Like{
-		Pattern: String(id.Name()),
-	}))
+	request := NewShowStorageIntegrationRequest().
+		WithLike(Like{Pattern: String(id.Name())})
+	storageIntegrations, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/streams_def.go b/pkg/sdk/streams_def.go
index a67098574f..21395f2b2b 100644
--- a/pkg/sdk/streams_def.go
+++ b/pkg/sdk/streams_def.go
@@ -233,7 +233,10 @@ var (
 				OptionalStartsWith().
 				OptionalLimit(),
 		).
-		ShowByIdOperation().
+		ShowByIdOperationWithFiltering(
+			g.ShowByIDExtendedInFiltering,
+			g.ShowByIDLikeFiltering,
+		).
 		DescribeOperation(
 			g.DescriptionMappingKindSingleValue,
 			"https://docs.snowflake.com/en/sql-reference/sql/desc-stream",
diff --git a/pkg/sdk/streams_impl_gen.go b/pkg/sdk/streams_impl_gen.go
index 6612925b60..969ea99b51 100644
--- a/pkg/sdk/streams_impl_gen.go
+++ b/pkg/sdk/streams_impl_gen.go
@@ -59,13 +59,10 @@ func (v *streams) Show(ctx context.Context, request *ShowStreamRequest) ([]Strea
 }
 
 func (v *streams) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*Stream, error) {
-	streams, err := v.Show(ctx, NewShowStreamRequest().
-		WithIn(ExtendedIn{
-			In: In{
-				Schema: id.SchemaId(),
-			},
-		}).
-		WithLike(Like{Pattern: String(id.Name())}))
+	request := NewShowStreamRequest().
+		WithIn(ExtendedIn{In: In{Schema: id.SchemaId()}}).
+		WithLike(Like{Pattern: String(id.Name())})
+	streams, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/tags_validations.go b/pkg/sdk/tags_validations.go
index 25a219c533..2d01814df5 100644
--- a/pkg/sdk/tags_validations.go
+++ b/pkg/sdk/tags_validations.go
@@ -36,7 +36,7 @@ func (opts *createTagOptions) validate() error {
 }
 
 func (v *AllowedValues) validate() error {
-	if !validateIntInRange(len(v.Values), 1, 300) {
+	if !validateIntInRangeInclusive(len(v.Values), 1, 300) {
 		return errIntBetween("AllowedValues", "Values", 1, 300)
 	}
 	return nil
diff --git a/pkg/sdk/tasks_def.go b/pkg/sdk/tasks_def.go
index 83ff671492..13fdaa89fc 100644
--- a/pkg/sdk/tasks_def.go
+++ b/pkg/sdk/tasks_def.go
@@ -292,7 +292,10 @@ var TasksDef = g.NewInterface(
 			OptionalSQL("ROOT ONLY").
 			OptionalLimit(),
 	).
-	ShowByIdOperation().
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDExtendedInFiltering,
+		g.ShowByIDLikeFiltering,
+	).
 	DescribeOperation(
 		g.DescriptionMappingKindSingleValue,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-task",
diff --git a/pkg/sdk/tasks_gen_test.go b/pkg/sdk/tasks_gen_test.go
index 9422d73824..56b8fe4c6f 100644
--- a/pkg/sdk/tasks_gen_test.go
+++ b/pkg/sdk/tasks_gen_test.go
@@ -45,9 +45,9 @@ func TestTasks_Create(t *testing.T) {
 	t.Run("validation: opts.SessionParameters.SessionParameters should be valid", func(t *testing.T) {
 		opts := defaultOpts()
 		opts.SessionParameters = &SessionParameters{
-			JSONIndent: Int(25),
+			JsonIndent: Int(-1),
 		}
-		assertOptsInvalidJoinedErrors(t, opts, errIntBetween("SessionParameters", "JSONIndent", 0, 16))
+		assertOptsInvalidJoinedErrors(t, opts, errIntValue("SessionParameters", "JsonIndent", IntErrGreaterOrEqual, 0))
 	})
 
 	t.Run("basic", func(t *testing.T) {
@@ -78,7 +78,7 @@ func TestTasks_Create(t *testing.T) {
 		opts.Config = String(`$${"output_dir": "/temp/test_directory/", "learning_rate": 0.1}$$`)
 		opts.AllowOverlappingExecution = Bool(true)
 		opts.SessionParameters = &SessionParameters{
-			JSONIndent:  Int(10),
+			JsonIndent:  Int(10),
 			LockTimeout: Int(5),
 		}
 		opts.UserTaskTimeoutMs = Int(5)
@@ -131,7 +131,7 @@ func TestTasks_CreateOrAlter(t *testing.T) {
 	t.Run("validation: opts.SessionParameters.SessionParameters should be valid", func(t *testing.T) {
 		opts := defaultOpts()
 		opts.SessionParameters = &SessionParameters{
-			JSONIndent: Int(25),
+			JsonIndent: Int(25),
 		}
 		assertOptsInvalidJoinedErrors(t, opts, errIntBetween("SessionParameters", "JSONIndent", 0, 16))
 	})
@@ -155,7 +155,7 @@ func TestTasks_CreateOrAlter(t *testing.T) {
 		opts.AllowOverlappingExecution = Bool(true)
 		opts.UserTaskTimeoutMs = Int(5)
 		opts.SessionParameters = &SessionParameters{
-			JSONIndent:  Int(10),
+			JsonIndent:  Int(10),
 			LockTimeout: Int(5),
 		}
 		opts.SuspendTaskAfterNumFailures = Int(6)
@@ -265,7 +265,7 @@ func TestTasks_Alter(t *testing.T) {
 		opts := defaultOpts()
 		opts.Set = &TaskSet{}
 		opts.Set.SessionParameters = &SessionParameters{
-			JSONIndent: Int(25),
+			JsonIndent: Int(25),
 		}
 		assertOptsInvalidJoinedErrors(t, opts, errIntBetween("SessionParameters", "JSONIndent", 0, 16))
 	})
@@ -337,7 +337,7 @@ func TestTasks_Alter(t *testing.T) {
 		opts := defaultOpts()
 		opts.Set = &TaskSet{
 			SessionParameters: &SessionParameters{
-				JSONIndent: Int(15),
+				JsonIndent: Int(15),
 			},
 		}
 		assertOptsValidAndSQLEquals(t, opts, "ALTER TASK %s SET JSON_INDENT = 15", id.FullyQualifiedName())
diff --git a/pkg/sdk/tasks_impl_gen.go b/pkg/sdk/tasks_impl_gen.go
index 5f7bd10a82..96ec539770 100644
--- a/pkg/sdk/tasks_impl_gen.go
+++ b/pkg/sdk/tasks_impl_gen.go
@@ -54,13 +54,10 @@ func (v *tasks) Show(ctx context.Context, request *ShowTaskRequest) ([]Task, err
 }
 
 func (v *tasks) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*Task, error) {
-	tasks, err := v.Show(ctx, NewShowTaskRequest().WithIn(ExtendedIn{
-		In: In{
-			Schema: id.SchemaId(),
-		},
-	}).WithLike(Like{
-		Pattern: String(id.Name()),
-	}))
+	request := NewShowTaskRequest().
+		WithIn(ExtendedIn{In: In{Schema: id.SchemaId()}}).
+		WithLike(Like{Pattern: String(id.Name())})
+	tasks, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sdk/testint/accounts_integration_test.go b/pkg/sdk/testint/accounts_integration_test.go
index 6ed6b1ac5d..f2e646073d 100644
--- a/pkg/sdk/testint/accounts_integration_test.go
+++ b/pkg/sdk/testint/accounts_integration_test.go
@@ -457,7 +457,7 @@ func TestInt_Account_SelfAlter(t *testing.T) {
 		require.NotEmpty(t, parameters)
 
 		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterMinDataRetentionTimeInDays))
-		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterJSONIndent))
+		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterJsonIndent))
 		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterUserTaskTimeoutMs))
 		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterEnableUnredactedQuerySyntaxError))
 
@@ -468,7 +468,7 @@ func TestInt_Account_SelfAlter(t *testing.T) {
 						MinDataRetentionTimeInDays: sdk.Int(15), // default is 0
 					},
 					SessionParameters: &sdk.SessionParameters{
-						JSONIndent: sdk.Int(8), // default is 2
+						JsonIndent: sdk.Int(8), // default is 2
 					},
 					ObjectParameters: &sdk.ObjectParameters{
 						UserTaskTimeoutMs: sdk.Int(100), // default is 3600000
@@ -486,7 +486,7 @@ func TestInt_Account_SelfAlter(t *testing.T) {
 		require.NotEmpty(t, parameters)
 
 		assertParameterValueSetOnAccount(t, parameters, string(sdk.AccountParameterMinDataRetentionTimeInDays), "15")
-		assertParameterValueSetOnAccount(t, parameters, string(sdk.AccountParameterJSONIndent), "8")
+		assertParameterValueSetOnAccount(t, parameters, string(sdk.AccountParameterJsonIndent), "8")
 		assertParameterValueSetOnAccount(t, parameters, string(sdk.AccountParameterUserTaskTimeoutMs), "100")
 		assertParameterValueSetOnAccount(t, parameters, string(sdk.AccountParameterEnableUnredactedQuerySyntaxError), "true")
 
@@ -497,7 +497,7 @@ func TestInt_Account_SelfAlter(t *testing.T) {
 						MinDataRetentionTimeInDays: sdk.Bool(true),
 					},
 					SessionParameters: &sdk.SessionParametersUnset{
-						JSONIndent: sdk.Bool(true),
+						JsonIndent: sdk.Bool(true),
 					},
 					ObjectParameters: &sdk.ObjectParametersUnset{
 						UserTaskTimeoutMs: sdk.Bool(true),
@@ -515,7 +515,7 @@ func TestInt_Account_SelfAlter(t *testing.T) {
 		require.NotEmpty(t, parameters)
 
 		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterMinDataRetentionTimeInDays))
-		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterJSONIndent))
+		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterJsonIndent))
 		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterUserTaskTimeoutMs))
 		assertParameterIsDefault(t, parameters, string(sdk.AccountParameterEnableUnredactedQuerySyntaxError))
 	})
diff --git a/pkg/sdk/testint/api_integrations_gen_integration_test.go b/pkg/sdk/testint/api_integrations_gen_integration_test.go
index b4c04c6e64..7f816d6b4d 100644
--- a/pkg/sdk/testint/api_integrations_gen_integration_test.go
+++ b/pkg/sdk/testint/api_integrations_gen_integration_test.go
@@ -387,7 +387,7 @@ func TestInt_ApiIntegrations(t *testing.T) {
 		integrationAzure := createAzureApiIntegration(t)
 
 		showRequest := sdk.NewShowApiIntegrationRequest().
-			WithLike(&sdk.Like{Pattern: &integrationAws.Name})
+			WithLike(sdk.Like{Pattern: &integrationAws.Name})
 		returnedIntegrations, err := client.ApiIntegrations.Show(ctx, showRequest)
 		require.NoError(t, err)
 
diff --git a/pkg/sdk/testint/application_packages_integration_test.go b/pkg/sdk/testint/application_packages_integration_test.go
index a9e5e5b2fd..dd0d768acc 100644
--- a/pkg/sdk/testint/application_packages_integration_test.go
+++ b/pkg/sdk/testint/application_packages_integration_test.go
@@ -123,7 +123,7 @@ func TestInt_ApplicationPackages(t *testing.T) {
 	t.Run("show application package for SQL: with like", func(t *testing.T) {
 		e := createApplicationPackageHandle(t)
 
-		packages, err := client.ApplicationPackages.Show(ctx, sdk.NewShowApplicationPackageRequest().WithLike(&sdk.Like{Pattern: &e.Name}))
+		packages, err := client.ApplicationPackages.Show(ctx, sdk.NewShowApplicationPackageRequest().WithLike(sdk.Like{Pattern: &e.Name}))
 		require.NoError(t, err)
 		require.Equal(t, 1, len(packages))
 		require.Equal(t, *e, packages[0])
diff --git a/pkg/sdk/testint/applications_integration_test.go b/pkg/sdk/testint/applications_integration_test.go
index 4332983a97..280a119c00 100644
--- a/pkg/sdk/testint/applications_integration_test.go
+++ b/pkg/sdk/testint/applications_integration_test.go
@@ -182,7 +182,7 @@ func TestInt_Applications(t *testing.T) {
 	t.Run("show application: with like", func(t *testing.T) {
 		version, patch := "V001", 0
 		_, e, _ := createApplicationHandle(t, version, patch, false, true, false)
-		packages, err := client.Applications.Show(ctx, sdk.NewShowApplicationRequest().WithLike(&sdk.Like{Pattern: &e.Name}))
+		packages, err := client.Applications.Show(ctx, sdk.NewShowApplicationRequest().WithLike(sdk.Like{Pattern: &e.Name}))
 		require.NoError(t, err)
 		require.Equal(t, 1, len(packages))
 		require.Equal(t, *e, packages[0])
diff --git a/pkg/sdk/testint/event_tables_integration_test.go b/pkg/sdk/testint/event_tables_integration_test.go
index 434e0e60c0..b6a3cef727 100644
--- a/pkg/sdk/testint/event_tables_integration_test.go
+++ b/pkg/sdk/testint/event_tables_integration_test.go
@@ -84,7 +84,7 @@ func TestInt_EventTables(t *testing.T) {
 		et1 := createEventTableHandle(t)
 		et2 := createEventTableHandle(t)
 
-		tables, err := client.EventTables.Show(ctx, sdk.NewShowEventTableRequest().WithLike(&sdk.Like{Pattern: &et1.Name}))
+		tables, err := client.EventTables.Show(ctx, sdk.NewShowEventTableRequest().WithLike(sdk.Like{Pattern: &et1.Name}))
 		require.NoError(t, err)
 		assert.Equal(t, 1, len(tables))
 		assert.Contains(t, tables, *et1)
@@ -98,7 +98,7 @@ func TestInt_EventTables(t *testing.T) {
 	})
 
 	t.Run("show event table: no matches", func(t *testing.T) {
-		tables, err := client.EventTables.Show(ctx, sdk.NewShowEventTableRequest().WithLike(&sdk.Like{Pattern: sdk.String("non-existent")}))
+		tables, err := client.EventTables.Show(ctx, sdk.NewShowEventTableRequest().WithLike(sdk.Like{Pattern: sdk.String("non-existent")}))
 		require.NoError(t, err)
 		assert.Equal(t, 0, len(tables))
 	})
diff --git a/pkg/sdk/testint/managed_accounts_gen_integration_test.go b/pkg/sdk/testint/managed_accounts_gen_integration_test.go
index 717db30db0..b76ce8956c 100644
--- a/pkg/sdk/testint/managed_accounts_gen_integration_test.go
+++ b/pkg/sdk/testint/managed_accounts_gen_integration_test.go
@@ -125,7 +125,7 @@ func TestInt_ManagedAccounts(t *testing.T) {
 		managedAccount2 := createManagedAccount(t)
 
 		showRequest := sdk.NewShowManagedAccountRequest().
-			WithLike(&sdk.Like{Pattern: &managedAccount1.Name})
+			WithLike(sdk.Like{Pattern: &managedAccount1.Name})
 		returnedManagedAccounts, err := client.ManagedAccounts.Show(ctx, showRequest)
 
 		require.NoError(t, err)
diff --git a/pkg/sdk/testint/materialized_views_gen_integration_test.go b/pkg/sdk/testint/materialized_views_gen_integration_test.go
index 6cad7bcb93..f4e74bdb4a 100644
--- a/pkg/sdk/testint/materialized_views_gen_integration_test.go
+++ b/pkg/sdk/testint/materialized_views_gen_integration_test.go
@@ -335,7 +335,7 @@ func TestInt_MaterializedViews(t *testing.T) {
 
 	t.Run("show materialized view: no existing view", func(t *testing.T) {
 		showRequest := sdk.NewShowMaterializedViewRequest().
-			WithIn(&sdk.In{Schema: testClientHelper().Ids.SchemaId()})
+			WithIn(sdk.In{Schema: testClientHelper().Ids.SchemaId()})
 		returnedViews, err := client.MaterializedViews.Show(ctx, showRequest)
 		require.NoError(t, err)
 
@@ -344,7 +344,7 @@ func TestInt_MaterializedViews(t *testing.T) {
 
 	t.Run("show materialized view: schema not existing", func(t *testing.T) {
 		showRequest := sdk.NewShowMaterializedViewRequest().
-			WithIn(&sdk.In{Schema: NonExistingDatabaseObjectIdentifier})
+			WithIn(sdk.In{Schema: NonExistingDatabaseObjectIdentifier})
 		_, err := client.MaterializedViews.Show(ctx, showRequest)
 		require.Error(t, err)
 	})
@@ -354,8 +354,8 @@ func TestInt_MaterializedViews(t *testing.T) {
 		view2 := createMaterializedView(t)
 
 		showRequest := sdk.NewShowMaterializedViewRequest().
-			WithLike(&sdk.Like{Pattern: &view1.Name}).
-			WithIn(&sdk.In{Schema: testClientHelper().Ids.SchemaId()})
+			WithLike(sdk.Like{Pattern: &view1.Name}).
+			WithIn(sdk.In{Schema: testClientHelper().Ids.SchemaId()})
 		returnedViews, err := client.MaterializedViews.Show(ctx, showRequest)
 
 		require.NoError(t, err)
diff --git a/pkg/sdk/testint/network_rule_gen_integration_test.go b/pkg/sdk/testint/network_rule_gen_integration_test.go
index 705b29824b..91122f3b05 100644
--- a/pkg/sdk/testint/network_rule_gen_integration_test.go
+++ b/pkg/sdk/testint/network_rule_gen_integration_test.go
@@ -92,9 +92,9 @@ func TestInt_NetworkRules(t *testing.T) {
 			require.NoError(t, err)
 		})
 
-		networkRules, err := client.NetworkRules.Show(ctx, sdk.NewShowNetworkRuleRequest().WithIn(&sdk.In{
+		networkRules, err := client.NetworkRules.Show(ctx, sdk.NewShowNetworkRuleRequest().WithIn(sdk.In{
 			Schema: id.SchemaId(),
-		}).WithLike(&sdk.Like{
+		}).WithLike(sdk.Like{
 			Pattern: sdk.String(id.Name()),
 		}))
 		require.NoError(t, err)
diff --git a/pkg/sdk/testint/notification_integrations_gen_integration_test.go b/pkg/sdk/testint/notification_integrations_gen_integration_test.go
index e813680226..5f3c4ab354 100644
--- a/pkg/sdk/testint/notification_integrations_gen_integration_test.go
+++ b/pkg/sdk/testint/notification_integrations_gen_integration_test.go
@@ -401,7 +401,7 @@ func TestInt_NotificationIntegrations(t *testing.T) {
 		notificationAutoAzure := createNotificationIntegrationAutoAzure(t)
 
 		showRequest := sdk.NewShowNotificationIntegrationRequest().
-			WithLike(&sdk.Like{Pattern: &notificationAutoGoogle.Name})
+			WithLike(sdk.Like{Pattern: &notificationAutoGoogle.Name})
 		returnedIntegrations, err := client.NotificationIntegrations.Show(ctx, showRequest)
 		require.NoError(t, err)
 
diff --git a/pkg/sdk/testint/procedures_integration_test.go b/pkg/sdk/testint/procedures_integration_test.go
index b0a935f070..1b31107ddd 100644
--- a/pkg/sdk/testint/procedures_integration_test.go
+++ b/pkg/sdk/testint/procedures_integration_test.go
@@ -2093,7 +2093,7 @@ def filter_by_role(session, table_name, role):
 		assert.Equal(t, "(x FLOAT)", *pairs["signature"])
 		assert.Equal(t, "FLOAT", *pairs["returns"])
 		assert.Equal(t, "SQL", *pairs["language"])
-		assert.Equal(t, "\nBEGIN\n\tRETURN 3.141592654::FLOAT;\nEND;\n", *pairs["body"])
+		assert.Equal(t, "BEGIN\n  RETURN 3.141592654::FLOAT;\nEND;\n", *pairs["body"])
 		assert.Equal(t, "OWNER", *pairs["execute as"])
 	})
 
diff --git a/pkg/sdk/testint/row_access_policies_gen_integration_test.go b/pkg/sdk/testint/row_access_policies_gen_integration_test.go
index 2833210fe8..cbcea2f05e 100644
--- a/pkg/sdk/testint/row_access_policies_gen_integration_test.go
+++ b/pkg/sdk/testint/row_access_policies_gen_integration_test.go
@@ -190,8 +190,8 @@ func TestInt_RowAccessPolicies(t *testing.T) {
 		t.Cleanup(cleanup2)
 
 		showRequest := sdk.NewShowRowAccessPolicyRequest().
-			WithLike(&sdk.Like{Pattern: &rowAccessPolicy1.Name}).
-			WithIn(&sdk.ExtendedIn{In: sdk.In{Schema: testClientHelper().Ids.SchemaId()}}).
+			WithLike(sdk.Like{Pattern: &rowAccessPolicy1.Name}).
+			WithIn(sdk.ExtendedIn{In: sdk.In{Schema: testClientHelper().Ids.SchemaId()}}).
 			WithLimit(&sdk.LimitFrom{Rows: sdk.Int(5)})
 		returnedRowAccessPolicies, err := client.RowAccessPolicies.Show(ctx, showRequest)
 
diff --git a/pkg/sdk/testint/sequences_integration_test.go b/pkg/sdk/testint/sequences_integration_test.go
index 1a8cb538f2..c268cfa85e 100644
--- a/pkg/sdk/testint/sequences_integration_test.go
+++ b/pkg/sdk/testint/sequences_integration_test.go
@@ -92,7 +92,7 @@ func TestInt_Sequences(t *testing.T) {
 		e1 := createSequenceHandle(t)
 		e2 := createSequenceHandle(t)
 
-		sequences, err := client.Sequences.Show(ctx, sdk.NewShowSequenceRequest().WithLike(&sdk.Like{Pattern: &e1.Name}))
+		sequences, err := client.Sequences.Show(ctx, sdk.NewShowSequenceRequest().WithLike(sdk.Like{Pattern: &e1.Name}))
 		require.NoError(t, err)
 		require.Equal(t, 1, len(sequences))
 		require.Contains(t, sequences, *e1)
@@ -100,7 +100,7 @@ func TestInt_Sequences(t *testing.T) {
 	})
 
 	t.Run("show sequence: no matches", func(t *testing.T) {
-		sequences, err := client.Sequences.Show(ctx, sdk.NewShowSequenceRequest().WithLike(&sdk.Like{Pattern: sdk.String("non-existent")}))
+		sequences, err := client.Sequences.Show(ctx, sdk.NewShowSequenceRequest().WithLike(sdk.Like{Pattern: sdk.String("non-existent")}))
 		require.NoError(t, err)
 		require.Equal(t, 0, len(sequences))
 	})
diff --git a/pkg/sdk/testint/tasks_gen_integration_test.go b/pkg/sdk/testint/tasks_gen_integration_test.go
index 6304a830d4..5efdade6de 100644
--- a/pkg/sdk/testint/tasks_gen_integration_test.go
+++ b/pkg/sdk/testint/tasks_gen_integration_test.go
@@ -142,7 +142,7 @@ func TestInt_Tasks(t *testing.T) {
 		GeometryOutputFormat:                     sdk.Pointer(sdk.GeometryOutputFormatWKB),
 		JdbcTreatTimestampNtzAsUtc:               sdk.Bool(true),
 		JdbcUseSessionTimezone:                   sdk.Bool(false),
-		JSONIndent:                               sdk.Int(4),
+		JsonIndent:                               sdk.Int(4),
 		LockTimeout:                              sdk.Int(21222),
 		LogLevel:                                 sdk.Pointer(sdk.LogLevelError),
 		MultiStatementCount:                      sdk.Int(0),
@@ -155,7 +155,7 @@ func TestInt_Tasks(t *testing.T) {
 		SearchPath:                               sdk.String("$public, $current"),
 		StatementQueuedTimeoutInSeconds:          sdk.Int(10),
 		StatementTimeoutInSeconds:                sdk.Int(10),
-		StrictJSONOutput:                         sdk.Bool(true),
+		StrictJsonOutput:                         sdk.Bool(true),
 		TimestampDayIsAlways24h:                  sdk.Bool(true),
 		TimestampInputFormat:                     sdk.String("YYYY-MM-DD"),
 		TimestampLTZOutputFormat:                 sdk.String("YYYY-MM-DD HH24:MI:SS"),
@@ -276,7 +276,7 @@ func TestInt_Tasks(t *testing.T) {
 			WithConfig(`{"output_dir": "/temp/test_directory/", "learning_rate": 0.1}`).
 			WithAllowOverlappingExecution(true).
 			WithSessionParameters(sdk.SessionParameters{
-				JSONIndent: sdk.Int(4),
+				JsonIndent: sdk.Int(4),
 			}).
 			WithUserTaskTimeoutMs(500).
 			WithSuspendTaskAfterNumFailures(3).
@@ -667,7 +667,7 @@ func TestInt_Tasks(t *testing.T) {
 				GeometryOutputFormat:                     sdk.Bool(true),
 				JdbcTreatTimestampNtzAsUtc:               sdk.Bool(true),
 				JdbcUseSessionTimezone:                   sdk.Bool(true),
-				JSONIndent:                               sdk.Bool(true),
+				JsonIndent:                               sdk.Bool(true),
 				LockTimeout:                              sdk.Bool(true),
 				LogLevel:                                 sdk.Bool(true),
 				MultiStatementCount:                      sdk.Bool(true),
@@ -680,7 +680,7 @@ func TestInt_Tasks(t *testing.T) {
 				SearchPath:                               sdk.Bool(true),
 				StatementQueuedTimeoutInSeconds:          sdk.Bool(true),
 				StatementTimeoutInSeconds:                sdk.Bool(true),
-				StrictJSONOutput:                         sdk.Bool(true),
+				StrictJsonOutput:                         sdk.Bool(true),
 				TimestampDayIsAlways24h:                  sdk.Bool(true),
 				TimestampInputFormat:                     sdk.Bool(true),
 				TimestampLTZOutputFormat:                 sdk.Bool(true),
diff --git a/pkg/sdk/testint/users_integration_test.go b/pkg/sdk/testint/users_integration_test.go
index 87dc57819a..cc884d6cc8 100644
--- a/pkg/sdk/testint/users_integration_test.go
+++ b/pkg/sdk/testint/users_integration_test.go
@@ -774,7 +774,7 @@ func TestInt_Users(t *testing.T) {
 					JdbcTreatDecimalAsInt:                    sdk.Bool(false),
 					JdbcTreatTimestampNtzAsUtc:               sdk.Bool(true),
 					JdbcUseSessionTimezone:                   sdk.Bool(false),
-					JSONIndent:                               sdk.Int(4),
+					JsonIndent:                               sdk.Int(4),
 					LockTimeout:                              sdk.Int(21222),
 					LogLevel:                                 sdk.Pointer(sdk.LogLevelError),
 					MultiStatementCount:                      sdk.Int(0),
@@ -788,7 +788,7 @@ func TestInt_Users(t *testing.T) {
 					SimulatedDataSharingConsumer:             sdk.String("some_consumer"),
 					StatementQueuedTimeoutInSeconds:          sdk.Int(10),
 					StatementTimeoutInSeconds:                sdk.Int(10),
-					StrictJSONOutput:                         sdk.Bool(true),
+					StrictJsonOutput:                         sdk.Bool(true),
 					TimestampDayIsAlways24h:                  sdk.Bool(true),
 					TimestampInputFormat:                     sdk.String("YYYY-MM-DD"),
 					TimestampLTZOutputFormat:                 sdk.String("YYYY-MM-DD HH24:MI:SS"),
@@ -1406,7 +1406,7 @@ func TestInt_Users(t *testing.T) {
 						JdbcTreatDecimalAsInt:                    sdk.Bool(false),
 						JdbcTreatTimestampNtzAsUtc:               sdk.Bool(true),
 						JdbcUseSessionTimezone:                   sdk.Bool(false),
-						JSONIndent:                               sdk.Int(4),
+						JsonIndent:                               sdk.Int(4),
 						LockTimeout:                              sdk.Int(21222),
 						LogLevel:                                 sdk.Pointer(sdk.LogLevelError),
 						MultiStatementCount:                      sdk.Int(0),
@@ -1420,7 +1420,7 @@ func TestInt_Users(t *testing.T) {
 						SimulatedDataSharingConsumer:             sdk.String("some_consumer"),
 						StatementQueuedTimeoutInSeconds:          sdk.Int(10),
 						StatementTimeoutInSeconds:                sdk.Int(10),
-						StrictJSONOutput:                         sdk.Bool(true),
+						StrictJsonOutput:                         sdk.Bool(true),
 						TimestampDayIsAlways24h:                  sdk.Bool(true),
 						TimestampInputFormat:                     sdk.String("YYYY-MM-DD"),
 						TimestampLTZOutputFormat:                 sdk.String("YYYY-MM-DD HH24:MI:SS"),
@@ -1483,7 +1483,7 @@ func TestInt_Users(t *testing.T) {
 						JdbcTreatDecimalAsInt:                    sdk.Bool(true),
 						JdbcTreatTimestampNtzAsUtc:               sdk.Bool(true),
 						JdbcUseSessionTimezone:                   sdk.Bool(true),
-						JSONIndent:                               sdk.Bool(true),
+						JsonIndent:                               sdk.Bool(true),
 						LockTimeout:                              sdk.Bool(true),
 						LogLevel:                                 sdk.Bool(true),
 						MultiStatementCount:                      sdk.Bool(true),
@@ -1497,7 +1497,7 @@ func TestInt_Users(t *testing.T) {
 						SimulatedDataSharingConsumer:             sdk.Bool(true),
 						StatementQueuedTimeoutInSeconds:          sdk.Bool(true),
 						StatementTimeoutInSeconds:                sdk.Bool(true),
-						StrictJSONOutput:                         sdk.Bool(true),
+						StrictJsonOutput:                         sdk.Bool(true),
 						TimestampDayIsAlways24h:                  sdk.Bool(true),
 						TimestampInputFormat:                     sdk.Bool(true),
 						TimestampLTZOutputFormat:                 sdk.Bool(true),
@@ -1732,7 +1732,7 @@ func TestInt_Users(t *testing.T) {
 				JdbcTreatDecimalAsInt:                    sdk.Bool(false),
 				JdbcTreatTimestampNtzAsUtc:               sdk.Bool(true),
 				JdbcUseSessionTimezone:                   sdk.Bool(false),
-				JSONIndent:                               sdk.Int(4),
+				JsonIndent:                               sdk.Int(4),
 				LockTimeout:                              sdk.Int(21222),
 				LogLevel:                                 sdk.Pointer(sdk.LogLevelError),
 				MultiStatementCount:                      sdk.Int(0),
@@ -1746,7 +1746,7 @@ func TestInt_Users(t *testing.T) {
 				SimulatedDataSharingConsumer:             sdk.String("some_consumer"),
 				StatementQueuedTimeoutInSeconds:          sdk.Int(10),
 				StatementTimeoutInSeconds:                sdk.Int(10),
-				StrictJSONOutput:                         sdk.Bool(true),
+				StrictJsonOutput:                         sdk.Bool(true),
 				TimestampDayIsAlways24h:                  sdk.Bool(true),
 				TimestampInputFormat:                     sdk.String("YYYY-MM-DD"),
 				TimestampLTZOutputFormat:                 sdk.String("YYYY-MM-DD HH24:MI:SS"),
diff --git a/pkg/sdk/validations.go b/pkg/sdk/validations.go
index d8199f2d24..aee936e17a 100644
--- a/pkg/sdk/validations.go
+++ b/pkg/sdk/validations.go
@@ -89,7 +89,7 @@ func valueSet(value interface{}) bool {
 	return true
 }
 
-func validateIntInRange(value int, min int, max int) bool {
+func validateIntInRangeInclusive(value int, min int, max int) bool {
 	if value < min || value > max {
 		return false
 	}
diff --git a/pkg/sdk/validations_test.go b/pkg/sdk/validations_test.go
index 36d26c0470..f9661d50aa 100644
--- a/pkg/sdk/validations_test.go
+++ b/pkg/sdk/validations_test.go
@@ -168,14 +168,14 @@ func TestValueSet(t *testing.T) {
 	})
 }
 
-func TestValidateIntInRange(t *testing.T) {
+func TestValidateIntInRangeInclusive(t *testing.T) {
 	t.Run("with value in range", func(t *testing.T) {
-		ok := validateIntInRange(5, 0, 10)
+		ok := validateIntInRangeInclusive(5, 0, 10)
 		assert.Equal(t, ok, true)
 	})
 
 	t.Run("with value out of range", func(t *testing.T) {
-		ok := validateIntInRange(5, 10, 20)
+		ok := validateIntInRangeInclusive(5, 10, 20)
 		assert.Equal(t, ok, false)
 	})
 }
diff --git a/pkg/sdk/views_def.go b/pkg/sdk/views_def.go
index e981a19c70..0346ace03b 100644
--- a/pkg/sdk/views_def.go
+++ b/pkg/sdk/views_def.go
@@ -336,7 +336,10 @@ var ViewsDef = g.NewInterface(
 			OptionalStartsWith().
 			OptionalLimit(),
 	).
-	ShowByIdOperation().
+	ShowByIdOperationWithFiltering(
+		g.ShowByIDExtendedInFiltering,
+		g.ShowByIDLikeFiltering,
+	).
 	DescribeOperation(
 		g.DescriptionMappingKindSlice,
 		"https://docs.snowflake.com/en/sql-reference/sql/desc-view",
diff --git a/pkg/sdk/views_impl_gen.go b/pkg/sdk/views_impl_gen.go
index a9a2783fb4..1bf940b4a9 100644
--- a/pkg/sdk/views_impl_gen.go
+++ b/pkg/sdk/views_impl_gen.go
@@ -40,7 +40,9 @@ func (v *views) Show(ctx context.Context, request *ShowViewRequest) ([]View, err
 }
 
 func (v *views) ShowByID(ctx context.Context, id SchemaObjectIdentifier) (*View, error) {
-	request := NewShowViewRequest().WithIn(ExtendedIn{In: In{Schema: id.SchemaId()}}).WithLike(Like{String(id.Name())})
+	request := NewShowViewRequest().
+		WithIn(ExtendedIn{In: In{Schema: id.SchemaId()}}).
+		WithLike(Like{Pattern: String(id.Name())})
 	views, err := v.Show(ctx, request)
 	if err != nil {
 		return nil, err
diff --git a/pkg/sdk/warehouses.go b/pkg/sdk/warehouses.go
index e9799f74dc..d0970687ee 100644
--- a/pkg/sdk/warehouses.go
+++ b/pkg/sdk/warehouses.go
@@ -155,7 +155,7 @@ func (opts *CreateWarehouseOptions) validate() error {
 	if valueSet(opts.MinClusterCount) && valueSet(opts.MaxClusterCount) && !validateIntGreaterThanOrEqual(*opts.MaxClusterCount, *opts.MinClusterCount) {
 		errs = append(errs, fmt.Errorf("MinClusterCount must be less than or equal to MaxClusterCount"))
 	}
-	if valueSet(opts.QueryAccelerationMaxScaleFactor) && !validateIntInRange(*opts.QueryAccelerationMaxScaleFactor, 0, 100) {
+	if valueSet(opts.QueryAccelerationMaxScaleFactor) && !validateIntInRangeInclusive(*opts.QueryAccelerationMaxScaleFactor, 0, 100) {
 		errs = append(errs, errIntBetween("CreateWarehouseOptions", "QueryAccelerationMaxScaleFactor", 0, 100))
 	}
 	return errors.Join(errs...)
@@ -250,7 +250,7 @@ type WarehouseSet struct {
 func (v *WarehouseSet) validate() error {
 	// we validate only the case then both are set together, if only MinClusterCount is set, we leave it for Snowflake to validate
 	if v.MinClusterCount != nil && valueSet(v.MaxClusterCount) {
-		if ok := validateIntInRange(*v.MinClusterCount, 1, *v.MaxClusterCount); !ok {
+		if ok := validateIntInRangeInclusive(*v.MinClusterCount, 1, *v.MaxClusterCount); !ok {
 			return fmt.Errorf("MinClusterCount must be less than or equal to MaxClusterCount")
 		}
 	}
@@ -260,7 +260,7 @@ func (v *WarehouseSet) validate() error {
 		}
 	}
 	if v.QueryAccelerationMaxScaleFactor != nil {
-		if ok := validateIntInRange(*v.QueryAccelerationMaxScaleFactor, 0, 100); !ok {
+		if ok := validateIntInRangeInclusive(*v.QueryAccelerationMaxScaleFactor, 0, 100); !ok {
 			return fmt.Errorf("QueryAccelerationMaxScaleFactor must be between 0 and 100")
 		}
 	}
diff --git a/templates/resources/procedure_python.md.tmpl b/templates/resources/procedure_python.md.tmpl
index 2636c371fa..1b16fbd8a4 100644
--- a/templates/resources/procedure_python.md.tmpl
+++ b/templates/resources/procedure_python.md.tmpl
@@ -11,6 +11,8 @@ description: |-
 
 !> **Caution: Preview Feature** This feature is considered a preview feature in the provider, regardless of the state of the resource in Snowflake. We do not guarantee its stability. It will be reworked and marked as a stable feature in future releases. Breaking changes are expected, even without bumping the major version. To use this feature, add the relevant feature name to `preview_features_enabled field` in the [provider configuration](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs#schema). Please always refer to the [Getting Help](https://github.com/Snowflake-Labs/terraform-provider-snowflake?tab=readme-ov-file#getting-help) section in our Github repo to best determine how to get help for your questions.
 
+!> **Caution: Import limitation** To import the python procedure, snowflake-snowpark-python version must be explicitly set in Snowflake (i.e. `snowflake-snowpark-python==1.14.0`). You can verify it by running `DESCRIBE PROCEDURE <your_procedure>` and checking the `packages`. Check [#3303](https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/3303) for reference.
+
 -> **Note** External changes to `is_secure` and `null_input_behavior` are not currently supported. They will be handled in the following versions of the provider which may still affect this resource.
 
 -> **Note** `COPY GRANTS` and `OR REPLACE` are not currently supported.
diff --git a/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md b/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md
index 93164a2c18..d0c39508a4 100644
--- a/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md
+++ b/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md
@@ -1,6 +1,6 @@
 # List of preview resources and data sources that are available in V1
 
-[Preview features](../ROADMAP.md#preview-resourcesdata sources) for the V1:
+[Preview features](../ROADMAP.md#preview-resourcesdatasources) for the V1:
 
 * [snowflake_current_account](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/1.0.0/docs/data-sources/current_account) (data source)
 * [snowflake_account_password_policy_attachment](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/1.0.0/docs/resources/account_password_policy_attachment)