From 664a61f638a5ed084bd06ba249235e2092889844 Mon Sep 17 00:00:00 2001
From: "fern-api[bot]" <115122769+fern-api[bot]@users.noreply.github.com>
Date: Fri, 13 Feb 2026 21:02:46 +0000
Subject: [PATCH] SDK regeneration

---
 pyproject.toml                                |   2 +-
 reference.md                                  | 673 ++++++----------
 src/polytomic/__init__.py                     | 590 +++++++-------
 src/polytomic/bulk_sync/__init__.py           |   6 +-
 src/polytomic/bulk_sync/client.py             | 412 +++++-----
 src/polytomic/bulk_sync/executions/client.py  | 104 ++-
 src/polytomic/bulk_sync/schedules/client.py   | 104 +--
 src/polytomic/bulk_sync/schemas/client.py     | 142 ++--
 src/polytomic/bulk_sync/types/__init__.py     |   6 +-
 ...v5create_bulk_sync_request_schemas_item.py |   6 +
 ...v5update_bulk_sync_request_schemas_item.py |   6 +
 ...2_create_bulk_sync_request_schemas_item.py |   6 -
 ...2_update_bulk_sync_request_schemas_item.py |   6 -
 src/polytomic/client.py                       |   8 +-
 src/polytomic/connections/client.py           | 216 +++---
 src/polytomic/core/client_wrapper.py          |   8 +-
 src/polytomic/events/client.py                |  59 +-
 src/polytomic/identity/client.py              |  18 +-
 src/polytomic/jobs/client.py                  |  38 +-
 src/polytomic/model_sync/client.py            | 729 +++++++-----------
 src/polytomic/model_sync/executions/client.py | 331 ++------
 src/polytomic/model_sync/targets/client.py    |  62 +-
 src/polytomic/models/client.py                | 232 +++---
 src/polytomic/notifications/client.py         |   2 +-
 src/polytomic/organization/client.py          |  88 +--
 src/polytomic/permissions/policies/client.py  | 116 +--
 src/polytomic/permissions/roles/client.py     |  88 +--
 src/polytomic/query_runner/client.py          |  14 +-
 src/polytomic/schemas/client.py               | 116 +--
 src/polytomic/types/__init__.py               | 628 +++++++--------
 src/polytomic/types/bulk_fetch_mode.py        |   5 -
 .../types/bulk_sync_dest_envelope.py          |  20 -
 .../types/bulk_sync_execution_envelope.py     |  20 -
 src/polytomic/types/bulk_sync_mode.py         |   5 -
 .../types/bulk_sync_response_envelope.py      |  23 -
 .../types/bulk_sync_source_envelope.py        |  20 -
 .../types/bulk_sync_source_schema_envelope.py |  20 -
 .../types/bulk_sync_source_status_envelope.py |  20 -
 .../types/bulk_sync_status_envelope.py        |  20 -
 src/polytomic/types/bulk_sync_target_mode.py  |   5 +
 .../cancel_model_sync_response_envelope.py    |  20 -
 .../types/connect_card_response_envelope.py   |  20 -
 .../connection_list_response_envelope.py      |  20 -
 ...tion_parameter_values_response_envelope.py |  20 -
 .../connection_type_response_envelope.py      |  20 -
 .../create_connection_response_envelope.py    |  20 -
 src/polytomic/types/event_body.py             |  26 -
 ...y => eventing_bulk_sync_canceled_event.py} |   2 +-
 ... => eventing_bulk_sync_completed_event.py} |   2 +-
 ...g_bulk_sync_completed_with_error_event.py} |   2 +-
 ....py => eventing_bulk_sync_failed_event.py} |   2 +-
 ...py => eventing_bulk_sync_running_event.py} |   2 +-
 ...ent.py => eventing_sync_canceled_event.py} |   6 +-
 ...nt.py => eventing_sync_completed_event.py} |   6 +-
 ...nting_sync_completed_with_errors_event.py} |   2 +-
 ...event.py => eventing_sync_failed_event.py} |   2 +-
 ...vent.py => eventing_sync_running_event.py} |   2 +-
 src/polytomic/types/events_envelope.py        |  20 -
 .../types/execution_logs_response_envelope.py |  20 -
 .../types/get_connection_meta_envelope.py     |  20 -
 .../types/get_execution_response_envelope.py  |  20 -
 .../get_model_sync_source_meta_envelope.py    |  20 -
 src/polytomic/types/job_response_envelope.py  |  20 -
 src/polytomic/types/jsonschema_schema.py      |   2 +-
 src/polytomic/types/list_bulk_schema.py       |  20 -
 ...ist_bulk_sync_execution_status_envelope.py |  20 -
 .../list_bulk_sync_executions_envelope.py     |  22 -
 .../types/list_execution_response_envelope.py |  22 -
 .../types/list_policies_response_envelope.py  |  20 -
 src/polytomic/types/list_users_envelope.py    |  20 -
 src/polytomic/types/model_field_response.py   |  20 -
 .../types/model_list_response_envelope.py     |  20 -
 .../types/model_response_envelope.py          |  22 -
 .../types/model_sample_response_envelope.py   |  22 -
 .../types/model_sync_response_envelope.py     |  20 -
 ..._mode.py => modelsync_sync_target_mode.py} |   2 +-
 src/polytomic/types/organization_envelope.py  |  20 -
 src/polytomic/types/organizations_envelope.py |  20 -
 .../types/policy_response_envelope.py         |  20 -
 .../types/role_list_response_envelope.py      |  20 -
 src/polytomic/types/role_response_envelope.py |  20 -
 .../schedule_option_response_envelope.py      |  20 -
 .../start_model_sync_response_envelope.py     |  20 -
 src/polytomic/types/sync_status_envelope.py   |  20 -
 .../types/target_response_envelope.py         |  20 -
 src/polytomic/types/user_envelope.py          |  20 -
 ...ion_status.py => util_execution_status.py} |   2 +-
 .../types/v2activate_sync_envelope.py         |  20 +
 ...sync_input.py => v2activate_sync_input.py} |   2 +-
 ...nc_output.py => v2activate_sync_output.py} |   2 +-
 ..._key_response.py => v2api_key_response.py} |   2 +-
 .../types/v2api_key_response_envelope.py      |  20 +
 .../{bulk_filter.py => v2bulk_filter.py}      |   2 +-
 ...{bulk_sync_dest.py => v2bulk_sync_dest.py} |   6 +-
 ...velope.py => v2bulk_sync_dest_envelope.py} |   6 +-
 ...velope.py => v2bulk_sync_list_envelope.py} |   6 +-
 ...nc_response.py => v2bulk_sync_response.py} |   6 +-
 ...tion_value.py => v2configuration_value.py} |   2 +-
 ...onnection_form.py => v2connection_form.py} |   0
 .../v2connection_list_response_envelope.py    |  20 +
 ...onnection_meta.py => v2connection_meta.py} |   2 +-
 ...ponse.py => v2connection_meta_response.py} |  10 +-
 ...lue.py => v2connection_parameter_value.py} |   2 +-
 ... => v2connection_parameter_values_resp.py} |   6 +-
 ...tion_parameter_values_response_envelope.py |  20 +
 .../types/v2connection_response_envelope.py   |  20 +
 ...ema.py => v2connection_response_schema.py} |  12 +-
 ...onnection_type.py => v2connection_type.py} |   4 +-
 .../v2connection_type_response_envelope.py    |  20 +
 ..._schema.py => v2connection_type_schema.py} |   2 +-
 .../v2create_connection_response_envelope.py  |  20 +
 ...=> v2create_connection_response_schema.py} |   6 +-
 ...l_request.py => v2create_model_request.py} |   6 +-
 ...uration.py => v2enricher_configuration.py} |   0
 ...icher_mapping.py => v2enricher_mapping.py} |   0
 .../types/{enrichment.py => v2enrichment.py}  |  10 +-
 src/polytomic/types/{event.py => v2event.py}  |   6 +-
 src/polytomic/types/v2event_payload.py        |  26 +
 ..._envelope.py => v2event_types_envelope.py} |   2 +-
 ...chema_envelope.py => v2events_envelope.py} |   6 +-
 ...cution_counts.py => v2execution_counts.py} |   2 +-
 ...esponse.py => v2execution_log_response.py} |   2 +-
 ...on_log_type.py => v2execution_log_type.py} |   0
 .../v2execution_logs_response_envelope.py     |  20 +
 ...figuration.py => v2field_configuration.py} |   2 +-
 .../types/{filter.py => v2filter.py}          |   6 +-
 ...e.py => v2get_connection_meta_envelope.py} |   6 +-
 ...ichment_input_fields_response_envelope.py} |   0
 .../v2get_execution_response_envelope.py      |  20 +
 ....py => v2get_execution_response_schema.py} |  10 +-
 .../types/v2get_identity_response_envelope.py |  20 +
 ...a.py => v2get_identity_response_schema.py} |   2 +-
 .../types/{identity.py => v2identity.py}      |   6 +-
 ...ity_function.py => v2identity_function.py} |   2 +-
 .../{job_response.py => v2job_response.py}    |   2 +-
 .../types/v2job_response_envelope.py          |  20 +
 .../v2list_execution_response_envelope.py     |  22 +
 .../v2list_policies_response_envelope.py      |  20 +
 src/polytomic/types/v2list_users_envelope.py  |  20 +
 src/polytomic/types/{mode.py => v2mode.py}    |   2 +-
 .../{model_field.py => v2model_field.py}      |   2 +-
 src/polytomic/types/v2model_field_response.py |  20 +
 .../types/v2model_list_response_envelope.py   |  20 +
 ...{model_response.py => v2model_response.py} |  14 +-
 .../types/v2model_response_envelope.py        |  22 +
 .../{model_sample.py => v2model_sample.py}    |   4 +-
 .../types/v2model_sample_response_envelope.py |  22 +
 ...g_github_com_invopop_jsonschema_schema.py} |   0
 .../{organization.py => v2organization.py}    |   2 +-
 .../types/v2organization_envelope.py          |  20 +
 ...nvelope.py => v2organizations_envelope.py} |   6 +-
 .../types/{override.py => v2override.py}      |   6 +-
 ...ion_details.py => v2pagination_details.py} |   2 +-
 .../{policy_action.py => v2policy_action.py}  |   2 +-
 ...olicy_response.py => v2policy_response.py} |   6 +-
 .../types/v2policy_response_envelope.py       |  20 +
 .../types/{relation.py => v2relation.py}      |   6 +-
 .../{relation_to.py => v2relation_to.py}      |   2 +-
 .../types/v2role_list_response_envelope.py    |  20 +
 .../{role_response.py => v2role_response.py}  |   2 +-
 .../types/v2role_response_envelope.py         |  20 +
 .../types/{run_after.py => v2run_after.py}    |   2 +-
 ..._2_sample_record.py => v2sample_record.py} |   0
 .../types/{schedule.py => v2schedule.py}      |   6 +-
 ...ponse.py => v2schedule_option_response.py} |   2 +-
 ...=> v2schedule_option_response_envelope.py} |   6 +-
 ...iguration.py => v2schema_configuration.py} |   8 +-
 .../v2schema_configuration_fields_item.py     |   6 +
 .../types/{source.py => v2source.py}          |   2 +-
 ...e.py => v2start_sync_response_envelope.py} |   6 +-
 ...ema.py => v2start_sync_response_schema.py} |   6 +-
 ..._bulk_mode.py => v2supported_bulk_mode.py} |   6 +-
 .../{model_sync_field.py => v2sync_field.py}  |   6 +-
 ...el_sync_response.py => v2sync_response.py} |  32 +-
 .../types/v2sync_response_envelope.py         |  20 +
 src/polytomic/types/v2sync_status_envelope.py |  20 +
 ..._response.py => v2sync_status_response.py} |   8 +-
 .../types/{target.py => v2target.py}          |   2 +-
 .../{target_field.py => v2target_field.py}    |   6 +-
 ...arget_response.py => v2target_response.py} |  10 +-
 .../types/v2target_response_envelope.py       |  20 +
 src/polytomic/types/{user.py => v2user.py}    |   2 +-
 src/polytomic/types/v2user_envelope.py        |  20 +
 .../types/{webhook.py => v2webhook.py}        |   2 +-
 src/polytomic/types/v2webhook_envelope.py     |  20 +
 .../types/v2webhook_list_envelope.py          |  20 +
 src/polytomic/types/v3bulk_fetch_mode.py      |   5 +
 .../types/{bulk_field.py => v3bulk_field.py}  |   2 +-
 src/polytomic/types/v3bulk_filter.py          |  26 +
 .../{bulk_schema.py => v3bulk_schema.py}      |  10 +-
 src/polytomic/types/v3bulk_schema_envelope.py |  20 +
 ..._execution.py => v3bulk_sync_execution.py} |  10 +-
 .../types/v3bulk_sync_execution_envelope.py   |  20 +
 ...ion.py => v3bulk_sync_schema_execution.py} |   2 +-
 ...k_sync_source.py => v3bulk_sync_source.py} |   6 +-
 .../types/v3bulk_sync_source_envelope.py      |  20 +
 .../v3bulk_sync_source_schema_envelope.py     |  20 +
 ...status.py => v3bulk_sync_source_status.py} |   2 +-
 .../v3bulk_sync_source_status_envelope.py     |  20 +
 .../types/v3bulk_sync_status_envelope.py      |  20 +
 ...onse.py => v3bulk_sync_status_response.py} |   8 +-
 ...response.py => v3connect_card_response.py} |   2 +-
 .../types/v3connect_card_response_envelope.py |  20 +
 .../types/v3list_bulk_schema_envelope.py      |  20 +
 .../v3list_bulk_sync_executions_envelope.py   |  22 +
 ...nc_response.py => v3pagination_details.py} |   4 +-
 .../types/{pick_value.py => v3pick_value.py}  |   2 +-
 .../types/{schema.py => v3schema.py}          |   6 +-
 .../{schema_field.py => v3schema_field.py}    |   6 +-
 ... => v3schema_records_response_envelope.py} |   2 +-
 ...e_bulk_field.py => v3update_bulk_field.py} |   2 +-
 ..._logs.py => v4bulk_sync_execution_logs.py} |   0
 ...=> v4bulk_sync_execution_logs_envelope.py} |   2 +-
 ...tus.py => v4bulk_sync_execution_status.py} |   6 +-
 ...ule_api.py => v4bulk_sync_schedule_api.py} |   0
 ...=> v4bulk_sync_schema_execution_status.py} |   2 +-
 src/polytomic/types/v4configuration_value.py  |  20 +
 ...lope.py => v4export_sync_logs_envelope.py} |   6 +-
 ...onse.py => v4export_sync_logs_response.py} |   0
 .../types/v4get_sync_source_meta_envelope.py  |  20 +
 ...=> v4global_error_subscribers_response.py} |   0
 ...st_bulk_sync_executions_status_envelope.py |  20 +
 ...nvelope.py => v4query_results_envelope.py} |   6 +-
 ...ry_envelope.py => v4run_query_envelope.py} |   2 +-
 ...agination.py => v4run_query_pagination.py} |   2 +-
 ..._query_result.py => v4run_query_result.py} |   0
 ...ule_envelope.py => v4schedule_envelope.py} |   2 +-
 ...es_envelope.py => v4schedules_envelope.py} |   2 +-
 .../{source_meta.py => v4source_meta.py}      |   2 +-
 ...{supported_mode.py => v4supported_mode.py} |   6 +-
 ...onse.py => v4sync_source_meta_response.py} |  10 +-
 ..._target_creator.py => v4target_creator.py} |   0
 .../{target_object.py => v4target_object.py}  |   6 +-
 ... => v4target_objects_response_envelope.py} |   6 +-
 ..._values.py => v4target_property_values.py} |   0
 ...y => v4target_property_values_envelope.py} |   2 +-
 ...eld_request.py => v4user_field_request.py} |   0
 src/polytomic/types/v5bulk_sync_response.py   |  72 ++
 .../types/v5bulk_sync_response_envelope.py    |  20 +
 .../types/v5bulk_sync_schedule_request.py     |  27 +
 .../types/v5bulk_sync_schedule_response.py    |  34 +
 src/polytomic/types/v5list_sync_item.py       |  41 +
 .../types/v5list_sync_response_envelope.py    |  22 +
 src/polytomic/types/v5pagination_details.py   |  19 +
 src/polytomic/types/v5run_after.py            |  20 +
 src/polytomic/types/v5schedule.py             |  33 +
 .../v_2_schema_configuration_fields_item.py   |   6 -
 src/polytomic/types/webhook_envelope.py       |  20 -
 src/polytomic/types/webhook_list_envelope.py  |  20 -
 src/polytomic/users/client.py                 | 188 ++---
 src/polytomic/webhooks/client.py              | 136 ++--
 251 files changed, 3660 insertions(+), 4013 deletions(-)
 create mode 100644 src/polytomic/bulk_sync/types/v5create_bulk_sync_request_schemas_item.py
 create mode 100644 src/polytomic/bulk_sync/types/v5update_bulk_sync_request_schemas_item.py
 delete mode 100644 src/polytomic/bulk_sync/types/v_2_create_bulk_sync_request_schemas_item.py
 delete mode 100644 src/polytomic/bulk_sync/types/v_2_update_bulk_sync_request_schemas_item.py
 delete mode 100644 src/polytomic/types/bulk_fetch_mode.py
 delete mode 100644 src/polytomic/types/bulk_sync_dest_envelope.py
 delete mode 100644 src/polytomic/types/bulk_sync_execution_envelope.py
 delete mode 100644 src/polytomic/types/bulk_sync_mode.py
 delete mode 100644 src/polytomic/types/bulk_sync_response_envelope.py
 delete mode 100644 src/polytomic/types/bulk_sync_source_envelope.py
 delete mode 100644 src/polytomic/types/bulk_sync_source_schema_envelope.py
 delete mode 100644 src/polytomic/types/bulk_sync_source_status_envelope.py
 delete mode 100644 src/polytomic/types/bulk_sync_status_envelope.py
 create mode 100644 src/polytomic/types/bulk_sync_target_mode.py
 delete mode 100644 src/polytomic/types/cancel_model_sync_response_envelope.py
 delete mode 100644 src/polytomic/types/connect_card_response_envelope.py
 delete mode 100644 src/polytomic/types/connection_list_response_envelope.py
 delete mode 100644 src/polytomic/types/connection_parameter_values_response_envelope.py
 delete mode 100644 src/polytomic/types/connection_type_response_envelope.py
 delete mode 100644 src/polytomic/types/create_connection_response_envelope.py
 delete mode 100644 src/polytomic/types/event_body.py
 rename src/polytomic/types/{bulk_sync_running_event.py => eventing_bulk_sync_canceled_event.py} (93%)
 rename src/polytomic/types/{bulk_sync_completed_event.py => eventing_bulk_sync_completed_event.py} (93%)
 rename src/polytomic/types/{bulk_sync_completed_with_error_event.py => eventing_bulk_sync_completed_with_error_event.py} (92%)
 rename src/polytomic/types/{bulk_sync_failed_event.py => eventing_bulk_sync_failed_event.py} (94%)
 rename src/polytomic/types/{bulk_sync_canceled_event.py => eventing_bulk_sync_running_event.py} (93%)
 rename src/polytomic/types/{sync_canceled_event.py => eventing_sync_canceled_event.py} (81%)
 rename src/polytomic/types/{sync_completed_event.py => eventing_sync_completed_event.py} (89%)
 rename src/polytomic/types/{sync_completed_with_errors_event.py => eventing_sync_completed_with_errors_event.py} (93%)
 rename src/polytomic/types/{sync_failed_event.py => eventing_sync_failed_event.py} (93%)
 rename src/polytomic/types/{sync_running_event.py => eventing_sync_running_event.py} (93%)
 delete mode 100644 src/polytomic/types/events_envelope.py
 delete mode 100644 src/polytomic/types/execution_logs_response_envelope.py
 delete mode 100644 src/polytomic/types/get_connection_meta_envelope.py
 delete mode 100644 src/polytomic/types/get_execution_response_envelope.py
 delete mode 100644 src/polytomic/types/get_model_sync_source_meta_envelope.py
 delete mode 100644 src/polytomic/types/job_response_envelope.py
 delete mode 100644 src/polytomic/types/list_bulk_schema.py
 delete mode 100644 src/polytomic/types/list_bulk_sync_execution_status_envelope.py
 delete mode 100644 src/polytomic/types/list_bulk_sync_executions_envelope.py
 delete mode 100644 src/polytomic/types/list_execution_response_envelope.py
 delete mode 100644 src/polytomic/types/list_policies_response_envelope.py
 delete mode 100644 src/polytomic/types/list_users_envelope.py
 delete mode 100644 src/polytomic/types/model_field_response.py
 delete mode 100644 src/polytomic/types/model_list_response_envelope.py
 delete mode 100644 src/polytomic/types/model_response_envelope.py
 delete mode 100644 src/polytomic/types/model_sample_response_envelope.py
 delete mode 100644 src/polytomic/types/model_sync_response_envelope.py
 rename src/polytomic/types/{model_sync_mode.py => modelsync_sync_target_mode.py} (81%)
 delete mode 100644 src/polytomic/types/organization_envelope.py
 delete mode 100644 src/polytomic/types/organizations_envelope.py
 delete mode 100644 src/polytomic/types/policy_response_envelope.py
 delete mode 100644 src/polytomic/types/role_list_response_envelope.py
 delete mode 100644 src/polytomic/types/role_response_envelope.py
 delete mode 100644 src/polytomic/types/schedule_option_response_envelope.py
 delete mode 100644 src/polytomic/types/start_model_sync_response_envelope.py
 delete mode 100644 src/polytomic/types/sync_status_envelope.py
 delete mode 100644 src/polytomic/types/target_response_envelope.py
 delete mode 100644 src/polytomic/types/user_envelope.py
 rename src/polytomic/types/{execution_status.py => util_execution_status.py} (90%)
 create mode 100644 src/polytomic/types/v2activate_sync_envelope.py
 rename src/polytomic/types/{activate_sync_input.py => v2activate_sync_input.py} (91%)
 rename src/polytomic/types/{activate_sync_output.py => v2activate_sync_output.py} (92%)
 rename src/polytomic/types/{api_key_response.py => v2api_key_response.py} (92%)
 create mode 100644 src/polytomic/types/v2api_key_response_envelope.py
 rename src/polytomic/types/{bulk_filter.py => v2bulk_filter.py} (94%)
 rename src/polytomic/types/{bulk_sync_dest.py => v2bulk_sync_dest.py} (78%)
 rename src/polytomic/types/{api_key_response_envelope.py => v2bulk_sync_dest_envelope.py} (77%)
 rename src/polytomic/types/{bulk_sync_list_envelope.py => v2bulk_sync_list_envelope.py} (80%)
 rename src/polytomic/types/{bulk_sync_response.py => v2bulk_sync_response.py} (94%)
 rename src/polytomic/types/{configuration_value.py => v2configuration_value.py} (92%)
 rename src/polytomic/types/{v_2_connection_form.py => v2connection_form.py} (100%)
 create mode 100644 src/polytomic/types/v2connection_list_response_envelope.py
 rename src/polytomic/types/{connection_meta.py => v2connection_meta.py} (93%)
 rename src/polytomic/types/{model_sync_source_meta_response.py => v2connection_meta_response.py} (63%)
 rename src/polytomic/types/{connection_parameter_value.py => v2connection_parameter_value.py} (91%)
 rename src/polytomic/types/{connection_parameter_values_resp.py => v2connection_parameter_values_resp.py} (72%)
 create mode 100644 src/polytomic/types/v2connection_parameter_values_response_envelope.py
 create mode 100644 src/polytomic/types/v2connection_response_envelope.py
 rename src/polytomic/types/{connection_response_schema.py => v2connection_response_schema.py} (75%)
 rename src/polytomic/types/{connection_type.py => v2connection_type.py} (94%)
 create mode 100644 src/polytomic/types/v2connection_type_response_envelope.py
 rename src/polytomic/types/{connection_type_schema.py => v2connection_type_schema.py} (93%)
 create mode 100644 src/polytomic/types/v2create_connection_response_envelope.py
 rename src/polytomic/types/{create_connection_response_schema.py => v2create_connection_response_schema.py} (88%)
 rename src/polytomic/types/{create_model_request.py => v2create_model_request.py} (89%)
 rename src/polytomic/types/{v_2_enricher_configuration.py => v2enricher_configuration.py} (100%)
 rename src/polytomic/types/{v_2_enricher_mapping.py => v2enricher_mapping.py} (100%)
 rename src/polytomic/types/{enrichment.py => v2enrichment.py} (75%)
 rename src/polytomic/types/{event.py => v2event.py} (84%)
 create mode 100644 src/polytomic/types/v2event_payload.py
 rename src/polytomic/types/{event_types_envelope.py => v2event_types_envelope.py} (92%)
 rename src/polytomic/types/{bulk_schema_envelope.py => v2events_envelope.py} (79%)
 rename src/polytomic/types/{execution_counts.py => v2execution_counts.py} (94%)
 rename src/polytomic/types/{execution_log_response.py => v2execution_log_response.py} (92%)
 rename src/polytomic/types/{v_2_execution_log_type.py => v2execution_log_type.py} (100%)
 create mode 100644 src/polytomic/types/v2execution_logs_response_envelope.py
 rename src/polytomic/types/{field_configuration.py => v2field_configuration.py} (94%)
 rename src/polytomic/types/{filter.py => v2filter.py} (90%)
 rename src/polytomic/types/{connection_response_envelope.py => v2get_connection_meta_envelope.py} (73%)
 rename src/polytomic/types/{v_2_get_enrichment_input_fields_response_envelope.py => v2get_enrichment_input_fields_response_envelope.py} (100%)
 create mode 100644 src/polytomic/types/v2get_execution_response_envelope.py
 rename src/polytomic/types/{get_execution_response_schema.py => v2get_execution_response_schema.py} (74%)
 create mode 100644 src/polytomic/types/v2get_identity_response_envelope.py
 rename src/polytomic/types/{get_identity_response_schema.py => v2get_identity_response_schema.py} (96%)
 rename src/polytomic/types/{identity.py => v2identity.py} (88%)
 rename src/polytomic/types/{identity_function.py => v2identity_function.py} (92%)
 rename src/polytomic/types/{job_response.py => v2job_response.py} (94%)
 create mode 100644 src/polytomic/types/v2job_response_envelope.py
 create mode 100644 src/polytomic/types/v2list_execution_response_envelope.py
 create mode 100644 src/polytomic/types/v2list_policies_response_envelope.py
 create mode 100644 src/polytomic/types/v2list_users_envelope.py
 rename src/polytomic/types/{mode.py => v2mode.py} (95%)
 rename src/polytomic/types/{model_field.py => v2model_field.py} (96%)
 create mode 100644 src/polytomic/types/v2model_field_response.py
 create mode 100644 src/polytomic/types/v2model_list_response_envelope.py
 rename src/polytomic/types/{model_response.py => v2model_response.py} (80%)
 create mode 100644 src/polytomic/types/v2model_response_envelope.py
 rename src/polytomic/types/{model_sample.py => v2model_sample.py} (87%)
 create mode 100644 src/polytomic/types/v2model_sample_response_envelope.py
 rename src/polytomic/types/{v_2_ordered_map_string_github_com_invopop_jsonschema_schema.py => v2ordered_map_string_github_com_invopop_jsonschema_schema.py} (100%)
 rename src/polytomic/types/{organization.py => v2organization.py} (94%)
 create mode 100644 src/polytomic/types/v2organization_envelope.py
 rename src/polytomic/types/{activate_sync_envelope.py => v2organizations_envelope.py} (76%)
 rename src/polytomic/types/{override.py => v2override.py} (89%)
 rename src/polytomic/types/{pagination_details.py => v2pagination_details.py} (92%)
 rename src/polytomic/types/{policy_action.py => v2policy_action.py} (93%)
 rename src/polytomic/types/{policy_response.py => v2policy_response.py} (80%)
 create mode 100644 src/polytomic/types/v2policy_response_envelope.py
 rename src/polytomic/types/{relation.py => v2relation.py} (84%)
 rename src/polytomic/types/{relation_to.py => v2relation_to.py} (93%)
 create mode 100644 src/polytomic/types/v2role_list_response_envelope.py
 rename src/polytomic/types/{role_response.py => v2role_response.py} (94%)
 create mode 100644 src/polytomic/types/v2role_response_envelope.py
 rename src/polytomic/types/{run_after.py => v2run_after.py} (94%)
 rename src/polytomic/types/{v_2_sample_record.py => v2sample_record.py} (100%)
 rename src/polytomic/types/{schedule.py => v2schedule.py} (89%)
 rename src/polytomic/types/{schedule_option_response.py => v2schedule_option_response.py} (92%)
 rename src/polytomic/types/{list_model_sync_response_envelope.py => v2schedule_option_response_envelope.py} (73%)
 rename src/polytomic/types/{schema_configuration.py => v2schema_configuration.py} (82%)
 create mode 100644 src/polytomic/types/v2schema_configuration_fields_item.py
 rename src/polytomic/types/{source.py => v2source.py} (93%)
 rename src/polytomic/types/{get_identity_response_envelope.py => v2start_sync_response_envelope.py} (73%)
 rename src/polytomic/types/{start_model_sync_response_schema.py => v2start_sync_response_schema.py} (80%)
 rename src/polytomic/types/{supported_bulk_mode.py => v2supported_bulk_mode.py} (83%)
 rename src/polytomic/types/{model_sync_field.py => v2sync_field.py} (92%)
 rename src/polytomic/types/{model_sync_response.py => v2sync_response.py} (64%)
 create mode 100644 src/polytomic/types/v2sync_response_envelope.py
 create mode 100644 src/polytomic/types/v2sync_status_envelope.py
 rename src/polytomic/types/{sync_status_response.py => v2sync_status_response.py} (68%)
 rename src/polytomic/types/{target.py => v2target.py} (96%)
 rename src/polytomic/types/{target_field.py => v2target_field.py} (85%)
 rename src/polytomic/types/{target_response.py => v2target_response.py} (77%)
 create mode 100644 src/polytomic/types/v2target_response_envelope.py
 rename src/polytomic/types/{user.py => v2user.py} (95%)
 create mode 100644 src/polytomic/types/v2user_envelope.py
 rename src/polytomic/types/{webhook.py => v2webhook.py} (95%)
 create mode 100644 src/polytomic/types/v2webhook_envelope.py
 create mode 100644 src/polytomic/types/v2webhook_list_envelope.py
 create mode 100644 src/polytomic/types/v3bulk_fetch_mode.py
 rename src/polytomic/types/{bulk_field.py => v3bulk_field.py} (94%)
 create mode 100644 src/polytomic/types/v3bulk_filter.py
 rename src/polytomic/types/{bulk_schema.py => v3bulk_schema.py} (78%)
 create mode 100644 src/polytomic/types/v3bulk_schema_envelope.py
 rename src/polytomic/types/{bulk_sync_execution.py => v3bulk_sync_execution.py} (80%)
 create mode 100644 src/polytomic/types/v3bulk_sync_execution_envelope.py
 rename src/polytomic/types/{bulk_sync_schema_execution.py => v3bulk_sync_schema_execution.py} (95%)
 rename src/polytomic/types/{bulk_sync_source.py => v3bulk_sync_source.py} (81%)
 create mode 100644 src/polytomic/types/v3bulk_sync_source_envelope.py
 create mode 100644 src/polytomic/types/v3bulk_sync_source_schema_envelope.py
 rename src/polytomic/types/{bulk_sync_source_status.py => v3bulk_sync_source_status.py} (93%)
 create mode 100644 src/polytomic/types/v3bulk_sync_source_status_envelope.py
 create mode 100644 src/polytomic/types/v3bulk_sync_status_envelope.py
 rename src/polytomic/types/{bulk_sync_status_response.py => v3bulk_sync_status_response.py} (71%)
 rename src/polytomic/types/{connect_card_response.py => v3connect_card_response.py} (93%)
 create mode 100644 src/polytomic/types/v3connect_card_response_envelope.py
 create mode 100644 src/polytomic/types/v3list_bulk_schema_envelope.py
 create mode 100644 src/polytomic/types/v3list_bulk_sync_executions_envelope.py
 rename src/polytomic/types/{cancel_model_sync_response.py => v3pagination_details.py} (83%)
 rename src/polytomic/types/{pick_value.py => v3pick_value.py} (93%)
 rename src/polytomic/types/{schema.py => v3schema.py} (80%)
 rename src/polytomic/types/{schema_field.py => v3schema_field.py} (89%)
 rename src/polytomic/types/{schema_records_response_envelope.py => v3schema_records_response_envelope.py} (90%)
 rename src/polytomic/types/{update_bulk_field.py => v3update_bulk_field.py} (93%)
 rename src/polytomic/types/{v_4_bulk_sync_execution_logs.py => v4bulk_sync_execution_logs.py} (100%)
 rename src/polytomic/types/{v_4_bulk_sync_execution_logs_envelope.py => v4bulk_sync_execution_logs_envelope.py} (90%)
 rename src/polytomic/types/{bulk_sync_execution_status.py => v4bulk_sync_execution_status.py} (80%)
 rename src/polytomic/types/{v_4_bulk_sync_schedule_api.py => v4bulk_sync_schedule_api.py} (100%)
 rename src/polytomic/types/{bulk_sync_schema_execution_status.py => v4bulk_sync_schema_execution_status.py} (95%)
 create mode 100644 src/polytomic/types/v4configuration_value.py
 rename src/polytomic/types/{v_4_export_sync_logs_envelope.py => v4export_sync_logs_envelope.py} (79%)
 rename src/polytomic/types/{v_4_export_sync_logs_response.py => v4export_sync_logs_response.py} (100%)
 create mode 100644 src/polytomic/types/v4get_sync_source_meta_envelope.py
 rename src/polytomic/types/{v_4_global_error_subscribers_response.py => v4global_error_subscribers_response.py} (100%)
 create mode 100644 src/polytomic/types/v4list_bulk_sync_executions_status_envelope.py
 rename src/polytomic/types/{v_4_query_results_envelope.py => v4query_results_envelope.py} (78%)
 rename src/polytomic/types/{v_4_run_query_envelope.py => v4run_query_envelope.py} (92%)
 rename src/polytomic/types/{pagination.py => v4run_query_pagination.py} (94%)
 rename src/polytomic/types/{v_4_run_query_result.py => v4run_query_result.py} (100%)
 rename src/polytomic/types/{schedule_envelope.py => v4schedule_envelope.py} (93%)
 rename src/polytomic/types/{schedules_envelope.py => v4schedules_envelope.py} (93%)
 rename src/polytomic/types/{source_meta.py => v4source_meta.py} (94%)
 rename src/polytomic/types/{supported_mode.py => v4supported_mode.py} (85%)
 rename src/polytomic/types/{connection_meta_response.py => v4sync_source_meta_response.py} (64%)
 rename src/polytomic/types/{v_4_target_creator.py => v4target_creator.py} (100%)
 rename src/polytomic/types/{target_object.py => v4target_object.py} (82%)
 rename src/polytomic/types/{v_4_target_objects_response_envelope.py => v4target_objects_response_envelope.py} (80%)
 rename src/polytomic/types/{v_4_target_property_values.py => v4target_property_values.py} (100%)
 rename src/polytomic/types/{v_4_target_property_values_envelope.py => v4target_property_values_envelope.py} (90%)
 rename src/polytomic/types/{v_4_user_field_request.py => v4user_field_request.py} (100%)
 create mode 100644 src/polytomic/types/v5bulk_sync_response.py
 create mode 100644 src/polytomic/types/v5bulk_sync_response_envelope.py
 create mode 100644 src/polytomic/types/v5bulk_sync_schedule_request.py
 create mode 100644 src/polytomic/types/v5bulk_sync_schedule_response.py
 create mode 100644 src/polytomic/types/v5list_sync_item.py
 create mode 100644 src/polytomic/types/v5list_sync_response_envelope.py
 create mode 100644 src/polytomic/types/v5pagination_details.py
 create mode 100644 src/polytomic/types/v5run_after.py
 create mode 100644 src/polytomic/types/v5schedule.py
 delete mode 100644 src/polytomic/types/v_2_schema_configuration_fields_item.py
 delete mode 100644 src/polytomic/types/webhook_envelope.py
 delete mode 100644 src/polytomic/types/webhook_list_envelope.py

diff --git a/pyproject.toml b/pyproject.toml
index 26af50f..9ed158f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ name = "polytomic"
 
 [tool.poetry]
 name = "polytomic"
-version = "1.15.5"
+version = "0.0.0"
 description = ""
 readme = "README.md"
 authors = []
diff --git a/reference.md b/reference.md
index c7dc842..c07e2c5 100644
--- a/reference.md
+++ b/reference.md
@@ -19,9 +19,7 @@ client = Polytomic(
     version="YOUR_VERSION",
     token="YOUR_TOKEN",
 )
-client.bulk_sync.list(
-    active=True,
-)
+client.bulk_sync.list()
 
 ```
 </dd>
@@ -109,20 +107,25 @@ to see configurations for particular integrations (for example, [here](https://a
 <dd>
 
 ```python
-from polytomic import BulkSchedule, Polytomic
+from polytomic import Polytomic, V5BulkSyncScheduleRequest
 
 client = Polytomic(
     version="YOUR_VERSION",
     token="YOUR_TOKEN",
 )
 client.bulk_sync.create(
-    destination_configuration={"schema": "my_schema"},
-    destination_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    name="My Bulk Sync",
-    schedule=BulkSchedule(
-        frequency="manual",
-    ),
-    source_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    destination_configuration={"destination_configuration": {"key": "value"}},
+    destination_connection_id="destination_connection_id",
+    name="name",
+    schedules=[
+        V5BulkSyncScheduleRequest(
+            frequency="manual",
+        ),
+        V5BulkSyncScheduleRequest(
+            frequency="manual",
+        ),
+    ],
+    source_connection_id="source_connection_id",
 )
 
 ```
@@ -163,7 +166,7 @@ client.bulk_sync.create(
 <dl>
 <dd>
 
-**schedule:** `BulkSchedule` 
+**schedules:** `typing.Sequence[V5BulkSyncScheduleRequest]` 
     
 </dd>
 </dl>
@@ -227,15 +230,7 @@ client.bulk_sync.create(
 <dl>
 <dd>
 
-**discover:** `typing.Optional[bool]` — DEPRECATED: Use automatically_add_new_objects/automatically_add_new_fields instead
-    
-</dd>
-</dl>
-
-<dl>
-<dd>
-
-**mode:** `typing.Optional[BulkSyncMode]` 
+**mode:** `typing.Optional[BulkSyncTargetMode]` 
     
 </dd>
 </dl>
@@ -275,7 +270,7 @@ client.bulk_sync.create(
 <dl>
 <dd>
 
-**schemas:** `typing.Optional[typing.Sequence[V2CreateBulkSyncRequestSchemasItem]]` — List of schemas to sync; if omitted, all schemas will be selected for syncing.
+**schemas:** `typing.Optional[typing.Sequence[V5CreateBulkSyncRequestSchemasItem]]` — List of schemas to sync; if omitted, all schemas will be selected for syncing.
     
 </dd>
 </dl>
@@ -323,8 +318,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    refresh_schemas=True,
+    id="id",
 )
 
 ```
@@ -373,22 +367,6 @@ client.bulk_sync.get(
 <dl>
 <dd>
 
-#### 📝 Description
-
-<dl>
-<dd>
-
-<dl>
-<dd>
-
-> 📘 Updating schemas
->
-> Schema updates can be performed using the [Update Bulk Sync Schemas](https://apidocs.polytomic.com/api-reference/bulk-sync/schemas/patch) endpoint.
-</dd>
-</dl>
-</dd>
-</dl>
-
 #### 🔌 Usage
 
 <dl>
@@ -398,21 +376,26 @@ client.bulk_sync.get(
 <dd>
 
 ```python
-from polytomic import BulkSchedule, Polytomic
+from polytomic import Polytomic, V5BulkSyncScheduleRequest
 
 client = Polytomic(
     version="YOUR_VERSION",
     token="YOUR_TOKEN",
 )
 client.bulk_sync.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    destination_configuration={"schema": "my_schema"},
-    destination_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    name="My Bulk Sync",
-    schedule=BulkSchedule(
-        frequency="manual",
-    ),
-    source_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
+    destination_configuration={"destination_configuration": {"key": "value"}},
+    destination_connection_id="destination_connection_id",
+    name="name",
+    schedules=[
+        V5BulkSyncScheduleRequest(
+            frequency="manual",
+        ),
+        V5BulkSyncScheduleRequest(
+            frequency="manual",
+        ),
+    ],
+    source_connection_id="source_connection_id",
 )
 
 ```
@@ -461,7 +444,7 @@ client.bulk_sync.update(
 <dl>
 <dd>
 
-**schedule:** `BulkSchedule` 
+**schedules:** `typing.Sequence[V5BulkSyncScheduleRequest]` 
     
 </dd>
 </dl>
@@ -525,15 +508,7 @@ client.bulk_sync.update(
 <dl>
 <dd>
 
-**discover:** `typing.Optional[bool]` — DEPRECATED: Use automatically_add_new_objects/automatically_add_new_fields instead
-    
-</dd>
-</dl>
-
-<dl>
-<dd>
-
-**mode:** `typing.Optional[BulkSyncMode]` 
+**mode:** `typing.Optional[BulkSyncTargetMode]` 
     
 </dd>
 </dl>
@@ -573,7 +548,7 @@ client.bulk_sync.update(
 <dl>
 <dd>
 
-**schemas:** `typing.Optional[typing.Sequence[V2UpdateBulkSyncRequestSchemasItem]]` — List of schemas to sync; if omitted, all schemas will be selected for syncing.
+**schemas:** `typing.Optional[typing.Sequence[V5UpdateBulkSyncRequestSchemasItem]]` — List of schemas to sync; if omitted, all schemas will be selected for syncing.
     
 </dd>
 </dl>
@@ -621,8 +596,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.remove(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    refresh_schemas=True,
+    id="id",
 )
 
 ```
@@ -687,7 +661,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.activate(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
     active=True,
 )
 
@@ -753,7 +727,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.start(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -778,7 +752,7 @@ client.bulk_sync.start(
 <dl>
 <dd>
 
-**fetch_mode:** `typing.Optional[BulkFetchMode]` 
+**fetch_mode:** `typing.Optional[V3BulkFetchMode]` 
     
 </dd>
 </dl>
@@ -842,7 +816,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.get_status(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -899,8 +873,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.get_source(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    include_fields=True,
+    id="id",
 )
 
 ```
@@ -965,7 +938,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.get_destination(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -1070,7 +1043,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.connections.get_connection_type_schema(
-    id="postgresql",
+    id="id",
 )
 
 ```
@@ -1174,15 +1147,9 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.connections.create(
-    configuration={
-        "database": "example",
-        "hostname": "postgres.example.com",
-        "password": "********",
-        "port": 5432,
-        "username": "user",
-    },
-    name="My Postgres Connection",
-    type="postgresql",
+    configuration={"configuration": {"key": "value"}},
+    name="name",
+    type="type",
 )
 
 ```
@@ -1317,7 +1284,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.connections.connect(
-    name="Salesforce Connection",
+    name="name",
     redirect_url="redirect_url",
 )
 
@@ -1437,14 +1404,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.connections.test_connection(
-    configuration={
-        "database": "example",
-        "hostname": "postgres.example.com",
-        "password": "password",
-        "port": 5432,
-        "username": "user",
-    },
-    type="postgresql",
+    configuration={"configuration": {"key": "value"}},
+    type="type",
 )
 
 ```
@@ -1517,7 +1478,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.connections.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -1574,15 +1535,9 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.connections.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    configuration={
-        "database": "example",
-        "hostname": "postgres.example.com",
-        "password": "********",
-        "port": 5432,
-        "username": "user",
-    },
-    name="My Postgres Connection",
+    id="id",
+    configuration={"configuration": {"key": "value"}},
+    name="name",
 )
 
 ```
@@ -1703,8 +1658,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.connections.remove(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    force=True,
+    id="id",
 )
 
 ```
@@ -1769,7 +1723,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.connections.get_parameter_values(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -1827,8 +1781,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.query_runner.run_query(
-    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    query="SELECT * FROM table",
+    connection_id="connection_id",
 )
 
 ```
@@ -1893,7 +1846,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.query_runner.get_query(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -1959,8 +1912,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.schemas.upsert_field(
-    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schema_id="public.users",
+    connection_id="connection_id",
+    schema_id="schema_id",
 )
 
 ```
@@ -2033,9 +1986,9 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.schemas.delete_field(
-    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schema_id="public.users",
-    field_id="first_name",
+    connection_id="connection_id",
+    schema_id="schema_id",
+    field_id="field_id",
 )
 
 ```
@@ -2108,8 +2061,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.schemas.set_primary_keys(
-    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schema_id="public.users",
+    connection_id="connection_id",
+    schema_id="schema_id",
 )
 
 ```
@@ -2196,8 +2149,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.schemas.reset_primary_keys(
-    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schema_id="public.users",
+    connection_id="connection_id",
+    schema_id="schema_id",
 )
 
 ```
@@ -2262,7 +2215,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.schemas.refresh(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -2333,7 +2286,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.schemas.get_status(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -2390,8 +2343,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.schemas.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schema_id="public.users",
+    id="id",
+    schema_id="schema_id",
 )
 
 ```
@@ -2456,8 +2409,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.schemas.get_records(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schema_id="public.users",
+    id="id",
+    schema_id="schema_id",
 )
 
 ```
@@ -2523,7 +2476,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.models.get_enrichment_source(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -2548,7 +2501,7 @@ client.models.get_enrichment_source(
 <dl>
 <dd>
 
-**params:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]]` 
+**params:** `typing.Optional[typing.Dict[str, typing.Sequence[str]]]` 
     
 </dd>
 </dl>
@@ -2602,7 +2555,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.models.post(
-    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    connection_id="connection_id",
 )
 
 ```
@@ -2667,9 +2620,9 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.models.preview(
-    configuration={"table": "public.users"},
-    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    name="Users",
+    configuration={"configuration": {"key": "value"}},
+    connection_id="connection_id",
+    name="name",
 )
 
 ```
@@ -2726,7 +2679,7 @@ client.models.preview(
 <dl>
 <dd>
 
-**enricher:** `typing.Optional[Enrichment]` 
+**enricher:** `typing.Optional[V2Enrichment]` 
     
 </dd>
 </dl>
@@ -2869,9 +2822,9 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.models.create(
-    configuration={"table": "public.users"},
-    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    name="Users",
+    configuration={"configuration": {"key": "value"}},
+    connection_id="connection_id",
+    name="name",
 )
 
 ```
@@ -2928,7 +2881,7 @@ client.models.create(
 <dl>
 <dd>
 
-**enricher:** `typing.Optional[Enrichment]` 
+**enricher:** `typing.Optional[V2Enrichment]` 
     
 </dd>
 </dl>
@@ -3024,7 +2977,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.models.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -3089,11 +3042,10 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.models.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    async_=False,
-    configuration={"table": "public.users"},
-    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    name="Users",
+    id="id",
+    configuration={"configuration": {"key": "value"}},
+    connection_id="connection_id",
+    name="name",
 )
 
 ```
@@ -3158,7 +3110,7 @@ client.models.update(
 <dl>
 <dd>
 
-**enricher:** `typing.Optional[Enrichment]` 
+**enricher:** `typing.Optional[V2Enrichment]` 
     
 </dd>
 </dl>
@@ -3262,7 +3214,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.models.remove(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -3341,7 +3293,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.models.sample(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -3407,7 +3359,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.get_source(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -3432,7 +3384,7 @@ client.model_sync.get_source(
 <dl>
 <dd>
 
-**params:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]]` 
+**params:** `typing.Optional[typing.Dict[str, typing.Sequence[str]]]` 
     
 </dd>
 </dl>
@@ -3472,7 +3424,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.get_source_fields(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -3497,7 +3449,7 @@ client.model_sync.get_source_fields(
 <dl>
 <dd>
 
-**params:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]]` 
+**params:** `typing.Optional[typing.Dict[str, typing.Sequence[str]]]` 
     
 </dd>
 </dl>
@@ -3536,10 +3488,7 @@ client = Polytomic(
     version="YOUR_VERSION",
     token="YOUR_TOKEN",
 )
-client.model_sync.list(
-    active=True,
-    target_connection_id="0b155265-c537-44c9-9359-a3ceb468a4da",
-)
+client.model_sync.list()
 
 ```
 </dd>
@@ -3563,7 +3512,7 @@ client.model_sync.list(
 <dl>
 <dd>
 
-**mode:** `typing.Optional[ModelSyncMode]` 
+**mode:** `typing.Optional[ModelsyncSyncTargetMode]` 
     
 </dd>
 </dl>
@@ -3579,6 +3528,22 @@ client.model_sync.list(
 <dl>
 <dd>
 
+**page_token:** `typing.Optional[str]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**limit:** `typing.Optional[int]` — Maximum number of syncs to return. Default and maximum is 50.
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
 **request_options:** `typing.Optional[RequestOptions]` — Request-specific configuration.
     
 </dd>
@@ -3673,7 +3638,7 @@ a connection supports target creation.
 <dd>
 
 ```python
-from polytomic import ModelSyncField, Polytomic, Schedule, Target
+from polytomic import Polytomic, V2Schedule, V2SyncField, V2Target
 
 client = Polytomic(
     version="YOUR_VERSION",
@@ -3681,15 +3646,18 @@ client = Polytomic(
 )
 client.model_sync.create(
     fields=[
-        ModelSyncField(
-            target="name",
-        )
+        V2SyncField(
+            target="target",
+        ),
+        V2SyncField(
+            target="target",
+        ),
     ],
     mode="create",
-    name="Users Sync",
-    schedule=Schedule(),
-    target=Target(
-        connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    name="name",
+    schedule=V2Schedule(),
+    target=V2Target(
+        connection_id="connection_id",
     ),
 )
 
@@ -3707,7 +3675,7 @@ client.model_sync.create(
 <dl>
 <dd>
 
-**fields:** `typing.Sequence[ModelSyncField]` — Fields to sync from source to destination.
+**fields:** `typing.Sequence[V2SyncField]` — Fields to sync from source to destination.
     
 </dd>
 </dl>
@@ -3715,7 +3683,7 @@ client.model_sync.create(
 <dl>
 <dd>
 
-**mode:** `ModelSyncMode` 
+**mode:** `ModelsyncSyncTargetMode` 
     
 </dd>
 </dl>
@@ -3731,7 +3699,7 @@ client.model_sync.create(
 <dl>
 <dd>
 
-**schedule:** `Schedule` 
+**schedule:** `V2Schedule` 
     
 </dd>
 </dl>
@@ -3739,7 +3707,7 @@ client.model_sync.create(
 <dl>
 <dd>
 
-**target:** `Target` 
+**target:** `V2Target` 
     
 </dd>
 </dl>
@@ -3771,7 +3739,7 @@ client.model_sync.create(
 <dl>
 <dd>
 
-**filters:** `typing.Optional[typing.Sequence[Filter]]` — Filters to apply to the source data.
+**filters:** `typing.Optional[typing.Sequence[V2Filter]]` — Filters to apply to the source data.
     
 </dd>
 </dl>
@@ -3779,7 +3747,7 @@ client.model_sync.create(
 <dl>
 <dd>
 
-**identity:** `typing.Optional[Identity]` 
+**identity:** `typing.Optional[V2Identity]` 
     
 </dd>
 </dl>
@@ -3803,7 +3771,7 @@ client.model_sync.create(
 <dl>
 <dd>
 
-**override_fields:** `typing.Optional[typing.Sequence[ModelSyncField]]` — Values to set in the target unconditionally.
+**override_fields:** `typing.Optional[typing.Sequence[V2SyncField]]` — Values to set in the target unconditionally.
     
 </dd>
 </dl>
@@ -3811,7 +3779,7 @@ client.model_sync.create(
 <dl>
 <dd>
 
-**overrides:** `typing.Optional[typing.Sequence[Override]]` — Conditional value replacement for fields.
+**overrides:** `typing.Optional[typing.Sequence[V2Override]]` — Conditional value replacement for fields.
     
 </dd>
 </dl>
@@ -3922,7 +3890,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -3972,24 +3940,27 @@ client.model_sync.get(
 <dd>
 
 ```python
-from polytomic import ModelSyncField, Polytomic, Schedule, Target
+from polytomic import Polytomic, V2Schedule, V2SyncField, V2Target
 
 client = Polytomic(
     version="YOUR_VERSION",
     token="YOUR_TOKEN",
 )
 client.model_sync.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
     fields=[
-        ModelSyncField(
-            target="name",
-        )
+        V2SyncField(
+            target="target",
+        ),
+        V2SyncField(
+            target="target",
+        ),
     ],
     mode="create",
-    name="Users Sync",
-    schedule=Schedule(),
-    target=Target(
-        connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    name="name",
+    schedule=V2Schedule(),
+    target=V2Target(
+        connection_id="connection_id",
     ),
 )
 
@@ -4015,7 +3986,7 @@ client.model_sync.update(
 <dl>
 <dd>
 
-**fields:** `typing.Sequence[ModelSyncField]` — Fields to sync from source to destination.
+**fields:** `typing.Sequence[V2SyncField]` — Fields to sync from source to destination.
     
 </dd>
 </dl>
@@ -4023,7 +3994,7 @@ client.model_sync.update(
 <dl>
 <dd>
 
-**mode:** `ModelSyncMode` 
+**mode:** `ModelsyncSyncTargetMode` 
     
 </dd>
 </dl>
@@ -4039,7 +4010,7 @@ client.model_sync.update(
 <dl>
 <dd>
 
-**schedule:** `Schedule` 
+**schedule:** `V2Schedule` 
     
 </dd>
 </dl>
@@ -4047,7 +4018,7 @@ client.model_sync.update(
 <dl>
 <dd>
 
-**target:** `Target` 
+**target:** `V2Target` 
     
 </dd>
 </dl>
@@ -4079,7 +4050,7 @@ client.model_sync.update(
 <dl>
 <dd>
 
-**filters:** `typing.Optional[typing.Sequence[Filter]]` — Filters to apply to the source data.
+**filters:** `typing.Optional[typing.Sequence[V2Filter]]` — Filters to apply to the source data.
     
 </dd>
 </dl>
@@ -4087,7 +4058,7 @@ client.model_sync.update(
 <dl>
 <dd>
 
-**identity:** `typing.Optional[Identity]` 
+**identity:** `typing.Optional[V2Identity]` 
     
 </dd>
 </dl>
@@ -4111,7 +4082,7 @@ client.model_sync.update(
 <dl>
 <dd>
 
-**override_fields:** `typing.Optional[typing.Sequence[ModelSyncField]]` — Values to set in the target unconditionally.
+**override_fields:** `typing.Optional[typing.Sequence[V2SyncField]]` — Values to set in the target unconditionally.
     
 </dd>
 </dl>
@@ -4119,7 +4090,7 @@ client.model_sync.update(
 <dl>
 <dd>
 
-**overrides:** `typing.Optional[typing.Sequence[Override]]` — Conditional value replacement for fields.
+**overrides:** `typing.Optional[typing.Sequence[V2Override]]` — Conditional value replacement for fields.
     
 </dd>
 </dl>
@@ -4183,7 +4154,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.remove(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -4240,7 +4211,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.activate(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
     active=True,
 )
 
@@ -4282,63 +4253,6 @@ client.model_sync.activate(
 </dl>
 
 
-</dd>
-</dl>
-</details>
-
-<details><summary><code>client.model_sync.<a href="src/polytomic/model_sync/client.py">cancel</a>(...)</code></summary>
-<dl>
-<dd>
-
-#### 🔌 Usage
-
-<dl>
-<dd>
-
-<dl>
-<dd>
-
-```python
-from polytomic import Polytomic
-
-client = Polytomic(
-    version="YOUR_VERSION",
-    token="YOUR_TOKEN",
-)
-client.model_sync.cancel(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-)
-
-```
-</dd>
-</dl>
-</dd>
-</dl>
-
-#### ⚙️ Parameters
-
-<dl>
-<dd>
-
-<dl>
-<dd>
-
-**id:** `str` — The active execution of this sync ID will be cancelled.
-    
-</dd>
-</dl>
-
-<dl>
-<dd>
-
-**request_options:** `typing.Optional[RequestOptions]` — Request-specific configuration.
-    
-</dd>
-</dl>
-</dd>
-</dl>
-
-
 </dd>
 </dl>
 </details>
@@ -4379,7 +4293,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.start(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -4460,7 +4374,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.get_status(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -4511,23 +4425,13 @@ client.model_sync.get_status(
 <dd>
 
 ```python
-import datetime
-
 from polytomic import Polytomic
 
 client = Polytomic(
     version="YOUR_VERSION",
     token="YOUR_TOKEN",
 )
-client.events.list(
-    organization_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    starting_after=datetime.datetime.fromisoformat(
-        "2020-01-01 00:00:00+00:00",
-    ),
-    ending_before=datetime.datetime.fromisoformat(
-        "2020-01-01 00:00:00+00:00",
-    ),
-)
+client.events.list()
 
 ```
 </dd>
@@ -4663,8 +4567,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.jobs.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    type="createmodel",
+    type="type",
+    id="id",
 )
 
 ```
@@ -4681,7 +4585,7 @@ client.jobs.get(
 <dl>
 <dd>
 
-**id:** `str` 
+**type:** `str` 
     
 </dd>
 </dl>
@@ -4689,7 +4593,7 @@ client.jobs.get(
 <dl>
 <dd>
 
-**type:** `str` 
+**id:** `str` 
     
 </dd>
 </dl>
@@ -4974,7 +4878,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.organization.create(
-    name="My Organization",
+    name="name",
 )
 
 ```
@@ -5087,7 +4991,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.organization.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -5160,8 +5064,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.organization.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    name="My Organization",
+    id="id",
+    name="name",
 )
 
 ```
@@ -5282,7 +5186,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.organization.remove(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -5356,7 +5260,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.users.list(
-    org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    org_id="org_id",
 )
 
 ```
@@ -5429,8 +5333,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.users.create(
-    org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    email="mail@example.com",
+    org_id="org_id",
+    email="email",
 )
 
 ```
@@ -5519,8 +5423,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.users.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    org_id="org_id",
+    id="id",
 )
 
 ```
@@ -5537,7 +5441,7 @@ client.users.get(
 <dl>
 <dd>
 
-**id:** `str` 
+**org_id:** `str` 
     
 </dd>
 </dl>
@@ -5545,7 +5449,7 @@ client.users.get(
 <dl>
 <dd>
 
-**org_id:** `str` 
+**id:** `str` 
     
 </dd>
 </dl>
@@ -5601,9 +5505,9 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.users.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    email="mail@example.com",
+    org_id="org_id",
+    id="id",
+    email="email",
 )
 
 ```
@@ -5620,7 +5524,7 @@ client.users.update(
 <dl>
 <dd>
 
-**id:** `str` 
+**org_id:** `str` 
     
 </dd>
 </dl>
@@ -5628,7 +5532,7 @@ client.users.update(
 <dl>
 <dd>
 
-**org_id:** `str` 
+**id:** `str` 
     
 </dd>
 </dl>
@@ -5700,8 +5604,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.users.remove(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    org_id="org_id",
+    id="id",
 )
 
 ```
@@ -5718,7 +5622,7 @@ client.users.remove(
 <dl>
 <dd>
 
-**id:** `str` 
+**org_id:** `str` 
     
 </dd>
 </dl>
@@ -5726,7 +5630,7 @@ client.users.remove(
 <dl>
 <dd>
 
-**org_id:** `str` 
+**id:** `str` 
     
 </dd>
 </dl>
@@ -5782,9 +5686,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.users.create_api_key(
-    org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    force=True,
+    org_id="org_id",
+    id="id",
 )
 
 ```
@@ -5941,8 +5844,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.webhooks.create(
-    endpoint="https://example.com/webhook",
-    secret="secret",
+    endpoint="endpoint",
+    secret="banana",
 )
 
 ```
@@ -6033,7 +5936,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.webhooks.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -6108,9 +6011,9 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.webhooks.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    endpoint="https://example.com/webhook",
-    secret="secret",
+    id="id",
+    endpoint="endpoint",
+    secret="banana",
 )
 
 ```
@@ -6191,7 +6094,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.webhooks.remove(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -6248,7 +6151,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.webhooks.disable(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -6305,7 +6208,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.webhooks.enable(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -6362,10 +6265,7 @@ client = Polytomic(
     version="YOUR_VERSION",
     token="YOUR_TOKEN",
 )
-client.bulk_sync.executions.list_status(
-    all_=True,
-    active=True,
-)
+client.bulk_sync.executions.list_status()
 
 ```
 </dd>
@@ -6437,11 +6337,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.executions.list(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    page_token="AmkYh8v0jR5B3kls2Qcc9y8MjrPmvR4CvaK7H0F4rEwqvg76K==",
-    only_terminal=True,
-    ascending=True,
-    limit=100,
+    id="id",
 )
 
 ```
@@ -6530,8 +6426,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.executions.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    exec_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
+    exec_id="exec_id",
 )
 
 ```
@@ -6596,8 +6492,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.executions.get_logs(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    execution_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    sync_id="sync_id",
+    execution_id="execution_id",
 )
 
 ```
@@ -6662,8 +6558,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.executions.export_logs(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    execution_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    sync_id="sync_id",
+    execution_id="execution_id",
 )
 
 ```
@@ -6737,7 +6633,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.schemas.list(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -6762,7 +6658,7 @@ client.bulk_sync.schemas.list(
 <dl>
 <dd>
 
-**filters:** `typing.Optional[typing.Dict[str, typing.Optional[str]]]` 
+**filters:** `typing.Optional[typing.Dict[str, str]]` 
     
 </dd>
 </dl>
@@ -6802,7 +6698,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.schemas.patch(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -6827,7 +6723,7 @@ client.bulk_sync.schemas.patch(
 <dl>
 <dd>
 
-**schemas:** `typing.Optional[typing.Sequence[BulkSchema]]` 
+**schemas:** `typing.Optional[typing.Sequence[V3BulkSchema]]` 
     
 </dd>
 </dl>
@@ -6867,8 +6763,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.schemas.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schema_id="Contact",
+    id="id",
+    schema_id="schema_id",
 )
 
 ```
@@ -6933,8 +6829,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.schemas.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schema_id="contact",
+    id="id",
+    schema_id="schema_id",
 )
 
 ```
@@ -6991,7 +6887,7 @@ client.bulk_sync.schemas.update(
 <dl>
 <dd>
 
-**fields:** `typing.Optional[typing.Sequence[UpdateBulkField]]` 
+**fields:** `typing.Optional[typing.Sequence[V3UpdateBulkField]]` 
     
 </dd>
 </dl>
@@ -6999,7 +6895,7 @@ client.bulk_sync.schemas.update(
 <dl>
 <dd>
 
-**filters:** `typing.Optional[typing.Sequence[BulkFilter]]` 
+**filters:** `typing.Optional[typing.Sequence[V3BulkFilter]]` 
     
 </dd>
 </dl>
@@ -7064,7 +6960,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.schedules.list(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    sync_id="sync_id",
 )
 
 ```
@@ -7121,7 +7017,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.schedules.create(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    sync_id="sync_id",
     schedule=V4BulkSyncScheduleApi(
         frequency="manual",
     ),
@@ -7189,8 +7085,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.schedules.get(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schedule_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    sync_id="sync_id",
+    schedule_id="schedule_id",
 )
 
 ```
@@ -7255,8 +7151,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.schedules.update(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schedule_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    sync_id="sync_id",
+    schedule_id="schedule_id",
     schedule=V4BulkSyncScheduleApi(
         frequency="manual",
     ),
@@ -7332,8 +7228,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.bulk_sync.schedules.delete(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    schedule_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    sync_id="sync_id",
+    schedule_id="schedule_id",
 )
 
 ```
@@ -7399,7 +7295,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.targets.get_target(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -7472,9 +7368,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.targets.get_target_fields(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    target="database.table",
-    refresh=False,
+    id="id",
+    target="target",
 )
 
 ```
@@ -7577,7 +7472,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.targets.list(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -7677,7 +7572,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.targets.get_create_property(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
     property="property",
 )
 
@@ -7744,10 +7639,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.executions.list(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    page_token="AmkYh8v0jR5B3kls2Qcc9y8MjrPmvR4CvaK7H0F4rEwqvg76K==",
-    only_completed=True,
-    ascending=True,
+    sync_id="sync_id",
 )
 
 ```
@@ -7828,8 +7720,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.executions.get(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    sync_id="sync_id",
+    id="id",
 )
 
 ```
@@ -7870,81 +7762,6 @@ client.model_sync.executions.get(
 </dl>
 
 
-</dd>
-</dl>
-</details>
-
-<details><summary><code>client.model_sync.executions.<a href="src/polytomic/model_sync/executions/client.py">update</a>(...)</code></summary>
-<dl>
-<dd>
-
-#### 🔌 Usage
-
-<dl>
-<dd>
-
-<dl>
-<dd>
-
-```python
-from polytomic import Polytomic
-
-client = Polytomic(
-    version="YOUR_VERSION",
-    token="YOUR_TOKEN",
-)
-client.model_sync.executions.update(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    status="created",
-)
-
-```
-</dd>
-</dl>
-</dd>
-</dl>
-
-#### ⚙️ Parameters
-
-<dl>
-<dd>
-
-<dl>
-<dd>
-
-**sync_id:** `str` 
-    
-</dd>
-</dl>
-
-<dl>
-<dd>
-
-**id:** `str` — The ID of the execution to update.
-    
-</dd>
-</dl>
-
-<dl>
-<dd>
-
-**status:** `ExecutionStatus` 
-    
-</dd>
-</dl>
-
-<dl>
-<dd>
-
-**request_options:** `typing.Optional[RequestOptions]` — Request-specific configuration.
-    
-</dd>
-</dl>
-</dd>
-</dl>
-
-
 </dd>
 </dl>
 </details>
@@ -7969,8 +7786,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.executions.get_log_urls(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    sync_id="sync_id",
+    id="id",
     type="records",
 )
 
@@ -8044,10 +7861,10 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.model_sync.executions.get_logs(
-    sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    id="0ecd09c1-b901-4d27-9053-f0367c427254",
+    sync_id="sync_id",
+    id="id",
     type="records",
-    filename="path/to/file.json",
+    filename="filename",
 )
 
 ```
@@ -8176,7 +7993,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.permissions.policies.create(
-    name="Custom",
+    name="name",
 )
 
 ```
@@ -8209,7 +8026,7 @@ client.permissions.policies.create(
 <dl>
 <dd>
 
-**policy_actions:** `typing.Optional[typing.Sequence[PolicyAction]]` 
+**policy_actions:** `typing.Optional[typing.Sequence[V2PolicyAction]]` 
     
 </dd>
 </dl>
@@ -8249,7 +8066,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.permissions.policies.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -8306,8 +8123,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.permissions.policies.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    name="Custom",
+    id="id",
+    name="name",
 )
 
 ```
@@ -8348,7 +8165,7 @@ client.permissions.policies.update(
 <dl>
 <dd>
 
-**policy_actions:** `typing.Optional[typing.Sequence[PolicyAction]]` 
+**policy_actions:** `typing.Optional[typing.Sequence[V2PolicyAction]]` 
     
 </dd>
 </dl>
@@ -8388,7 +8205,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.permissions.policies.remove(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -8493,7 +8310,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.permissions.roles.create(
-    name="Custom",
+    name="name",
 )
 
 ```
@@ -8558,7 +8375,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.permissions.roles.get(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
@@ -8615,8 +8432,8 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.permissions.roles.update(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
-    name="Custom",
+    id="id",
+    name="name",
 )
 
 ```
@@ -8689,7 +8506,7 @@ client = Polytomic(
     token="YOUR_TOKEN",
 )
 client.permissions.roles.remove(
-    id="248df4b7-aa70-47b8-a036-33ac447e668d",
+    id="id",
 )
 
 ```
diff --git a/src/polytomic/__init__.py b/src/polytomic/__init__.py
index 6bf93da..7e30362 100644
--- a/src/polytomic/__init__.py
+++ b/src/polytomic/__init__.py
@@ -1,203 +1,211 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from .types import (
-    ActivateSyncEnvelope,
-    ActivateSyncInput,
-    ActivateSyncOutput,
     ApiError,
-    ApiKeyResponse,
-    ApiKeyResponseEnvelope,
     BackendConnectionCapabilities,
     BackendOAuthPrompt,
     BulkBulkSyncSchedule,
     BulkDiscover,
     BulkExecutionStatus,
-    BulkFetchMode,
-    BulkField,
-    BulkFilter,
     BulkItemizedSchedule,
     BulkMultiScheduleConfiguration,
     BulkNormalizeNames,
     BulkSchedule,
-    BulkSchema,
-    BulkSchemaEnvelope,
     BulkSchemaExecutionStatus,
     BulkSelectiveMode,
-    BulkSyncCanceledEvent,
-    BulkSyncCompletedEvent,
-    BulkSyncCompletedWithErrorEvent,
-    BulkSyncDest,
-    BulkSyncDestEnvelope,
-    BulkSyncExecution,
-    BulkSyncExecutionEnvelope,
-    BulkSyncExecutionStatus,
-    BulkSyncFailedEvent,
-    BulkSyncListEnvelope,
-    BulkSyncMode,
-    BulkSyncResponse,
-    BulkSyncResponseEnvelope,
-    BulkSyncRunningEvent,
-    BulkSyncSchemaExecution,
-    BulkSyncSchemaExecutionStatus,
-    BulkSyncSource,
-    BulkSyncSourceEnvelope,
-    BulkSyncSourceSchemaEnvelope,
-    BulkSyncSourceStatus,
-    BulkSyncSourceStatusEnvelope,
-    BulkSyncStatusEnvelope,
-    BulkSyncStatusResponse,
-    CancelModelSyncResponse,
-    CancelModelSyncResponseEnvelope,
+    BulkSyncTargetMode,
     CommonOutputActor,
-    ConfigurationValue,
-    ConnectCardResponse,
-    ConnectCardResponseEnvelope,
-    ConnectionListResponseEnvelope,
-    ConnectionMeta,
-    ConnectionMetaResponse,
-    ConnectionParameterValue,
-    ConnectionParameterValuesResp,
-    ConnectionParameterValuesResponseEnvelope,
-    ConnectionResponseEnvelope,
-    ConnectionResponseSchema,
-    ConnectionType,
-    ConnectionTypeResponseEnvelope,
-    ConnectionTypeSchema,
-    CreateConnectionResponseEnvelope,
-    CreateConnectionResponseSchema,
-    CreateModelRequest,
-    Enrichment,
-    Event,
-    EventBody,
-    EventTypesEnvelope,
-    EventsEnvelope,
-    ExecutionCounts,
-    ExecutionLogResponse,
-    ExecutionLogsResponseEnvelope,
-    ExecutionStatus,
-    FieldConfiguration,
-    Filter,
+    EventingBulkSyncCanceledEvent,
+    EventingBulkSyncCompletedEvent,
+    EventingBulkSyncCompletedWithErrorEvent,
+    EventingBulkSyncFailedEvent,
+    EventingBulkSyncRunningEvent,
+    EventingSyncCanceledEvent,
+    EventingSyncCompletedEvent,
+    EventingSyncCompletedWithErrorsEvent,
+    EventingSyncFailedEvent,
+    EventingSyncRunningEvent,
     FilterFieldReferenceType,
     FilterFunction,
-    GetConnectionMetaEnvelope,
-    GetExecutionResponseEnvelope,
-    GetExecutionResponseSchema,
-    GetIdentityResponseEnvelope,
-    GetIdentityResponseSchema,
-    GetModelSyncSourceMetaEnvelope,
-    Identity,
-    IdentityFunction,
-    JobResponse,
-    JobResponseEnvelope,
     JsonschemaDefinitions,
     JsonschemaForm,
     JsonschemaSchema,
     LabelLabel,
-    ListBulkSchema,
-    ListBulkSyncExecutionStatusEnvelope,
-    ListBulkSyncExecutionsEnvelope,
-    ListExecutionResponseEnvelope,
-    ListModelSyncResponseEnvelope,
-    ListPoliciesResponseEnvelope,
-    ListUsersEnvelope,
-    Mode,
-    ModelField,
-    ModelFieldResponse,
-    ModelListResponseEnvelope,
     ModelModelFieldRequest,
     ModelRelation,
     ModelRelationTo,
-    ModelResponse,
-    ModelResponseEnvelope,
-    ModelSample,
-    ModelSampleResponseEnvelope,
-    ModelSyncField,
-    ModelSyncMode,
-    ModelSyncResponse,
-    ModelSyncResponseEnvelope,
-    ModelSyncSourceMetaResponse,
-    Organization,
-    OrganizationEnvelope,
-    OrganizationsEnvelope,
-    Override,
-    Pagination,
-    PaginationDetails,
-    PickValue,
-    PolicyAction,
-    PolicyResponse,
-    PolicyResponseEnvelope,
-    Relation,
-    RelationTo,
+    ModelsyncSyncTargetMode,
     RestErrResponse,
-    RoleListResponseEnvelope,
-    RoleResponse,
-    RoleResponseEnvelope,
-    RunAfter,
-    Schedule,
-    ScheduleEnvelope,
     ScheduleFrequency,
-    ScheduleOptionResponse,
-    ScheduleOptionResponseEnvelope,
     ScheduleScheduleOption,
-    SchedulesEnvelope,
-    Schema,
     SchemaAssociation,
-    SchemaConfiguration,
-    SchemaField,
     SchemaIdentityFunction,
     SchemaPrimaryKeyOverrideInput,
-    SchemaRecordsResponseEnvelope,
-    Source,
-    SourceMeta,
-    StartModelSyncResponseEnvelope,
-    StartModelSyncResponseSchema,
-    SupportedBulkMode,
-    SupportedMode,
-    SyncCanceledEvent,
-    SyncCompletedEvent,
-    SyncCompletedWithErrorsEvent,
     SyncDestinationProperties,
-    SyncFailedEvent,
-    SyncRunningEvent,
-    SyncStatusEnvelope,
-    SyncStatusResponse,
-    Target,
     TargetCreateInput,
-    TargetField,
-    TargetObject,
-    TargetResponse,
-    TargetResponseEnvelope,
     TypesType,
-    UpdateBulkField,
-    User,
-    UserEnvelope,
     UtilEnumValue,
+    UtilExecutionStatus,
     UtilFieldType,
+    V2ActivateSyncEnvelope,
+    V2ActivateSyncInput,
+    V2ActivateSyncOutput,
+    V2ApiKeyResponse,
+    V2ApiKeyResponseEnvelope,
+    V2BulkFilter,
+    V2BulkSyncDest,
+    V2BulkSyncDestEnvelope,
+    V2BulkSyncListEnvelope,
+    V2BulkSyncResponse,
+    V2ConfigurationValue,
     V2ConnectionForm,
+    V2ConnectionListResponseEnvelope,
+    V2ConnectionMeta,
+    V2ConnectionMetaResponse,
+    V2ConnectionParameterValue,
+    V2ConnectionParameterValuesResp,
+    V2ConnectionParameterValuesResponseEnvelope,
+    V2ConnectionResponseEnvelope,
+    V2ConnectionResponseSchema,
+    V2ConnectionType,
+    V2ConnectionTypeResponseEnvelope,
+    V2ConnectionTypeSchema,
+    V2CreateConnectionResponseEnvelope,
+    V2CreateConnectionResponseSchema,
+    V2CreateModelRequest,
     V2EnricherConfiguration,
     V2EnricherMapping,
+    V2Enrichment,
+    V2Event,
+    V2EventPayload,
+    V2EventTypesEnvelope,
+    V2EventsEnvelope,
+    V2ExecutionCounts,
+    V2ExecutionLogResponse,
     V2ExecutionLogType,
+    V2ExecutionLogsResponseEnvelope,
+    V2FieldConfiguration,
+    V2Filter,
+    V2GetConnectionMetaEnvelope,
     V2GetEnrichmentInputFieldsResponseEnvelope,
+    V2GetExecutionResponseEnvelope,
+    V2GetExecutionResponseSchema,
+    V2GetIdentityResponseEnvelope,
+    V2GetIdentityResponseSchema,
+    V2Identity,
+    V2IdentityFunction,
+    V2JobResponse,
+    V2JobResponseEnvelope,
+    V2ListExecutionResponseEnvelope,
+    V2ListPoliciesResponseEnvelope,
+    V2ListUsersEnvelope,
+    V2Mode,
+    V2ModelField,
+    V2ModelFieldResponse,
+    V2ModelListResponseEnvelope,
+    V2ModelResponse,
+    V2ModelResponseEnvelope,
+    V2ModelSample,
+    V2ModelSampleResponseEnvelope,
     V2OrderedMapStringGithubComInvopopJsonschemaSchema,
+    V2Organization,
+    V2OrganizationEnvelope,
+    V2OrganizationsEnvelope,
+    V2Override,
+    V2PaginationDetails,
+    V2PolicyAction,
+    V2PolicyResponse,
+    V2PolicyResponseEnvelope,
+    V2Relation,
+    V2RelationTo,
+    V2RoleListResponseEnvelope,
+    V2RoleResponse,
+    V2RoleResponseEnvelope,
+    V2RunAfter,
     V2SampleRecord,
+    V2Schedule,
+    V2ScheduleOptionResponse,
+    V2ScheduleOptionResponseEnvelope,
+    V2SchemaConfiguration,
     V2SchemaConfigurationFieldsItem,
+    V2Source,
+    V2StartSyncResponseEnvelope,
+    V2StartSyncResponseSchema,
+    V2SupportedBulkMode,
+    V2SyncField,
+    V2SyncResponse,
+    V2SyncResponseEnvelope,
+    V2SyncStatusEnvelope,
+    V2SyncStatusResponse,
+    V2Target,
+    V2TargetField,
+    V2TargetResponse,
+    V2TargetResponseEnvelope,
+    V2User,
+    V2UserEnvelope,
+    V2Webhook,
+    V2WebhookEnvelope,
+    V2WebhookListEnvelope,
+    V3BulkFetchMode,
+    V3BulkField,
+    V3BulkFilter,
+    V3BulkSchema,
+    V3BulkSchemaEnvelope,
+    V3BulkSyncExecution,
+    V3BulkSyncExecutionEnvelope,
+    V3BulkSyncSchemaExecution,
+    V3BulkSyncSource,
+    V3BulkSyncSourceEnvelope,
+    V3BulkSyncSourceSchemaEnvelope,
+    V3BulkSyncSourceStatus,
+    V3BulkSyncSourceStatusEnvelope,
+    V3BulkSyncStatusEnvelope,
+    V3BulkSyncStatusResponse,
+    V3ConnectCardResponse,
+    V3ConnectCardResponseEnvelope,
+    V3ListBulkSchemaEnvelope,
+    V3ListBulkSyncExecutionsEnvelope,
+    V3PaginationDetails,
+    V3PickValue,
+    V3Schema,
+    V3SchemaField,
+    V3SchemaRecordsResponseEnvelope,
+    V3UpdateBulkField,
     V4BulkSyncExecutionLogs,
     V4BulkSyncExecutionLogsEnvelope,
+    V4BulkSyncExecutionStatus,
     V4BulkSyncScheduleApi,
+    V4BulkSyncSchemaExecutionStatus,
+    V4ConfigurationValue,
     V4ExportSyncLogsEnvelope,
     V4ExportSyncLogsResponse,
+    V4GetSyncSourceMetaEnvelope,
     V4GlobalErrorSubscribersResponse,
+    V4ListBulkSyncExecutionsStatusEnvelope,
     V4QueryResultsEnvelope,
     V4RunQueryEnvelope,
+    V4RunQueryPagination,
     V4RunQueryResult,
+    V4ScheduleEnvelope,
+    V4SchedulesEnvelope,
+    V4SourceMeta,
+    V4SupportedMode,
+    V4SyncSourceMetaResponse,
     V4TargetCreator,
+    V4TargetObject,
     V4TargetObjectsResponseEnvelope,
     V4TargetPropertyValues,
     V4TargetPropertyValuesEnvelope,
     V4UserFieldRequest,
-    Webhook,
-    WebhookEnvelope,
-    WebhookListEnvelope,
+    V5BulkSyncResponse,
+    V5BulkSyncResponseEnvelope,
+    V5BulkSyncScheduleRequest,
+    V5BulkSyncScheduleResponse,
+    V5ListSyncItem,
+    V5ListSyncResponseEnvelope,
+    V5PaginationDetails,
+    V5RunAfter,
+    V5Schedule,
     WorkTaskStatus,
 )
 from .errors import (
@@ -225,18 +233,13 @@
     users,
     webhooks,
 )
-from .bulk_sync import V2CreateBulkSyncRequestSchemasItem, V2UpdateBulkSyncRequestSchemasItem
+from .bulk_sync import V5CreateBulkSyncRequestSchemasItem, V5UpdateBulkSyncRequestSchemasItem
 from .client import AsyncPolytomic, Polytomic
 from .environment import PolytomicEnvironment
 from .version import __version__
 
 __all__ = [
-    "ActivateSyncEnvelope",
-    "ActivateSyncInput",
-    "ActivateSyncOutput",
     "ApiError",
-    "ApiKeyResponse",
-    "ApiKeyResponseEnvelope",
     "AsyncPolytomic",
     "BackendConnectionCapabilities",
     "BackendOAuthPrompt",
@@ -244,202 +247,215 @@
     "BulkBulkSyncSchedule",
     "BulkDiscover",
     "BulkExecutionStatus",
-    "BulkFetchMode",
-    "BulkField",
-    "BulkFilter",
     "BulkItemizedSchedule",
     "BulkMultiScheduleConfiguration",
     "BulkNormalizeNames",
     "BulkSchedule",
-    "BulkSchema",
-    "BulkSchemaEnvelope",
     "BulkSchemaExecutionStatus",
     "BulkSelectiveMode",
-    "BulkSyncCanceledEvent",
-    "BulkSyncCompletedEvent",
-    "BulkSyncCompletedWithErrorEvent",
-    "BulkSyncDest",
-    "BulkSyncDestEnvelope",
-    "BulkSyncExecution",
-    "BulkSyncExecutionEnvelope",
-    "BulkSyncExecutionStatus",
-    "BulkSyncFailedEvent",
-    "BulkSyncListEnvelope",
-    "BulkSyncMode",
-    "BulkSyncResponse",
-    "BulkSyncResponseEnvelope",
-    "BulkSyncRunningEvent",
-    "BulkSyncSchemaExecution",
-    "BulkSyncSchemaExecutionStatus",
-    "BulkSyncSource",
-    "BulkSyncSourceEnvelope",
-    "BulkSyncSourceSchemaEnvelope",
-    "BulkSyncSourceStatus",
-    "BulkSyncSourceStatusEnvelope",
-    "BulkSyncStatusEnvelope",
-    "BulkSyncStatusResponse",
-    "CancelModelSyncResponse",
-    "CancelModelSyncResponseEnvelope",
+    "BulkSyncTargetMode",
     "CommonOutputActor",
-    "ConfigurationValue",
     "ConflictError",
-    "ConnectCardResponse",
-    "ConnectCardResponseEnvelope",
-    "ConnectionListResponseEnvelope",
-    "ConnectionMeta",
-    "ConnectionMetaResponse",
-    "ConnectionParameterValue",
-    "ConnectionParameterValuesResp",
-    "ConnectionParameterValuesResponseEnvelope",
-    "ConnectionResponseEnvelope",
-    "ConnectionResponseSchema",
-    "ConnectionType",
-    "ConnectionTypeResponseEnvelope",
-    "ConnectionTypeSchema",
-    "CreateConnectionResponseEnvelope",
-    "CreateConnectionResponseSchema",
-    "CreateModelRequest",
-    "Enrichment",
-    "Event",
-    "EventBody",
-    "EventTypesEnvelope",
-    "EventsEnvelope",
-    "ExecutionCounts",
-    "ExecutionLogResponse",
-    "ExecutionLogsResponseEnvelope",
-    "ExecutionStatus",
-    "FieldConfiguration",
-    "Filter",
+    "EventingBulkSyncCanceledEvent",
+    "EventingBulkSyncCompletedEvent",
+    "EventingBulkSyncCompletedWithErrorEvent",
+    "EventingBulkSyncFailedEvent",
+    "EventingBulkSyncRunningEvent",
+    "EventingSyncCanceledEvent",
+    "EventingSyncCompletedEvent",
+    "EventingSyncCompletedWithErrorsEvent",
+    "EventingSyncFailedEvent",
+    "EventingSyncRunningEvent",
     "FilterFieldReferenceType",
     "FilterFunction",
     "ForbiddenError",
-    "GetConnectionMetaEnvelope",
-    "GetExecutionResponseEnvelope",
-    "GetExecutionResponseSchema",
-    "GetIdentityResponseEnvelope",
-    "GetIdentityResponseSchema",
-    "GetModelSyncSourceMetaEnvelope",
-    "Identity",
-    "IdentityFunction",
     "InternalServerError",
-    "JobResponse",
-    "JobResponseEnvelope",
     "JsonschemaDefinitions",
     "JsonschemaForm",
     "JsonschemaSchema",
     "LabelLabel",
-    "ListBulkSchema",
-    "ListBulkSyncExecutionStatusEnvelope",
-    "ListBulkSyncExecutionsEnvelope",
-    "ListExecutionResponseEnvelope",
-    "ListModelSyncResponseEnvelope",
-    "ListPoliciesResponseEnvelope",
-    "ListUsersEnvelope",
-    "Mode",
-    "ModelField",
-    "ModelFieldResponse",
-    "ModelListResponseEnvelope",
     "ModelModelFieldRequest",
     "ModelRelation",
     "ModelRelationTo",
-    "ModelResponse",
-    "ModelResponseEnvelope",
-    "ModelSample",
-    "ModelSampleResponseEnvelope",
-    "ModelSyncField",
-    "ModelSyncMode",
-    "ModelSyncResponse",
-    "ModelSyncResponseEnvelope",
-    "ModelSyncSourceMetaResponse",
+    "ModelsyncSyncTargetMode",
     "NotFoundError",
-    "Organization",
-    "OrganizationEnvelope",
-    "OrganizationsEnvelope",
-    "Override",
-    "Pagination",
-    "PaginationDetails",
-    "PickValue",
-    "PolicyAction",
-    "PolicyResponse",
-    "PolicyResponseEnvelope",
     "Polytomic",
     "PolytomicEnvironment",
-    "Relation",
-    "RelationTo",
     "RestErrResponse",
-    "RoleListResponseEnvelope",
-    "RoleResponse",
-    "RoleResponseEnvelope",
-    "RunAfter",
-    "Schedule",
-    "ScheduleEnvelope",
     "ScheduleFrequency",
-    "ScheduleOptionResponse",
-    "ScheduleOptionResponseEnvelope",
     "ScheduleScheduleOption",
-    "SchedulesEnvelope",
-    "Schema",
     "SchemaAssociation",
-    "SchemaConfiguration",
-    "SchemaField",
     "SchemaIdentityFunction",
     "SchemaPrimaryKeyOverrideInput",
-    "SchemaRecordsResponseEnvelope",
-    "Source",
-    "SourceMeta",
-    "StartModelSyncResponseEnvelope",
-    "StartModelSyncResponseSchema",
-    "SupportedBulkMode",
-    "SupportedMode",
-    "SyncCanceledEvent",
-    "SyncCompletedEvent",
-    "SyncCompletedWithErrorsEvent",
     "SyncDestinationProperties",
-    "SyncFailedEvent",
-    "SyncRunningEvent",
-    "SyncStatusEnvelope",
-    "SyncStatusResponse",
-    "Target",
     "TargetCreateInput",
-    "TargetField",
-    "TargetObject",
-    "TargetResponse",
-    "TargetResponseEnvelope",
     "TypesType",
     "UnauthorizedError",
     "UnprocessableEntityError",
-    "UpdateBulkField",
-    "User",
-    "UserEnvelope",
     "UtilEnumValue",
+    "UtilExecutionStatus",
     "UtilFieldType",
+    "V2ActivateSyncEnvelope",
+    "V2ActivateSyncInput",
+    "V2ActivateSyncOutput",
+    "V2ApiKeyResponse",
+    "V2ApiKeyResponseEnvelope",
+    "V2BulkFilter",
+    "V2BulkSyncDest",
+    "V2BulkSyncDestEnvelope",
+    "V2BulkSyncListEnvelope",
+    "V2BulkSyncResponse",
+    "V2ConfigurationValue",
     "V2ConnectionForm",
-    "V2CreateBulkSyncRequestSchemasItem",
+    "V2ConnectionListResponseEnvelope",
+    "V2ConnectionMeta",
+    "V2ConnectionMetaResponse",
+    "V2ConnectionParameterValue",
+    "V2ConnectionParameterValuesResp",
+    "V2ConnectionParameterValuesResponseEnvelope",
+    "V2ConnectionResponseEnvelope",
+    "V2ConnectionResponseSchema",
+    "V2ConnectionType",
+    "V2ConnectionTypeResponseEnvelope",
+    "V2ConnectionTypeSchema",
+    "V2CreateConnectionResponseEnvelope",
+    "V2CreateConnectionResponseSchema",
+    "V2CreateModelRequest",
     "V2EnricherConfiguration",
     "V2EnricherMapping",
+    "V2Enrichment",
+    "V2Event",
+    "V2EventPayload",
+    "V2EventTypesEnvelope",
+    "V2EventsEnvelope",
+    "V2ExecutionCounts",
+    "V2ExecutionLogResponse",
     "V2ExecutionLogType",
+    "V2ExecutionLogsResponseEnvelope",
+    "V2FieldConfiguration",
+    "V2Filter",
+    "V2GetConnectionMetaEnvelope",
     "V2GetEnrichmentInputFieldsResponseEnvelope",
+    "V2GetExecutionResponseEnvelope",
+    "V2GetExecutionResponseSchema",
+    "V2GetIdentityResponseEnvelope",
+    "V2GetIdentityResponseSchema",
+    "V2Identity",
+    "V2IdentityFunction",
+    "V2JobResponse",
+    "V2JobResponseEnvelope",
+    "V2ListExecutionResponseEnvelope",
+    "V2ListPoliciesResponseEnvelope",
+    "V2ListUsersEnvelope",
+    "V2Mode",
+    "V2ModelField",
+    "V2ModelFieldResponse",
+    "V2ModelListResponseEnvelope",
+    "V2ModelResponse",
+    "V2ModelResponseEnvelope",
+    "V2ModelSample",
+    "V2ModelSampleResponseEnvelope",
     "V2OrderedMapStringGithubComInvopopJsonschemaSchema",
+    "V2Organization",
+    "V2OrganizationEnvelope",
+    "V2OrganizationsEnvelope",
+    "V2Override",
+    "V2PaginationDetails",
+    "V2PolicyAction",
+    "V2PolicyResponse",
+    "V2PolicyResponseEnvelope",
+    "V2Relation",
+    "V2RelationTo",
+    "V2RoleListResponseEnvelope",
+    "V2RoleResponse",
+    "V2RoleResponseEnvelope",
+    "V2RunAfter",
     "V2SampleRecord",
+    "V2Schedule",
+    "V2ScheduleOptionResponse",
+    "V2ScheduleOptionResponseEnvelope",
+    "V2SchemaConfiguration",
     "V2SchemaConfigurationFieldsItem",
-    "V2UpdateBulkSyncRequestSchemasItem",
+    "V2Source",
+    "V2StartSyncResponseEnvelope",
+    "V2StartSyncResponseSchema",
+    "V2SupportedBulkMode",
+    "V2SyncField",
+    "V2SyncResponse",
+    "V2SyncResponseEnvelope",
+    "V2SyncStatusEnvelope",
+    "V2SyncStatusResponse",
+    "V2Target",
+    "V2TargetField",
+    "V2TargetResponse",
+    "V2TargetResponseEnvelope",
+    "V2User",
+    "V2UserEnvelope",
+    "V2Webhook",
+    "V2WebhookEnvelope",
+    "V2WebhookListEnvelope",
+    "V3BulkFetchMode",
+    "V3BulkField",
+    "V3BulkFilter",
+    "V3BulkSchema",
+    "V3BulkSchemaEnvelope",
+    "V3BulkSyncExecution",
+    "V3BulkSyncExecutionEnvelope",
+    "V3BulkSyncSchemaExecution",
+    "V3BulkSyncSource",
+    "V3BulkSyncSourceEnvelope",
+    "V3BulkSyncSourceSchemaEnvelope",
+    "V3BulkSyncSourceStatus",
+    "V3BulkSyncSourceStatusEnvelope",
+    "V3BulkSyncStatusEnvelope",
+    "V3BulkSyncStatusResponse",
+    "V3ConnectCardResponse",
+    "V3ConnectCardResponseEnvelope",
+    "V3ListBulkSchemaEnvelope",
+    "V3ListBulkSyncExecutionsEnvelope",
+    "V3PaginationDetails",
+    "V3PickValue",
+    "V3Schema",
+    "V3SchemaField",
+    "V3SchemaRecordsResponseEnvelope",
+    "V3UpdateBulkField",
     "V4BulkSyncExecutionLogs",
     "V4BulkSyncExecutionLogsEnvelope",
+    "V4BulkSyncExecutionStatus",
     "V4BulkSyncScheduleApi",
+    "V4BulkSyncSchemaExecutionStatus",
+    "V4ConfigurationValue",
     "V4ExportSyncLogsEnvelope",
     "V4ExportSyncLogsResponse",
+    "V4GetSyncSourceMetaEnvelope",
     "V4GlobalErrorSubscribersResponse",
+    "V4ListBulkSyncExecutionsStatusEnvelope",
     "V4QueryResultsEnvelope",
     "V4RunQueryEnvelope",
+    "V4RunQueryPagination",
     "V4RunQueryResult",
+    "V4ScheduleEnvelope",
+    "V4SchedulesEnvelope",
+    "V4SourceMeta",
+    "V4SupportedMode",
+    "V4SyncSourceMetaResponse",
     "V4TargetCreator",
+    "V4TargetObject",
     "V4TargetObjectsResponseEnvelope",
     "V4TargetPropertyValues",
     "V4TargetPropertyValuesEnvelope",
     "V4UserFieldRequest",
-    "Webhook",
-    "WebhookEnvelope",
-    "WebhookListEnvelope",
+    "V5BulkSyncResponse",
+    "V5BulkSyncResponseEnvelope",
+    "V5BulkSyncScheduleRequest",
+    "V5BulkSyncScheduleResponse",
+    "V5CreateBulkSyncRequestSchemasItem",
+    "V5ListSyncItem",
+    "V5ListSyncResponseEnvelope",
+    "V5PaginationDetails",
+    "V5RunAfter",
+    "V5Schedule",
+    "V5UpdateBulkSyncRequestSchemasItem",
     "WorkTaskStatus",
     "__version__",
     "bulk_sync",
diff --git a/src/polytomic/bulk_sync/__init__.py b/src/polytomic/bulk_sync/__init__.py
index 13ec86b..106f403 100644
--- a/src/polytomic/bulk_sync/__init__.py
+++ b/src/polytomic/bulk_sync/__init__.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from .types import V2CreateBulkSyncRequestSchemasItem, V2UpdateBulkSyncRequestSchemasItem
+from .types import V5CreateBulkSyncRequestSchemasItem, V5UpdateBulkSyncRequestSchemasItem
 from . import executions, schedules, schemas
 
 __all__ = [
-    "V2CreateBulkSyncRequestSchemasItem",
-    "V2UpdateBulkSyncRequestSchemasItem",
+    "V5CreateBulkSyncRequestSchemasItem",
+    "V5UpdateBulkSyncRequestSchemasItem",
     "executions",
     "schedules",
     "schemas",
diff --git a/src/polytomic/bulk_sync/client.py b/src/polytomic/bulk_sync/client.py
index d7c1313..da4ad02 100644
--- a/src/polytomic/bulk_sync/client.py
+++ b/src/polytomic/bulk_sync/client.py
@@ -6,7 +6,7 @@
 from .schemas.client import SchemasClient
 from .schedules.client import SchedulesClient
 from ..core.request_options import RequestOptions
-from ..types.bulk_sync_list_envelope import BulkSyncListEnvelope
+from ..types.v2bulk_sync_list_envelope import V2BulkSyncListEnvelope
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.unauthorized_error import UnauthorizedError
 from ..types.rest_err_response import RestErrResponse
@@ -14,27 +14,27 @@
 from ..types.api_error import ApiError as types_api_error_ApiError
 from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError as core_api_error_ApiError
-from ..types.bulk_schedule import BulkSchedule
+from ..types.v5bulk_sync_schedule_request import V5BulkSyncScheduleRequest
 from ..types.bulk_discover import BulkDiscover
 import datetime as dt
-from ..types.bulk_sync_mode import BulkSyncMode
+from ..types.bulk_sync_target_mode import BulkSyncTargetMode
 from ..types.bulk_normalize_names import BulkNormalizeNames
-from .types.v_2_create_bulk_sync_request_schemas_item import V2CreateBulkSyncRequestSchemasItem
-from ..types.bulk_sync_response_envelope import BulkSyncResponseEnvelope
+from .types.v5create_bulk_sync_request_schemas_item import V5CreateBulkSyncRequestSchemasItem
+from ..types.v5bulk_sync_response_envelope import V5BulkSyncResponseEnvelope
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..errors.bad_request_error import BadRequestError
 from ..errors.forbidden_error import ForbiddenError
 from ..errors.unprocessable_entity_error import UnprocessableEntityError
 from ..core.jsonable_encoder import jsonable_encoder
 from ..errors.not_found_error import NotFoundError
-from .types.v_2_update_bulk_sync_request_schemas_item import V2UpdateBulkSyncRequestSchemasItem
-from ..types.activate_sync_envelope import ActivateSyncEnvelope
-from ..types.bulk_fetch_mode import BulkFetchMode
-from ..types.bulk_sync_execution_envelope import BulkSyncExecutionEnvelope
+from .types.v5update_bulk_sync_request_schemas_item import V5UpdateBulkSyncRequestSchemasItem
+from ..types.v2activate_sync_envelope import V2ActivateSyncEnvelope
+from ..types.v3bulk_fetch_mode import V3BulkFetchMode
+from ..types.v3bulk_sync_execution_envelope import V3BulkSyncExecutionEnvelope
 from ..errors.conflict_error import ConflictError
-from ..types.bulk_sync_status_envelope import BulkSyncStatusEnvelope
-from ..types.bulk_sync_source_envelope import BulkSyncSourceEnvelope
-from ..types.bulk_sync_dest_envelope import BulkSyncDestEnvelope
+from ..types.v3bulk_sync_status_envelope import V3BulkSyncStatusEnvelope
+from ..types.v3bulk_sync_source_envelope import V3BulkSyncSourceEnvelope
+from ..types.v2bulk_sync_dest_envelope import V2BulkSyncDestEnvelope
 from ..core.client_wrapper import AsyncClientWrapper
 from .executions.client import AsyncExecutionsClient
 from .schemas.client import AsyncSchemasClient
@@ -53,7 +53,7 @@ def __init__(self, *, client_wrapper: SyncClientWrapper):
 
     def list(
         self, *, active: typing.Optional[bool] = None, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncListEnvelope:
+    ) -> V2BulkSyncListEnvelope:
         """
         Parameters
         ----------
@@ -64,7 +64,7 @@ def list(
 
         Returns
         -------
-        BulkSyncListEnvelope
+        V2BulkSyncListEnvelope
             OK
 
         Examples
@@ -75,9 +75,7 @@ def list(
             version="YOUR_VERSION",
             token="YOUR_TOKEN",
         )
-        client.bulk_sync.list(
-            active=True,
-        )
+        client.bulk_sync.list()
         """
         _response = self._client_wrapper.httpx_client.request(
             "api/bulk/syncs",
@@ -90,9 +88,9 @@ def list(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncListEnvelope,
+                    V2BulkSyncListEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncListEnvelope,  # type: ignore
+                        type_=V2BulkSyncListEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -127,7 +125,7 @@ def create(
         destination_configuration: typing.Dict[str, typing.Optional[typing.Any]],
         destination_connection_id: str,
         name: str,
-        schedule: BulkSchedule,
+        schedules: typing.Sequence[V5BulkSyncScheduleRequest],
         source_connection_id: str,
         active: typing.Optional[bool] = OMIT,
         automatically_add_new_fields: typing.Optional[BulkDiscover] = OMIT,
@@ -135,16 +133,15 @@ def create(
         concurrency_limit: typing.Optional[int] = OMIT,
         data_cutoff_timestamp: typing.Optional[dt.datetime] = OMIT,
         disable_record_timestamps: typing.Optional[bool] = OMIT,
-        discover: typing.Optional[bool] = OMIT,
-        mode: typing.Optional[BulkSyncMode] = OMIT,
+        mode: typing.Optional[BulkSyncTargetMode] = OMIT,
         normalize_names: typing.Optional[BulkNormalizeNames] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
         policies: typing.Optional[typing.Sequence[str]] = OMIT,
         resync_concurrency_limit: typing.Optional[int] = OMIT,
-        schemas: typing.Optional[typing.Sequence[V2CreateBulkSyncRequestSchemasItem]] = OMIT,
+        schemas: typing.Optional[typing.Sequence[V5CreateBulkSyncRequestSchemasItem]] = OMIT,
         source_configuration: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncResponseEnvelope:
+    ) -> V5BulkSyncResponseEnvelope:
         """
         Create a new Bulk Sync from a source to a destination (data warehouse, database, or cloud storage bucket like S3).
 
@@ -181,7 +178,7 @@ def create(
 
         name : str
 
-        schedule : BulkSchedule
+        schedules : typing.Sequence[V5BulkSyncScheduleRequest]
 
         source_connection_id : str
 
@@ -198,10 +195,7 @@ def create(
 
         disable_record_timestamps : typing.Optional[bool]
 
-        discover : typing.Optional[bool]
-            DEPRECATED: Use automatically_add_new_objects/automatically_add_new_fields instead
-
-        mode : typing.Optional[BulkSyncMode]
+        mode : typing.Optional[BulkSyncTargetMode]
 
         normalize_names : typing.Optional[BulkNormalizeNames]
 
@@ -212,7 +206,7 @@ def create(
         resync_concurrency_limit : typing.Optional[int]
             Override the default resync concurrency limit for this sync.
 
-        schemas : typing.Optional[typing.Sequence[V2CreateBulkSyncRequestSchemasItem]]
+        schemas : typing.Optional[typing.Sequence[V5CreateBulkSyncRequestSchemasItem]]
             List of schemas to sync; if omitted, all schemas will be selected for syncing.
 
         source_configuration : typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]
@@ -222,25 +216,30 @@ def create(
 
         Returns
         -------
-        BulkSyncResponseEnvelope
+        V5BulkSyncResponseEnvelope
             OK
 
         Examples
         --------
-        from polytomic import BulkSchedule, Polytomic
+        from polytomic import Polytomic, V5BulkSyncScheduleRequest
 
         client = Polytomic(
             version="YOUR_VERSION",
             token="YOUR_TOKEN",
         )
         client.bulk_sync.create(
-            destination_configuration={"schema": "my_schema"},
-            destination_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            name="My Bulk Sync",
-            schedule=BulkSchedule(
-                frequency="manual",
-            ),
-            source_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            destination_configuration={"destination_configuration": {"key": "value"}},
+            destination_connection_id="destination_connection_id",
+            name="name",
+            schedules=[
+                V5BulkSyncScheduleRequest(
+                    frequency="manual",
+                ),
+                V5BulkSyncScheduleRequest(
+                    frequency="manual",
+                ),
+            ],
+            source_connection_id="source_connection_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -255,18 +254,17 @@ def create(
                 "destination_configuration": destination_configuration,
                 "destination_connection_id": destination_connection_id,
                 "disable_record_timestamps": disable_record_timestamps,
-                "discover": discover,
                 "mode": mode,
                 "name": name,
                 "normalize_names": normalize_names,
                 "organization_id": organization_id,
                 "policies": policies,
                 "resync_concurrency_limit": resync_concurrency_limit,
-                "schedule": convert_and_respect_annotation_metadata(
-                    object_=schedule, annotation=BulkSchedule, direction="write"
+                "schedules": convert_and_respect_annotation_metadata(
+                    object_=schedules, annotation=typing.Sequence[V5BulkSyncScheduleRequest], direction="write"
                 ),
                 "schemas": convert_and_respect_annotation_metadata(
-                    object_=schemas, annotation=typing.Sequence[V2CreateBulkSyncRequestSchemasItem], direction="write"
+                    object_=schemas, annotation=typing.Sequence[V5CreateBulkSyncRequestSchemasItem], direction="write"
                 ),
                 "source_configuration": source_configuration,
                 "source_connection_id": source_connection_id,
@@ -280,9 +278,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncResponseEnvelope,
+                    V5BulkSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncResponseEnvelope,  # type: ignore
+                        type_=V5BulkSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -347,7 +345,7 @@ def get(
         *,
         refresh_schemas: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncResponseEnvelope:
+    ) -> V5BulkSyncResponseEnvelope:
         """
         Parameters
         ----------
@@ -360,7 +358,7 @@ def get(
 
         Returns
         -------
-        BulkSyncResponseEnvelope
+        V5BulkSyncResponseEnvelope
             OK
 
         Examples
@@ -372,8 +370,7 @@ def get(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            refresh_schemas=True,
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -387,9 +384,9 @@ def get(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncResponseEnvelope,
+                    V5BulkSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncResponseEnvelope,  # type: ignore
+                        type_=V5BulkSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -425,7 +422,7 @@ def update(
         destination_configuration: typing.Dict[str, typing.Optional[typing.Any]],
         destination_connection_id: str,
         name: str,
-        schedule: BulkSchedule,
+        schedules: typing.Sequence[V5BulkSyncScheduleRequest],
         source_connection_id: str,
         active: typing.Optional[bool] = OMIT,
         automatically_add_new_fields: typing.Optional[BulkDiscover] = OMIT,
@@ -433,21 +430,16 @@ def update(
         concurrency_limit: typing.Optional[int] = OMIT,
         data_cutoff_timestamp: typing.Optional[dt.datetime] = OMIT,
         disable_record_timestamps: typing.Optional[bool] = OMIT,
-        discover: typing.Optional[bool] = OMIT,
-        mode: typing.Optional[BulkSyncMode] = OMIT,
+        mode: typing.Optional[BulkSyncTargetMode] = OMIT,
         normalize_names: typing.Optional[BulkNormalizeNames] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
         policies: typing.Optional[typing.Sequence[str]] = OMIT,
         resync_concurrency_limit: typing.Optional[int] = OMIT,
-        schemas: typing.Optional[typing.Sequence[V2UpdateBulkSyncRequestSchemasItem]] = OMIT,
+        schemas: typing.Optional[typing.Sequence[V5UpdateBulkSyncRequestSchemasItem]] = OMIT,
         source_configuration: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncResponseEnvelope:
+    ) -> V5BulkSyncResponseEnvelope:
         """
-        > 📘 Updating schemas
-        >
-        > Schema updates can be performed using the [Update Bulk Sync Schemas](https://apidocs.polytomic.com/api-reference/bulk-sync/schemas/patch) endpoint.
-
         Parameters
         ----------
         id : str
@@ -458,7 +450,7 @@ def update(
 
         name : str
 
-        schedule : BulkSchedule
+        schedules : typing.Sequence[V5BulkSyncScheduleRequest]
 
         source_connection_id : str
 
@@ -475,10 +467,7 @@ def update(
 
         disable_record_timestamps : typing.Optional[bool]
 
-        discover : typing.Optional[bool]
-            DEPRECATED: Use automatically_add_new_objects/automatically_add_new_fields instead
-
-        mode : typing.Optional[BulkSyncMode]
+        mode : typing.Optional[BulkSyncTargetMode]
 
         normalize_names : typing.Optional[BulkNormalizeNames]
 
@@ -489,7 +478,7 @@ def update(
         resync_concurrency_limit : typing.Optional[int]
             Override the default resync concurrency limit for this sync.
 
-        schemas : typing.Optional[typing.Sequence[V2UpdateBulkSyncRequestSchemasItem]]
+        schemas : typing.Optional[typing.Sequence[V5UpdateBulkSyncRequestSchemasItem]]
             List of schemas to sync; if omitted, all schemas will be selected for syncing.
 
         source_configuration : typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]
@@ -499,26 +488,31 @@ def update(
 
         Returns
         -------
-        BulkSyncResponseEnvelope
+        V5BulkSyncResponseEnvelope
             OK
 
         Examples
         --------
-        from polytomic import BulkSchedule, Polytomic
+        from polytomic import Polytomic, V5BulkSyncScheduleRequest
 
         client = Polytomic(
             version="YOUR_VERSION",
             token="YOUR_TOKEN",
         )
         client.bulk_sync.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            destination_configuration={"schema": "my_schema"},
-            destination_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            name="My Bulk Sync",
-            schedule=BulkSchedule(
-                frequency="manual",
-            ),
-            source_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
+            destination_configuration={"destination_configuration": {"key": "value"}},
+            destination_connection_id="destination_connection_id",
+            name="name",
+            schedules=[
+                V5BulkSyncScheduleRequest(
+                    frequency="manual",
+                ),
+                V5BulkSyncScheduleRequest(
+                    frequency="manual",
+                ),
+            ],
+            source_connection_id="source_connection_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -533,18 +527,17 @@ def update(
                 "destination_configuration": destination_configuration,
                 "destination_connection_id": destination_connection_id,
                 "disable_record_timestamps": disable_record_timestamps,
-                "discover": discover,
                 "mode": mode,
                 "name": name,
                 "normalize_names": normalize_names,
                 "organization_id": organization_id,
                 "policies": policies,
                 "resync_concurrency_limit": resync_concurrency_limit,
-                "schedule": convert_and_respect_annotation_metadata(
-                    object_=schedule, annotation=BulkSchedule, direction="write"
+                "schedules": convert_and_respect_annotation_metadata(
+                    object_=schedules, annotation=typing.Sequence[V5BulkSyncScheduleRequest], direction="write"
                 ),
                 "schemas": convert_and_respect_annotation_metadata(
-                    object_=schemas, annotation=typing.Sequence[V2UpdateBulkSyncRequestSchemasItem], direction="write"
+                    object_=schemas, annotation=typing.Sequence[V5UpdateBulkSyncRequestSchemasItem], direction="write"
                 ),
                 "source_configuration": source_configuration,
                 "source_connection_id": source_connection_id,
@@ -558,9 +551,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncResponseEnvelope,
+                    V5BulkSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncResponseEnvelope,  # type: ignore
+                        type_=V5BulkSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -649,8 +642,7 @@ def remove(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.remove(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            refresh_schemas=True,
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -711,7 +703,7 @@ def remove(
 
     def activate(
         self, id: str, *, active: bool, request_options: typing.Optional[RequestOptions] = None
-    ) -> ActivateSyncEnvelope:
+    ) -> V2ActivateSyncEnvelope:
         """
         Parameters
         ----------
@@ -724,7 +716,7 @@ def activate(
 
         Returns
         -------
-        ActivateSyncEnvelope
+        V2ActivateSyncEnvelope
             OK
 
         Examples
@@ -736,7 +728,7 @@ def activate(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.activate(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
             active=True,
         )
         """
@@ -752,9 +744,9 @@ def activate(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ActivateSyncEnvelope,
+                    V2ActivateSyncEnvelope,
                     parse_obj_as(
-                        type_=ActivateSyncEnvelope,  # type: ignore
+                        type_=V2ActivateSyncEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -807,18 +799,18 @@ def start(
         self,
         id: str,
         *,
-        fetch_mode: typing.Optional[BulkFetchMode] = OMIT,
+        fetch_mode: typing.Optional[V3BulkFetchMode] = OMIT,
         resync: typing.Optional[bool] = OMIT,
         schemas: typing.Optional[typing.Sequence[str]] = OMIT,
         test: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncExecutionEnvelope:
+    ) -> V3BulkSyncExecutionEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        fetch_mode : typing.Optional[BulkFetchMode]
+        fetch_mode : typing.Optional[V3BulkFetchMode]
 
         resync : typing.Optional[bool]
 
@@ -831,7 +823,7 @@ def start(
 
         Returns
         -------
-        BulkSyncExecutionEnvelope
+        V3BulkSyncExecutionEnvelope
             OK
 
         Examples
@@ -843,7 +835,7 @@ def start(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.start(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -864,9 +856,9 @@ def start(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncExecutionEnvelope,
+                    V3BulkSyncExecutionEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncExecutionEnvelope,  # type: ignore
+                        type_=V3BulkSyncExecutionEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -905,7 +897,9 @@ def start(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_status(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> BulkSyncStatusEnvelope:
+    def get_status(
+        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V3BulkSyncStatusEnvelope:
         """
         Parameters
         ----------
@@ -916,7 +910,7 @@ def get_status(self, id: str, *, request_options: typing.Optional[RequestOptions
 
         Returns
         -------
-        BulkSyncStatusEnvelope
+        V3BulkSyncStatusEnvelope
             OK
 
         Examples
@@ -928,7 +922,7 @@ def get_status(self, id: str, *, request_options: typing.Optional[RequestOptions
             token="YOUR_TOKEN",
         )
         client.bulk_sync.get_status(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -939,9 +933,9 @@ def get_status(self, id: str, *, request_options: typing.Optional[RequestOptions
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncStatusEnvelope,
+                    V3BulkSyncStatusEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncStatusEnvelope,  # type: ignore
+                        type_=V3BulkSyncStatusEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -986,7 +980,7 @@ def get_source(
         *,
         include_fields: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncSourceEnvelope:
+    ) -> V3BulkSyncSourceEnvelope:
         """
         Parameters
         ----------
@@ -999,7 +993,7 @@ def get_source(
 
         Returns
         -------
-        BulkSyncSourceEnvelope
+        V3BulkSyncSourceEnvelope
             OK
 
         Examples
@@ -1011,8 +1005,7 @@ def get_source(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.get_source(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            include_fields=True,
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -1026,9 +1019,9 @@ def get_source(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncSourceEnvelope,
+                    V3BulkSyncSourceEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncSourceEnvelope,  # type: ignore
+                        type_=V3BulkSyncSourceEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1079,7 +1072,7 @@ def get_source(
 
     def get_destination(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncDestEnvelope:
+    ) -> V2BulkSyncDestEnvelope:
         """
         Parameters
         ----------
@@ -1090,7 +1083,7 @@ def get_destination(
 
         Returns
         -------
-        BulkSyncDestEnvelope
+        V2BulkSyncDestEnvelope
             OK
 
         Examples
@@ -1102,7 +1095,7 @@ def get_destination(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.get_destination(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -1113,9 +1106,9 @@ def get_destination(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncDestEnvelope,
+                    V2BulkSyncDestEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncDestEnvelope,  # type: ignore
+                        type_=V2BulkSyncDestEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1174,7 +1167,7 @@ def __init__(self, *, client_wrapper: AsyncClientWrapper):
 
     async def list(
         self, *, active: typing.Optional[bool] = None, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncListEnvelope:
+    ) -> V2BulkSyncListEnvelope:
         """
         Parameters
         ----------
@@ -1185,7 +1178,7 @@ async def list(
 
         Returns
         -------
-        BulkSyncListEnvelope
+        V2BulkSyncListEnvelope
             OK
 
         Examples
@@ -1201,9 +1194,7 @@ async def list(
 
 
         async def main() -> None:
-            await client.bulk_sync.list(
-                active=True,
-            )
+            await client.bulk_sync.list()
 
 
         asyncio.run(main())
@@ -1219,9 +1210,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncListEnvelope,
+                    V2BulkSyncListEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncListEnvelope,  # type: ignore
+                        type_=V2BulkSyncListEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1256,7 +1247,7 @@ async def create(
         destination_configuration: typing.Dict[str, typing.Optional[typing.Any]],
         destination_connection_id: str,
         name: str,
-        schedule: BulkSchedule,
+        schedules: typing.Sequence[V5BulkSyncScheduleRequest],
         source_connection_id: str,
         active: typing.Optional[bool] = OMIT,
         automatically_add_new_fields: typing.Optional[BulkDiscover] = OMIT,
@@ -1264,16 +1255,15 @@ async def create(
         concurrency_limit: typing.Optional[int] = OMIT,
         data_cutoff_timestamp: typing.Optional[dt.datetime] = OMIT,
         disable_record_timestamps: typing.Optional[bool] = OMIT,
-        discover: typing.Optional[bool] = OMIT,
-        mode: typing.Optional[BulkSyncMode] = OMIT,
+        mode: typing.Optional[BulkSyncTargetMode] = OMIT,
         normalize_names: typing.Optional[BulkNormalizeNames] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
         policies: typing.Optional[typing.Sequence[str]] = OMIT,
         resync_concurrency_limit: typing.Optional[int] = OMIT,
-        schemas: typing.Optional[typing.Sequence[V2CreateBulkSyncRequestSchemasItem]] = OMIT,
+        schemas: typing.Optional[typing.Sequence[V5CreateBulkSyncRequestSchemasItem]] = OMIT,
         source_configuration: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncResponseEnvelope:
+    ) -> V5BulkSyncResponseEnvelope:
         """
         Create a new Bulk Sync from a source to a destination (data warehouse, database, or cloud storage bucket like S3).
 
@@ -1310,7 +1300,7 @@ async def create(
 
         name : str
 
-        schedule : BulkSchedule
+        schedules : typing.Sequence[V5BulkSyncScheduleRequest]
 
         source_connection_id : str
 
@@ -1327,10 +1317,7 @@ async def create(
 
         disable_record_timestamps : typing.Optional[bool]
 
-        discover : typing.Optional[bool]
-            DEPRECATED: Use automatically_add_new_objects/automatically_add_new_fields instead
-
-        mode : typing.Optional[BulkSyncMode]
+        mode : typing.Optional[BulkSyncTargetMode]
 
         normalize_names : typing.Optional[BulkNormalizeNames]
 
@@ -1341,7 +1328,7 @@ async def create(
         resync_concurrency_limit : typing.Optional[int]
             Override the default resync concurrency limit for this sync.
 
-        schemas : typing.Optional[typing.Sequence[V2CreateBulkSyncRequestSchemasItem]]
+        schemas : typing.Optional[typing.Sequence[V5CreateBulkSyncRequestSchemasItem]]
             List of schemas to sync; if omitted, all schemas will be selected for syncing.
 
         source_configuration : typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]
@@ -1351,14 +1338,14 @@ async def create(
 
         Returns
         -------
-        BulkSyncResponseEnvelope
+        V5BulkSyncResponseEnvelope
             OK
 
         Examples
         --------
         import asyncio
 
-        from polytomic import AsyncPolytomic, BulkSchedule
+        from polytomic import AsyncPolytomic, V5BulkSyncScheduleRequest
 
         client = AsyncPolytomic(
             version="YOUR_VERSION",
@@ -1368,13 +1355,20 @@ async def create(
 
         async def main() -> None:
             await client.bulk_sync.create(
-                destination_configuration={"schema": "my_schema"},
-                destination_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                name="My Bulk Sync",
-                schedule=BulkSchedule(
-                    frequency="manual",
-                ),
-                source_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                destination_configuration={
+                    "destination_configuration": {"key": "value"}
+                },
+                destination_connection_id="destination_connection_id",
+                name="name",
+                schedules=[
+                    V5BulkSyncScheduleRequest(
+                        frequency="manual",
+                    ),
+                    V5BulkSyncScheduleRequest(
+                        frequency="manual",
+                    ),
+                ],
+                source_connection_id="source_connection_id",
             )
 
 
@@ -1392,18 +1386,17 @@ async def main() -> None:
                 "destination_configuration": destination_configuration,
                 "destination_connection_id": destination_connection_id,
                 "disable_record_timestamps": disable_record_timestamps,
-                "discover": discover,
                 "mode": mode,
                 "name": name,
                 "normalize_names": normalize_names,
                 "organization_id": organization_id,
                 "policies": policies,
                 "resync_concurrency_limit": resync_concurrency_limit,
-                "schedule": convert_and_respect_annotation_metadata(
-                    object_=schedule, annotation=BulkSchedule, direction="write"
+                "schedules": convert_and_respect_annotation_metadata(
+                    object_=schedules, annotation=typing.Sequence[V5BulkSyncScheduleRequest], direction="write"
                 ),
                 "schemas": convert_and_respect_annotation_metadata(
-                    object_=schemas, annotation=typing.Sequence[V2CreateBulkSyncRequestSchemasItem], direction="write"
+                    object_=schemas, annotation=typing.Sequence[V5CreateBulkSyncRequestSchemasItem], direction="write"
                 ),
                 "source_configuration": source_configuration,
                 "source_connection_id": source_connection_id,
@@ -1417,9 +1410,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncResponseEnvelope,
+                    V5BulkSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncResponseEnvelope,  # type: ignore
+                        type_=V5BulkSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1484,7 +1477,7 @@ async def get(
         *,
         refresh_schemas: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncResponseEnvelope:
+    ) -> V5BulkSyncResponseEnvelope:
         """
         Parameters
         ----------
@@ -1497,7 +1490,7 @@ async def get(
 
         Returns
         -------
-        BulkSyncResponseEnvelope
+        V5BulkSyncResponseEnvelope
             OK
 
         Examples
@@ -1514,8 +1507,7 @@ async def get(
 
         async def main() -> None:
             await client.bulk_sync.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                refresh_schemas=True,
+                id="id",
             )
 
 
@@ -1532,9 +1524,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncResponseEnvelope,
+                    V5BulkSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncResponseEnvelope,  # type: ignore
+                        type_=V5BulkSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1570,7 +1562,7 @@ async def update(
         destination_configuration: typing.Dict[str, typing.Optional[typing.Any]],
         destination_connection_id: str,
         name: str,
-        schedule: BulkSchedule,
+        schedules: typing.Sequence[V5BulkSyncScheduleRequest],
         source_connection_id: str,
         active: typing.Optional[bool] = OMIT,
         automatically_add_new_fields: typing.Optional[BulkDiscover] = OMIT,
@@ -1578,21 +1570,16 @@ async def update(
         concurrency_limit: typing.Optional[int] = OMIT,
         data_cutoff_timestamp: typing.Optional[dt.datetime] = OMIT,
         disable_record_timestamps: typing.Optional[bool] = OMIT,
-        discover: typing.Optional[bool] = OMIT,
-        mode: typing.Optional[BulkSyncMode] = OMIT,
+        mode: typing.Optional[BulkSyncTargetMode] = OMIT,
         normalize_names: typing.Optional[BulkNormalizeNames] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
         policies: typing.Optional[typing.Sequence[str]] = OMIT,
         resync_concurrency_limit: typing.Optional[int] = OMIT,
-        schemas: typing.Optional[typing.Sequence[V2UpdateBulkSyncRequestSchemasItem]] = OMIT,
+        schemas: typing.Optional[typing.Sequence[V5UpdateBulkSyncRequestSchemasItem]] = OMIT,
         source_configuration: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncResponseEnvelope:
+    ) -> V5BulkSyncResponseEnvelope:
         """
-        > 📘 Updating schemas
-        >
-        > Schema updates can be performed using the [Update Bulk Sync Schemas](https://apidocs.polytomic.com/api-reference/bulk-sync/schemas/patch) endpoint.
-
         Parameters
         ----------
         id : str
@@ -1603,7 +1590,7 @@ async def update(
 
         name : str
 
-        schedule : BulkSchedule
+        schedules : typing.Sequence[V5BulkSyncScheduleRequest]
 
         source_connection_id : str
 
@@ -1620,10 +1607,7 @@ async def update(
 
         disable_record_timestamps : typing.Optional[bool]
 
-        discover : typing.Optional[bool]
-            DEPRECATED: Use automatically_add_new_objects/automatically_add_new_fields instead
-
-        mode : typing.Optional[BulkSyncMode]
+        mode : typing.Optional[BulkSyncTargetMode]
 
         normalize_names : typing.Optional[BulkNormalizeNames]
 
@@ -1634,7 +1618,7 @@ async def update(
         resync_concurrency_limit : typing.Optional[int]
             Override the default resync concurrency limit for this sync.
 
-        schemas : typing.Optional[typing.Sequence[V2UpdateBulkSyncRequestSchemasItem]]
+        schemas : typing.Optional[typing.Sequence[V5UpdateBulkSyncRequestSchemasItem]]
             List of schemas to sync; if omitted, all schemas will be selected for syncing.
 
         source_configuration : typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]
@@ -1644,14 +1628,14 @@ async def update(
 
         Returns
         -------
-        BulkSyncResponseEnvelope
+        V5BulkSyncResponseEnvelope
             OK
 
         Examples
         --------
         import asyncio
 
-        from polytomic import AsyncPolytomic, BulkSchedule
+        from polytomic import AsyncPolytomic, V5BulkSyncScheduleRequest
 
         client = AsyncPolytomic(
             version="YOUR_VERSION",
@@ -1661,14 +1645,21 @@ async def update(
 
         async def main() -> None:
             await client.bulk_sync.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                destination_configuration={"schema": "my_schema"},
-                destination_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                name="My Bulk Sync",
-                schedule=BulkSchedule(
-                    frequency="manual",
-                ),
-                source_connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
+                destination_configuration={
+                    "destination_configuration": {"key": "value"}
+                },
+                destination_connection_id="destination_connection_id",
+                name="name",
+                schedules=[
+                    V5BulkSyncScheduleRequest(
+                        frequency="manual",
+                    ),
+                    V5BulkSyncScheduleRequest(
+                        frequency="manual",
+                    ),
+                ],
+                source_connection_id="source_connection_id",
             )
 
 
@@ -1686,18 +1677,17 @@ async def main() -> None:
                 "destination_configuration": destination_configuration,
                 "destination_connection_id": destination_connection_id,
                 "disable_record_timestamps": disable_record_timestamps,
-                "discover": discover,
                 "mode": mode,
                 "name": name,
                 "normalize_names": normalize_names,
                 "organization_id": organization_id,
                 "policies": policies,
                 "resync_concurrency_limit": resync_concurrency_limit,
-                "schedule": convert_and_respect_annotation_metadata(
-                    object_=schedule, annotation=BulkSchedule, direction="write"
+                "schedules": convert_and_respect_annotation_metadata(
+                    object_=schedules, annotation=typing.Sequence[V5BulkSyncScheduleRequest], direction="write"
                 ),
                 "schemas": convert_and_respect_annotation_metadata(
-                    object_=schemas, annotation=typing.Sequence[V2UpdateBulkSyncRequestSchemasItem], direction="write"
+                    object_=schemas, annotation=typing.Sequence[V5UpdateBulkSyncRequestSchemasItem], direction="write"
                 ),
                 "source_configuration": source_configuration,
                 "source_connection_id": source_connection_id,
@@ -1711,9 +1701,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncResponseEnvelope,
+                    V5BulkSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncResponseEnvelope,  # type: ignore
+                        type_=V5BulkSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1807,8 +1797,7 @@ async def remove(
 
         async def main() -> None:
             await client.bulk_sync.remove(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                refresh_schemas=True,
+                id="id",
             )
 
 
@@ -1872,7 +1861,7 @@ async def main() -> None:
 
     async def activate(
         self, id: str, *, active: bool, request_options: typing.Optional[RequestOptions] = None
-    ) -> ActivateSyncEnvelope:
+    ) -> V2ActivateSyncEnvelope:
         """
         Parameters
         ----------
@@ -1885,7 +1874,7 @@ async def activate(
 
         Returns
         -------
-        ActivateSyncEnvelope
+        V2ActivateSyncEnvelope
             OK
 
         Examples
@@ -1902,7 +1891,7 @@ async def activate(
 
         async def main() -> None:
             await client.bulk_sync.activate(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
                 active=True,
             )
 
@@ -1921,9 +1910,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ActivateSyncEnvelope,
+                    V2ActivateSyncEnvelope,
                     parse_obj_as(
-                        type_=ActivateSyncEnvelope,  # type: ignore
+                        type_=V2ActivateSyncEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1976,18 +1965,18 @@ async def start(
         self,
         id: str,
         *,
-        fetch_mode: typing.Optional[BulkFetchMode] = OMIT,
+        fetch_mode: typing.Optional[V3BulkFetchMode] = OMIT,
         resync: typing.Optional[bool] = OMIT,
         schemas: typing.Optional[typing.Sequence[str]] = OMIT,
         test: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncExecutionEnvelope:
+    ) -> V3BulkSyncExecutionEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        fetch_mode : typing.Optional[BulkFetchMode]
+        fetch_mode : typing.Optional[V3BulkFetchMode]
 
         resync : typing.Optional[bool]
 
@@ -2000,7 +1989,7 @@ async def start(
 
         Returns
         -------
-        BulkSyncExecutionEnvelope
+        V3BulkSyncExecutionEnvelope
             OK
 
         Examples
@@ -2017,7 +2006,7 @@ async def start(
 
         async def main() -> None:
             await client.bulk_sync.start(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2041,9 +2030,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncExecutionEnvelope,
+                    V3BulkSyncExecutionEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncExecutionEnvelope,  # type: ignore
+                        type_=V3BulkSyncExecutionEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -2084,7 +2073,7 @@ async def main() -> None:
 
     async def get_status(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncStatusEnvelope:
+    ) -> V3BulkSyncStatusEnvelope:
         """
         Parameters
         ----------
@@ -2095,7 +2084,7 @@ async def get_status(
 
         Returns
         -------
-        BulkSyncStatusEnvelope
+        V3BulkSyncStatusEnvelope
             OK
 
         Examples
@@ -2112,7 +2101,7 @@ async def get_status(
 
         async def main() -> None:
             await client.bulk_sync.get_status(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2126,9 +2115,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncStatusEnvelope,
+                    V3BulkSyncStatusEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncStatusEnvelope,  # type: ignore
+                        type_=V3BulkSyncStatusEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -2173,7 +2162,7 @@ async def get_source(
         *,
         include_fields: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSyncSourceEnvelope:
+    ) -> V3BulkSyncSourceEnvelope:
         """
         Parameters
         ----------
@@ -2186,7 +2175,7 @@ async def get_source(
 
         Returns
         -------
-        BulkSyncSourceEnvelope
+        V3BulkSyncSourceEnvelope
             OK
 
         Examples
@@ -2203,8 +2192,7 @@ async def get_source(
 
         async def main() -> None:
             await client.bulk_sync.get_source(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                include_fields=True,
+                id="id",
             )
 
 
@@ -2221,9 +2209,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncSourceEnvelope,
+                    V3BulkSyncSourceEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncSourceEnvelope,  # type: ignore
+                        type_=V3BulkSyncSourceEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -2274,7 +2262,7 @@ async def main() -> None:
 
     async def get_destination(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncDestEnvelope:
+    ) -> V2BulkSyncDestEnvelope:
         """
         Parameters
         ----------
@@ -2285,7 +2273,7 @@ async def get_destination(
 
         Returns
         -------
-        BulkSyncDestEnvelope
+        V2BulkSyncDestEnvelope
             OK
 
         Examples
@@ -2302,7 +2290,7 @@ async def get_destination(
 
         async def main() -> None:
             await client.bulk_sync.get_destination(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2316,9 +2304,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncDestEnvelope,
+                    V2BulkSyncDestEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncDestEnvelope,  # type: ignore
+                        type_=V2BulkSyncDestEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/bulk_sync/executions/client.py b/src/polytomic/bulk_sync/executions/client.py
index a47b5ad..6d2657a 100644
--- a/src/polytomic/bulk_sync/executions/client.py
+++ b/src/polytomic/bulk_sync/executions/client.py
@@ -3,7 +3,7 @@
 from ...core.client_wrapper import SyncClientWrapper
 import typing
 from ...core.request_options import RequestOptions
-from ...types.list_bulk_sync_execution_status_envelope import ListBulkSyncExecutionStatusEnvelope
+from ...types.v4list_bulk_sync_executions_status_envelope import V4ListBulkSyncExecutionsStatusEnvelope
 from ...core.pydantic_utilities import parse_obj_as
 from ...errors.unauthorized_error import UnauthorizedError
 from ...types.rest_err_response import RestErrResponse
@@ -11,11 +11,11 @@
 from ...types.api_error import ApiError as types_api_error_ApiError
 from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError as core_api_error_ApiError
-from ...types.list_bulk_sync_executions_envelope import ListBulkSyncExecutionsEnvelope
+from ...types.v3list_bulk_sync_executions_envelope import V3ListBulkSyncExecutionsEnvelope
 from ...core.jsonable_encoder import jsonable_encoder
-from ...types.bulk_sync_execution_envelope import BulkSyncExecutionEnvelope
-from ...types.v_4_bulk_sync_execution_logs_envelope import V4BulkSyncExecutionLogsEnvelope
-from ...types.v_4_export_sync_logs_envelope import V4ExportSyncLogsEnvelope
+from ...types.v3bulk_sync_execution_envelope import V3BulkSyncExecutionEnvelope
+from ...types.v4bulk_sync_execution_logs_envelope import V4BulkSyncExecutionLogsEnvelope
+from ...types.v4export_sync_logs_envelope import V4ExportSyncLogsEnvelope
 from ...errors.bad_request_error import BadRequestError
 from ...errors.internal_server_error import InternalServerError
 from ...core.client_wrapper import AsyncClientWrapper
@@ -32,7 +32,7 @@ def list_status(
         active: typing.Optional[bool] = None,
         sync_id: typing.Optional[typing.Union[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListBulkSyncExecutionStatusEnvelope:
+    ) -> V4ListBulkSyncExecutionsStatusEnvelope:
         """
         Parameters
         ----------
@@ -50,7 +50,7 @@ def list_status(
 
         Returns
         -------
-        ListBulkSyncExecutionStatusEnvelope
+        V4ListBulkSyncExecutionsStatusEnvelope
             OK
 
         Examples
@@ -61,10 +61,7 @@ def list_status(
             version="YOUR_VERSION",
             token="YOUR_TOKEN",
         )
-        client.bulk_sync.executions.list_status(
-            all_=True,
-            active=True,
-        )
+        client.bulk_sync.executions.list_status()
         """
         _response = self._client_wrapper.httpx_client.request(
             "api/bulk/syncs/status",
@@ -79,9 +76,9 @@ def list_status(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListBulkSyncExecutionStatusEnvelope,
+                    V4ListBulkSyncExecutionsStatusEnvelope,
                     parse_obj_as(
-                        type_=ListBulkSyncExecutionStatusEnvelope,  # type: ignore
+                        type_=V4ListBulkSyncExecutionsStatusEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -119,7 +116,7 @@ def list(
         ascending: typing.Optional[bool] = None,
         limit: typing.Optional[int] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListBulkSyncExecutionsEnvelope:
+    ) -> V3ListBulkSyncExecutionsEnvelope:
         """
         Parameters
         ----------
@@ -138,7 +135,7 @@ def list(
 
         Returns
         -------
-        ListBulkSyncExecutionsEnvelope
+        V3ListBulkSyncExecutionsEnvelope
             OK
 
         Examples
@@ -150,11 +147,7 @@ def list(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.executions.list(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            page_token="AmkYh8v0jR5B3kls2Qcc9y8MjrPmvR4CvaK7H0F4rEwqvg76K==",
-            only_terminal=True,
-            ascending=True,
-            limit=100,
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -171,9 +164,9 @@ def list(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListBulkSyncExecutionsEnvelope,
+                    V3ListBulkSyncExecutionsEnvelope,
                     parse_obj_as(
-                        type_=ListBulkSyncExecutionsEnvelope,  # type: ignore
+                        type_=V3ListBulkSyncExecutionsEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -204,7 +197,7 @@ def list(
 
     def get(
         self, id: str, exec_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncExecutionEnvelope:
+    ) -> V3BulkSyncExecutionEnvelope:
         """
         Parameters
         ----------
@@ -217,7 +210,7 @@ def get(
 
         Returns
         -------
-        BulkSyncExecutionEnvelope
+        V3BulkSyncExecutionEnvelope
             OK
 
         Examples
@@ -229,8 +222,8 @@ def get(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.executions.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            exec_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
+            exec_id="exec_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -241,9 +234,9 @@ def get(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncExecutionEnvelope,
+                    V3BulkSyncExecutionEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncExecutionEnvelope,  # type: ignore
+                        type_=V3BulkSyncExecutionEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -299,8 +292,8 @@ def get_logs(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.executions.get_logs(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            execution_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            sync_id="sync_id",
+            execution_id="execution_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -377,8 +370,8 @@ def export_logs(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.executions.export_logs(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            execution_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            sync_id="sync_id",
+            execution_id="execution_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -455,7 +448,7 @@ async def list_status(
         active: typing.Optional[bool] = None,
         sync_id: typing.Optional[typing.Union[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListBulkSyncExecutionStatusEnvelope:
+    ) -> V4ListBulkSyncExecutionsStatusEnvelope:
         """
         Parameters
         ----------
@@ -473,7 +466,7 @@ async def list_status(
 
         Returns
         -------
-        ListBulkSyncExecutionStatusEnvelope
+        V4ListBulkSyncExecutionsStatusEnvelope
             OK
 
         Examples
@@ -489,10 +482,7 @@ async def list_status(
 
 
         async def main() -> None:
-            await client.bulk_sync.executions.list_status(
-                all_=True,
-                active=True,
-            )
+            await client.bulk_sync.executions.list_status()
 
 
         asyncio.run(main())
@@ -510,9 +500,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListBulkSyncExecutionStatusEnvelope,
+                    V4ListBulkSyncExecutionsStatusEnvelope,
                     parse_obj_as(
-                        type_=ListBulkSyncExecutionStatusEnvelope,  # type: ignore
+                        type_=V4ListBulkSyncExecutionsStatusEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -550,7 +540,7 @@ async def list(
         ascending: typing.Optional[bool] = None,
         limit: typing.Optional[int] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListBulkSyncExecutionsEnvelope:
+    ) -> V3ListBulkSyncExecutionsEnvelope:
         """
         Parameters
         ----------
@@ -569,7 +559,7 @@ async def list(
 
         Returns
         -------
-        ListBulkSyncExecutionsEnvelope
+        V3ListBulkSyncExecutionsEnvelope
             OK
 
         Examples
@@ -586,11 +576,7 @@ async def list(
 
         async def main() -> None:
             await client.bulk_sync.executions.list(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                page_token="AmkYh8v0jR5B3kls2Qcc9y8MjrPmvR4CvaK7H0F4rEwqvg76K==",
-                only_terminal=True,
-                ascending=True,
-                limit=100,
+                id="id",
             )
 
 
@@ -610,9 +596,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListBulkSyncExecutionsEnvelope,
+                    V3ListBulkSyncExecutionsEnvelope,
                     parse_obj_as(
-                        type_=ListBulkSyncExecutionsEnvelope,  # type: ignore
+                        type_=V3ListBulkSyncExecutionsEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -643,7 +629,7 @@ async def main() -> None:
 
     async def get(
         self, id: str, exec_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncExecutionEnvelope:
+    ) -> V3BulkSyncExecutionEnvelope:
         """
         Parameters
         ----------
@@ -656,7 +642,7 @@ async def get(
 
         Returns
         -------
-        BulkSyncExecutionEnvelope
+        V3BulkSyncExecutionEnvelope
             OK
 
         Examples
@@ -673,8 +659,8 @@ async def get(
 
         async def main() -> None:
             await client.bulk_sync.executions.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                exec_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
+                exec_id="exec_id",
             )
 
 
@@ -688,9 +674,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncExecutionEnvelope,
+                    V3BulkSyncExecutionEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncExecutionEnvelope,  # type: ignore
+                        type_=V3BulkSyncExecutionEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -751,8 +737,8 @@ async def get_logs(
 
         async def main() -> None:
             await client.bulk_sync.executions.get_logs(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                execution_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                sync_id="sync_id",
+                execution_id="execution_id",
             )
 
 
@@ -837,8 +823,8 @@ async def export_logs(
 
         async def main() -> None:
             await client.bulk_sync.executions.export_logs(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                execution_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                sync_id="sync_id",
+                execution_id="execution_id",
             )
 
 
diff --git a/src/polytomic/bulk_sync/schedules/client.py b/src/polytomic/bulk_sync/schedules/client.py
index 2d941ad..5c45fd6 100644
--- a/src/polytomic/bulk_sync/schedules/client.py
+++ b/src/polytomic/bulk_sync/schedules/client.py
@@ -3,7 +3,7 @@
 import typing
 from ...core.client_wrapper import SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.schedules_envelope import SchedulesEnvelope
+from ...types.v4schedules_envelope import V4SchedulesEnvelope
 from ...core.jsonable_encoder import jsonable_encoder
 from ...core.pydantic_utilities import parse_obj_as
 from ...errors.unauthorized_error import UnauthorizedError
@@ -14,8 +14,8 @@
 from ...errors.internal_server_error import InternalServerError
 from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError as core_api_error_ApiError
-from ...types.v_4_bulk_sync_schedule_api import V4BulkSyncScheduleApi
-from ...types.schedule_envelope import ScheduleEnvelope
+from ...types.v4bulk_sync_schedule_api import V4BulkSyncScheduleApi
+from ...types.v4schedule_envelope import V4ScheduleEnvelope
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...errors.bad_request_error import BadRequestError
 from ...core.client_wrapper import AsyncClientWrapper
@@ -28,7 +28,7 @@ class SchedulesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def list(self, sync_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> SchedulesEnvelope:
+    def list(self, sync_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V4SchedulesEnvelope:
         """
         Parameters
         ----------
@@ -39,7 +39,7 @@ def list(self, sync_id: str, *, request_options: typing.Optional[RequestOptions]
 
         Returns
         -------
-        SchedulesEnvelope
+        V4SchedulesEnvelope
             OK
 
         Examples
@@ -51,7 +51,7 @@ def list(self, sync_id: str, *, request_options: typing.Optional[RequestOptions]
             token="YOUR_TOKEN",
         )
         client.bulk_sync.schedules.list(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            sync_id="sync_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -62,9 +62,9 @@ def list(self, sync_id: str, *, request_options: typing.Optional[RequestOptions]
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    SchedulesEnvelope,
+                    V4SchedulesEnvelope,
                     parse_obj_as(
-                        type_=SchedulesEnvelope,  # type: ignore
+                        type_=V4SchedulesEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -115,7 +115,7 @@ def list(self, sync_id: str, *, request_options: typing.Optional[RequestOptions]
 
     def create(
         self, sync_id: str, *, schedule: V4BulkSyncScheduleApi, request_options: typing.Optional[RequestOptions] = None
-    ) -> ScheduleEnvelope:
+    ) -> V4ScheduleEnvelope:
         """
         Parameters
         ----------
@@ -128,7 +128,7 @@ def create(
 
         Returns
         -------
-        ScheduleEnvelope
+        V4ScheduleEnvelope
             OK
 
         Examples
@@ -140,7 +140,7 @@ def create(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.schedules.create(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            sync_id="sync_id",
             schedule=V4BulkSyncScheduleApi(
                 frequency="manual",
             ),
@@ -163,9 +163,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ScheduleEnvelope,
+                    V4ScheduleEnvelope,
                     parse_obj_as(
-                        type_=ScheduleEnvelope,  # type: ignore
+                        type_=V4ScheduleEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -226,7 +226,7 @@ def create(
 
     def get(
         self, sync_id: str, schedule_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ScheduleEnvelope:
+    ) -> V4ScheduleEnvelope:
         """
         Parameters
         ----------
@@ -239,7 +239,7 @@ def get(
 
         Returns
         -------
-        ScheduleEnvelope
+        V4ScheduleEnvelope
             OK
 
         Examples
@@ -251,8 +251,8 @@ def get(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.schedules.get(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schedule_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            sync_id="sync_id",
+            schedule_id="schedule_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -263,9 +263,9 @@ def get(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ScheduleEnvelope,
+                    V4ScheduleEnvelope,
                     parse_obj_as(
-                        type_=ScheduleEnvelope,  # type: ignore
+                        type_=V4ScheduleEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -321,7 +321,7 @@ def update(
         *,
         schedule: V4BulkSyncScheduleApi,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ScheduleEnvelope:
+    ) -> V4ScheduleEnvelope:
         """
         Parameters
         ----------
@@ -336,7 +336,7 @@ def update(
 
         Returns
         -------
-        ScheduleEnvelope
+        V4ScheduleEnvelope
             OK
 
         Examples
@@ -348,8 +348,8 @@ def update(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.schedules.update(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schedule_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            sync_id="sync_id",
+            schedule_id="schedule_id",
             schedule=V4BulkSyncScheduleApi(
                 frequency="manual",
             ),
@@ -372,9 +372,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ScheduleEnvelope,
+                    V4ScheduleEnvelope,
                     parse_obj_as(
-                        type_=ScheduleEnvelope,  # type: ignore
+                        type_=V4ScheduleEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -459,8 +459,8 @@ def delete(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.schedules.delete(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schedule_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            sync_id="sync_id",
+            schedule_id="schedule_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -521,7 +521,9 @@ class AsyncSchedulesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def list(self, sync_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> SchedulesEnvelope:
+    async def list(
+        self, sync_id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V4SchedulesEnvelope:
         """
         Parameters
         ----------
@@ -532,7 +534,7 @@ async def list(self, sync_id: str, *, request_options: typing.Optional[RequestOp
 
         Returns
         -------
-        SchedulesEnvelope
+        V4SchedulesEnvelope
             OK
 
         Examples
@@ -549,7 +551,7 @@ async def list(self, sync_id: str, *, request_options: typing.Optional[RequestOp
 
         async def main() -> None:
             await client.bulk_sync.schedules.list(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                sync_id="sync_id",
             )
 
 
@@ -563,9 +565,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    SchedulesEnvelope,
+                    V4SchedulesEnvelope,
                     parse_obj_as(
-                        type_=SchedulesEnvelope,  # type: ignore
+                        type_=V4SchedulesEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -616,7 +618,7 @@ async def main() -> None:
 
     async def create(
         self, sync_id: str, *, schedule: V4BulkSyncScheduleApi, request_options: typing.Optional[RequestOptions] = None
-    ) -> ScheduleEnvelope:
+    ) -> V4ScheduleEnvelope:
         """
         Parameters
         ----------
@@ -629,7 +631,7 @@ async def create(
 
         Returns
         -------
-        ScheduleEnvelope
+        V4ScheduleEnvelope
             OK
 
         Examples
@@ -646,7 +648,7 @@ async def create(
 
         async def main() -> None:
             await client.bulk_sync.schedules.create(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                sync_id="sync_id",
                 schedule=V4BulkSyncScheduleApi(
                     frequency="manual",
                 ),
@@ -672,9 +674,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ScheduleEnvelope,
+                    V4ScheduleEnvelope,
                     parse_obj_as(
-                        type_=ScheduleEnvelope,  # type: ignore
+                        type_=V4ScheduleEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -735,7 +737,7 @@ async def main() -> None:
 
     async def get(
         self, sync_id: str, schedule_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ScheduleEnvelope:
+    ) -> V4ScheduleEnvelope:
         """
         Parameters
         ----------
@@ -748,7 +750,7 @@ async def get(
 
         Returns
         -------
-        ScheduleEnvelope
+        V4ScheduleEnvelope
             OK
 
         Examples
@@ -765,8 +767,8 @@ async def get(
 
         async def main() -> None:
             await client.bulk_sync.schedules.get(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schedule_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                sync_id="sync_id",
+                schedule_id="schedule_id",
             )
 
 
@@ -780,9 +782,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ScheduleEnvelope,
+                    V4ScheduleEnvelope,
                     parse_obj_as(
-                        type_=ScheduleEnvelope,  # type: ignore
+                        type_=V4ScheduleEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -838,7 +840,7 @@ async def update(
         *,
         schedule: V4BulkSyncScheduleApi,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ScheduleEnvelope:
+    ) -> V4ScheduleEnvelope:
         """
         Parameters
         ----------
@@ -853,7 +855,7 @@ async def update(
 
         Returns
         -------
-        ScheduleEnvelope
+        V4ScheduleEnvelope
             OK
 
         Examples
@@ -870,8 +872,8 @@ async def update(
 
         async def main() -> None:
             await client.bulk_sync.schedules.update(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schedule_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                sync_id="sync_id",
+                schedule_id="schedule_id",
                 schedule=V4BulkSyncScheduleApi(
                     frequency="manual",
                 ),
@@ -897,9 +899,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ScheduleEnvelope,
+                    V4ScheduleEnvelope,
                     parse_obj_as(
-                        type_=ScheduleEnvelope,  # type: ignore
+                        type_=V4ScheduleEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -989,8 +991,8 @@ async def delete(
 
         async def main() -> None:
             await client.bulk_sync.schedules.delete(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schedule_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                sync_id="sync_id",
+                schedule_id="schedule_id",
             )
 
 
diff --git a/src/polytomic/bulk_sync/schemas/client.py b/src/polytomic/bulk_sync/schemas/client.py
index b20a8a8..2212971 100644
--- a/src/polytomic/bulk_sync/schemas/client.py
+++ b/src/polytomic/bulk_sync/schemas/client.py
@@ -3,7 +3,7 @@
 import typing
 from ...core.client_wrapper import SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.list_bulk_schema import ListBulkSchema
+from ...types.v3list_bulk_schema_envelope import V3ListBulkSchemaEnvelope
 from ...core.jsonable_encoder import jsonable_encoder
 from ...core.pydantic_utilities import parse_obj_as
 from ...errors.unauthorized_error import UnauthorizedError
@@ -12,15 +12,15 @@
 from ...types.api_error import ApiError as types_api_error_ApiError
 from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError as core_api_error_ApiError
-from ...types.bulk_schema import BulkSchema
+from ...types.v3bulk_schema import V3BulkSchema
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...errors.bad_request_error import BadRequestError
 from ...errors.forbidden_error import ForbiddenError
 from ...errors.internal_server_error import InternalServerError
-from ...types.bulk_schema_envelope import BulkSchemaEnvelope
+from ...types.v3bulk_schema_envelope import V3BulkSchemaEnvelope
 import datetime as dt
-from ...types.update_bulk_field import UpdateBulkField
-from ...types.bulk_filter import BulkFilter
+from ...types.v3update_bulk_field import V3UpdateBulkField
+from ...types.v3bulk_filter import V3BulkFilter
 from ...core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
@@ -35,22 +35,22 @@ def list(
         self,
         id: str,
         *,
-        filters: typing.Optional[typing.Dict[str, typing.Optional[str]]] = None,
+        filters: typing.Optional[typing.Dict[str, str]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListBulkSchema:
+    ) -> V3ListBulkSchemaEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        filters : typing.Optional[typing.Dict[str, typing.Optional[str]]]
+        filters : typing.Optional[typing.Dict[str, str]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        ListBulkSchema
+        V3ListBulkSchemaEnvelope
             OK
 
         Examples
@@ -62,7 +62,7 @@ def list(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.schemas.list(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -76,9 +76,9 @@ def list(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListBulkSchema,
+                    V3ListBulkSchemaEnvelope,
                     parse_obj_as(
-                        type_=ListBulkSchema,  # type: ignore
+                        type_=V3ListBulkSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -111,22 +111,22 @@ def patch(
         self,
         id: str,
         *,
-        schemas: typing.Optional[typing.Sequence[BulkSchema]] = OMIT,
+        schemas: typing.Optional[typing.Sequence[V3BulkSchema]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListBulkSchema:
+    ) -> V3ListBulkSchemaEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        schemas : typing.Optional[typing.Sequence[BulkSchema]]
+        schemas : typing.Optional[typing.Sequence[V3BulkSchema]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        ListBulkSchema
+        V3ListBulkSchemaEnvelope
             OK
 
         Examples
@@ -138,7 +138,7 @@ def patch(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.schemas.patch(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -146,7 +146,7 @@ def patch(
             method="PATCH",
             json={
                 "schemas": convert_and_respect_annotation_metadata(
-                    object_=schemas, annotation=typing.Sequence[BulkSchema], direction="write"
+                    object_=schemas, annotation=typing.Sequence[V3BulkSchema], direction="write"
                 ),
             },
             headers={
@@ -158,9 +158,9 @@ def patch(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListBulkSchema,
+                    V3ListBulkSchemaEnvelope,
                     parse_obj_as(
-                        type_=ListBulkSchema,  # type: ignore
+                        type_=V3ListBulkSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -221,7 +221,7 @@ def patch(
 
     def get(
         self, id: str, schema_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSchemaEnvelope:
+    ) -> V3BulkSchemaEnvelope:
         """
         Parameters
         ----------
@@ -234,7 +234,7 @@ def get(
 
         Returns
         -------
-        BulkSchemaEnvelope
+        V3BulkSchemaEnvelope
             OK
 
         Examples
@@ -246,8 +246,8 @@ def get(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.schemas.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schema_id="Contact",
+            id="id",
+            schema_id="schema_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -258,9 +258,9 @@ def get(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSchemaEnvelope,
+                    V3BulkSchemaEnvelope,
                     parse_obj_as(
-                        type_=BulkSchemaEnvelope,  # type: ignore
+                        type_=V3BulkSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -297,13 +297,13 @@ def update(
         data_cutoff_timestamp: typing.Optional[dt.datetime] = OMIT,
         disable_data_cutoff: typing.Optional[bool] = OMIT,
         enabled: typing.Optional[bool] = OMIT,
-        fields: typing.Optional[typing.Sequence[UpdateBulkField]] = OMIT,
-        filters: typing.Optional[typing.Sequence[BulkFilter]] = OMIT,
+        fields: typing.Optional[typing.Sequence[V3UpdateBulkField]] = OMIT,
+        filters: typing.Optional[typing.Sequence[V3BulkFilter]] = OMIT,
         partition_key: typing.Optional[str] = OMIT,
         tracking_field: typing.Optional[str] = OMIT,
         user_output_name: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSchemaEnvelope:
+    ) -> V3BulkSchemaEnvelope:
         """
         Parameters
         ----------
@@ -317,9 +317,9 @@ def update(
 
         enabled : typing.Optional[bool]
 
-        fields : typing.Optional[typing.Sequence[UpdateBulkField]]
+        fields : typing.Optional[typing.Sequence[V3UpdateBulkField]]
 
-        filters : typing.Optional[typing.Sequence[BulkFilter]]
+        filters : typing.Optional[typing.Sequence[V3BulkFilter]]
 
         partition_key : typing.Optional[str]
 
@@ -332,7 +332,7 @@ def update(
 
         Returns
         -------
-        BulkSchemaEnvelope
+        V3BulkSchemaEnvelope
             OK
 
         Examples
@@ -344,8 +344,8 @@ def update(
             token="YOUR_TOKEN",
         )
         client.bulk_sync.schemas.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schema_id="contact",
+            id="id",
+            schema_id="schema_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -356,10 +356,10 @@ def update(
                 "disable_data_cutoff": disable_data_cutoff,
                 "enabled": enabled,
                 "fields": convert_and_respect_annotation_metadata(
-                    object_=fields, annotation=typing.Sequence[UpdateBulkField], direction="write"
+                    object_=fields, annotation=typing.Sequence[V3UpdateBulkField], direction="write"
                 ),
                 "filters": convert_and_respect_annotation_metadata(
-                    object_=filters, annotation=typing.Sequence[BulkFilter], direction="write"
+                    object_=filters, annotation=typing.Sequence[V3BulkFilter], direction="write"
                 ),
                 "partition_key": partition_key,
                 "tracking_field": tracking_field,
@@ -374,9 +374,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSchemaEnvelope,
+                    V3BulkSchemaEnvelope,
                     parse_obj_as(
-                        type_=BulkSchemaEnvelope,  # type: ignore
+                        type_=V3BulkSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -434,22 +434,22 @@ async def list(
         self,
         id: str,
         *,
-        filters: typing.Optional[typing.Dict[str, typing.Optional[str]]] = None,
+        filters: typing.Optional[typing.Dict[str, str]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListBulkSchema:
+    ) -> V3ListBulkSchemaEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        filters : typing.Optional[typing.Dict[str, typing.Optional[str]]]
+        filters : typing.Optional[typing.Dict[str, str]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        ListBulkSchema
+        V3ListBulkSchemaEnvelope
             OK
 
         Examples
@@ -466,7 +466,7 @@ async def list(
 
         async def main() -> None:
             await client.bulk_sync.schemas.list(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -483,9 +483,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListBulkSchema,
+                    V3ListBulkSchemaEnvelope,
                     parse_obj_as(
-                        type_=ListBulkSchema,  # type: ignore
+                        type_=V3ListBulkSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -518,22 +518,22 @@ async def patch(
         self,
         id: str,
         *,
-        schemas: typing.Optional[typing.Sequence[BulkSchema]] = OMIT,
+        schemas: typing.Optional[typing.Sequence[V3BulkSchema]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListBulkSchema:
+    ) -> V3ListBulkSchemaEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        schemas : typing.Optional[typing.Sequence[BulkSchema]]
+        schemas : typing.Optional[typing.Sequence[V3BulkSchema]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        ListBulkSchema
+        V3ListBulkSchemaEnvelope
             OK
 
         Examples
@@ -550,7 +550,7 @@ async def patch(
 
         async def main() -> None:
             await client.bulk_sync.schemas.patch(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -561,7 +561,7 @@ async def main() -> None:
             method="PATCH",
             json={
                 "schemas": convert_and_respect_annotation_metadata(
-                    object_=schemas, annotation=typing.Sequence[BulkSchema], direction="write"
+                    object_=schemas, annotation=typing.Sequence[V3BulkSchema], direction="write"
                 ),
             },
             headers={
@@ -573,9 +573,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListBulkSchema,
+                    V3ListBulkSchemaEnvelope,
                     parse_obj_as(
-                        type_=ListBulkSchema,  # type: ignore
+                        type_=V3ListBulkSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -636,7 +636,7 @@ async def main() -> None:
 
     async def get(
         self, id: str, schema_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSchemaEnvelope:
+    ) -> V3BulkSchemaEnvelope:
         """
         Parameters
         ----------
@@ -649,7 +649,7 @@ async def get(
 
         Returns
         -------
-        BulkSchemaEnvelope
+        V3BulkSchemaEnvelope
             OK
 
         Examples
@@ -666,8 +666,8 @@ async def get(
 
         async def main() -> None:
             await client.bulk_sync.schemas.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schema_id="Contact",
+                id="id",
+                schema_id="schema_id",
             )
 
 
@@ -681,9 +681,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSchemaEnvelope,
+                    V3BulkSchemaEnvelope,
                     parse_obj_as(
-                        type_=BulkSchemaEnvelope,  # type: ignore
+                        type_=V3BulkSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -720,13 +720,13 @@ async def update(
         data_cutoff_timestamp: typing.Optional[dt.datetime] = OMIT,
         disable_data_cutoff: typing.Optional[bool] = OMIT,
         enabled: typing.Optional[bool] = OMIT,
-        fields: typing.Optional[typing.Sequence[UpdateBulkField]] = OMIT,
-        filters: typing.Optional[typing.Sequence[BulkFilter]] = OMIT,
+        fields: typing.Optional[typing.Sequence[V3UpdateBulkField]] = OMIT,
+        filters: typing.Optional[typing.Sequence[V3BulkFilter]] = OMIT,
         partition_key: typing.Optional[str] = OMIT,
         tracking_field: typing.Optional[str] = OMIT,
         user_output_name: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> BulkSchemaEnvelope:
+    ) -> V3BulkSchemaEnvelope:
         """
         Parameters
         ----------
@@ -740,9 +740,9 @@ async def update(
 
         enabled : typing.Optional[bool]
 
-        fields : typing.Optional[typing.Sequence[UpdateBulkField]]
+        fields : typing.Optional[typing.Sequence[V3UpdateBulkField]]
 
-        filters : typing.Optional[typing.Sequence[BulkFilter]]
+        filters : typing.Optional[typing.Sequence[V3BulkFilter]]
 
         partition_key : typing.Optional[str]
 
@@ -755,7 +755,7 @@ async def update(
 
         Returns
         -------
-        BulkSchemaEnvelope
+        V3BulkSchemaEnvelope
             OK
 
         Examples
@@ -772,8 +772,8 @@ async def update(
 
         async def main() -> None:
             await client.bulk_sync.schemas.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schema_id="contact",
+                id="id",
+                schema_id="schema_id",
             )
 
 
@@ -787,10 +787,10 @@ async def main() -> None:
                 "disable_data_cutoff": disable_data_cutoff,
                 "enabled": enabled,
                 "fields": convert_and_respect_annotation_metadata(
-                    object_=fields, annotation=typing.Sequence[UpdateBulkField], direction="write"
+                    object_=fields, annotation=typing.Sequence[V3UpdateBulkField], direction="write"
                 ),
                 "filters": convert_and_respect_annotation_metadata(
-                    object_=filters, annotation=typing.Sequence[BulkFilter], direction="write"
+                    object_=filters, annotation=typing.Sequence[V3BulkFilter], direction="write"
                 ),
                 "partition_key": partition_key,
                 "tracking_field": tracking_field,
@@ -805,9 +805,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSchemaEnvelope,
+                    V3BulkSchemaEnvelope,
                     parse_obj_as(
-                        type_=BulkSchemaEnvelope,  # type: ignore
+                        type_=V3BulkSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/bulk_sync/types/__init__.py b/src/polytomic/bulk_sync/types/__init__.py
index 09a2010..4271b24 100644
--- a/src/polytomic/bulk_sync/types/__init__.py
+++ b/src/polytomic/bulk_sync/types/__init__.py
@@ -1,6 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from .v_2_create_bulk_sync_request_schemas_item import V2CreateBulkSyncRequestSchemasItem
-from .v_2_update_bulk_sync_request_schemas_item import V2UpdateBulkSyncRequestSchemasItem
+from .v5create_bulk_sync_request_schemas_item import V5CreateBulkSyncRequestSchemasItem
+from .v5update_bulk_sync_request_schemas_item import V5UpdateBulkSyncRequestSchemasItem
 
-__all__ = ["V2CreateBulkSyncRequestSchemasItem", "V2UpdateBulkSyncRequestSchemasItem"]
+__all__ = ["V5CreateBulkSyncRequestSchemasItem", "V5UpdateBulkSyncRequestSchemasItem"]
diff --git a/src/polytomic/bulk_sync/types/v5create_bulk_sync_request_schemas_item.py b/src/polytomic/bulk_sync/types/v5create_bulk_sync_request_schemas_item.py
new file mode 100644
index 0000000..1b0c0c1
--- /dev/null
+++ b/src/polytomic/bulk_sync/types/v5create_bulk_sync_request_schemas_item.py
@@ -0,0 +1,6 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+from ...types.v2schema_configuration import V2SchemaConfiguration
+
+V5CreateBulkSyncRequestSchemasItem = typing.Union[str, V2SchemaConfiguration]
diff --git a/src/polytomic/bulk_sync/types/v5update_bulk_sync_request_schemas_item.py b/src/polytomic/bulk_sync/types/v5update_bulk_sync_request_schemas_item.py
new file mode 100644
index 0000000..4c42880
--- /dev/null
+++ b/src/polytomic/bulk_sync/types/v5update_bulk_sync_request_schemas_item.py
@@ -0,0 +1,6 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+from ...types.v2schema_configuration import V2SchemaConfiguration
+
+V5UpdateBulkSyncRequestSchemasItem = typing.Union[str, V2SchemaConfiguration]
diff --git a/src/polytomic/bulk_sync/types/v_2_create_bulk_sync_request_schemas_item.py b/src/polytomic/bulk_sync/types/v_2_create_bulk_sync_request_schemas_item.py
deleted file mode 100644
index 5808811..0000000
--- a/src/polytomic/bulk_sync/types/v_2_create_bulk_sync_request_schemas_item.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import typing
-from ...types.schema_configuration import SchemaConfiguration
-
-V2CreateBulkSyncRequestSchemasItem = typing.Union[str, SchemaConfiguration]
diff --git a/src/polytomic/bulk_sync/types/v_2_update_bulk_sync_request_schemas_item.py b/src/polytomic/bulk_sync/types/v_2_update_bulk_sync_request_schemas_item.py
deleted file mode 100644
index ea51f93..0000000
--- a/src/polytomic/bulk_sync/types/v_2_update_bulk_sync_request_schemas_item.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import typing
-from ...types.schema_configuration import SchemaConfiguration
-
-V2UpdateBulkSyncRequestSchemasItem = typing.Union[str, SchemaConfiguration]
diff --git a/src/polytomic/client.py b/src/polytomic/client.py
index f0762a7..5518539 100644
--- a/src/polytomic/client.py
+++ b/src/polytomic/client.py
@@ -53,7 +53,7 @@ class Polytomic:
 
 
 
-    version : typing.Optional[str]
+    version : typing.Optional[typing.Any]
     token : typing.Union[str, typing.Callable[[], str]]
     timeout : typing.Optional[float]
         The timeout to be used, in seconds, for requests. By default the timeout is 60 seconds, unless a custom httpx client is used, in which case this default is not enforced.
@@ -79,7 +79,7 @@ def __init__(
         *,
         base_url: typing.Optional[str] = None,
         environment: PolytomicEnvironment = PolytomicEnvironment.DEFAULT,
-        version: typing.Optional[str] = None,
+        version: typing.Optional[typing.Any] = None,
         token: typing.Union[str, typing.Callable[[], str]],
         timeout: typing.Optional[float] = None,
         follow_redirects: typing.Optional[bool] = True,
@@ -131,7 +131,7 @@ class AsyncPolytomic:
 
 
 
-    version : typing.Optional[str]
+    version : typing.Optional[typing.Any]
     token : typing.Union[str, typing.Callable[[], str]]
     timeout : typing.Optional[float]
         The timeout to be used, in seconds, for requests. By default the timeout is 60 seconds, unless a custom httpx client is used, in which case this default is not enforced.
@@ -157,7 +157,7 @@ def __init__(
         *,
         base_url: typing.Optional[str] = None,
         environment: PolytomicEnvironment = PolytomicEnvironment.DEFAULT,
-        version: typing.Optional[str] = None,
+        version: typing.Optional[typing.Any] = None,
         token: typing.Union[str, typing.Callable[[], str]],
         timeout: typing.Optional[float] = None,
         follow_redirects: typing.Optional[bool] = True,
diff --git a/src/polytomic/connections/client.py b/src/polytomic/connections/client.py
index c7915c6..33da06c 100644
--- a/src/polytomic/connections/client.py
+++ b/src/polytomic/connections/client.py
@@ -3,7 +3,7 @@
 import typing
 from ..core.client_wrapper import SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.connection_type_response_envelope import ConnectionTypeResponseEnvelope
+from ..types.v2connection_type_response_envelope import V2ConnectionTypeResponseEnvelope
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.unauthorized_error import UnauthorizedError
 from ..types.rest_err_response import RestErrResponse
@@ -14,14 +14,14 @@
 from ..types.jsonschema_schema import JsonschemaSchema
 from ..core.jsonable_encoder import jsonable_encoder
 from ..errors.not_found_error import NotFoundError
-from ..types.connection_list_response_envelope import ConnectionListResponseEnvelope
-from ..types.create_connection_response_envelope import CreateConnectionResponseEnvelope
+from ..types.v2connection_list_response_envelope import V2ConnectionListResponseEnvelope
+from ..types.v2create_connection_response_envelope import V2CreateConnectionResponseEnvelope
 from ..errors.bad_request_error import BadRequestError
 from ..errors.forbidden_error import ForbiddenError
 from ..errors.unprocessable_entity_error import UnprocessableEntityError
-from ..types.connect_card_response_envelope import ConnectCardResponseEnvelope
-from ..types.connection_response_envelope import ConnectionResponseEnvelope
-from ..types.connection_parameter_values_response_envelope import ConnectionParameterValuesResponseEnvelope
+from ..types.v3connect_card_response_envelope import V3ConnectCardResponseEnvelope
+from ..types.v2connection_response_envelope import V2ConnectionResponseEnvelope
+from ..types.v2connection_parameter_values_response_envelope import V2ConnectionParameterValuesResponseEnvelope
 from ..core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
@@ -32,7 +32,7 @@ class ConnectionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def get_types(self, *, request_options: typing.Optional[RequestOptions] = None) -> ConnectionTypeResponseEnvelope:
+    def get_types(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2ConnectionTypeResponseEnvelope:
         """
         Parameters
         ----------
@@ -41,7 +41,7 @@ def get_types(self, *, request_options: typing.Optional[RequestOptions] = None)
 
         Returns
         -------
-        ConnectionTypeResponseEnvelope
+        V2ConnectionTypeResponseEnvelope
             OK
 
         Examples
@@ -62,9 +62,9 @@ def get_types(self, *, request_options: typing.Optional[RequestOptions] = None)
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectionTypeResponseEnvelope,
+                    V2ConnectionTypeResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectionTypeResponseEnvelope,  # type: ignore
+                        type_=V2ConnectionTypeResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -118,7 +118,7 @@ def get_connection_type_schema(
             token="YOUR_TOKEN",
         )
         client.connections.get_connection_type_schema(
-            id="postgresql",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -170,7 +170,7 @@ def get_connection_type_schema(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> ConnectionListResponseEnvelope:
+    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2ConnectionListResponseEnvelope:
         """
         Parameters
         ----------
@@ -179,7 +179,7 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Co
 
         Returns
         -------
-        ConnectionListResponseEnvelope
+        V2ConnectionListResponseEnvelope
             OK
 
         Examples
@@ -200,9 +200,9 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Co
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectionListResponseEnvelope,
+                    V2ConnectionListResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectionListResponseEnvelope,  # type: ignore
+                        type_=V2ConnectionListResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -243,7 +243,7 @@ def create(
         redirect_url: typing.Optional[str] = OMIT,
         validate: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> CreateConnectionResponseEnvelope:
+    ) -> V2CreateConnectionResponseEnvelope:
         """
         Parameters
         ----------
@@ -271,7 +271,7 @@ def create(
 
         Returns
         -------
-        CreateConnectionResponseEnvelope
+        V2CreateConnectionResponseEnvelope
             OK
 
         Examples
@@ -283,15 +283,9 @@ def create(
             token="YOUR_TOKEN",
         )
         client.connections.create(
-            configuration={
-                "database": "example",
-                "hostname": "postgres.example.com",
-                "password": "********",
-                "port": 5432,
-                "username": "user",
-            },
-            name="My Postgres Connection",
-            type="postgresql",
+            configuration={"configuration": {"key": "value"}},
+            name="name",
+            type="type",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -316,9 +310,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    CreateConnectionResponseEnvelope,
+                    V2CreateConnectionResponseEnvelope,
                     parse_obj_as(
-                        type_=CreateConnectionResponseEnvelope,  # type: ignore
+                        type_=V2CreateConnectionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -388,7 +382,7 @@ def connect(
         type: typing.Optional[str] = OMIT,
         whitelist: typing.Optional[typing.Sequence[str]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ConnectCardResponseEnvelope:
+    ) -> V3ConnectCardResponseEnvelope:
         """
         Creates a new request for [Polytomic Connect](https://www.polytomic.com/connect).
 
@@ -427,7 +421,7 @@ def connect(
 
         Returns
         -------
-        ConnectCardResponseEnvelope
+        V3ConnectCardResponseEnvelope
             OK
 
         Examples
@@ -439,7 +433,7 @@ def connect(
             token="YOUR_TOKEN",
         )
         client.connections.connect(
-            name="Salesforce Connection",
+            name="name",
             redirect_url="redirect_url",
         )
         """
@@ -464,9 +458,9 @@ def connect(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectCardResponseEnvelope,
+                    V3ConnectCardResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectCardResponseEnvelope,  # type: ignore
+                        type_=V3ConnectCardResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -553,14 +547,8 @@ def test_connection(
             token="YOUR_TOKEN",
         )
         client.connections.test_connection(
-            configuration={
-                "database": "example",
-                "hostname": "postgres.example.com",
-                "password": "password",
-                "port": 5432,
-                "username": "user",
-            },
-            type="postgresql",
+            configuration={"configuration": {"key": "value"}},
+            type="type",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -625,7 +613,7 @@ def test_connection(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> ConnectionResponseEnvelope:
+    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2ConnectionResponseEnvelope:
         """
         Parameters
         ----------
@@ -636,7 +624,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
 
         Returns
         -------
-        ConnectionResponseEnvelope
+        V2ConnectionResponseEnvelope
             OK
 
         Examples
@@ -648,7 +636,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             token="YOUR_TOKEN",
         )
         client.connections.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -659,9 +647,9 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectionResponseEnvelope,
+                    V2ConnectionResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectionResponseEnvelope,  # type: ignore
+                        type_=V2ConnectionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -713,7 +701,7 @@ def update(
         type: typing.Optional[str] = OMIT,
         validate: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> CreateConnectionResponseEnvelope:
+    ) -> V2CreateConnectionResponseEnvelope:
         """
         Parameters
         ----------
@@ -742,7 +730,7 @@ def update(
 
         Returns
         -------
-        CreateConnectionResponseEnvelope
+        V2CreateConnectionResponseEnvelope
             OK
 
         Examples
@@ -754,15 +742,9 @@ def update(
             token="YOUR_TOKEN",
         )
         client.connections.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            configuration={
-                "database": "example",
-                "hostname": "postgres.example.com",
-                "password": "********",
-                "port": 5432,
-                "username": "user",
-            },
-            name="My Postgres Connection",
+            id="id",
+            configuration={"configuration": {"key": "value"}},
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -787,9 +769,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    CreateConnectionResponseEnvelope,
+                    V2CreateConnectionResponseEnvelope,
                     parse_obj_as(
-                        type_=CreateConnectionResponseEnvelope,  # type: ignore
+                        type_=V2CreateConnectionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -884,8 +866,7 @@ def remove(
             token="YOUR_TOKEN",
         )
         client.connections.remove(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            force=True,
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -956,7 +937,7 @@ def remove(
 
     def get_parameter_values(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ConnectionParameterValuesResponseEnvelope:
+    ) -> V2ConnectionParameterValuesResponseEnvelope:
         """
         Parameters
         ----------
@@ -967,7 +948,7 @@ def get_parameter_values(
 
         Returns
         -------
-        ConnectionParameterValuesResponseEnvelope
+        V2ConnectionParameterValuesResponseEnvelope
             OK
 
         Examples
@@ -979,7 +960,7 @@ def get_parameter_values(
             token="YOUR_TOKEN",
         )
         client.connections.get_parameter_values(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -990,9 +971,9 @@ def get_parameter_values(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectionParameterValuesResponseEnvelope,
+                    V2ConnectionParameterValuesResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectionParameterValuesResponseEnvelope,  # type: ignore
+                        type_=V2ConnectionParameterValuesResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1038,7 +1019,7 @@ def __init__(self, *, client_wrapper: AsyncClientWrapper):
 
     async def get_types(
         self, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ConnectionTypeResponseEnvelope:
+    ) -> V2ConnectionTypeResponseEnvelope:
         """
         Parameters
         ----------
@@ -1047,7 +1028,7 @@ async def get_types(
 
         Returns
         -------
-        ConnectionTypeResponseEnvelope
+        V2ConnectionTypeResponseEnvelope
             OK
 
         Examples
@@ -1076,9 +1057,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectionTypeResponseEnvelope,
+                    V2ConnectionTypeResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectionTypeResponseEnvelope,  # type: ignore
+                        type_=V2ConnectionTypeResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1137,7 +1118,7 @@ async def get_connection_type_schema(
 
         async def main() -> None:
             await client.connections.get_connection_type_schema(
-                id="postgresql",
+                id="id",
             )
 
 
@@ -1192,7 +1173,9 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> ConnectionListResponseEnvelope:
+    async def list(
+        self, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V2ConnectionListResponseEnvelope:
         """
         Parameters
         ----------
@@ -1201,7 +1184,7 @@ async def list(self, *, request_options: typing.Optional[RequestOptions] = None)
 
         Returns
         -------
-        ConnectionListResponseEnvelope
+        V2ConnectionListResponseEnvelope
             OK
 
         Examples
@@ -1230,9 +1213,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectionListResponseEnvelope,
+                    V2ConnectionListResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectionListResponseEnvelope,  # type: ignore
+                        type_=V2ConnectionListResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1273,7 +1256,7 @@ async def create(
         redirect_url: typing.Optional[str] = OMIT,
         validate: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> CreateConnectionResponseEnvelope:
+    ) -> V2CreateConnectionResponseEnvelope:
         """
         Parameters
         ----------
@@ -1301,7 +1284,7 @@ async def create(
 
         Returns
         -------
-        CreateConnectionResponseEnvelope
+        V2CreateConnectionResponseEnvelope
             OK
 
         Examples
@@ -1318,15 +1301,9 @@ async def create(
 
         async def main() -> None:
             await client.connections.create(
-                configuration={
-                    "database": "example",
-                    "hostname": "postgres.example.com",
-                    "password": "********",
-                    "port": 5432,
-                    "username": "user",
-                },
-                name="My Postgres Connection",
-                type="postgresql",
+                configuration={"configuration": {"key": "value"}},
+                name="name",
+                type="type",
             )
 
 
@@ -1354,9 +1331,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    CreateConnectionResponseEnvelope,
+                    V2CreateConnectionResponseEnvelope,
                     parse_obj_as(
-                        type_=CreateConnectionResponseEnvelope,  # type: ignore
+                        type_=V2CreateConnectionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1426,7 +1403,7 @@ async def connect(
         type: typing.Optional[str] = OMIT,
         whitelist: typing.Optional[typing.Sequence[str]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ConnectCardResponseEnvelope:
+    ) -> V3ConnectCardResponseEnvelope:
         """
         Creates a new request for [Polytomic Connect](https://www.polytomic.com/connect).
 
@@ -1465,7 +1442,7 @@ async def connect(
 
         Returns
         -------
-        ConnectCardResponseEnvelope
+        V3ConnectCardResponseEnvelope
             OK
 
         Examples
@@ -1482,7 +1459,7 @@ async def connect(
 
         async def main() -> None:
             await client.connections.connect(
-                name="Salesforce Connection",
+                name="name",
                 redirect_url="redirect_url",
             )
 
@@ -1510,9 +1487,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectCardResponseEnvelope,
+                    V3ConnectCardResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectCardResponseEnvelope,  # type: ignore
+                        type_=V3ConnectCardResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1604,14 +1581,8 @@ async def test_connection(
 
         async def main() -> None:
             await client.connections.test_connection(
-                configuration={
-                    "database": "example",
-                    "hostname": "postgres.example.com",
-                    "password": "password",
-                    "port": 5432,
-                    "username": "user",
-                },
-                type="postgresql",
+                configuration={"configuration": {"key": "value"}},
+                type="type",
             )
 
 
@@ -1681,7 +1652,7 @@ async def main() -> None:
 
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ConnectionResponseEnvelope:
+    ) -> V2ConnectionResponseEnvelope:
         """
         Parameters
         ----------
@@ -1692,7 +1663,7 @@ async def get(
 
         Returns
         -------
-        ConnectionResponseEnvelope
+        V2ConnectionResponseEnvelope
             OK
 
         Examples
@@ -1709,7 +1680,7 @@ async def get(
 
         async def main() -> None:
             await client.connections.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1723,9 +1694,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectionResponseEnvelope,
+                    V2ConnectionResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectionResponseEnvelope,  # type: ignore
+                        type_=V2ConnectionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1777,7 +1748,7 @@ async def update(
         type: typing.Optional[str] = OMIT,
         validate: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> CreateConnectionResponseEnvelope:
+    ) -> V2CreateConnectionResponseEnvelope:
         """
         Parameters
         ----------
@@ -1806,7 +1777,7 @@ async def update(
 
         Returns
         -------
-        CreateConnectionResponseEnvelope
+        V2CreateConnectionResponseEnvelope
             OK
 
         Examples
@@ -1823,15 +1794,9 @@ async def update(
 
         async def main() -> None:
             await client.connections.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                configuration={
-                    "database": "example",
-                    "hostname": "postgres.example.com",
-                    "password": "********",
-                    "port": 5432,
-                    "username": "user",
-                },
-                name="My Postgres Connection",
+                id="id",
+                configuration={"configuration": {"key": "value"}},
+                name="name",
             )
 
 
@@ -1859,9 +1824,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    CreateConnectionResponseEnvelope,
+                    V2CreateConnectionResponseEnvelope,
                     parse_obj_as(
-                        type_=CreateConnectionResponseEnvelope,  # type: ignore
+                        type_=V2CreateConnectionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1961,8 +1926,7 @@ async def remove(
 
         async def main() -> None:
             await client.connections.remove(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                force=True,
+                id="id",
             )
 
 
@@ -2036,7 +2000,7 @@ async def main() -> None:
 
     async def get_parameter_values(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ConnectionParameterValuesResponseEnvelope:
+    ) -> V2ConnectionParameterValuesResponseEnvelope:
         """
         Parameters
         ----------
@@ -2047,7 +2011,7 @@ async def get_parameter_values(
 
         Returns
         -------
-        ConnectionParameterValuesResponseEnvelope
+        V2ConnectionParameterValuesResponseEnvelope
             OK
 
         Examples
@@ -2064,7 +2028,7 @@ async def get_parameter_values(
 
         async def main() -> None:
             await client.connections.get_parameter_values(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2078,9 +2042,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ConnectionParameterValuesResponseEnvelope,
+                    V2ConnectionParameterValuesResponseEnvelope,
                     parse_obj_as(
-                        type_=ConnectionParameterValuesResponseEnvelope,  # type: ignore
+                        type_=V2ConnectionParameterValuesResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/core/client_wrapper.py b/src/polytomic/core/client_wrapper.py
index bd3a034..221e1e0 100644
--- a/src/polytomic/core/client_wrapper.py
+++ b/src/polytomic/core/client_wrapper.py
@@ -10,7 +10,7 @@ class BaseClientWrapper:
     def __init__(
         self,
         *,
-        version: typing.Optional[str] = None,
+        version: typing.Optional[typing.Any] = None,
         token: typing.Union[str, typing.Callable[[], str]],
         base_url: str,
         timeout: typing.Optional[float] = None,
@@ -24,7 +24,7 @@ def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "polytomic",
-            "X-Fern-SDK-Version": "1.15.5",
+            "X-Fern-SDK-Version": "0.0.0",
         }
         if self._version is not None:
             headers["X-Polytomic-Version"] = self._version
@@ -48,7 +48,7 @@ class SyncClientWrapper(BaseClientWrapper):
     def __init__(
         self,
         *,
-        version: typing.Optional[str] = None,
+        version: typing.Optional[typing.Any] = None,
         token: typing.Union[str, typing.Callable[[], str]],
         base_url: str,
         timeout: typing.Optional[float] = None,
@@ -67,7 +67,7 @@ class AsyncClientWrapper(BaseClientWrapper):
     def __init__(
         self,
         *,
-        version: typing.Optional[str] = None,
+        version: typing.Optional[typing.Any] = None,
         token: typing.Union[str, typing.Callable[[], str]],
         base_url: str,
         timeout: typing.Optional[float] = None,
diff --git a/src/polytomic/events/client.py b/src/polytomic/events/client.py
index 01d4d77..eb2fc55 100644
--- a/src/polytomic/events/client.py
+++ b/src/polytomic/events/client.py
@@ -4,7 +4,7 @@
 import typing
 import datetime as dt
 from ..core.request_options import RequestOptions
-from ..types.events_envelope import EventsEnvelope
+from ..types.v2events_envelope import V2EventsEnvelope
 from ..core.datetime_utils import serialize_datetime
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.unauthorized_error import UnauthorizedError
@@ -14,7 +14,7 @@
 from ..errors.internal_server_error import InternalServerError
 from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError as core_api_error_ApiError
-from ..types.event_types_envelope import EventTypesEnvelope
+from ..types.v2event_types_envelope import V2EventTypesEnvelope
 from ..core.client_wrapper import AsyncClientWrapper
 
 
@@ -31,7 +31,7 @@ def list(
         ending_before: typing.Optional[dt.datetime] = None,
         limit: typing.Optional[int] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> EventsEnvelope:
+    ) -> V2EventsEnvelope:
         """
         Parameters
         ----------
@@ -50,28 +50,18 @@ def list(
 
         Returns
         -------
-        EventsEnvelope
+        V2EventsEnvelope
             OK
 
         Examples
         --------
-        import datetime
-
         from polytomic import Polytomic
 
         client = Polytomic(
             version="YOUR_VERSION",
             token="YOUR_TOKEN",
         )
-        client.events.list(
-            organization_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            starting_after=datetime.datetime.fromisoformat(
-                "2020-01-01 00:00:00+00:00",
-            ),
-            ending_before=datetime.datetime.fromisoformat(
-                "2020-01-01 00:00:00+00:00",
-            ),
-        )
+        client.events.list()
         """
         _response = self._client_wrapper.httpx_client.request(
             "api/events",
@@ -88,9 +78,9 @@ def list(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    EventsEnvelope,
+                    V2EventsEnvelope,
                     parse_obj_as(
-                        type_=EventsEnvelope,  # type: ignore
+                        type_=V2EventsEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -129,7 +119,7 @@ def list(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_types(self, *, request_options: typing.Optional[RequestOptions] = None) -> EventTypesEnvelope:
+    def get_types(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2EventTypesEnvelope:
         """
         Parameters
         ----------
@@ -138,7 +128,7 @@ def get_types(self, *, request_options: typing.Optional[RequestOptions] = None)
 
         Returns
         -------
-        EventTypesEnvelope
+        V2EventTypesEnvelope
             OK
 
         Examples
@@ -159,9 +149,9 @@ def get_types(self, *, request_options: typing.Optional[RequestOptions] = None)
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    EventTypesEnvelope,
+                    V2EventTypesEnvelope,
                     parse_obj_as(
-                        type_=EventTypesEnvelope,  # type: ignore
+                        type_=V2EventTypesEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -194,7 +184,7 @@ async def list(
         ending_before: typing.Optional[dt.datetime] = None,
         limit: typing.Optional[int] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> EventsEnvelope:
+    ) -> V2EventsEnvelope:
         """
         Parameters
         ----------
@@ -213,13 +203,12 @@ async def list(
 
         Returns
         -------
-        EventsEnvelope
+        V2EventsEnvelope
             OK
 
         Examples
         --------
         import asyncio
-        import datetime
 
         from polytomic import AsyncPolytomic
 
@@ -230,15 +219,7 @@ async def list(
 
 
         async def main() -> None:
-            await client.events.list(
-                organization_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                starting_after=datetime.datetime.fromisoformat(
-                    "2020-01-01 00:00:00+00:00",
-                ),
-                ending_before=datetime.datetime.fromisoformat(
-                    "2020-01-01 00:00:00+00:00",
-                ),
-            )
+            await client.events.list()
 
 
         asyncio.run(main())
@@ -258,9 +239,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    EventsEnvelope,
+                    V2EventsEnvelope,
                     parse_obj_as(
-                        type_=EventsEnvelope,  # type: ignore
+                        type_=V2EventsEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -299,7 +280,7 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_types(self, *, request_options: typing.Optional[RequestOptions] = None) -> EventTypesEnvelope:
+    async def get_types(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2EventTypesEnvelope:
         """
         Parameters
         ----------
@@ -308,7 +289,7 @@ async def get_types(self, *, request_options: typing.Optional[RequestOptions] =
 
         Returns
         -------
-        EventTypesEnvelope
+        V2EventTypesEnvelope
             OK
 
         Examples
@@ -337,9 +318,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    EventTypesEnvelope,
+                    V2EventTypesEnvelope,
                     parse_obj_as(
-                        type_=EventTypesEnvelope,  # type: ignore
+                        type_=V2EventTypesEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/identity/client.py b/src/polytomic/identity/client.py
index ff5375d..6792a1a 100644
--- a/src/polytomic/identity/client.py
+++ b/src/polytomic/identity/client.py
@@ -3,7 +3,7 @@
 from ..core.client_wrapper import SyncClientWrapper
 import typing
 from ..core.request_options import RequestOptions
-from ..types.get_identity_response_envelope import GetIdentityResponseEnvelope
+from ..types.v2get_identity_response_envelope import V2GetIdentityResponseEnvelope
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.unauthorized_error import UnauthorizedError
 from ..types.rest_err_response import RestErrResponse
@@ -18,7 +18,7 @@ class IdentityClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def get(self, *, request_options: typing.Optional[RequestOptions] = None) -> GetIdentityResponseEnvelope:
+    def get(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2GetIdentityResponseEnvelope:
         """
         Returns information about the caller's identity.
 
@@ -29,7 +29,7 @@ def get(self, *, request_options: typing.Optional[RequestOptions] = None) -> Get
 
         Returns
         -------
-        GetIdentityResponseEnvelope
+        V2GetIdentityResponseEnvelope
             OK
 
         Examples
@@ -50,9 +50,9 @@ def get(self, *, request_options: typing.Optional[RequestOptions] = None) -> Get
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetIdentityResponseEnvelope,
+                    V2GetIdentityResponseEnvelope,
                     parse_obj_as(
-                        type_=GetIdentityResponseEnvelope,  # type: ignore
+                        type_=V2GetIdentityResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -86,7 +86,7 @@ class AsyncIdentityClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def get(self, *, request_options: typing.Optional[RequestOptions] = None) -> GetIdentityResponseEnvelope:
+    async def get(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2GetIdentityResponseEnvelope:
         """
         Returns information about the caller's identity.
 
@@ -97,7 +97,7 @@ async def get(self, *, request_options: typing.Optional[RequestOptions] = None)
 
         Returns
         -------
-        GetIdentityResponseEnvelope
+        V2GetIdentityResponseEnvelope
             OK
 
         Examples
@@ -126,9 +126,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetIdentityResponseEnvelope,
+                    V2GetIdentityResponseEnvelope,
                     parse_obj_as(
-                        type_=GetIdentityResponseEnvelope,  # type: ignore
+                        type_=V2GetIdentityResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/jobs/client.py b/src/polytomic/jobs/client.py
index 32ba6b8..fa5035c 100644
--- a/src/polytomic/jobs/client.py
+++ b/src/polytomic/jobs/client.py
@@ -3,7 +3,7 @@
 from ..core.client_wrapper import SyncClientWrapper
 import typing
 from ..core.request_options import RequestOptions
-from ..types.job_response_envelope import JobResponseEnvelope
+from ..types.v2job_response_envelope import V2JobResponseEnvelope
 from ..core.jsonable_encoder import jsonable_encoder
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.bad_request_error import BadRequestError
@@ -22,21 +22,21 @@ def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
     def get(
-        self, id: str, type: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> JobResponseEnvelope:
+        self, type: str, id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V2JobResponseEnvelope:
         """
         Parameters
         ----------
-        id : str
-
         type : str
 
+        id : str
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        JobResponseEnvelope
+        V2JobResponseEnvelope
             OK
 
         Examples
@@ -48,8 +48,8 @@ def get(
             token="YOUR_TOKEN",
         )
         client.jobs.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            type="createmodel",
+            type="type",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -60,9 +60,9 @@ def get(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    JobResponseEnvelope,
+                    V2JobResponseEnvelope,
                     parse_obj_as(
-                        type_=JobResponseEnvelope,  # type: ignore
+                        type_=V2JobResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -117,21 +117,21 @@ def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
     async def get(
-        self, id: str, type: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> JobResponseEnvelope:
+        self, type: str, id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V2JobResponseEnvelope:
         """
         Parameters
         ----------
-        id : str
-
         type : str
 
+        id : str
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        JobResponseEnvelope
+        V2JobResponseEnvelope
             OK
 
         Examples
@@ -148,8 +148,8 @@ async def get(
 
         async def main() -> None:
             await client.jobs.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                type="createmodel",
+                type="type",
+                id="id",
             )
 
 
@@ -163,9 +163,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    JobResponseEnvelope,
+                    V2JobResponseEnvelope,
                     parse_obj_as(
-                        type_=JobResponseEnvelope,  # type: ignore
+                        type_=V2JobResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/model_sync/client.py b/src/polytomic/model_sync/client.py
index b5a0048..5999828 100644
--- a/src/polytomic/model_sync/client.py
+++ b/src/polytomic/model_sync/client.py
@@ -5,7 +5,7 @@
 from .targets.client import TargetsClient
 from .executions.client import ExecutionsClient
 from ..core.request_options import RequestOptions
-from ..types.get_model_sync_source_meta_envelope import GetModelSyncSourceMetaEnvelope
+from ..types.v4get_sync_source_meta_envelope import V4GetSyncSourceMetaEnvelope
 from ..core.jsonable_encoder import jsonable_encoder
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.bad_request_error import BadRequestError
@@ -17,24 +17,23 @@
 from ..errors.internal_server_error import InternalServerError
 from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError as core_api_error_ApiError
-from ..types.model_field_response import ModelFieldResponse
-from ..types.model_sync_mode import ModelSyncMode
-from ..types.list_model_sync_response_envelope import ListModelSyncResponseEnvelope
-from ..types.model_sync_field import ModelSyncField
-from ..types.schedule import Schedule
-from ..types.target import Target
-from ..types.filter import Filter
-from ..types.identity import Identity
-from ..types.override import Override
-from ..types.model_sync_response_envelope import ModelSyncResponseEnvelope
+from ..types.v2model_field_response import V2ModelFieldResponse
+from ..types.modelsync_sync_target_mode import ModelsyncSyncTargetMode
+from ..types.v5list_sync_response_envelope import V5ListSyncResponseEnvelope
+from ..types.v2sync_field import V2SyncField
+from ..types.v2schedule import V2Schedule
+from ..types.v2target import V2Target
+from ..types.v2filter import V2Filter
+from ..types.v2identity import V2Identity
+from ..types.v2override import V2Override
+from ..types.v2sync_response_envelope import V2SyncResponseEnvelope
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..errors.unprocessable_entity_error import UnprocessableEntityError
-from ..types.schedule_option_response_envelope import ScheduleOptionResponseEnvelope
+from ..types.v2schedule_option_response_envelope import V2ScheduleOptionResponseEnvelope
 from ..errors.conflict_error import ConflictError
-from ..types.activate_sync_envelope import ActivateSyncEnvelope
-from ..types.cancel_model_sync_response_envelope import CancelModelSyncResponseEnvelope
-from ..types.start_model_sync_response_envelope import StartModelSyncResponseEnvelope
-from ..types.sync_status_envelope import SyncStatusEnvelope
+from ..types.v2activate_sync_envelope import V2ActivateSyncEnvelope
+from ..types.v2start_sync_response_envelope import V2StartSyncResponseEnvelope
+from ..types.v2sync_status_envelope import V2SyncStatusEnvelope
 from ..core.client_wrapper import AsyncClientWrapper
 from .targets.client import AsyncTargetsClient
 from .executions.client import AsyncExecutionsClient
@@ -53,22 +52,22 @@ def get_source(
         self,
         id: str,
         *,
-        params: typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]] = None,
+        params: typing.Optional[typing.Dict[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> GetModelSyncSourceMetaEnvelope:
+    ) -> V4GetSyncSourceMetaEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        params : typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]]
+        params : typing.Optional[typing.Dict[str, typing.Sequence[str]]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        GetModelSyncSourceMetaEnvelope
+        V4GetSyncSourceMetaEnvelope
             OK
 
         Examples
@@ -80,7 +79,7 @@ def get_source(
             token="YOUR_TOKEN",
         )
         client.model_sync.get_source(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -94,9 +93,9 @@ def get_source(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetModelSyncSourceMetaEnvelope,
+                    V4GetSyncSourceMetaEnvelope,
                     parse_obj_as(
-                        type_=GetModelSyncSourceMetaEnvelope,  # type: ignore
+                        type_=V4GetSyncSourceMetaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -159,22 +158,22 @@ def get_source_fields(
         self,
         id: str,
         *,
-        params: typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]] = None,
+        params: typing.Optional[typing.Dict[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelFieldResponse:
+    ) -> V2ModelFieldResponse:
         """
         Parameters
         ----------
         id : str
 
-        params : typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]]
+        params : typing.Optional[typing.Dict[str, typing.Sequence[str]]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        ModelFieldResponse
+        V2ModelFieldResponse
             OK
 
         Examples
@@ -186,7 +185,7 @@ def get_source_fields(
             token="YOUR_TOKEN",
         )
         client.model_sync.get_source_fields(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -200,9 +199,9 @@ def get_source_fields(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelFieldResponse,
+                    V2ModelFieldResponse,
                     parse_obj_as(
-                        type_=ModelFieldResponse,  # type: ignore
+                        type_=V2ModelFieldResponse,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -265,25 +264,32 @@ def list(
         self,
         *,
         active: typing.Optional[bool] = None,
-        mode: typing.Optional[ModelSyncMode] = None,
+        mode: typing.Optional[ModelsyncSyncTargetMode] = None,
         target_connection_id: typing.Optional[str] = None,
+        page_token: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListModelSyncResponseEnvelope:
+    ) -> V5ListSyncResponseEnvelope:
         """
         Parameters
         ----------
         active : typing.Optional[bool]
 
-        mode : typing.Optional[ModelSyncMode]
+        mode : typing.Optional[ModelsyncSyncTargetMode]
 
         target_connection_id : typing.Optional[str]
 
+        page_token : typing.Optional[str]
+
+        limit : typing.Optional[int]
+            Maximum number of syncs to return. Default and maximum is 50.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        ListModelSyncResponseEnvelope
+        V5ListSyncResponseEnvelope
             OK
 
         Examples
@@ -294,10 +300,7 @@ def list(
             version="YOUR_VERSION",
             token="YOUR_TOKEN",
         )
-        client.model_sync.list(
-            active=True,
-            target_connection_id="0b155265-c537-44c9-9359-a3ceb468a4da",
-        )
+        client.model_sync.list()
         """
         _response = self._client_wrapper.httpx_client.request(
             "api/syncs",
@@ -306,15 +309,17 @@ def list(
                 "active": active,
                 "mode": mode,
                 "target_connection_id": target_connection_id,
+                "page_token": page_token,
+                "limit": limit,
             },
             request_options=request_options,
         )
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListModelSyncResponseEnvelope,
+                    V5ListSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=ListModelSyncResponseEnvelope,  # type: ignore
+                        type_=V5ListSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -366,25 +371,25 @@ def list(
     def create(
         self,
         *,
-        fields: typing.Sequence[ModelSyncField],
-        mode: ModelSyncMode,
+        fields: typing.Sequence[V2SyncField],
+        mode: ModelsyncSyncTargetMode,
         name: str,
-        schedule: Schedule,
-        target: Target,
+        schedule: V2Schedule,
+        target: V2Target,
         active: typing.Optional[bool] = OMIT,
         encryption_passphrase: typing.Optional[str] = OMIT,
         filter_logic: typing.Optional[str] = OMIT,
-        filters: typing.Optional[typing.Sequence[Filter]] = OMIT,
-        identity: typing.Optional[Identity] = OMIT,
+        filters: typing.Optional[typing.Sequence[V2Filter]] = OMIT,
+        identity: typing.Optional[V2Identity] = OMIT,
         only_enrich_updates: typing.Optional[bool] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
-        override_fields: typing.Optional[typing.Sequence[ModelSyncField]] = OMIT,
-        overrides: typing.Optional[typing.Sequence[Override]] = OMIT,
+        override_fields: typing.Optional[typing.Sequence[V2SyncField]] = OMIT,
+        overrides: typing.Optional[typing.Sequence[V2Override]] = OMIT,
         policies: typing.Optional[typing.Sequence[str]] = OMIT,
         skip_initial_backfill: typing.Optional[bool] = OMIT,
         sync_all_records: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelSyncResponseEnvelope:
+    ) -> V2SyncResponseEnvelope:
         """
         Create a new sync from one or more models to a destination.
 
@@ -445,16 +450,16 @@ def create(
 
         Parameters
         ----------
-        fields : typing.Sequence[ModelSyncField]
+        fields : typing.Sequence[V2SyncField]
             Fields to sync from source to destination.
 
-        mode : ModelSyncMode
+        mode : ModelsyncSyncTargetMode
 
         name : str
 
-        schedule : Schedule
+        schedule : V2Schedule
 
-        target : Target
+        target : V2Target
 
         active : typing.Optional[bool]
             Whether the sync is enabled and scheduled.
@@ -465,10 +470,10 @@ def create(
         filter_logic : typing.Optional[str]
             Logical expression to combine filters.
 
-        filters : typing.Optional[typing.Sequence[Filter]]
+        filters : typing.Optional[typing.Sequence[V2Filter]]
             Filters to apply to the source data.
 
-        identity : typing.Optional[Identity]
+        identity : typing.Optional[V2Identity]
 
         only_enrich_updates : typing.Optional[bool]
             Whether to use enrichment models as a source of possible changes to sync. If true, only changes to the base models will cause a record to sync.
@@ -476,10 +481,10 @@ def create(
         organization_id : typing.Optional[str]
             Organization ID for the sync; read-only with a partner key.
 
-        override_fields : typing.Optional[typing.Sequence[ModelSyncField]]
+        override_fields : typing.Optional[typing.Sequence[V2SyncField]]
             Values to set in the target unconditionally.
 
-        overrides : typing.Optional[typing.Sequence[Override]]
+        overrides : typing.Optional[typing.Sequence[V2Override]]
             Conditional value replacement for fields.
 
         policies : typing.Optional[typing.Sequence[str]]
@@ -495,12 +500,12 @@ def create(
 
         Returns
         -------
-        ModelSyncResponseEnvelope
+        V2SyncResponseEnvelope
             OK
 
         Examples
         --------
-        from polytomic import ModelSyncField, Polytomic, Schedule, Target
+        from polytomic import Polytomic, V2Schedule, V2SyncField, V2Target
 
         client = Polytomic(
             version="YOUR_VERSION",
@@ -508,15 +513,18 @@ def create(
         )
         client.model_sync.create(
             fields=[
-                ModelSyncField(
-                    target="name",
-                )
+                V2SyncField(
+                    target="target",
+                ),
+                V2SyncField(
+                    target="target",
+                ),
             ],
             mode="create",
-            name="Users Sync",
-            schedule=Schedule(),
-            target=Target(
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            name="name",
+            schedule=V2Schedule(),
+            target=V2Target(
+                connection_id="connection_id",
             ),
         )
         """
@@ -527,32 +535,34 @@ def create(
                 "active": active,
                 "encryption_passphrase": encryption_passphrase,
                 "fields": convert_and_respect_annotation_metadata(
-                    object_=fields, annotation=typing.Sequence[ModelSyncField], direction="write"
+                    object_=fields, annotation=typing.Sequence[V2SyncField], direction="write"
                 ),
                 "filter_logic": filter_logic,
                 "filters": convert_and_respect_annotation_metadata(
-                    object_=filters, annotation=typing.Sequence[Filter], direction="write"
+                    object_=filters, annotation=typing.Sequence[V2Filter], direction="write"
                 ),
                 "identity": convert_and_respect_annotation_metadata(
-                    object_=identity, annotation=Identity, direction="write"
+                    object_=identity, annotation=V2Identity, direction="write"
                 ),
                 "mode": mode,
                 "name": name,
                 "only_enrich_updates": only_enrich_updates,
                 "organization_id": organization_id,
                 "override_fields": convert_and_respect_annotation_metadata(
-                    object_=override_fields, annotation=typing.Sequence[ModelSyncField], direction="write"
+                    object_=override_fields, annotation=typing.Sequence[V2SyncField], direction="write"
                 ),
                 "overrides": convert_and_respect_annotation_metadata(
-                    object_=overrides, annotation=typing.Sequence[Override], direction="write"
+                    object_=overrides, annotation=typing.Sequence[V2Override], direction="write"
                 ),
                 "policies": policies,
                 "schedule": convert_and_respect_annotation_metadata(
-                    object_=schedule, annotation=Schedule, direction="write"
+                    object_=schedule, annotation=V2Schedule, direction="write"
                 ),
                 "skip_initial_backfill": skip_initial_backfill,
                 "sync_all_records": sync_all_records,
-                "target": convert_and_respect_annotation_metadata(object_=target, annotation=Target, direction="write"),
+                "target": convert_and_respect_annotation_metadata(
+                    object_=target, annotation=V2Target, direction="write"
+                ),
             },
             headers={
                 "content-type": "application/json",
@@ -563,9 +573,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelSyncResponseEnvelope,
+                    V2SyncResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2SyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -626,7 +636,7 @@ def create(
 
     def get_schedule_options(
         self, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ScheduleOptionResponseEnvelope:
+    ) -> V2ScheduleOptionResponseEnvelope:
         """
         Parameters
         ----------
@@ -635,7 +645,7 @@ def get_schedule_options(
 
         Returns
         -------
-        ScheduleOptionResponseEnvelope
+        V2ScheduleOptionResponseEnvelope
             OK
 
         Examples
@@ -656,9 +666,9 @@ def get_schedule_options(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ScheduleOptionResponseEnvelope,
+                    V2ScheduleOptionResponseEnvelope,
                     parse_obj_as(
-                        type_=ScheduleOptionResponseEnvelope,  # type: ignore
+                        type_=V2ScheduleOptionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -687,7 +697,7 @@ def get_schedule_options(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> ModelSyncResponseEnvelope:
+    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2SyncResponseEnvelope:
         """
         Parameters
         ----------
@@ -698,7 +708,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
 
         Returns
         -------
-        ModelSyncResponseEnvelope
+        V2SyncResponseEnvelope
             OK
 
         Examples
@@ -710,7 +720,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             token="YOUR_TOKEN",
         )
         client.model_sync.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -721,9 +731,9 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelSyncResponseEnvelope,
+                    V2SyncResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2SyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -766,40 +776,40 @@ def update(
         self,
         id: str,
         *,
-        fields: typing.Sequence[ModelSyncField],
-        mode: ModelSyncMode,
+        fields: typing.Sequence[V2SyncField],
+        mode: ModelsyncSyncTargetMode,
         name: str,
-        schedule: Schedule,
-        target: Target,
+        schedule: V2Schedule,
+        target: V2Target,
         active: typing.Optional[bool] = OMIT,
         encryption_passphrase: typing.Optional[str] = OMIT,
         filter_logic: typing.Optional[str] = OMIT,
-        filters: typing.Optional[typing.Sequence[Filter]] = OMIT,
-        identity: typing.Optional[Identity] = OMIT,
+        filters: typing.Optional[typing.Sequence[V2Filter]] = OMIT,
+        identity: typing.Optional[V2Identity] = OMIT,
         only_enrich_updates: typing.Optional[bool] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
-        override_fields: typing.Optional[typing.Sequence[ModelSyncField]] = OMIT,
-        overrides: typing.Optional[typing.Sequence[Override]] = OMIT,
+        override_fields: typing.Optional[typing.Sequence[V2SyncField]] = OMIT,
+        overrides: typing.Optional[typing.Sequence[V2Override]] = OMIT,
         policies: typing.Optional[typing.Sequence[str]] = OMIT,
         skip_initial_backfill: typing.Optional[bool] = OMIT,
         sync_all_records: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelSyncResponseEnvelope:
+    ) -> V2SyncResponseEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        fields : typing.Sequence[ModelSyncField]
+        fields : typing.Sequence[V2SyncField]
             Fields to sync from source to destination.
 
-        mode : ModelSyncMode
+        mode : ModelsyncSyncTargetMode
 
         name : str
 
-        schedule : Schedule
+        schedule : V2Schedule
 
-        target : Target
+        target : V2Target
 
         active : typing.Optional[bool]
             Whether the sync is enabled and scheduled.
@@ -810,10 +820,10 @@ def update(
         filter_logic : typing.Optional[str]
             Logical expression to combine filters.
 
-        filters : typing.Optional[typing.Sequence[Filter]]
+        filters : typing.Optional[typing.Sequence[V2Filter]]
             Filters to apply to the source data.
 
-        identity : typing.Optional[Identity]
+        identity : typing.Optional[V2Identity]
 
         only_enrich_updates : typing.Optional[bool]
             Whether to use enrichment models as a source of possible changes to sync. If true, only changes to the base models will cause a record to sync.
@@ -821,10 +831,10 @@ def update(
         organization_id : typing.Optional[str]
             Organization ID for the sync; read-only with a partner key.
 
-        override_fields : typing.Optional[typing.Sequence[ModelSyncField]]
+        override_fields : typing.Optional[typing.Sequence[V2SyncField]]
             Values to set in the target unconditionally.
 
-        overrides : typing.Optional[typing.Sequence[Override]]
+        overrides : typing.Optional[typing.Sequence[V2Override]]
             Conditional value replacement for fields.
 
         policies : typing.Optional[typing.Sequence[str]]
@@ -840,29 +850,32 @@ def update(
 
         Returns
         -------
-        ModelSyncResponseEnvelope
+        V2SyncResponseEnvelope
             OK
 
         Examples
         --------
-        from polytomic import ModelSyncField, Polytomic, Schedule, Target
+        from polytomic import Polytomic, V2Schedule, V2SyncField, V2Target
 
         client = Polytomic(
             version="YOUR_VERSION",
             token="YOUR_TOKEN",
         )
         client.model_sync.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
             fields=[
-                ModelSyncField(
-                    target="name",
-                )
+                V2SyncField(
+                    target="target",
+                ),
+                V2SyncField(
+                    target="target",
+                ),
             ],
             mode="create",
-            name="Users Sync",
-            schedule=Schedule(),
-            target=Target(
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            name="name",
+            schedule=V2Schedule(),
+            target=V2Target(
+                connection_id="connection_id",
             ),
         )
         """
@@ -873,32 +886,34 @@ def update(
                 "active": active,
                 "encryption_passphrase": encryption_passphrase,
                 "fields": convert_and_respect_annotation_metadata(
-                    object_=fields, annotation=typing.Sequence[ModelSyncField], direction="write"
+                    object_=fields, annotation=typing.Sequence[V2SyncField], direction="write"
                 ),
                 "filter_logic": filter_logic,
                 "filters": convert_and_respect_annotation_metadata(
-                    object_=filters, annotation=typing.Sequence[Filter], direction="write"
+                    object_=filters, annotation=typing.Sequence[V2Filter], direction="write"
                 ),
                 "identity": convert_and_respect_annotation_metadata(
-                    object_=identity, annotation=Identity, direction="write"
+                    object_=identity, annotation=V2Identity, direction="write"
                 ),
                 "mode": mode,
                 "name": name,
                 "only_enrich_updates": only_enrich_updates,
                 "organization_id": organization_id,
                 "override_fields": convert_and_respect_annotation_metadata(
-                    object_=override_fields, annotation=typing.Sequence[ModelSyncField], direction="write"
+                    object_=override_fields, annotation=typing.Sequence[V2SyncField], direction="write"
                 ),
                 "overrides": convert_and_respect_annotation_metadata(
-                    object_=overrides, annotation=typing.Sequence[Override], direction="write"
+                    object_=overrides, annotation=typing.Sequence[V2Override], direction="write"
                 ),
                 "policies": policies,
                 "schedule": convert_and_respect_annotation_metadata(
-                    object_=schedule, annotation=Schedule, direction="write"
+                    object_=schedule, annotation=V2Schedule, direction="write"
                 ),
                 "skip_initial_backfill": skip_initial_backfill,
                 "sync_all_records": sync_all_records,
-                "target": convert_and_respect_annotation_metadata(object_=target, annotation=Target, direction="write"),
+                "target": convert_and_respect_annotation_metadata(
+                    object_=target, annotation=V2Target, direction="write"
+                ),
             },
             headers={
                 "content-type": "application/json",
@@ -909,9 +924,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelSyncResponseEnvelope,
+                    V2SyncResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2SyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1002,7 +1017,7 @@ def remove(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             token="YOUR_TOKEN",
         )
         client.model_sync.remove(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -1070,7 +1085,7 @@ def remove(self, id: str, *, request_options: typing.Optional[RequestOptions] =
 
     def activate(
         self, id: str, *, active: bool, request_options: typing.Optional[RequestOptions] = None
-    ) -> ActivateSyncEnvelope:
+    ) -> V2ActivateSyncEnvelope:
         """
         Parameters
         ----------
@@ -1083,7 +1098,7 @@ def activate(
 
         Returns
         -------
-        ActivateSyncEnvelope
+        V2ActivateSyncEnvelope
             OK
 
         Examples
@@ -1095,7 +1110,7 @@ def activate(
             token="YOUR_TOKEN",
         )
         client.model_sync.activate(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
             active=True,
         )
         """
@@ -1111,97 +1126,9 @@ def activate(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ActivateSyncEnvelope,
-                    parse_obj_as(
-                        type_=ActivateSyncEnvelope,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 401:
-                raise UnauthorizedError(
-                    typing.cast(
-                        RestErrResponse,
-                        parse_obj_as(
-                            type_=RestErrResponse,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 403:
-                raise ForbiddenError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 500:
-                raise InternalServerError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
-        raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
-
-    def cancel(
-        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> CancelModelSyncResponseEnvelope:
-        """
-        Parameters
-        ----------
-        id : str
-            The active execution of this sync ID will be cancelled.
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        CancelModelSyncResponseEnvelope
-            OK
-
-        Examples
-        --------
-        from polytomic import Polytomic
-
-        client = Polytomic(
-            version="YOUR_VERSION",
-            token="YOUR_TOKEN",
-        )
-        client.model_sync.cancel(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            f"api/syncs/{jsonable_encoder(id)}/cancel",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    CancelModelSyncResponseEnvelope,
+                    V2ActivateSyncEnvelope,
                     parse_obj_as(
-                        type_=CancelModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2ActivateSyncEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1258,7 +1185,7 @@ def start(
         resync: typing.Optional[bool] = OMIT,
         test: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> StartModelSyncResponseEnvelope:
+    ) -> V2StartSyncResponseEnvelope:
         """
         > 🚧 Force full resync
         >
@@ -1279,7 +1206,7 @@ def start(
 
         Returns
         -------
-        StartModelSyncResponseEnvelope
+        V2StartSyncResponseEnvelope
             OK
 
         Examples
@@ -1291,7 +1218,7 @@ def start(
             token="YOUR_TOKEN",
         )
         client.model_sync.start(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -1311,9 +1238,9 @@ def start(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    StartModelSyncResponseEnvelope,
+                    V2StartSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=StartModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2StartSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1382,7 +1309,7 @@ def start(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_status(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> SyncStatusEnvelope:
+    def get_status(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2SyncStatusEnvelope:
         """
         Parameters
         ----------
@@ -1393,7 +1320,7 @@ def get_status(self, id: str, *, request_options: typing.Optional[RequestOptions
 
         Returns
         -------
-        SyncStatusEnvelope
+        V2SyncStatusEnvelope
             OK
 
         Examples
@@ -1405,7 +1332,7 @@ def get_status(self, id: str, *, request_options: typing.Optional[RequestOptions
             token="YOUR_TOKEN",
         )
         client.model_sync.get_status(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -1416,9 +1343,9 @@ def get_status(self, id: str, *, request_options: typing.Optional[RequestOptions
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    SyncStatusEnvelope,
+                    V2SyncStatusEnvelope,
                     parse_obj_as(
-                        type_=SyncStatusEnvelope,  # type: ignore
+                        type_=V2SyncStatusEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1468,22 +1395,22 @@ async def get_source(
         self,
         id: str,
         *,
-        params: typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]] = None,
+        params: typing.Optional[typing.Dict[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> GetModelSyncSourceMetaEnvelope:
+    ) -> V4GetSyncSourceMetaEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        params : typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]]
+        params : typing.Optional[typing.Dict[str, typing.Sequence[str]]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        GetModelSyncSourceMetaEnvelope
+        V4GetSyncSourceMetaEnvelope
             OK
 
         Examples
@@ -1500,7 +1427,7 @@ async def get_source(
 
         async def main() -> None:
             await client.model_sync.get_source(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1517,9 +1444,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetModelSyncSourceMetaEnvelope,
+                    V4GetSyncSourceMetaEnvelope,
                     parse_obj_as(
-                        type_=GetModelSyncSourceMetaEnvelope,  # type: ignore
+                        type_=V4GetSyncSourceMetaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1582,22 +1509,22 @@ async def get_source_fields(
         self,
         id: str,
         *,
-        params: typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]] = None,
+        params: typing.Optional[typing.Dict[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelFieldResponse:
+    ) -> V2ModelFieldResponse:
         """
         Parameters
         ----------
         id : str
 
-        params : typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]]
+        params : typing.Optional[typing.Dict[str, typing.Sequence[str]]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        ModelFieldResponse
+        V2ModelFieldResponse
             OK
 
         Examples
@@ -1614,7 +1541,7 @@ async def get_source_fields(
 
         async def main() -> None:
             await client.model_sync.get_source_fields(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1631,9 +1558,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelFieldResponse,
+                    V2ModelFieldResponse,
                     parse_obj_as(
-                        type_=ModelFieldResponse,  # type: ignore
+                        type_=V2ModelFieldResponse,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1696,25 +1623,32 @@ async def list(
         self,
         *,
         active: typing.Optional[bool] = None,
-        mode: typing.Optional[ModelSyncMode] = None,
+        mode: typing.Optional[ModelsyncSyncTargetMode] = None,
         target_connection_id: typing.Optional[str] = None,
+        page_token: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListModelSyncResponseEnvelope:
+    ) -> V5ListSyncResponseEnvelope:
         """
         Parameters
         ----------
         active : typing.Optional[bool]
 
-        mode : typing.Optional[ModelSyncMode]
+        mode : typing.Optional[ModelsyncSyncTargetMode]
 
         target_connection_id : typing.Optional[str]
 
+        page_token : typing.Optional[str]
+
+        limit : typing.Optional[int]
+            Maximum number of syncs to return. Default and maximum is 50.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        ListModelSyncResponseEnvelope
+        V5ListSyncResponseEnvelope
             OK
 
         Examples
@@ -1730,10 +1664,7 @@ async def list(
 
 
         async def main() -> None:
-            await client.model_sync.list(
-                active=True,
-                target_connection_id="0b155265-c537-44c9-9359-a3ceb468a4da",
-            )
+            await client.model_sync.list()
 
 
         asyncio.run(main())
@@ -1745,15 +1676,17 @@ async def main() -> None:
                 "active": active,
                 "mode": mode,
                 "target_connection_id": target_connection_id,
+                "page_token": page_token,
+                "limit": limit,
             },
             request_options=request_options,
         )
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListModelSyncResponseEnvelope,
+                    V5ListSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=ListModelSyncResponseEnvelope,  # type: ignore
+                        type_=V5ListSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1805,25 +1738,25 @@ async def main() -> None:
     async def create(
         self,
         *,
-        fields: typing.Sequence[ModelSyncField],
-        mode: ModelSyncMode,
+        fields: typing.Sequence[V2SyncField],
+        mode: ModelsyncSyncTargetMode,
         name: str,
-        schedule: Schedule,
-        target: Target,
+        schedule: V2Schedule,
+        target: V2Target,
         active: typing.Optional[bool] = OMIT,
         encryption_passphrase: typing.Optional[str] = OMIT,
         filter_logic: typing.Optional[str] = OMIT,
-        filters: typing.Optional[typing.Sequence[Filter]] = OMIT,
-        identity: typing.Optional[Identity] = OMIT,
+        filters: typing.Optional[typing.Sequence[V2Filter]] = OMIT,
+        identity: typing.Optional[V2Identity] = OMIT,
         only_enrich_updates: typing.Optional[bool] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
-        override_fields: typing.Optional[typing.Sequence[ModelSyncField]] = OMIT,
-        overrides: typing.Optional[typing.Sequence[Override]] = OMIT,
+        override_fields: typing.Optional[typing.Sequence[V2SyncField]] = OMIT,
+        overrides: typing.Optional[typing.Sequence[V2Override]] = OMIT,
         policies: typing.Optional[typing.Sequence[str]] = OMIT,
         skip_initial_backfill: typing.Optional[bool] = OMIT,
         sync_all_records: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelSyncResponseEnvelope:
+    ) -> V2SyncResponseEnvelope:
         """
         Create a new sync from one or more models to a destination.
 
@@ -1884,16 +1817,16 @@ async def create(
 
         Parameters
         ----------
-        fields : typing.Sequence[ModelSyncField]
+        fields : typing.Sequence[V2SyncField]
             Fields to sync from source to destination.
 
-        mode : ModelSyncMode
+        mode : ModelsyncSyncTargetMode
 
         name : str
 
-        schedule : Schedule
+        schedule : V2Schedule
 
-        target : Target
+        target : V2Target
 
         active : typing.Optional[bool]
             Whether the sync is enabled and scheduled.
@@ -1904,10 +1837,10 @@ async def create(
         filter_logic : typing.Optional[str]
             Logical expression to combine filters.
 
-        filters : typing.Optional[typing.Sequence[Filter]]
+        filters : typing.Optional[typing.Sequence[V2Filter]]
             Filters to apply to the source data.
 
-        identity : typing.Optional[Identity]
+        identity : typing.Optional[V2Identity]
 
         only_enrich_updates : typing.Optional[bool]
             Whether to use enrichment models as a source of possible changes to sync. If true, only changes to the base models will cause a record to sync.
@@ -1915,10 +1848,10 @@ async def create(
         organization_id : typing.Optional[str]
             Organization ID for the sync; read-only with a partner key.
 
-        override_fields : typing.Optional[typing.Sequence[ModelSyncField]]
+        override_fields : typing.Optional[typing.Sequence[V2SyncField]]
             Values to set in the target unconditionally.
 
-        overrides : typing.Optional[typing.Sequence[Override]]
+        overrides : typing.Optional[typing.Sequence[V2Override]]
             Conditional value replacement for fields.
 
         policies : typing.Optional[typing.Sequence[str]]
@@ -1934,14 +1867,14 @@ async def create(
 
         Returns
         -------
-        ModelSyncResponseEnvelope
+        V2SyncResponseEnvelope
             OK
 
         Examples
         --------
         import asyncio
 
-        from polytomic import AsyncPolytomic, ModelSyncField, Schedule, Target
+        from polytomic import AsyncPolytomic, V2Schedule, V2SyncField, V2Target
 
         client = AsyncPolytomic(
             version="YOUR_VERSION",
@@ -1952,15 +1885,18 @@ async def create(
         async def main() -> None:
             await client.model_sync.create(
                 fields=[
-                    ModelSyncField(
-                        target="name",
-                    )
+                    V2SyncField(
+                        target="target",
+                    ),
+                    V2SyncField(
+                        target="target",
+                    ),
                 ],
                 mode="create",
-                name="Users Sync",
-                schedule=Schedule(),
-                target=Target(
-                    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                name="name",
+                schedule=V2Schedule(),
+                target=V2Target(
+                    connection_id="connection_id",
                 ),
             )
 
@@ -1974,32 +1910,34 @@ async def main() -> None:
                 "active": active,
                 "encryption_passphrase": encryption_passphrase,
                 "fields": convert_and_respect_annotation_metadata(
-                    object_=fields, annotation=typing.Sequence[ModelSyncField], direction="write"
+                    object_=fields, annotation=typing.Sequence[V2SyncField], direction="write"
                 ),
                 "filter_logic": filter_logic,
                 "filters": convert_and_respect_annotation_metadata(
-                    object_=filters, annotation=typing.Sequence[Filter], direction="write"
+                    object_=filters, annotation=typing.Sequence[V2Filter], direction="write"
                 ),
                 "identity": convert_and_respect_annotation_metadata(
-                    object_=identity, annotation=Identity, direction="write"
+                    object_=identity, annotation=V2Identity, direction="write"
                 ),
                 "mode": mode,
                 "name": name,
                 "only_enrich_updates": only_enrich_updates,
                 "organization_id": organization_id,
                 "override_fields": convert_and_respect_annotation_metadata(
-                    object_=override_fields, annotation=typing.Sequence[ModelSyncField], direction="write"
+                    object_=override_fields, annotation=typing.Sequence[V2SyncField], direction="write"
                 ),
                 "overrides": convert_and_respect_annotation_metadata(
-                    object_=overrides, annotation=typing.Sequence[Override], direction="write"
+                    object_=overrides, annotation=typing.Sequence[V2Override], direction="write"
                 ),
                 "policies": policies,
                 "schedule": convert_and_respect_annotation_metadata(
-                    object_=schedule, annotation=Schedule, direction="write"
+                    object_=schedule, annotation=V2Schedule, direction="write"
                 ),
                 "skip_initial_backfill": skip_initial_backfill,
                 "sync_all_records": sync_all_records,
-                "target": convert_and_respect_annotation_metadata(object_=target, annotation=Target, direction="write"),
+                "target": convert_and_respect_annotation_metadata(
+                    object_=target, annotation=V2Target, direction="write"
+                ),
             },
             headers={
                 "content-type": "application/json",
@@ -2010,9 +1948,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelSyncResponseEnvelope,
+                    V2SyncResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2SyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -2073,7 +2011,7 @@ async def main() -> None:
 
     async def get_schedule_options(
         self, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ScheduleOptionResponseEnvelope:
+    ) -> V2ScheduleOptionResponseEnvelope:
         """
         Parameters
         ----------
@@ -2082,7 +2020,7 @@ async def get_schedule_options(
 
         Returns
         -------
-        ScheduleOptionResponseEnvelope
+        V2ScheduleOptionResponseEnvelope
             OK
 
         Examples
@@ -2111,9 +2049,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ScheduleOptionResponseEnvelope,
+                    V2ScheduleOptionResponseEnvelope,
                     parse_obj_as(
-                        type_=ScheduleOptionResponseEnvelope,  # type: ignore
+                        type_=V2ScheduleOptionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -2142,9 +2080,7 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get(
-        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ModelSyncResponseEnvelope:
+    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2SyncResponseEnvelope:
         """
         Parameters
         ----------
@@ -2155,7 +2091,7 @@ async def get(
 
         Returns
         -------
-        ModelSyncResponseEnvelope
+        V2SyncResponseEnvelope
             OK
 
         Examples
@@ -2172,7 +2108,7 @@ async def get(
 
         async def main() -> None:
             await client.model_sync.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2186,9 +2122,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelSyncResponseEnvelope,
+                    V2SyncResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2SyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -2231,40 +2167,40 @@ async def update(
         self,
         id: str,
         *,
-        fields: typing.Sequence[ModelSyncField],
-        mode: ModelSyncMode,
+        fields: typing.Sequence[V2SyncField],
+        mode: ModelsyncSyncTargetMode,
         name: str,
-        schedule: Schedule,
-        target: Target,
+        schedule: V2Schedule,
+        target: V2Target,
         active: typing.Optional[bool] = OMIT,
         encryption_passphrase: typing.Optional[str] = OMIT,
         filter_logic: typing.Optional[str] = OMIT,
-        filters: typing.Optional[typing.Sequence[Filter]] = OMIT,
-        identity: typing.Optional[Identity] = OMIT,
+        filters: typing.Optional[typing.Sequence[V2Filter]] = OMIT,
+        identity: typing.Optional[V2Identity] = OMIT,
         only_enrich_updates: typing.Optional[bool] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
-        override_fields: typing.Optional[typing.Sequence[ModelSyncField]] = OMIT,
-        overrides: typing.Optional[typing.Sequence[Override]] = OMIT,
+        override_fields: typing.Optional[typing.Sequence[V2SyncField]] = OMIT,
+        overrides: typing.Optional[typing.Sequence[V2Override]] = OMIT,
         policies: typing.Optional[typing.Sequence[str]] = OMIT,
         skip_initial_backfill: typing.Optional[bool] = OMIT,
         sync_all_records: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelSyncResponseEnvelope:
+    ) -> V2SyncResponseEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        fields : typing.Sequence[ModelSyncField]
+        fields : typing.Sequence[V2SyncField]
             Fields to sync from source to destination.
 
-        mode : ModelSyncMode
+        mode : ModelsyncSyncTargetMode
 
         name : str
 
-        schedule : Schedule
+        schedule : V2Schedule
 
-        target : Target
+        target : V2Target
 
         active : typing.Optional[bool]
             Whether the sync is enabled and scheduled.
@@ -2275,10 +2211,10 @@ async def update(
         filter_logic : typing.Optional[str]
             Logical expression to combine filters.
 
-        filters : typing.Optional[typing.Sequence[Filter]]
+        filters : typing.Optional[typing.Sequence[V2Filter]]
             Filters to apply to the source data.
 
-        identity : typing.Optional[Identity]
+        identity : typing.Optional[V2Identity]
 
         only_enrich_updates : typing.Optional[bool]
             Whether to use enrichment models as a source of possible changes to sync. If true, only changes to the base models will cause a record to sync.
@@ -2286,10 +2222,10 @@ async def update(
         organization_id : typing.Optional[str]
             Organization ID for the sync; read-only with a partner key.
 
-        override_fields : typing.Optional[typing.Sequence[ModelSyncField]]
+        override_fields : typing.Optional[typing.Sequence[V2SyncField]]
             Values to set in the target unconditionally.
 
-        overrides : typing.Optional[typing.Sequence[Override]]
+        overrides : typing.Optional[typing.Sequence[V2Override]]
             Conditional value replacement for fields.
 
         policies : typing.Optional[typing.Sequence[str]]
@@ -2305,14 +2241,14 @@ async def update(
 
         Returns
         -------
-        ModelSyncResponseEnvelope
+        V2SyncResponseEnvelope
             OK
 
         Examples
         --------
         import asyncio
 
-        from polytomic import AsyncPolytomic, ModelSyncField, Schedule, Target
+        from polytomic import AsyncPolytomic, V2Schedule, V2SyncField, V2Target
 
         client = AsyncPolytomic(
             version="YOUR_VERSION",
@@ -2322,17 +2258,20 @@ async def update(
 
         async def main() -> None:
             await client.model_sync.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
                 fields=[
-                    ModelSyncField(
-                        target="name",
-                    )
+                    V2SyncField(
+                        target="target",
+                    ),
+                    V2SyncField(
+                        target="target",
+                    ),
                 ],
                 mode="create",
-                name="Users Sync",
-                schedule=Schedule(),
-                target=Target(
-                    connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                name="name",
+                schedule=V2Schedule(),
+                target=V2Target(
+                    connection_id="connection_id",
                 ),
             )
 
@@ -2346,32 +2285,34 @@ async def main() -> None:
                 "active": active,
                 "encryption_passphrase": encryption_passphrase,
                 "fields": convert_and_respect_annotation_metadata(
-                    object_=fields, annotation=typing.Sequence[ModelSyncField], direction="write"
+                    object_=fields, annotation=typing.Sequence[V2SyncField], direction="write"
                 ),
                 "filter_logic": filter_logic,
                 "filters": convert_and_respect_annotation_metadata(
-                    object_=filters, annotation=typing.Sequence[Filter], direction="write"
+                    object_=filters, annotation=typing.Sequence[V2Filter], direction="write"
                 ),
                 "identity": convert_and_respect_annotation_metadata(
-                    object_=identity, annotation=Identity, direction="write"
+                    object_=identity, annotation=V2Identity, direction="write"
                 ),
                 "mode": mode,
                 "name": name,
                 "only_enrich_updates": only_enrich_updates,
                 "organization_id": organization_id,
                 "override_fields": convert_and_respect_annotation_metadata(
-                    object_=override_fields, annotation=typing.Sequence[ModelSyncField], direction="write"
+                    object_=override_fields, annotation=typing.Sequence[V2SyncField], direction="write"
                 ),
                 "overrides": convert_and_respect_annotation_metadata(
-                    object_=overrides, annotation=typing.Sequence[Override], direction="write"
+                    object_=overrides, annotation=typing.Sequence[V2Override], direction="write"
                 ),
                 "policies": policies,
                 "schedule": convert_and_respect_annotation_metadata(
-                    object_=schedule, annotation=Schedule, direction="write"
+                    object_=schedule, annotation=V2Schedule, direction="write"
                 ),
                 "skip_initial_backfill": skip_initial_backfill,
                 "sync_all_records": sync_all_records,
-                "target": convert_and_respect_annotation_metadata(object_=target, annotation=Target, direction="write"),
+                "target": convert_and_respect_annotation_metadata(
+                    object_=target, annotation=V2Target, direction="write"
+                ),
             },
             headers={
                 "content-type": "application/json",
@@ -2382,9 +2323,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelSyncResponseEnvelope,
+                    V2SyncResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2SyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -2480,7 +2421,7 @@ async def remove(self, id: str, *, request_options: typing.Optional[RequestOptio
 
         async def main() -> None:
             await client.model_sync.remove(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2551,7 +2492,7 @@ async def main() -> None:
 
     async def activate(
         self, id: str, *, active: bool, request_options: typing.Optional[RequestOptions] = None
-    ) -> ActivateSyncEnvelope:
+    ) -> V2ActivateSyncEnvelope:
         """
         Parameters
         ----------
@@ -2564,7 +2505,7 @@ async def activate(
 
         Returns
         -------
-        ActivateSyncEnvelope
+        V2ActivateSyncEnvelope
             OK
 
         Examples
@@ -2581,7 +2522,7 @@ async def activate(
 
         async def main() -> None:
             await client.model_sync.activate(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
                 active=True,
             )
 
@@ -2600,105 +2541,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ActivateSyncEnvelope,
-                    parse_obj_as(
-                        type_=ActivateSyncEnvelope,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 401:
-                raise UnauthorizedError(
-                    typing.cast(
-                        RestErrResponse,
-                        parse_obj_as(
-                            type_=RestErrResponse,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 403:
-                raise ForbiddenError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 500:
-                raise InternalServerError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
-        raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
-
-    async def cancel(
-        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> CancelModelSyncResponseEnvelope:
-        """
-        Parameters
-        ----------
-        id : str
-            The active execution of this sync ID will be cancelled.
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        CancelModelSyncResponseEnvelope
-            OK
-
-        Examples
-        --------
-        import asyncio
-
-        from polytomic import AsyncPolytomic
-
-        client = AsyncPolytomic(
-            version="YOUR_VERSION",
-            token="YOUR_TOKEN",
-        )
-
-
-        async def main() -> None:
-            await client.model_sync.cancel(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            )
-
-
-        asyncio.run(main())
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"api/syncs/{jsonable_encoder(id)}/cancel",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    CancelModelSyncResponseEnvelope,
+                    V2ActivateSyncEnvelope,
                     parse_obj_as(
-                        type_=CancelModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2ActivateSyncEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -2755,7 +2600,7 @@ async def start(
         resync: typing.Optional[bool] = OMIT,
         test: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> StartModelSyncResponseEnvelope:
+    ) -> V2StartSyncResponseEnvelope:
         """
         > 🚧 Force full resync
         >
@@ -2776,7 +2621,7 @@ async def start(
 
         Returns
         -------
-        StartModelSyncResponseEnvelope
+        V2StartSyncResponseEnvelope
             OK
 
         Examples
@@ -2793,7 +2638,7 @@ async def start(
 
         async def main() -> None:
             await client.model_sync.start(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2816,9 +2661,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    StartModelSyncResponseEnvelope,
+                    V2StartSyncResponseEnvelope,
                     parse_obj_as(
-                        type_=StartModelSyncResponseEnvelope,  # type: ignore
+                        type_=V2StartSyncResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -2889,7 +2734,7 @@ async def main() -> None:
 
     async def get_status(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> SyncStatusEnvelope:
+    ) -> V2SyncStatusEnvelope:
         """
         Parameters
         ----------
@@ -2900,7 +2745,7 @@ async def get_status(
 
         Returns
         -------
-        SyncStatusEnvelope
+        V2SyncStatusEnvelope
             OK
 
         Examples
@@ -2917,7 +2762,7 @@ async def get_status(
 
         async def main() -> None:
             await client.model_sync.get_status(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2931,9 +2776,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    SyncStatusEnvelope,
+                    V2SyncStatusEnvelope,
                     parse_obj_as(
-                        type_=SyncStatusEnvelope,  # type: ignore
+                        type_=V2SyncStatusEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/model_sync/executions/client.py b/src/polytomic/model_sync/executions/client.py
index a1e1140..63ec561 100644
--- a/src/polytomic/model_sync/executions/client.py
+++ b/src/polytomic/model_sync/executions/client.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
 from ...core.client_wrapper import SyncClientWrapper
+import typing
 from ...core.request_options import RequestOptions
-from ...types.list_execution_response_envelope import ListExecutionResponseEnvelope
+from ...types.v2list_execution_response_envelope import V2ListExecutionResponseEnvelope
 from ...core.jsonable_encoder import jsonable_encoder
 from ...core.pydantic_utilities import parse_obj_as
 from ...errors.unauthorized_error import UnauthorizedError
@@ -12,18 +12,13 @@
 from ...types.api_error import ApiError as types_api_error_ApiError
 from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError as core_api_error_ApiError
-from ...types.get_execution_response_envelope import GetExecutionResponseEnvelope
+from ...types.v2get_execution_response_envelope import V2GetExecutionResponseEnvelope
 from ...errors.internal_server_error import InternalServerError
-from ...types.execution_status import ExecutionStatus
+from ...types.v2execution_log_type import V2ExecutionLogType
+from ...types.v2execution_logs_response_envelope import V2ExecutionLogsResponseEnvelope
 from ...errors.bad_request_error import BadRequestError
-from ...errors.forbidden_error import ForbiddenError
-from ...types.v_2_execution_log_type import V2ExecutionLogType
-from ...types.execution_logs_response_envelope import ExecutionLogsResponseEnvelope
 from ...core.client_wrapper import AsyncClientWrapper
 
-# this is used as the default value for optional parameters
-OMIT = typing.cast(typing.Any, ...)
-
 
 class ExecutionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
@@ -37,7 +32,7 @@ def list(
         only_completed: typing.Optional[bool] = None,
         ascending: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListExecutionResponseEnvelope:
+    ) -> V2ListExecutionResponseEnvelope:
         """
         Parameters
         ----------
@@ -54,7 +49,7 @@ def list(
 
         Returns
         -------
-        ListExecutionResponseEnvelope
+        V2ListExecutionResponseEnvelope
             OK
 
         Examples
@@ -66,10 +61,7 @@ def list(
             token="YOUR_TOKEN",
         )
         client.model_sync.executions.list(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            page_token="AmkYh8v0jR5B3kls2Qcc9y8MjrPmvR4CvaK7H0F4rEwqvg76K==",
-            only_completed=True,
-            ascending=True,
+            sync_id="sync_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -85,9 +77,9 @@ def list(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListExecutionResponseEnvelope,
+                    V2ListExecutionResponseEnvelope,
                     parse_obj_as(
-                        type_=ListExecutionResponseEnvelope,  # type: ignore
+                        type_=V2ListExecutionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -118,7 +110,7 @@ def list(
 
     def get(
         self, sync_id: str, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> GetExecutionResponseEnvelope:
+    ) -> V2GetExecutionResponseEnvelope:
         """
         Parameters
         ----------
@@ -131,7 +123,7 @@ def get(
 
         Returns
         -------
-        GetExecutionResponseEnvelope
+        V2GetExecutionResponseEnvelope
             OK
 
         Examples
@@ -143,8 +135,8 @@ def get(
             token="YOUR_TOKEN",
         )
         client.model_sync.executions.get(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            sync_id="sync_id",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -155,9 +147,9 @@ def get(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetExecutionResponseEnvelope,
+                    V2GetExecutionResponseEnvelope,
                     parse_obj_as(
-                        type_=GetExecutionResponseEnvelope,  # type: ignore
+                        type_=V2GetExecutionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -196,117 +188,6 @@ def get(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def update(
-        self, sync_id: str, id: str, *, status: ExecutionStatus, request_options: typing.Optional[RequestOptions] = None
-    ) -> GetExecutionResponseEnvelope:
-        """
-        Parameters
-        ----------
-        sync_id : str
-
-        id : str
-            The ID of the execution to update.
-
-        status : ExecutionStatus
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        GetExecutionResponseEnvelope
-            OK
-
-        Examples
-        --------
-        from polytomic import Polytomic
-
-        client = Polytomic(
-            version="YOUR_VERSION",
-            token="YOUR_TOKEN",
-        )
-        client.model_sync.executions.update(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            status="created",
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            f"api/syncs/{jsonable_encoder(sync_id)}/executions/{jsonable_encoder(id)}",
-            method="PUT",
-            json={
-                "status": status,
-            },
-            headers={
-                "content-type": "application/json",
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    GetExecutionResponseEnvelope,
-                    parse_obj_as(
-                        type_=GetExecutionResponseEnvelope,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 400:
-                raise BadRequestError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 401:
-                raise UnauthorizedError(
-                    typing.cast(
-                        RestErrResponse,
-                        parse_obj_as(
-                            type_=RestErrResponse,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 403:
-                raise ForbiddenError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 500:
-                raise InternalServerError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
-        raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
-
     def get_log_urls(
         self,
         sync_id: str,
@@ -314,7 +195,7 @@ def get_log_urls(
         type: V2ExecutionLogType,
         *,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ExecutionLogsResponseEnvelope:
+    ) -> V2ExecutionLogsResponseEnvelope:
         """
         Parameters
         ----------
@@ -329,7 +210,7 @@ def get_log_urls(
 
         Returns
         -------
-        ExecutionLogsResponseEnvelope
+        V2ExecutionLogsResponseEnvelope
             OK
 
         Examples
@@ -341,8 +222,8 @@ def get_log_urls(
             token="YOUR_TOKEN",
         )
         client.model_sync.executions.get_log_urls(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            sync_id="sync_id",
+            id="id",
             type="records",
         )
         """
@@ -354,9 +235,9 @@ def get_log_urls(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ExecutionLogsResponseEnvelope,
+                    V2ExecutionLogsResponseEnvelope,
                     parse_obj_as(
-                        type_=ExecutionLogsResponseEnvelope,  # type: ignore
+                        type_=V2ExecutionLogsResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -441,10 +322,10 @@ def get_logs(
             token="YOUR_TOKEN",
         )
         client.model_sync.executions.get_logs(
-            sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            id="0ecd09c1-b901-4d27-9053-f0367c427254",
+            sync_id="sync_id",
+            id="id",
             type="records",
-            filename="path/to/file.json",
+            filename="filename",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -513,7 +394,7 @@ async def list(
         only_completed: typing.Optional[bool] = None,
         ascending: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ListExecutionResponseEnvelope:
+    ) -> V2ListExecutionResponseEnvelope:
         """
         Parameters
         ----------
@@ -530,7 +411,7 @@ async def list(
 
         Returns
         -------
-        ListExecutionResponseEnvelope
+        V2ListExecutionResponseEnvelope
             OK
 
         Examples
@@ -547,10 +428,7 @@ async def list(
 
         async def main() -> None:
             await client.model_sync.executions.list(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                page_token="AmkYh8v0jR5B3kls2Qcc9y8MjrPmvR4CvaK7H0F4rEwqvg76K==",
-                only_completed=True,
-                ascending=True,
+                sync_id="sync_id",
             )
 
 
@@ -569,9 +447,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListExecutionResponseEnvelope,
+                    V2ListExecutionResponseEnvelope,
                     parse_obj_as(
-                        type_=ListExecutionResponseEnvelope,  # type: ignore
+                        type_=V2ListExecutionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -602,7 +480,7 @@ async def main() -> None:
 
     async def get(
         self, sync_id: str, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> GetExecutionResponseEnvelope:
+    ) -> V2GetExecutionResponseEnvelope:
         """
         Parameters
         ----------
@@ -615,7 +493,7 @@ async def get(
 
         Returns
         -------
-        GetExecutionResponseEnvelope
+        V2GetExecutionResponseEnvelope
             OK
 
         Examples
@@ -632,8 +510,8 @@ async def get(
 
         async def main() -> None:
             await client.model_sync.executions.get(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                sync_id="sync_id",
+                id="id",
             )
 
 
@@ -647,9 +525,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetExecutionResponseEnvelope,
+                    V2GetExecutionResponseEnvelope,
                     parse_obj_as(
-                        type_=GetExecutionResponseEnvelope,  # type: ignore
+                        type_=V2GetExecutionResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -688,125 +566,6 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def update(
-        self, sync_id: str, id: str, *, status: ExecutionStatus, request_options: typing.Optional[RequestOptions] = None
-    ) -> GetExecutionResponseEnvelope:
-        """
-        Parameters
-        ----------
-        sync_id : str
-
-        id : str
-            The ID of the execution to update.
-
-        status : ExecutionStatus
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        GetExecutionResponseEnvelope
-            OK
-
-        Examples
-        --------
-        import asyncio
-
-        from polytomic import AsyncPolytomic
-
-        client = AsyncPolytomic(
-            version="YOUR_VERSION",
-            token="YOUR_TOKEN",
-        )
-
-
-        async def main() -> None:
-            await client.model_sync.executions.update(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                status="created",
-            )
-
-
-        asyncio.run(main())
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"api/syncs/{jsonable_encoder(sync_id)}/executions/{jsonable_encoder(id)}",
-            method="PUT",
-            json={
-                "status": status,
-            },
-            headers={
-                "content-type": "application/json",
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    GetExecutionResponseEnvelope,
-                    parse_obj_as(
-                        type_=GetExecutionResponseEnvelope,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 400:
-                raise BadRequestError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 401:
-                raise UnauthorizedError(
-                    typing.cast(
-                        RestErrResponse,
-                        parse_obj_as(
-                            type_=RestErrResponse,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 403:
-                raise ForbiddenError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            if _response.status_code == 500:
-                raise InternalServerError(
-                    typing.cast(
-                        types_api_error_ApiError,
-                        parse_obj_as(
-                            type_=types_api_error_ApiError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
-        raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
-
     async def get_log_urls(
         self,
         sync_id: str,
@@ -814,7 +573,7 @@ async def get_log_urls(
         type: V2ExecutionLogType,
         *,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ExecutionLogsResponseEnvelope:
+    ) -> V2ExecutionLogsResponseEnvelope:
         """
         Parameters
         ----------
@@ -829,7 +588,7 @@ async def get_log_urls(
 
         Returns
         -------
-        ExecutionLogsResponseEnvelope
+        V2ExecutionLogsResponseEnvelope
             OK
 
         Examples
@@ -846,8 +605,8 @@ async def get_log_urls(
 
         async def main() -> None:
             await client.model_sync.executions.get_log_urls(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                sync_id="sync_id",
+                id="id",
                 type="records",
             )
 
@@ -862,9 +621,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ExecutionLogsResponseEnvelope,
+                    V2ExecutionLogsResponseEnvelope,
                     parse_obj_as(
-                        type_=ExecutionLogsResponseEnvelope,  # type: ignore
+                        type_=V2ExecutionLogsResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -954,10 +713,10 @@ async def get_logs(
 
         async def main() -> None:
             await client.model_sync.executions.get_logs(
-                sync_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                id="0ecd09c1-b901-4d27-9053-f0367c427254",
+                sync_id="sync_id",
+                id="id",
                 type="records",
-                filename="path/to/file.json",
+                filename="filename",
             )
 
 
diff --git a/src/polytomic/model_sync/targets/client.py b/src/polytomic/model_sync/targets/client.py
index 59dcf67..8c3101a 100644
--- a/src/polytomic/model_sync/targets/client.py
+++ b/src/polytomic/model_sync/targets/client.py
@@ -3,7 +3,7 @@
 from ...core.client_wrapper import SyncClientWrapper
 import typing
 from ...core.request_options import RequestOptions
-from ...types.get_connection_meta_envelope import GetConnectionMetaEnvelope
+from ...types.v2get_connection_meta_envelope import V2GetConnectionMetaEnvelope
 from ...core.jsonable_encoder import jsonable_encoder
 from ...core.pydantic_utilities import parse_obj_as
 from ...errors.bad_request_error import BadRequestError
@@ -15,9 +15,9 @@
 from ...errors.internal_server_error import InternalServerError
 from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError as core_api_error_ApiError
-from ...types.target_response_envelope import TargetResponseEnvelope
-from ...types.v_4_target_objects_response_envelope import V4TargetObjectsResponseEnvelope
-from ...types.v_4_target_property_values_envelope import V4TargetPropertyValuesEnvelope
+from ...types.v2target_response_envelope import V2TargetResponseEnvelope
+from ...types.v4target_objects_response_envelope import V4TargetObjectsResponseEnvelope
+from ...types.v4target_property_values_envelope import V4TargetPropertyValuesEnvelope
 from ...core.client_wrapper import AsyncClientWrapper
 
 
@@ -32,7 +32,7 @@ def get_target(
         type: typing.Optional[str] = None,
         search: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> GetConnectionMetaEnvelope:
+    ) -> V2GetConnectionMetaEnvelope:
         """
         Parameters
         ----------
@@ -47,7 +47,7 @@ def get_target(
 
         Returns
         -------
-        GetConnectionMetaEnvelope
+        V2GetConnectionMetaEnvelope
             OK
 
         Examples
@@ -59,7 +59,7 @@ def get_target(
             token="YOUR_TOKEN",
         )
         client.model_sync.targets.get_target(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -74,9 +74,9 @@ def get_target(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetConnectionMetaEnvelope,
+                    V2GetConnectionMetaEnvelope,
                     parse_obj_as(
-                        type_=GetConnectionMetaEnvelope,  # type: ignore
+                        type_=V2GetConnectionMetaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -142,7 +142,7 @@ def get_target_fields(
         target: str,
         refresh: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> TargetResponseEnvelope:
+    ) -> V2TargetResponseEnvelope:
         """
         Parameters
         ----------
@@ -157,7 +157,7 @@ def get_target_fields(
 
         Returns
         -------
-        TargetResponseEnvelope
+        V2TargetResponseEnvelope
             OK
 
         Examples
@@ -169,9 +169,8 @@ def get_target_fields(
             token="YOUR_TOKEN",
         )
         client.model_sync.targets.get_target_fields(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            target="database.table",
-            refresh=False,
+            id="id",
+            target="target",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -186,9 +185,9 @@ def get_target_fields(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    TargetResponseEnvelope,
+                    V2TargetResponseEnvelope,
                     parse_obj_as(
-                        type_=TargetResponseEnvelope,  # type: ignore
+                        type_=V2TargetResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -280,7 +279,7 @@ def list(
             token="YOUR_TOKEN",
         )
         client.model_sync.targets.list(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -410,7 +409,7 @@ def get_create_property(
             token="YOUR_TOKEN",
         )
         client.model_sync.targets.get_create_property(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
             property="property",
         )
         """
@@ -495,7 +494,7 @@ async def get_target(
         type: typing.Optional[str] = None,
         search: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> GetConnectionMetaEnvelope:
+    ) -> V2GetConnectionMetaEnvelope:
         """
         Parameters
         ----------
@@ -510,7 +509,7 @@ async def get_target(
 
         Returns
         -------
-        GetConnectionMetaEnvelope
+        V2GetConnectionMetaEnvelope
             OK
 
         Examples
@@ -527,7 +526,7 @@ async def get_target(
 
         async def main() -> None:
             await client.model_sync.targets.get_target(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -545,9 +544,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetConnectionMetaEnvelope,
+                    V2GetConnectionMetaEnvelope,
                     parse_obj_as(
-                        type_=GetConnectionMetaEnvelope,  # type: ignore
+                        type_=V2GetConnectionMetaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -613,7 +612,7 @@ async def get_target_fields(
         target: str,
         refresh: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> TargetResponseEnvelope:
+    ) -> V2TargetResponseEnvelope:
         """
         Parameters
         ----------
@@ -628,7 +627,7 @@ async def get_target_fields(
 
         Returns
         -------
-        TargetResponseEnvelope
+        V2TargetResponseEnvelope
             OK
 
         Examples
@@ -645,9 +644,8 @@ async def get_target_fields(
 
         async def main() -> None:
             await client.model_sync.targets.get_target_fields(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                target="database.table",
-                refresh=False,
+                id="id",
+                target="target",
             )
 
 
@@ -665,9 +663,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    TargetResponseEnvelope,
+                    V2TargetResponseEnvelope,
                     parse_obj_as(
-                        type_=TargetResponseEnvelope,  # type: ignore
+                        type_=V2TargetResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -764,7 +762,7 @@ async def list(
 
         async def main() -> None:
             await client.model_sync.targets.list(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -902,7 +900,7 @@ async def get_create_property(
 
         async def main() -> None:
             await client.model_sync.targets.get_create_property(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
                 property="property",
             )
 
diff --git a/src/polytomic/models/client.py b/src/polytomic/models/client.py
index 45efe7f..3dd7392 100644
--- a/src/polytomic/models/client.py
+++ b/src/polytomic/models/client.py
@@ -3,7 +3,7 @@
 import typing
 from ..core.client_wrapper import SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.get_model_sync_source_meta_envelope import GetModelSyncSourceMetaEnvelope
+from ..types.v4get_sync_source_meta_envelope import V4GetSyncSourceMetaEnvelope
 from ..core.jsonable_encoder import jsonable_encoder
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.bad_request_error import BadRequestError
@@ -15,15 +15,15 @@
 from ..errors.internal_server_error import InternalServerError
 from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError as core_api_error_ApiError
-from ..types.v_2_enricher_configuration import V2EnricherConfiguration
-from ..types.v_2_get_enrichment_input_fields_response_envelope import V2GetEnrichmentInputFieldsResponseEnvelope
+from ..types.v2enricher_configuration import V2EnricherConfiguration
+from ..types.v2get_enrichment_input_fields_response_envelope import V2GetEnrichmentInputFieldsResponseEnvelope
 from ..types.model_model_field_request import ModelModelFieldRequest
-from ..types.enrichment import Enrichment
+from ..types.v2enrichment import V2Enrichment
 from ..types.model_relation import ModelRelation
-from ..types.model_response_envelope import ModelResponseEnvelope
+from ..types.v2model_response_envelope import V2ModelResponseEnvelope
 from ..core.serialization import convert_and_respect_annotation_metadata
-from ..types.model_list_response_envelope import ModelListResponseEnvelope
-from ..types.model_sample_response_envelope import ModelSampleResponseEnvelope
+from ..types.v2model_list_response_envelope import V2ModelListResponseEnvelope
+from ..types.v2model_sample_response_envelope import V2ModelSampleResponseEnvelope
 from ..core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
@@ -38,22 +38,22 @@ def get_enrichment_source(
         self,
         id: str,
         *,
-        params: typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]] = None,
+        params: typing.Optional[typing.Dict[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> GetModelSyncSourceMetaEnvelope:
+    ) -> V4GetSyncSourceMetaEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        params : typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]]
+        params : typing.Optional[typing.Dict[str, typing.Sequence[str]]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        GetModelSyncSourceMetaEnvelope
+        V4GetSyncSourceMetaEnvelope
             OK
 
         Examples
@@ -65,7 +65,7 @@ def get_enrichment_source(
             token="YOUR_TOKEN",
         )
         client.models.get_enrichment_source(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -79,9 +79,9 @@ def get_enrichment_source(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetModelSyncSourceMetaEnvelope,
+                    V4GetSyncSourceMetaEnvelope,
                     parse_obj_as(
-                        type_=GetModelSyncSourceMetaEnvelope,  # type: ignore
+                        type_=V4GetSyncSourceMetaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -173,7 +173,7 @@ def post(
             token="YOUR_TOKEN",
         )
         client.models.post(
-            connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            connection_id="connection_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -250,7 +250,7 @@ def preview(
         name: str,
         async_: typing.Optional[bool] = None,
         additional_fields: typing.Optional[typing.Sequence[ModelModelFieldRequest]] = OMIT,
-        enricher: typing.Optional[Enrichment] = OMIT,
+        enricher: typing.Optional[V2Enrichment] = OMIT,
         fields: typing.Optional[typing.Sequence[str]] = OMIT,
         identifier: typing.Optional[str] = OMIT,
         labels: typing.Optional[typing.Sequence[str]] = OMIT,
@@ -259,7 +259,7 @@ def preview(
         relations: typing.Optional[typing.Sequence[ModelRelation]] = OMIT,
         tracking_columns: typing.Optional[typing.Sequence[str]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelResponseEnvelope:
+    ) -> V2ModelResponseEnvelope:
         """
         Parameters
         ----------
@@ -273,7 +273,7 @@ def preview(
 
         additional_fields : typing.Optional[typing.Sequence[ModelModelFieldRequest]]
 
-        enricher : typing.Optional[Enrichment]
+        enricher : typing.Optional[V2Enrichment]
 
         fields : typing.Optional[typing.Sequence[str]]
 
@@ -294,7 +294,7 @@ def preview(
 
         Returns
         -------
-        ModelResponseEnvelope
+        V2ModelResponseEnvelope
             OK
 
         Examples
@@ -306,9 +306,9 @@ def preview(
             token="YOUR_TOKEN",
         )
         client.models.preview(
-            configuration={"table": "public.users"},
-            connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            name="Users",
+            configuration={"configuration": {"key": "value"}},
+            connection_id="connection_id",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -324,7 +324,7 @@ def preview(
                 "configuration": configuration,
                 "connection_id": connection_id,
                 "enricher": convert_and_respect_annotation_metadata(
-                    object_=enricher, annotation=Enrichment, direction="write"
+                    object_=enricher, annotation=V2Enrichment, direction="write"
                 ),
                 "fields": fields,
                 "identifier": identifier,
@@ -343,9 +343,9 @@ def preview(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelResponseEnvelope,
+                    V2ModelResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelResponseEnvelope,  # type: ignore
+                        type_=V2ModelResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -394,7 +394,7 @@ def preview(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> ModelListResponseEnvelope:
+    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2ModelListResponseEnvelope:
         """
         Parameters
         ----------
@@ -403,7 +403,7 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Mo
 
         Returns
         -------
-        ModelListResponseEnvelope
+        V2ModelListResponseEnvelope
             OK
 
         Examples
@@ -424,9 +424,9 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Mo
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelListResponseEnvelope,
+                    V2ModelListResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelListResponseEnvelope,  # type: ignore
+                        type_=V2ModelListResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -463,7 +463,7 @@ def create(
         name: str,
         async_: typing.Optional[bool] = None,
         additional_fields: typing.Optional[typing.Sequence[ModelModelFieldRequest]] = OMIT,
-        enricher: typing.Optional[Enrichment] = OMIT,
+        enricher: typing.Optional[V2Enrichment] = OMIT,
         fields: typing.Optional[typing.Sequence[str]] = OMIT,
         identifier: typing.Optional[str] = OMIT,
         labels: typing.Optional[typing.Sequence[str]] = OMIT,
@@ -472,7 +472,7 @@ def create(
         relations: typing.Optional[typing.Sequence[ModelRelation]] = OMIT,
         tracking_columns: typing.Optional[typing.Sequence[str]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelResponseEnvelope:
+    ) -> V2ModelResponseEnvelope:
         """
         Parameters
         ----------
@@ -486,7 +486,7 @@ def create(
 
         additional_fields : typing.Optional[typing.Sequence[ModelModelFieldRequest]]
 
-        enricher : typing.Optional[Enrichment]
+        enricher : typing.Optional[V2Enrichment]
 
         fields : typing.Optional[typing.Sequence[str]]
 
@@ -507,7 +507,7 @@ def create(
 
         Returns
         -------
-        ModelResponseEnvelope
+        V2ModelResponseEnvelope
             OK
 
         Examples
@@ -519,9 +519,9 @@ def create(
             token="YOUR_TOKEN",
         )
         client.models.create(
-            configuration={"table": "public.users"},
-            connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            name="Users",
+            configuration={"configuration": {"key": "value"}},
+            connection_id="connection_id",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -537,7 +537,7 @@ def create(
                 "configuration": configuration,
                 "connection_id": connection_id,
                 "enricher": convert_and_respect_annotation_metadata(
-                    object_=enricher, annotation=Enrichment, direction="write"
+                    object_=enricher, annotation=V2Enrichment, direction="write"
                 ),
                 "fields": fields,
                 "identifier": identifier,
@@ -556,9 +556,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelResponseEnvelope,
+                    V2ModelResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelResponseEnvelope,  # type: ignore
+                        type_=V2ModelResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -609,7 +609,7 @@ def create(
 
     def get(
         self, id: str, *, async_: typing.Optional[bool] = None, request_options: typing.Optional[RequestOptions] = None
-    ) -> ModelResponseEnvelope:
+    ) -> V2ModelResponseEnvelope:
         """
         Parameters
         ----------
@@ -622,7 +622,7 @@ def get(
 
         Returns
         -------
-        ModelResponseEnvelope
+        V2ModelResponseEnvelope
             OK
 
         Examples
@@ -634,7 +634,7 @@ def get(
             token="YOUR_TOKEN",
         )
         client.models.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -648,9 +648,9 @@ def get(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelResponseEnvelope,
+                    V2ModelResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelResponseEnvelope,  # type: ignore
+                        type_=V2ModelResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -698,7 +698,7 @@ def update(
         name: str,
         async_: typing.Optional[bool] = None,
         additional_fields: typing.Optional[typing.Sequence[ModelModelFieldRequest]] = OMIT,
-        enricher: typing.Optional[Enrichment] = OMIT,
+        enricher: typing.Optional[V2Enrichment] = OMIT,
         fields: typing.Optional[typing.Sequence[str]] = OMIT,
         identifier: typing.Optional[str] = OMIT,
         labels: typing.Optional[typing.Sequence[str]] = OMIT,
@@ -708,7 +708,7 @@ def update(
         relations: typing.Optional[typing.Sequence[ModelRelation]] = OMIT,
         tracking_columns: typing.Optional[typing.Sequence[str]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelResponseEnvelope:
+    ) -> V2ModelResponseEnvelope:
         """
         Parameters
         ----------
@@ -724,7 +724,7 @@ def update(
 
         additional_fields : typing.Optional[typing.Sequence[ModelModelFieldRequest]]
 
-        enricher : typing.Optional[Enrichment]
+        enricher : typing.Optional[V2Enrichment]
 
         fields : typing.Optional[typing.Sequence[str]]
 
@@ -747,7 +747,7 @@ def update(
 
         Returns
         -------
-        ModelResponseEnvelope
+        V2ModelResponseEnvelope
             OK
 
         Examples
@@ -759,11 +759,10 @@ def update(
             token="YOUR_TOKEN",
         )
         client.models.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            async_=False,
-            configuration={"table": "public.users"},
-            connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            name="Users",
+            id="id",
+            configuration={"configuration": {"key": "value"}},
+            connection_id="connection_id",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -779,7 +778,7 @@ def update(
                 "configuration": configuration,
                 "connection_id": connection_id,
                 "enricher": convert_and_respect_annotation_metadata(
-                    object_=enricher, annotation=Enrichment, direction="write"
+                    object_=enricher, annotation=V2Enrichment, direction="write"
                 ),
                 "fields": fields,
                 "identifier": identifier,
@@ -802,9 +801,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelResponseEnvelope,
+                    V2ModelResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelResponseEnvelope,  # type: ignore
+                        type_=V2ModelResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -879,7 +878,7 @@ def remove(
             token="YOUR_TOKEN",
         )
         client.models.remove(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -940,7 +939,7 @@ def remove(
 
     def sample(
         self, id: str, *, async_: typing.Optional[bool] = None, request_options: typing.Optional[RequestOptions] = None
-    ) -> ModelSampleResponseEnvelope:
+    ) -> V2ModelSampleResponseEnvelope:
         """
         Returns sample records from the model. The first ten records that the source provides will be returned after being enriched (if applicable). Synchronous requests must complete within 10s. If either querying or enrichment exceeds 10s, please use the async option.
 
@@ -955,7 +954,7 @@ def sample(
 
         Returns
         -------
-        ModelSampleResponseEnvelope
+        V2ModelSampleResponseEnvelope
             OK
 
         Examples
@@ -967,7 +966,7 @@ def sample(
             token="YOUR_TOKEN",
         )
         client.models.sample(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -981,9 +980,9 @@ def sample(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelSampleResponseEnvelope,
+                    V2ModelSampleResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelSampleResponseEnvelope,  # type: ignore
+                        type_=V2ModelSampleResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1041,22 +1040,22 @@ async def get_enrichment_source(
         self,
         id: str,
         *,
-        params: typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]] = None,
+        params: typing.Optional[typing.Dict[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> GetModelSyncSourceMetaEnvelope:
+    ) -> V4GetSyncSourceMetaEnvelope:
         """
         Parameters
         ----------
         id : str
 
-        params : typing.Optional[typing.Dict[str, typing.Optional[typing.Sequence[str]]]]
+        params : typing.Optional[typing.Dict[str, typing.Sequence[str]]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        GetModelSyncSourceMetaEnvelope
+        V4GetSyncSourceMetaEnvelope
             OK
 
         Examples
@@ -1073,7 +1072,7 @@ async def get_enrichment_source(
 
         async def main() -> None:
             await client.models.get_enrichment_source(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1090,9 +1089,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    GetModelSyncSourceMetaEnvelope,
+                    V4GetSyncSourceMetaEnvelope,
                     parse_obj_as(
-                        type_=GetModelSyncSourceMetaEnvelope,  # type: ignore
+                        type_=V4GetSyncSourceMetaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1189,7 +1188,7 @@ async def post(
 
         async def main() -> None:
             await client.models.post(
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                connection_id="connection_id",
             )
 
 
@@ -1269,7 +1268,7 @@ async def preview(
         name: str,
         async_: typing.Optional[bool] = None,
         additional_fields: typing.Optional[typing.Sequence[ModelModelFieldRequest]] = OMIT,
-        enricher: typing.Optional[Enrichment] = OMIT,
+        enricher: typing.Optional[V2Enrichment] = OMIT,
         fields: typing.Optional[typing.Sequence[str]] = OMIT,
         identifier: typing.Optional[str] = OMIT,
         labels: typing.Optional[typing.Sequence[str]] = OMIT,
@@ -1278,7 +1277,7 @@ async def preview(
         relations: typing.Optional[typing.Sequence[ModelRelation]] = OMIT,
         tracking_columns: typing.Optional[typing.Sequence[str]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelResponseEnvelope:
+    ) -> V2ModelResponseEnvelope:
         """
         Parameters
         ----------
@@ -1292,7 +1291,7 @@ async def preview(
 
         additional_fields : typing.Optional[typing.Sequence[ModelModelFieldRequest]]
 
-        enricher : typing.Optional[Enrichment]
+        enricher : typing.Optional[V2Enrichment]
 
         fields : typing.Optional[typing.Sequence[str]]
 
@@ -1313,7 +1312,7 @@ async def preview(
 
         Returns
         -------
-        ModelResponseEnvelope
+        V2ModelResponseEnvelope
             OK
 
         Examples
@@ -1330,9 +1329,9 @@ async def preview(
 
         async def main() -> None:
             await client.models.preview(
-                configuration={"table": "public.users"},
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                name="Users",
+                configuration={"configuration": {"key": "value"}},
+                connection_id="connection_id",
+                name="name",
             )
 
 
@@ -1351,7 +1350,7 @@ async def main() -> None:
                 "configuration": configuration,
                 "connection_id": connection_id,
                 "enricher": convert_and_respect_annotation_metadata(
-                    object_=enricher, annotation=Enrichment, direction="write"
+                    object_=enricher, annotation=V2Enrichment, direction="write"
                 ),
                 "fields": fields,
                 "identifier": identifier,
@@ -1370,9 +1369,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelResponseEnvelope,
+                    V2ModelResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelResponseEnvelope,  # type: ignore
+                        type_=V2ModelResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1421,7 +1420,7 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> ModelListResponseEnvelope:
+    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2ModelListResponseEnvelope:
         """
         Parameters
         ----------
@@ -1430,7 +1429,7 @@ async def list(self, *, request_options: typing.Optional[RequestOptions] = None)
 
         Returns
         -------
-        ModelListResponseEnvelope
+        V2ModelListResponseEnvelope
             OK
 
         Examples
@@ -1459,9 +1458,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelListResponseEnvelope,
+                    V2ModelListResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelListResponseEnvelope,  # type: ignore
+                        type_=V2ModelListResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1498,7 +1497,7 @@ async def create(
         name: str,
         async_: typing.Optional[bool] = None,
         additional_fields: typing.Optional[typing.Sequence[ModelModelFieldRequest]] = OMIT,
-        enricher: typing.Optional[Enrichment] = OMIT,
+        enricher: typing.Optional[V2Enrichment] = OMIT,
         fields: typing.Optional[typing.Sequence[str]] = OMIT,
         identifier: typing.Optional[str] = OMIT,
         labels: typing.Optional[typing.Sequence[str]] = OMIT,
@@ -1507,7 +1506,7 @@ async def create(
         relations: typing.Optional[typing.Sequence[ModelRelation]] = OMIT,
         tracking_columns: typing.Optional[typing.Sequence[str]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelResponseEnvelope:
+    ) -> V2ModelResponseEnvelope:
         """
         Parameters
         ----------
@@ -1521,7 +1520,7 @@ async def create(
 
         additional_fields : typing.Optional[typing.Sequence[ModelModelFieldRequest]]
 
-        enricher : typing.Optional[Enrichment]
+        enricher : typing.Optional[V2Enrichment]
 
         fields : typing.Optional[typing.Sequence[str]]
 
@@ -1542,7 +1541,7 @@ async def create(
 
         Returns
         -------
-        ModelResponseEnvelope
+        V2ModelResponseEnvelope
             OK
 
         Examples
@@ -1559,9 +1558,9 @@ async def create(
 
         async def main() -> None:
             await client.models.create(
-                configuration={"table": "public.users"},
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                name="Users",
+                configuration={"configuration": {"key": "value"}},
+                connection_id="connection_id",
+                name="name",
             )
 
 
@@ -1580,7 +1579,7 @@ async def main() -> None:
                 "configuration": configuration,
                 "connection_id": connection_id,
                 "enricher": convert_and_respect_annotation_metadata(
-                    object_=enricher, annotation=Enrichment, direction="write"
+                    object_=enricher, annotation=V2Enrichment, direction="write"
                 ),
                 "fields": fields,
                 "identifier": identifier,
@@ -1599,9 +1598,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelResponseEnvelope,
+                    V2ModelResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelResponseEnvelope,  # type: ignore
+                        type_=V2ModelResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1652,7 +1651,7 @@ async def main() -> None:
 
     async def get(
         self, id: str, *, async_: typing.Optional[bool] = None, request_options: typing.Optional[RequestOptions] = None
-    ) -> ModelResponseEnvelope:
+    ) -> V2ModelResponseEnvelope:
         """
         Parameters
         ----------
@@ -1665,7 +1664,7 @@ async def get(
 
         Returns
         -------
-        ModelResponseEnvelope
+        V2ModelResponseEnvelope
             OK
 
         Examples
@@ -1682,7 +1681,7 @@ async def get(
 
         async def main() -> None:
             await client.models.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1699,9 +1698,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelResponseEnvelope,
+                    V2ModelResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelResponseEnvelope,  # type: ignore
+                        type_=V2ModelResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1749,7 +1748,7 @@ async def update(
         name: str,
         async_: typing.Optional[bool] = None,
         additional_fields: typing.Optional[typing.Sequence[ModelModelFieldRequest]] = OMIT,
-        enricher: typing.Optional[Enrichment] = OMIT,
+        enricher: typing.Optional[V2Enrichment] = OMIT,
         fields: typing.Optional[typing.Sequence[str]] = OMIT,
         identifier: typing.Optional[str] = OMIT,
         labels: typing.Optional[typing.Sequence[str]] = OMIT,
@@ -1759,7 +1758,7 @@ async def update(
         relations: typing.Optional[typing.Sequence[ModelRelation]] = OMIT,
         tracking_columns: typing.Optional[typing.Sequence[str]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ModelResponseEnvelope:
+    ) -> V2ModelResponseEnvelope:
         """
         Parameters
         ----------
@@ -1775,7 +1774,7 @@ async def update(
 
         additional_fields : typing.Optional[typing.Sequence[ModelModelFieldRequest]]
 
-        enricher : typing.Optional[Enrichment]
+        enricher : typing.Optional[V2Enrichment]
 
         fields : typing.Optional[typing.Sequence[str]]
 
@@ -1798,7 +1797,7 @@ async def update(
 
         Returns
         -------
-        ModelResponseEnvelope
+        V2ModelResponseEnvelope
             OK
 
         Examples
@@ -1815,11 +1814,10 @@ async def update(
 
         async def main() -> None:
             await client.models.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                async_=False,
-                configuration={"table": "public.users"},
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                name="Users",
+                id="id",
+                configuration={"configuration": {"key": "value"}},
+                connection_id="connection_id",
+                name="name",
             )
 
 
@@ -1838,7 +1836,7 @@ async def main() -> None:
                 "configuration": configuration,
                 "connection_id": connection_id,
                 "enricher": convert_and_respect_annotation_metadata(
-                    object_=enricher, annotation=Enrichment, direction="write"
+                    object_=enricher, annotation=V2Enrichment, direction="write"
                 ),
                 "fields": fields,
                 "identifier": identifier,
@@ -1861,9 +1859,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelResponseEnvelope,
+                    V2ModelResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelResponseEnvelope,  # type: ignore
+                        type_=V2ModelResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1943,7 +1941,7 @@ async def remove(
 
         async def main() -> None:
             await client.models.remove(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2007,7 +2005,7 @@ async def main() -> None:
 
     async def sample(
         self, id: str, *, async_: typing.Optional[bool] = None, request_options: typing.Optional[RequestOptions] = None
-    ) -> ModelSampleResponseEnvelope:
+    ) -> V2ModelSampleResponseEnvelope:
         """
         Returns sample records from the model. The first ten records that the source provides will be returned after being enriched (if applicable). Synchronous requests must complete within 10s. If either querying or enrichment exceeds 10s, please use the async option.
 
@@ -2022,7 +2020,7 @@ async def sample(
 
         Returns
         -------
-        ModelSampleResponseEnvelope
+        V2ModelSampleResponseEnvelope
             OK
 
         Examples
@@ -2039,7 +2037,7 @@ async def sample(
 
         async def main() -> None:
             await client.models.sample(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -2056,9 +2054,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ModelSampleResponseEnvelope,
+                    V2ModelSampleResponseEnvelope,
                     parse_obj_as(
-                        type_=ModelSampleResponseEnvelope,  # type: ignore
+                        type_=V2ModelSampleResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/notifications/client.py b/src/polytomic/notifications/client.py
index aed56ee..290abf1 100644
--- a/src/polytomic/notifications/client.py
+++ b/src/polytomic/notifications/client.py
@@ -3,7 +3,7 @@
 import typing
 from ..core.client_wrapper import SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.v_4_global_error_subscribers_response import V4GlobalErrorSubscribersResponse
+from ..types.v4global_error_subscribers_response import V4GlobalErrorSubscribersResponse
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.unauthorized_error import UnauthorizedError
 from ..types.rest_err_response import RestErrResponse
diff --git a/src/polytomic/organization/client.py b/src/polytomic/organization/client.py
index 8929e07..aab3dbb 100644
--- a/src/polytomic/organization/client.py
+++ b/src/polytomic/organization/client.py
@@ -3,7 +3,7 @@
 import typing
 from ..core.client_wrapper import SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.organizations_envelope import OrganizationsEnvelope
+from ..types.v2organizations_envelope import V2OrganizationsEnvelope
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.unauthorized_error import UnauthorizedError
 from ..types.rest_err_response import RestErrResponse
@@ -11,7 +11,7 @@
 from ..types.api_error import ApiError as types_api_error_ApiError
 from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError as core_api_error_ApiError
-from ..types.organization_envelope import OrganizationEnvelope
+from ..types.v2organization_envelope import V2OrganizationEnvelope
 from ..errors.conflict_error import ConflictError
 from ..errors.unprocessable_entity_error import UnprocessableEntityError
 from ..core.jsonable_encoder import jsonable_encoder
@@ -26,7 +26,7 @@ class OrganizationClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> OrganizationsEnvelope:
+    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2OrganizationsEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -39,7 +39,7 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Or
 
         Returns
         -------
-        OrganizationsEnvelope
+        V2OrganizationsEnvelope
             OK
 
         Examples
@@ -60,9 +60,9 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Or
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    OrganizationsEnvelope,
+                    V2OrganizationsEnvelope,
                     parse_obj_as(
-                        type_=OrganizationsEnvelope,  # type: ignore
+                        type_=V2OrganizationsEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -101,7 +101,7 @@ def create(
         sso_domain: typing.Optional[str] = OMIT,
         sso_org_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> OrganizationEnvelope:
+    ) -> V2OrganizationEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -126,7 +126,7 @@ def create(
 
         Returns
         -------
-        OrganizationEnvelope
+        V2OrganizationEnvelope
             OK
 
         Examples
@@ -138,7 +138,7 @@ def create(
             token="YOUR_TOKEN",
         )
         client.organization.create(
-            name="My Organization",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -161,9 +161,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    OrganizationEnvelope,
+                    V2OrganizationEnvelope,
                     parse_obj_as(
-                        type_=OrganizationEnvelope,  # type: ignore
+                        type_=V2OrganizationEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -212,7 +212,7 @@ def create(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> OrganizationEnvelope:
+    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2OrganizationEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -227,7 +227,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
 
         Returns
         -------
-        OrganizationEnvelope
+        V2OrganizationEnvelope
             OK
 
         Examples
@@ -239,7 +239,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             token="YOUR_TOKEN",
         )
         client.organization.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -250,9 +250,9 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    OrganizationEnvelope,
+                    V2OrganizationEnvelope,
                     parse_obj_as(
-                        type_=OrganizationEnvelope,  # type: ignore
+                        type_=V2OrganizationEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -292,7 +292,7 @@ def update(
         sso_domain: typing.Optional[str] = OMIT,
         sso_org_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> OrganizationEnvelope:
+    ) -> V2OrganizationEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -319,7 +319,7 @@ def update(
 
         Returns
         -------
-        OrganizationEnvelope
+        V2OrganizationEnvelope
             OK
 
         Examples
@@ -331,8 +331,8 @@ def update(
             token="YOUR_TOKEN",
         )
         client.organization.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            name="My Organization",
+            id="id",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -355,9 +355,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    OrganizationEnvelope,
+                    V2OrganizationEnvelope,
                     parse_obj_as(
-                        type_=OrganizationEnvelope,  # type: ignore
+                        type_=V2OrganizationEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -432,7 +432,7 @@ def remove(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             token="YOUR_TOKEN",
         )
         client.organization.remove(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -483,7 +483,7 @@ class AsyncOrganizationClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> OrganizationsEnvelope:
+    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2OrganizationsEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -496,7 +496,7 @@ async def list(self, *, request_options: typing.Optional[RequestOptions] = None)
 
         Returns
         -------
-        OrganizationsEnvelope
+        V2OrganizationsEnvelope
             OK
 
         Examples
@@ -525,9 +525,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    OrganizationsEnvelope,
+                    V2OrganizationsEnvelope,
                     parse_obj_as(
-                        type_=OrganizationsEnvelope,  # type: ignore
+                        type_=V2OrganizationsEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -566,7 +566,7 @@ async def create(
         sso_domain: typing.Optional[str] = OMIT,
         sso_org_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> OrganizationEnvelope:
+    ) -> V2OrganizationEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -591,7 +591,7 @@ async def create(
 
         Returns
         -------
-        OrganizationEnvelope
+        V2OrganizationEnvelope
             OK
 
         Examples
@@ -608,7 +608,7 @@ async def create(
 
         async def main() -> None:
             await client.organization.create(
-                name="My Organization",
+                name="name",
             )
 
 
@@ -634,9 +634,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    OrganizationEnvelope,
+                    V2OrganizationEnvelope,
                     parse_obj_as(
-                        type_=OrganizationEnvelope,  # type: ignore
+                        type_=V2OrganizationEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -685,7 +685,7 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> OrganizationEnvelope:
+    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2OrganizationEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -700,7 +700,7 @@ async def get(self, id: str, *, request_options: typing.Optional[RequestOptions]
 
         Returns
         -------
-        OrganizationEnvelope
+        V2OrganizationEnvelope
             OK
 
         Examples
@@ -717,7 +717,7 @@ async def get(self, id: str, *, request_options: typing.Optional[RequestOptions]
 
         async def main() -> None:
             await client.organization.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -731,9 +731,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    OrganizationEnvelope,
+                    V2OrganizationEnvelope,
                     parse_obj_as(
-                        type_=OrganizationEnvelope,  # type: ignore
+                        type_=V2OrganizationEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -773,7 +773,7 @@ async def update(
         sso_domain: typing.Optional[str] = OMIT,
         sso_org_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> OrganizationEnvelope:
+    ) -> V2OrganizationEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -800,7 +800,7 @@ async def update(
 
         Returns
         -------
-        OrganizationEnvelope
+        V2OrganizationEnvelope
             OK
 
         Examples
@@ -817,8 +817,8 @@ async def update(
 
         async def main() -> None:
             await client.organization.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                name="My Organization",
+                id="id",
+                name="name",
             )
 
 
@@ -844,9 +844,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    OrganizationEnvelope,
+                    V2OrganizationEnvelope,
                     parse_obj_as(
-                        type_=OrganizationEnvelope,  # type: ignore
+                        type_=V2OrganizationEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -926,7 +926,7 @@ async def remove(self, id: str, *, request_options: typing.Optional[RequestOptio
 
         async def main() -> None:
             await client.organization.remove(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
diff --git a/src/polytomic/permissions/policies/client.py b/src/polytomic/permissions/policies/client.py
index a0fc74a..6eb8809 100644
--- a/src/polytomic/permissions/policies/client.py
+++ b/src/polytomic/permissions/policies/client.py
@@ -3,7 +3,7 @@
 import typing
 from ...core.client_wrapper import SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.list_policies_response_envelope import ListPoliciesResponseEnvelope
+from ...types.v2list_policies_response_envelope import V2ListPoliciesResponseEnvelope
 from ...core.pydantic_utilities import parse_obj_as
 from ...errors.unauthorized_error import UnauthorizedError
 from ...types.rest_err_response import RestErrResponse
@@ -11,8 +11,8 @@
 from ...types.api_error import ApiError as types_api_error_ApiError
 from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError as core_api_error_ApiError
-from ...types.policy_action import PolicyAction
-from ...types.policy_response_envelope import PolicyResponseEnvelope
+from ...types.v2policy_action import V2PolicyAction
+from ...types.v2policy_response_envelope import V2PolicyResponseEnvelope
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...errors.bad_request_error import BadRequestError
 from ...errors.forbidden_error import ForbiddenError
@@ -28,7 +28,7 @@ class PoliciesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> ListPoliciesResponseEnvelope:
+    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2ListPoliciesResponseEnvelope:
         """
         Parameters
         ----------
@@ -37,7 +37,7 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Li
 
         Returns
         -------
-        ListPoliciesResponseEnvelope
+        V2ListPoliciesResponseEnvelope
             OK
 
         Examples
@@ -58,9 +58,9 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Li
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListPoliciesResponseEnvelope,
+                    V2ListPoliciesResponseEnvelope,
                     parse_obj_as(
-                        type_=ListPoliciesResponseEnvelope,  # type: ignore
+                        type_=V2ListPoliciesResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -94,9 +94,9 @@ def create(
         *,
         name: str,
         organization_id: typing.Optional[str] = OMIT,
-        policy_actions: typing.Optional[typing.Sequence[PolicyAction]] = OMIT,
+        policy_actions: typing.Optional[typing.Sequence[V2PolicyAction]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> PolicyResponseEnvelope:
+    ) -> V2PolicyResponseEnvelope:
         """
         Parameters
         ----------
@@ -104,14 +104,14 @@ def create(
 
         organization_id : typing.Optional[str]
 
-        policy_actions : typing.Optional[typing.Sequence[PolicyAction]]
+        policy_actions : typing.Optional[typing.Sequence[V2PolicyAction]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        PolicyResponseEnvelope
+        V2PolicyResponseEnvelope
             OK
 
         Examples
@@ -123,7 +123,7 @@ def create(
             token="YOUR_TOKEN",
         )
         client.permissions.policies.create(
-            name="Custom",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -133,7 +133,7 @@ def create(
                 "name": name,
                 "organization_id": organization_id,
                 "policy_actions": convert_and_respect_annotation_metadata(
-                    object_=policy_actions, annotation=typing.Sequence[PolicyAction], direction="write"
+                    object_=policy_actions, annotation=typing.Sequence[V2PolicyAction], direction="write"
                 ),
             },
             headers={
@@ -145,9 +145,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    PolicyResponseEnvelope,
+                    V2PolicyResponseEnvelope,
                     parse_obj_as(
-                        type_=PolicyResponseEnvelope,  # type: ignore
+                        type_=V2PolicyResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -206,7 +206,7 @@ def create(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> PolicyResponseEnvelope:
+    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2PolicyResponseEnvelope:
         """
         Parameters
         ----------
@@ -217,7 +217,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
 
         Returns
         -------
-        PolicyResponseEnvelope
+        V2PolicyResponseEnvelope
             OK
 
         Examples
@@ -229,7 +229,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             token="YOUR_TOKEN",
         )
         client.permissions.policies.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -240,9 +240,9 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    PolicyResponseEnvelope,
+                    V2PolicyResponseEnvelope,
                     parse_obj_as(
-                        type_=PolicyResponseEnvelope,  # type: ignore
+                        type_=V2PolicyResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -287,9 +287,9 @@ def update(
         *,
         name: str,
         organization_id: typing.Optional[str] = OMIT,
-        policy_actions: typing.Optional[typing.Sequence[PolicyAction]] = OMIT,
+        policy_actions: typing.Optional[typing.Sequence[V2PolicyAction]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> PolicyResponseEnvelope:
+    ) -> V2PolicyResponseEnvelope:
         """
         Parameters
         ----------
@@ -299,14 +299,14 @@ def update(
 
         organization_id : typing.Optional[str]
 
-        policy_actions : typing.Optional[typing.Sequence[PolicyAction]]
+        policy_actions : typing.Optional[typing.Sequence[V2PolicyAction]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        PolicyResponseEnvelope
+        V2PolicyResponseEnvelope
             OK
 
         Examples
@@ -318,8 +318,8 @@ def update(
             token="YOUR_TOKEN",
         )
         client.permissions.policies.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            name="Custom",
+            id="id",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -329,7 +329,7 @@ def update(
                 "name": name,
                 "organization_id": organization_id,
                 "policy_actions": convert_and_respect_annotation_metadata(
-                    object_=policy_actions, annotation=typing.Sequence[PolicyAction], direction="write"
+                    object_=policy_actions, annotation=typing.Sequence[V2PolicyAction], direction="write"
                 ),
             },
             headers={
@@ -341,9 +341,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    PolicyResponseEnvelope,
+                    V2PolicyResponseEnvelope,
                     parse_obj_as(
-                        type_=PolicyResponseEnvelope,  # type: ignore
+                        type_=V2PolicyResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -424,7 +424,7 @@ def remove(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             token="YOUR_TOKEN",
         )
         client.permissions.policies.remove(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -485,7 +485,7 @@ class AsyncPoliciesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> ListPoliciesResponseEnvelope:
+    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2ListPoliciesResponseEnvelope:
         """
         Parameters
         ----------
@@ -494,7 +494,7 @@ async def list(self, *, request_options: typing.Optional[RequestOptions] = None)
 
         Returns
         -------
-        ListPoliciesResponseEnvelope
+        V2ListPoliciesResponseEnvelope
             OK
 
         Examples
@@ -523,9 +523,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListPoliciesResponseEnvelope,
+                    V2ListPoliciesResponseEnvelope,
                     parse_obj_as(
-                        type_=ListPoliciesResponseEnvelope,  # type: ignore
+                        type_=V2ListPoliciesResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -559,9 +559,9 @@ async def create(
         *,
         name: str,
         organization_id: typing.Optional[str] = OMIT,
-        policy_actions: typing.Optional[typing.Sequence[PolicyAction]] = OMIT,
+        policy_actions: typing.Optional[typing.Sequence[V2PolicyAction]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> PolicyResponseEnvelope:
+    ) -> V2PolicyResponseEnvelope:
         """
         Parameters
         ----------
@@ -569,14 +569,14 @@ async def create(
 
         organization_id : typing.Optional[str]
 
-        policy_actions : typing.Optional[typing.Sequence[PolicyAction]]
+        policy_actions : typing.Optional[typing.Sequence[V2PolicyAction]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        PolicyResponseEnvelope
+        V2PolicyResponseEnvelope
             OK
 
         Examples
@@ -593,7 +593,7 @@ async def create(
 
         async def main() -> None:
             await client.permissions.policies.create(
-                name="Custom",
+                name="name",
             )
 
 
@@ -606,7 +606,7 @@ async def main() -> None:
                 "name": name,
                 "organization_id": organization_id,
                 "policy_actions": convert_and_respect_annotation_metadata(
-                    object_=policy_actions, annotation=typing.Sequence[PolicyAction], direction="write"
+                    object_=policy_actions, annotation=typing.Sequence[V2PolicyAction], direction="write"
                 ),
             },
             headers={
@@ -618,9 +618,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    PolicyResponseEnvelope,
+                    V2PolicyResponseEnvelope,
                     parse_obj_as(
-                        type_=PolicyResponseEnvelope,  # type: ignore
+                        type_=V2PolicyResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -679,7 +679,9 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> PolicyResponseEnvelope:
+    async def get(
+        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V2PolicyResponseEnvelope:
         """
         Parameters
         ----------
@@ -690,7 +692,7 @@ async def get(self, id: str, *, request_options: typing.Optional[RequestOptions]
 
         Returns
         -------
-        PolicyResponseEnvelope
+        V2PolicyResponseEnvelope
             OK
 
         Examples
@@ -707,7 +709,7 @@ async def get(self, id: str, *, request_options: typing.Optional[RequestOptions]
 
         async def main() -> None:
             await client.permissions.policies.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -721,9 +723,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    PolicyResponseEnvelope,
+                    V2PolicyResponseEnvelope,
                     parse_obj_as(
-                        type_=PolicyResponseEnvelope,  # type: ignore
+                        type_=V2PolicyResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -768,9 +770,9 @@ async def update(
         *,
         name: str,
         organization_id: typing.Optional[str] = OMIT,
-        policy_actions: typing.Optional[typing.Sequence[PolicyAction]] = OMIT,
+        policy_actions: typing.Optional[typing.Sequence[V2PolicyAction]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> PolicyResponseEnvelope:
+    ) -> V2PolicyResponseEnvelope:
         """
         Parameters
         ----------
@@ -780,14 +782,14 @@ async def update(
 
         organization_id : typing.Optional[str]
 
-        policy_actions : typing.Optional[typing.Sequence[PolicyAction]]
+        policy_actions : typing.Optional[typing.Sequence[V2PolicyAction]]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        PolicyResponseEnvelope
+        V2PolicyResponseEnvelope
             OK
 
         Examples
@@ -804,8 +806,8 @@ async def update(
 
         async def main() -> None:
             await client.permissions.policies.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                name="Custom",
+                id="id",
+                name="name",
             )
 
 
@@ -818,7 +820,7 @@ async def main() -> None:
                 "name": name,
                 "organization_id": organization_id,
                 "policy_actions": convert_and_respect_annotation_metadata(
-                    object_=policy_actions, annotation=typing.Sequence[PolicyAction], direction="write"
+                    object_=policy_actions, annotation=typing.Sequence[V2PolicyAction], direction="write"
                 ),
             },
             headers={
@@ -830,9 +832,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    PolicyResponseEnvelope,
+                    V2PolicyResponseEnvelope,
                     parse_obj_as(
-                        type_=PolicyResponseEnvelope,  # type: ignore
+                        type_=V2PolicyResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -918,7 +920,7 @@ async def remove(self, id: str, *, request_options: typing.Optional[RequestOptio
 
         async def main() -> None:
             await client.permissions.policies.remove(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
diff --git a/src/polytomic/permissions/roles/client.py b/src/polytomic/permissions/roles/client.py
index b7a80bc..36d7e53 100644
--- a/src/polytomic/permissions/roles/client.py
+++ b/src/polytomic/permissions/roles/client.py
@@ -3,7 +3,7 @@
 import typing
 from ...core.client_wrapper import SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.role_list_response_envelope import RoleListResponseEnvelope
+from ...types.v2role_list_response_envelope import V2RoleListResponseEnvelope
 from ...core.pydantic_utilities import parse_obj_as
 from ...errors.unauthorized_error import UnauthorizedError
 from ...types.rest_err_response import RestErrResponse
@@ -11,7 +11,7 @@
 from ...types.api_error import ApiError as types_api_error_ApiError
 from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError as core_api_error_ApiError
-from ...types.role_response_envelope import RoleResponseEnvelope
+from ...types.v2role_response_envelope import V2RoleResponseEnvelope
 from ...errors.bad_request_error import BadRequestError
 from ...errors.forbidden_error import ForbiddenError
 from ...errors.not_found_error import NotFoundError
@@ -26,7 +26,7 @@ class RolesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> RoleListResponseEnvelope:
+    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2RoleListResponseEnvelope:
         """
         Parameters
         ----------
@@ -35,7 +35,7 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Ro
 
         Returns
         -------
-        RoleListResponseEnvelope
+        V2RoleListResponseEnvelope
             OK
 
         Examples
@@ -56,9 +56,9 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Ro
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    RoleListResponseEnvelope,
+                    V2RoleListResponseEnvelope,
                     parse_obj_as(
-                        type_=RoleListResponseEnvelope,  # type: ignore
+                        type_=V2RoleListResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -93,7 +93,7 @@ def create(
         name: str,
         organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> RoleResponseEnvelope:
+    ) -> V2RoleResponseEnvelope:
         """
         Parameters
         ----------
@@ -106,7 +106,7 @@ def create(
 
         Returns
         -------
-        RoleResponseEnvelope
+        V2RoleResponseEnvelope
             OK
 
         Examples
@@ -118,7 +118,7 @@ def create(
             token="YOUR_TOKEN",
         )
         client.permissions.roles.create(
-            name="Custom",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -137,9 +137,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    RoleResponseEnvelope,
+                    V2RoleResponseEnvelope,
                     parse_obj_as(
-                        type_=RoleResponseEnvelope,  # type: ignore
+                        type_=V2RoleResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -198,7 +198,7 @@ def create(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> RoleResponseEnvelope:
+    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2RoleResponseEnvelope:
         """
         Parameters
         ----------
@@ -209,7 +209,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
 
         Returns
         -------
-        RoleResponseEnvelope
+        V2RoleResponseEnvelope
             OK
 
         Examples
@@ -221,7 +221,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             token="YOUR_TOKEN",
         )
         client.permissions.roles.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -232,9 +232,9 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    RoleResponseEnvelope,
+                    V2RoleResponseEnvelope,
                     parse_obj_as(
-                        type_=RoleResponseEnvelope,  # type: ignore
+                        type_=V2RoleResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -270,7 +270,7 @@ def update(
         name: str,
         organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> RoleResponseEnvelope:
+    ) -> V2RoleResponseEnvelope:
         """
         Parameters
         ----------
@@ -285,7 +285,7 @@ def update(
 
         Returns
         -------
-        RoleResponseEnvelope
+        V2RoleResponseEnvelope
             OK
 
         Examples
@@ -297,8 +297,8 @@ def update(
             token="YOUR_TOKEN",
         )
         client.permissions.roles.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            name="Custom",
+            id="id",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -317,9 +317,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    RoleResponseEnvelope,
+                    V2RoleResponseEnvelope,
                     parse_obj_as(
-                        type_=RoleResponseEnvelope,  # type: ignore
+                        type_=V2RoleResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -400,7 +400,7 @@ def remove(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             token="YOUR_TOKEN",
         )
         client.permissions.roles.remove(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -461,7 +461,7 @@ class AsyncRolesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> RoleListResponseEnvelope:
+    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2RoleListResponseEnvelope:
         """
         Parameters
         ----------
@@ -470,7 +470,7 @@ async def list(self, *, request_options: typing.Optional[RequestOptions] = None)
 
         Returns
         -------
-        RoleListResponseEnvelope
+        V2RoleListResponseEnvelope
             OK
 
         Examples
@@ -499,9 +499,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    RoleListResponseEnvelope,
+                    V2RoleListResponseEnvelope,
                     parse_obj_as(
-                        type_=RoleListResponseEnvelope,  # type: ignore
+                        type_=V2RoleListResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -536,7 +536,7 @@ async def create(
         name: str,
         organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> RoleResponseEnvelope:
+    ) -> V2RoleResponseEnvelope:
         """
         Parameters
         ----------
@@ -549,7 +549,7 @@ async def create(
 
         Returns
         -------
-        RoleResponseEnvelope
+        V2RoleResponseEnvelope
             OK
 
         Examples
@@ -566,7 +566,7 @@ async def create(
 
         async def main() -> None:
             await client.permissions.roles.create(
-                name="Custom",
+                name="name",
             )
 
 
@@ -588,9 +588,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    RoleResponseEnvelope,
+                    V2RoleResponseEnvelope,
                     parse_obj_as(
-                        type_=RoleResponseEnvelope,  # type: ignore
+                        type_=V2RoleResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -649,7 +649,7 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> RoleResponseEnvelope:
+    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2RoleResponseEnvelope:
         """
         Parameters
         ----------
@@ -660,7 +660,7 @@ async def get(self, id: str, *, request_options: typing.Optional[RequestOptions]
 
         Returns
         -------
-        RoleResponseEnvelope
+        V2RoleResponseEnvelope
             OK
 
         Examples
@@ -677,7 +677,7 @@ async def get(self, id: str, *, request_options: typing.Optional[RequestOptions]
 
         async def main() -> None:
             await client.permissions.roles.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -691,9 +691,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    RoleResponseEnvelope,
+                    V2RoleResponseEnvelope,
                     parse_obj_as(
-                        type_=RoleResponseEnvelope,  # type: ignore
+                        type_=V2RoleResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -729,7 +729,7 @@ async def update(
         name: str,
         organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> RoleResponseEnvelope:
+    ) -> V2RoleResponseEnvelope:
         """
         Parameters
         ----------
@@ -744,7 +744,7 @@ async def update(
 
         Returns
         -------
-        RoleResponseEnvelope
+        V2RoleResponseEnvelope
             OK
 
         Examples
@@ -761,8 +761,8 @@ async def update(
 
         async def main() -> None:
             await client.permissions.roles.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                name="Custom",
+                id="id",
+                name="name",
             )
 
 
@@ -784,9 +784,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    RoleResponseEnvelope,
+                    V2RoleResponseEnvelope,
                     parse_obj_as(
-                        type_=RoleResponseEnvelope,  # type: ignore
+                        type_=V2RoleResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -872,7 +872,7 @@ async def remove(self, id: str, *, request_options: typing.Optional[RequestOptio
 
         async def main() -> None:
             await client.permissions.roles.remove(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
diff --git a/src/polytomic/query_runner/client.py b/src/polytomic/query_runner/client.py
index cd5fc5b..80a1812 100644
--- a/src/polytomic/query_runner/client.py
+++ b/src/polytomic/query_runner/client.py
@@ -3,7 +3,7 @@
 import typing
 from ..core.client_wrapper import SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.v_4_run_query_envelope import V4RunQueryEnvelope
+from ..types.v4run_query_envelope import V4RunQueryEnvelope
 from ..core.jsonable_encoder import jsonable_encoder
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.bad_request_error import BadRequestError
@@ -14,7 +14,7 @@
 from ..errors.internal_server_error import InternalServerError
 from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError as core_api_error_ApiError
-from ..types.v_4_query_results_envelope import V4QueryResultsEnvelope
+from ..types.v4query_results_envelope import V4QueryResultsEnvelope
 from ..core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
@@ -57,8 +57,7 @@ def run_query(
             token="YOUR_TOKEN",
         )
         client.query_runner.run_query(
-            connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            query="SELECT * FROM table",
+            connection_id="connection_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -155,7 +154,7 @@ def get_query(
             token="YOUR_TOKEN",
         )
         client.query_runner.get_query(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -262,8 +261,7 @@ async def run_query(
 
         async def main() -> None:
             await client.query_runner.run_query(
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                query="SELECT * FROM table",
+                connection_id="connection_id",
             )
 
 
@@ -368,7 +366,7 @@ async def get_query(
 
         async def main() -> None:
             await client.query_runner.get_query(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
diff --git a/src/polytomic/schemas/client.py b/src/polytomic/schemas/client.py
index 04edb01..8b27f13 100644
--- a/src/polytomic/schemas/client.py
+++ b/src/polytomic/schemas/client.py
@@ -2,7 +2,7 @@
 
 import typing
 from ..core.client_wrapper import SyncClientWrapper
-from ..types.v_4_user_field_request import V4UserFieldRequest
+from ..types.v4user_field_request import V4UserFieldRequest
 from ..core.request_options import RequestOptions
 from ..core.jsonable_encoder import jsonable_encoder
 from ..core.serialization import convert_and_respect_annotation_metadata
@@ -16,9 +16,9 @@
 from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError as core_api_error_ApiError
 from ..types.schema_primary_key_override_input import SchemaPrimaryKeyOverrideInput
-from ..types.bulk_sync_source_status_envelope import BulkSyncSourceStatusEnvelope
-from ..types.bulk_sync_source_schema_envelope import BulkSyncSourceSchemaEnvelope
-from ..types.schema_records_response_envelope import SchemaRecordsResponseEnvelope
+from ..types.v3bulk_sync_source_status_envelope import V3BulkSyncSourceStatusEnvelope
+from ..types.v3bulk_sync_source_schema_envelope import V3BulkSyncSourceSchemaEnvelope
+from ..types.v3schema_records_response_envelope import V3SchemaRecordsResponseEnvelope
 from ..errors.forbidden_error import ForbiddenError
 from ..core.client_wrapper import AsyncClientWrapper
 
@@ -63,8 +63,8 @@ def upsert_field(
             token="YOUR_TOKEN",
         )
         client.schemas.upsert_field(
-            connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schema_id="public.users",
+            connection_id="connection_id",
+            schema_id="schema_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -162,9 +162,9 @@ def delete_field(
             token="YOUR_TOKEN",
         )
         client.schemas.delete_field(
-            connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schema_id="public.users",
-            field_id="first_name",
+            connection_id="connection_id",
+            schema_id="schema_id",
+            field_id="field_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -253,8 +253,8 @@ def set_primary_keys(
             token="YOUR_TOKEN",
         )
         client.schemas.set_primary_keys(
-            connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schema_id="public.users",
+            connection_id="connection_id",
+            schema_id="schema_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -347,8 +347,8 @@ def reset_primary_keys(
             token="YOUR_TOKEN",
         )
         client.schemas.reset_primary_keys(
-            connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schema_id="public.users",
+            connection_id="connection_id",
+            schema_id="schema_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -426,7 +426,7 @@ def refresh(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             token="YOUR_TOKEN",
         )
         client.schemas.refresh(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -484,7 +484,7 @@ def refresh(self, id: str, *, request_options: typing.Optional[RequestOptions] =
 
     def get_status(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncSourceStatusEnvelope:
+    ) -> V3BulkSyncSourceStatusEnvelope:
         """
         Polytomic periodically inspects the schemas for connections to discover new fields and update metadata. This endpoint returns the current inspection status.
 
@@ -497,7 +497,7 @@ def get_status(
 
         Returns
         -------
-        BulkSyncSourceStatusEnvelope
+        V3BulkSyncSourceStatusEnvelope
             OK
 
         Examples
@@ -509,7 +509,7 @@ def get_status(
             token="YOUR_TOKEN",
         )
         client.schemas.get_status(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -520,9 +520,9 @@ def get_status(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncSourceStatusEnvelope,
+                    V3BulkSyncSourceStatusEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncSourceStatusEnvelope,  # type: ignore
+                        type_=V3BulkSyncSourceStatusEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -573,7 +573,7 @@ def get_status(
 
     def get(
         self, id: str, schema_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncSourceSchemaEnvelope:
+    ) -> V3BulkSyncSourceSchemaEnvelope:
         """
         Parameters
         ----------
@@ -586,7 +586,7 @@ def get(
 
         Returns
         -------
-        BulkSyncSourceSchemaEnvelope
+        V3BulkSyncSourceSchemaEnvelope
             OK
 
         Examples
@@ -598,8 +598,8 @@ def get(
             token="YOUR_TOKEN",
         )
         client.schemas.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schema_id="public.users",
+            id="id",
+            schema_id="schema_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -610,9 +610,9 @@ def get(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncSourceSchemaEnvelope,
+                    V3BulkSyncSourceSchemaEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncSourceSchemaEnvelope,  # type: ignore
+                        type_=V3BulkSyncSourceSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -663,7 +663,7 @@ def get(
 
     def get_records(
         self, id: str, schema_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> SchemaRecordsResponseEnvelope:
+    ) -> V3SchemaRecordsResponseEnvelope:
         """
         Parameters
         ----------
@@ -676,7 +676,7 @@ def get_records(
 
         Returns
         -------
-        SchemaRecordsResponseEnvelope
+        V3SchemaRecordsResponseEnvelope
             OK
 
         Examples
@@ -688,8 +688,8 @@ def get_records(
             token="YOUR_TOKEN",
         )
         client.schemas.get_records(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            schema_id="public.users",
+            id="id",
+            schema_id="schema_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -700,9 +700,9 @@ def get_records(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    SchemaRecordsResponseEnvelope,
+                    V3SchemaRecordsResponseEnvelope,
                     parse_obj_as(
-                        type_=SchemaRecordsResponseEnvelope,  # type: ignore
+                        type_=V3SchemaRecordsResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -804,8 +804,8 @@ async def upsert_field(
 
         async def main() -> None:
             await client.schemas.upsert_field(
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schema_id="public.users",
+                connection_id="connection_id",
+                schema_id="schema_id",
             )
 
 
@@ -911,9 +911,9 @@ async def delete_field(
 
         async def main() -> None:
             await client.schemas.delete_field(
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schema_id="public.users",
-                field_id="first_name",
+                connection_id="connection_id",
+                schema_id="schema_id",
+                field_id="field_id",
             )
 
 
@@ -1010,8 +1010,8 @@ async def set_primary_keys(
 
         async def main() -> None:
             await client.schemas.set_primary_keys(
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schema_id="public.users",
+                connection_id="connection_id",
+                schema_id="schema_id",
             )
 
 
@@ -1112,8 +1112,8 @@ async def reset_primary_keys(
 
         async def main() -> None:
             await client.schemas.reset_primary_keys(
-                connection_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schema_id="public.users",
+                connection_id="connection_id",
+                schema_id="schema_id",
             )
 
 
@@ -1199,7 +1199,7 @@ async def refresh(self, id: str, *, request_options: typing.Optional[RequestOpti
 
         async def main() -> None:
             await client.schemas.refresh(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1260,7 +1260,7 @@ async def main() -> None:
 
     async def get_status(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncSourceStatusEnvelope:
+    ) -> V3BulkSyncSourceStatusEnvelope:
         """
         Polytomic periodically inspects the schemas for connections to discover new fields and update metadata. This endpoint returns the current inspection status.
 
@@ -1273,7 +1273,7 @@ async def get_status(
 
         Returns
         -------
-        BulkSyncSourceStatusEnvelope
+        V3BulkSyncSourceStatusEnvelope
             OK
 
         Examples
@@ -1290,7 +1290,7 @@ async def get_status(
 
         async def main() -> None:
             await client.schemas.get_status(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1304,9 +1304,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncSourceStatusEnvelope,
+                    V3BulkSyncSourceStatusEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncSourceStatusEnvelope,  # type: ignore
+                        type_=V3BulkSyncSourceStatusEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1357,7 +1357,7 @@ async def main() -> None:
 
     async def get(
         self, id: str, schema_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> BulkSyncSourceSchemaEnvelope:
+    ) -> V3BulkSyncSourceSchemaEnvelope:
         """
         Parameters
         ----------
@@ -1370,7 +1370,7 @@ async def get(
 
         Returns
         -------
-        BulkSyncSourceSchemaEnvelope
+        V3BulkSyncSourceSchemaEnvelope
             OK
 
         Examples
@@ -1387,8 +1387,8 @@ async def get(
 
         async def main() -> None:
             await client.schemas.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schema_id="public.users",
+                id="id",
+                schema_id="schema_id",
             )
 
 
@@ -1402,9 +1402,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    BulkSyncSourceSchemaEnvelope,
+                    V3BulkSyncSourceSchemaEnvelope,
                     parse_obj_as(
-                        type_=BulkSyncSourceSchemaEnvelope,  # type: ignore
+                        type_=V3BulkSyncSourceSchemaEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1455,7 +1455,7 @@ async def main() -> None:
 
     async def get_records(
         self, id: str, schema_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> SchemaRecordsResponseEnvelope:
+    ) -> V3SchemaRecordsResponseEnvelope:
         """
         Parameters
         ----------
@@ -1468,7 +1468,7 @@ async def get_records(
 
         Returns
         -------
-        SchemaRecordsResponseEnvelope
+        V3SchemaRecordsResponseEnvelope
             OK
 
         Examples
@@ -1485,8 +1485,8 @@ async def get_records(
 
         async def main() -> None:
             await client.schemas.get_records(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                schema_id="public.users",
+                id="id",
+                schema_id="schema_id",
             )
 
 
@@ -1500,9 +1500,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    SchemaRecordsResponseEnvelope,
+                    V3SchemaRecordsResponseEnvelope,
                     parse_obj_as(
-                        type_=SchemaRecordsResponseEnvelope,  # type: ignore
+                        type_=V3SchemaRecordsResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/types/__init__.py b/src/polytomic/types/__init__.py
index fdf1e45..ea999ee 100644
--- a/src/polytomic/types/__init__.py
+++ b/src/polytomic/types/__init__.py
@@ -1,403 +1,419 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from .types_type import TypesType
-from .activate_sync_envelope import ActivateSyncEnvelope
-from .activate_sync_input import ActivateSyncInput
-from .activate_sync_output import ActivateSyncOutput
 from .api_error import ApiError
-from .api_key_response import ApiKeyResponse
-from .api_key_response_envelope import ApiKeyResponseEnvelope
 from .backend_connection_capabilities import BackendConnectionCapabilities
 from .backend_o_auth_prompt import BackendOAuthPrompt
 from .bulk_bulk_sync_schedule import BulkBulkSyncSchedule
 from .bulk_discover import BulkDiscover
 from .bulk_execution_status import BulkExecutionStatus
-from .bulk_fetch_mode import BulkFetchMode
-from .bulk_field import BulkField
-from .bulk_filter import BulkFilter
 from .bulk_itemized_schedule import BulkItemizedSchedule
 from .bulk_multi_schedule_configuration import BulkMultiScheduleConfiguration
 from .bulk_normalize_names import BulkNormalizeNames
 from .bulk_schedule import BulkSchedule
-from .bulk_schema import BulkSchema
-from .bulk_schema_envelope import BulkSchemaEnvelope
 from .bulk_schema_execution_status import BulkSchemaExecutionStatus
 from .bulk_selective_mode import BulkSelectiveMode
-from .bulk_sync_canceled_event import BulkSyncCanceledEvent
-from .bulk_sync_completed_event import BulkSyncCompletedEvent
-from .bulk_sync_completed_with_error_event import BulkSyncCompletedWithErrorEvent
-from .bulk_sync_dest import BulkSyncDest
-from .bulk_sync_dest_envelope import BulkSyncDestEnvelope
-from .bulk_sync_execution import BulkSyncExecution
-from .bulk_sync_execution_envelope import BulkSyncExecutionEnvelope
-from .bulk_sync_execution_status import BulkSyncExecutionStatus
-from .bulk_sync_failed_event import BulkSyncFailedEvent
-from .bulk_sync_list_envelope import BulkSyncListEnvelope
-from .bulk_sync_mode import BulkSyncMode
-from .bulk_sync_response import BulkSyncResponse
-from .bulk_sync_response_envelope import BulkSyncResponseEnvelope
-from .bulk_sync_running_event import BulkSyncRunningEvent
-from .bulk_sync_schema_execution import BulkSyncSchemaExecution
-from .bulk_sync_schema_execution_status import BulkSyncSchemaExecutionStatus
-from .bulk_sync_source import BulkSyncSource
-from .bulk_sync_source_envelope import BulkSyncSourceEnvelope
-from .bulk_sync_source_schema_envelope import BulkSyncSourceSchemaEnvelope
-from .bulk_sync_source_status import BulkSyncSourceStatus
-from .bulk_sync_source_status_envelope import BulkSyncSourceStatusEnvelope
-from .bulk_sync_status_envelope import BulkSyncStatusEnvelope
-from .bulk_sync_status_response import BulkSyncStatusResponse
-from .cancel_model_sync_response import CancelModelSyncResponse
-from .cancel_model_sync_response_envelope import CancelModelSyncResponseEnvelope
+from .bulk_sync_target_mode import BulkSyncTargetMode
 from .common_output_actor import CommonOutputActor
-from .configuration_value import ConfigurationValue
-from .connect_card_response import ConnectCardResponse
-from .connect_card_response_envelope import ConnectCardResponseEnvelope
-from .connection_list_response_envelope import ConnectionListResponseEnvelope
-from .connection_meta import ConnectionMeta
-from .connection_meta_response import ConnectionMetaResponse
-from .connection_parameter_value import ConnectionParameterValue
-from .connection_parameter_values_resp import ConnectionParameterValuesResp
-from .connection_parameter_values_response_envelope import ConnectionParameterValuesResponseEnvelope
-from .connection_response_envelope import ConnectionResponseEnvelope
-from .connection_response_schema import ConnectionResponseSchema
-from .connection_type import ConnectionType
-from .connection_type_response_envelope import ConnectionTypeResponseEnvelope
-from .connection_type_schema import ConnectionTypeSchema
-from .create_connection_response_envelope import CreateConnectionResponseEnvelope
-from .create_connection_response_schema import CreateConnectionResponseSchema
-from .create_model_request import CreateModelRequest
-from .enrichment import Enrichment
-from .event import Event
-from .event_body import EventBody
-from .event_types_envelope import EventTypesEnvelope
-from .events_envelope import EventsEnvelope
-from .execution_counts import ExecutionCounts
-from .execution_log_response import ExecutionLogResponse
-from .execution_logs_response_envelope import ExecutionLogsResponseEnvelope
-from .execution_status import ExecutionStatus
-from .field_configuration import FieldConfiguration
-from .filter import Filter
+from .eventing_bulk_sync_canceled_event import EventingBulkSyncCanceledEvent
+from .eventing_bulk_sync_completed_event import EventingBulkSyncCompletedEvent
+from .eventing_bulk_sync_completed_with_error_event import EventingBulkSyncCompletedWithErrorEvent
+from .eventing_bulk_sync_failed_event import EventingBulkSyncFailedEvent
+from .eventing_bulk_sync_running_event import EventingBulkSyncRunningEvent
+from .eventing_sync_canceled_event import EventingSyncCanceledEvent
+from .eventing_sync_completed_event import EventingSyncCompletedEvent
+from .eventing_sync_completed_with_errors_event import EventingSyncCompletedWithErrorsEvent
+from .eventing_sync_failed_event import EventingSyncFailedEvent
+from .eventing_sync_running_event import EventingSyncRunningEvent
 from .filter_field_reference_type import FilterFieldReferenceType
 from .filter_function import FilterFunction
-from .get_connection_meta_envelope import GetConnectionMetaEnvelope
-from .get_execution_response_envelope import GetExecutionResponseEnvelope
-from .get_execution_response_schema import GetExecutionResponseSchema
-from .get_identity_response_envelope import GetIdentityResponseEnvelope
-from .get_identity_response_schema import GetIdentityResponseSchema
-from .get_model_sync_source_meta_envelope import GetModelSyncSourceMetaEnvelope
-from .identity import Identity
-from .identity_function import IdentityFunction
-from .job_response import JobResponse
-from .job_response_envelope import JobResponseEnvelope
 from .jsonschema_definitions import JsonschemaDefinitions
 from .jsonschema_form import JsonschemaForm
 from .jsonschema_schema import JsonschemaSchema
 from .label_label import LabelLabel
-from .list_bulk_schema import ListBulkSchema
-from .list_bulk_sync_execution_status_envelope import ListBulkSyncExecutionStatusEnvelope
-from .list_bulk_sync_executions_envelope import ListBulkSyncExecutionsEnvelope
-from .list_execution_response_envelope import ListExecutionResponseEnvelope
-from .list_model_sync_response_envelope import ListModelSyncResponseEnvelope
-from .list_policies_response_envelope import ListPoliciesResponseEnvelope
-from .list_users_envelope import ListUsersEnvelope
-from .mode import Mode
-from .model_field import ModelField
-from .model_field_response import ModelFieldResponse
-from .model_list_response_envelope import ModelListResponseEnvelope
 from .model_model_field_request import ModelModelFieldRequest
 from .model_relation import ModelRelation
 from .model_relation_to import ModelRelationTo
-from .model_response import ModelResponse
-from .model_response_envelope import ModelResponseEnvelope
-from .model_sample import ModelSample
-from .model_sample_response_envelope import ModelSampleResponseEnvelope
-from .model_sync_field import ModelSyncField
-from .model_sync_mode import ModelSyncMode
-from .model_sync_response import ModelSyncResponse
-from .model_sync_response_envelope import ModelSyncResponseEnvelope
-from .model_sync_source_meta_response import ModelSyncSourceMetaResponse
-from .organization import Organization
-from .organization_envelope import OrganizationEnvelope
-from .organizations_envelope import OrganizationsEnvelope
-from .override import Override
-from .pagination import Pagination
-from .pagination_details import PaginationDetails
-from .pick_value import PickValue
-from .policy_action import PolicyAction
-from .policy_response import PolicyResponse
-from .policy_response_envelope import PolicyResponseEnvelope
-from .relation import Relation
-from .relation_to import RelationTo
+from .modelsync_sync_target_mode import ModelsyncSyncTargetMode
 from .rest_err_response import RestErrResponse
-from .role_list_response_envelope import RoleListResponseEnvelope
-from .role_response import RoleResponse
-from .role_response_envelope import RoleResponseEnvelope
-from .run_after import RunAfter
-from .schedule import Schedule
-from .schedule_envelope import ScheduleEnvelope
 from .schedule_frequency import ScheduleFrequency
-from .schedule_option_response import ScheduleOptionResponse
-from .schedule_option_response_envelope import ScheduleOptionResponseEnvelope
 from .schedule_schedule_option import ScheduleScheduleOption
-from .schedules_envelope import SchedulesEnvelope
-from .schema import Schema
 from .schema_association import SchemaAssociation
-from .schema_configuration import SchemaConfiguration
-from .schema_field import SchemaField
 from .schema_identity_function import SchemaIdentityFunction
 from .schema_primary_key_override_input import SchemaPrimaryKeyOverrideInput
-from .schema_records_response_envelope import SchemaRecordsResponseEnvelope
-from .source import Source
-from .source_meta import SourceMeta
-from .start_model_sync_response_envelope import StartModelSyncResponseEnvelope
-from .start_model_sync_response_schema import StartModelSyncResponseSchema
-from .supported_bulk_mode import SupportedBulkMode
-from .supported_mode import SupportedMode
-from .sync_canceled_event import SyncCanceledEvent
-from .sync_completed_event import SyncCompletedEvent
-from .sync_completed_with_errors_event import SyncCompletedWithErrorsEvent
 from .sync_destination_properties import SyncDestinationProperties
-from .sync_failed_event import SyncFailedEvent
-from .sync_running_event import SyncRunningEvent
-from .sync_status_envelope import SyncStatusEnvelope
-from .sync_status_response import SyncStatusResponse
-from .target import Target
 from .target_create_input import TargetCreateInput
-from .target_field import TargetField
-from .target_object import TargetObject
-from .target_response import TargetResponse
-from .target_response_envelope import TargetResponseEnvelope
-from .update_bulk_field import UpdateBulkField
-from .user import User
-from .user_envelope import UserEnvelope
 from .util_enum_value import UtilEnumValue
+from .util_execution_status import UtilExecutionStatus
 from .util_field_type import UtilFieldType
-from .v_2_connection_form import V2ConnectionForm
-from .v_2_enricher_configuration import V2EnricherConfiguration
-from .v_2_enricher_mapping import V2EnricherMapping
-from .v_2_execution_log_type import V2ExecutionLogType
-from .v_2_get_enrichment_input_fields_response_envelope import V2GetEnrichmentInputFieldsResponseEnvelope
-from .v_2_ordered_map_string_github_com_invopop_jsonschema_schema import (
+from .v2activate_sync_envelope import V2ActivateSyncEnvelope
+from .v2activate_sync_input import V2ActivateSyncInput
+from .v2activate_sync_output import V2ActivateSyncOutput
+from .v2api_key_response import V2ApiKeyResponse
+from .v2api_key_response_envelope import V2ApiKeyResponseEnvelope
+from .v2bulk_filter import V2BulkFilter
+from .v2bulk_sync_dest import V2BulkSyncDest
+from .v2bulk_sync_dest_envelope import V2BulkSyncDestEnvelope
+from .v2bulk_sync_list_envelope import V2BulkSyncListEnvelope
+from .v2bulk_sync_response import V2BulkSyncResponse
+from .v2configuration_value import V2ConfigurationValue
+from .v2connection_form import V2ConnectionForm
+from .v2connection_list_response_envelope import V2ConnectionListResponseEnvelope
+from .v2connection_meta import V2ConnectionMeta
+from .v2connection_meta_response import V2ConnectionMetaResponse
+from .v2connection_parameter_value import V2ConnectionParameterValue
+from .v2connection_parameter_values_resp import V2ConnectionParameterValuesResp
+from .v2connection_parameter_values_response_envelope import V2ConnectionParameterValuesResponseEnvelope
+from .v2connection_response_envelope import V2ConnectionResponseEnvelope
+from .v2connection_response_schema import V2ConnectionResponseSchema
+from .v2connection_type import V2ConnectionType
+from .v2connection_type_response_envelope import V2ConnectionTypeResponseEnvelope
+from .v2connection_type_schema import V2ConnectionTypeSchema
+from .v2create_connection_response_envelope import V2CreateConnectionResponseEnvelope
+from .v2create_connection_response_schema import V2CreateConnectionResponseSchema
+from .v2create_model_request import V2CreateModelRequest
+from .v2enricher_configuration import V2EnricherConfiguration
+from .v2enricher_mapping import V2EnricherMapping
+from .v2enrichment import V2Enrichment
+from .v2event import V2Event
+from .v2event_payload import V2EventPayload
+from .v2event_types_envelope import V2EventTypesEnvelope
+from .v2events_envelope import V2EventsEnvelope
+from .v2execution_counts import V2ExecutionCounts
+from .v2execution_log_response import V2ExecutionLogResponse
+from .v2execution_log_type import V2ExecutionLogType
+from .v2execution_logs_response_envelope import V2ExecutionLogsResponseEnvelope
+from .v2field_configuration import V2FieldConfiguration
+from .v2filter import V2Filter
+from .v2get_connection_meta_envelope import V2GetConnectionMetaEnvelope
+from .v2get_enrichment_input_fields_response_envelope import V2GetEnrichmentInputFieldsResponseEnvelope
+from .v2get_execution_response_envelope import V2GetExecutionResponseEnvelope
+from .v2get_execution_response_schema import V2GetExecutionResponseSchema
+from .v2get_identity_response_envelope import V2GetIdentityResponseEnvelope
+from .v2get_identity_response_schema import V2GetIdentityResponseSchema
+from .v2identity import V2Identity
+from .v2identity_function import V2IdentityFunction
+from .v2job_response import V2JobResponse
+from .v2job_response_envelope import V2JobResponseEnvelope
+from .v2list_execution_response_envelope import V2ListExecutionResponseEnvelope
+from .v2list_policies_response_envelope import V2ListPoliciesResponseEnvelope
+from .v2list_users_envelope import V2ListUsersEnvelope
+from .v2mode import V2Mode
+from .v2model_field import V2ModelField
+from .v2model_field_response import V2ModelFieldResponse
+from .v2model_list_response_envelope import V2ModelListResponseEnvelope
+from .v2model_response import V2ModelResponse
+from .v2model_response_envelope import V2ModelResponseEnvelope
+from .v2model_sample import V2ModelSample
+from .v2model_sample_response_envelope import V2ModelSampleResponseEnvelope
+from .v2ordered_map_string_github_com_invopop_jsonschema_schema import (
     V2OrderedMapStringGithubComInvopopJsonschemaSchema,
 )
-from .v_2_sample_record import V2SampleRecord
-from .v_2_schema_configuration_fields_item import V2SchemaConfigurationFieldsItem
-from .v_4_bulk_sync_execution_logs import V4BulkSyncExecutionLogs
-from .v_4_bulk_sync_execution_logs_envelope import V4BulkSyncExecutionLogsEnvelope
-from .v_4_bulk_sync_schedule_api import V4BulkSyncScheduleApi
-from .v_4_export_sync_logs_envelope import V4ExportSyncLogsEnvelope
-from .v_4_export_sync_logs_response import V4ExportSyncLogsResponse
-from .v_4_global_error_subscribers_response import V4GlobalErrorSubscribersResponse
-from .v_4_query_results_envelope import V4QueryResultsEnvelope
-from .v_4_run_query_envelope import V4RunQueryEnvelope
-from .v_4_run_query_result import V4RunQueryResult
-from .v_4_target_creator import V4TargetCreator
-from .v_4_target_objects_response_envelope import V4TargetObjectsResponseEnvelope
-from .v_4_target_property_values import V4TargetPropertyValues
-from .v_4_target_property_values_envelope import V4TargetPropertyValuesEnvelope
-from .v_4_user_field_request import V4UserFieldRequest
-from .webhook import Webhook
-from .webhook_envelope import WebhookEnvelope
-from .webhook_list_envelope import WebhookListEnvelope
+from .v2organization import V2Organization
+from .v2organization_envelope import V2OrganizationEnvelope
+from .v2organizations_envelope import V2OrganizationsEnvelope
+from .v2override import V2Override
+from .v2pagination_details import V2PaginationDetails
+from .v2policy_action import V2PolicyAction
+from .v2policy_response import V2PolicyResponse
+from .v2policy_response_envelope import V2PolicyResponseEnvelope
+from .v2relation import V2Relation
+from .v2relation_to import V2RelationTo
+from .v2role_list_response_envelope import V2RoleListResponseEnvelope
+from .v2role_response import V2RoleResponse
+from .v2role_response_envelope import V2RoleResponseEnvelope
+from .v2run_after import V2RunAfter
+from .v2sample_record import V2SampleRecord
+from .v2schedule import V2Schedule
+from .v2schedule_option_response import V2ScheduleOptionResponse
+from .v2schedule_option_response_envelope import V2ScheduleOptionResponseEnvelope
+from .v2schema_configuration import V2SchemaConfiguration
+from .v2schema_configuration_fields_item import V2SchemaConfigurationFieldsItem
+from .v2source import V2Source
+from .v2start_sync_response_envelope import V2StartSyncResponseEnvelope
+from .v2start_sync_response_schema import V2StartSyncResponseSchema
+from .v2supported_bulk_mode import V2SupportedBulkMode
+from .v2sync_field import V2SyncField
+from .v2sync_response import V2SyncResponse
+from .v2sync_response_envelope import V2SyncResponseEnvelope
+from .v2sync_status_envelope import V2SyncStatusEnvelope
+from .v2sync_status_response import V2SyncStatusResponse
+from .v2target import V2Target
+from .v2target_field import V2TargetField
+from .v2target_response import V2TargetResponse
+from .v2target_response_envelope import V2TargetResponseEnvelope
+from .v2user import V2User
+from .v2user_envelope import V2UserEnvelope
+from .v2webhook import V2Webhook
+from .v2webhook_envelope import V2WebhookEnvelope
+from .v2webhook_list_envelope import V2WebhookListEnvelope
+from .v3bulk_fetch_mode import V3BulkFetchMode
+from .v3bulk_field import V3BulkField
+from .v3bulk_filter import V3BulkFilter
+from .v3bulk_schema import V3BulkSchema
+from .v3bulk_schema_envelope import V3BulkSchemaEnvelope
+from .v3bulk_sync_execution import V3BulkSyncExecution
+from .v3bulk_sync_execution_envelope import V3BulkSyncExecutionEnvelope
+from .v3bulk_sync_schema_execution import V3BulkSyncSchemaExecution
+from .v3bulk_sync_source import V3BulkSyncSource
+from .v3bulk_sync_source_envelope import V3BulkSyncSourceEnvelope
+from .v3bulk_sync_source_schema_envelope import V3BulkSyncSourceSchemaEnvelope
+from .v3bulk_sync_source_status import V3BulkSyncSourceStatus
+from .v3bulk_sync_source_status_envelope import V3BulkSyncSourceStatusEnvelope
+from .v3bulk_sync_status_envelope import V3BulkSyncStatusEnvelope
+from .v3bulk_sync_status_response import V3BulkSyncStatusResponse
+from .v3connect_card_response import V3ConnectCardResponse
+from .v3connect_card_response_envelope import V3ConnectCardResponseEnvelope
+from .v3list_bulk_schema_envelope import V3ListBulkSchemaEnvelope
+from .v3list_bulk_sync_executions_envelope import V3ListBulkSyncExecutionsEnvelope
+from .v3pagination_details import V3PaginationDetails
+from .v3pick_value import V3PickValue
+from .v3schema import V3Schema
+from .v3schema_field import V3SchemaField
+from .v3schema_records_response_envelope import V3SchemaRecordsResponseEnvelope
+from .v3update_bulk_field import V3UpdateBulkField
+from .v4bulk_sync_execution_logs import V4BulkSyncExecutionLogs
+from .v4bulk_sync_execution_logs_envelope import V4BulkSyncExecutionLogsEnvelope
+from .v4bulk_sync_execution_status import V4BulkSyncExecutionStatus
+from .v4bulk_sync_schedule_api import V4BulkSyncScheduleApi
+from .v4bulk_sync_schema_execution_status import V4BulkSyncSchemaExecutionStatus
+from .v4configuration_value import V4ConfigurationValue
+from .v4export_sync_logs_envelope import V4ExportSyncLogsEnvelope
+from .v4export_sync_logs_response import V4ExportSyncLogsResponse
+from .v4get_sync_source_meta_envelope import V4GetSyncSourceMetaEnvelope
+from .v4global_error_subscribers_response import V4GlobalErrorSubscribersResponse
+from .v4list_bulk_sync_executions_status_envelope import V4ListBulkSyncExecutionsStatusEnvelope
+from .v4query_results_envelope import V4QueryResultsEnvelope
+from .v4run_query_envelope import V4RunQueryEnvelope
+from .v4run_query_pagination import V4RunQueryPagination
+from .v4run_query_result import V4RunQueryResult
+from .v4schedule_envelope import V4ScheduleEnvelope
+from .v4schedules_envelope import V4SchedulesEnvelope
+from .v4source_meta import V4SourceMeta
+from .v4supported_mode import V4SupportedMode
+from .v4sync_source_meta_response import V4SyncSourceMetaResponse
+from .v4target_creator import V4TargetCreator
+from .v4target_object import V4TargetObject
+from .v4target_objects_response_envelope import V4TargetObjectsResponseEnvelope
+from .v4target_property_values import V4TargetPropertyValues
+from .v4target_property_values_envelope import V4TargetPropertyValuesEnvelope
+from .v4user_field_request import V4UserFieldRequest
+from .v5bulk_sync_response import V5BulkSyncResponse
+from .v5bulk_sync_response_envelope import V5BulkSyncResponseEnvelope
+from .v5bulk_sync_schedule_request import V5BulkSyncScheduleRequest
+from .v5bulk_sync_schedule_response import V5BulkSyncScheduleResponse
+from .v5list_sync_item import V5ListSyncItem
+from .v5list_sync_response_envelope import V5ListSyncResponseEnvelope
+from .v5pagination_details import V5PaginationDetails
+from .v5run_after import V5RunAfter
+from .v5schedule import V5Schedule
 from .work_task_status import WorkTaskStatus
 
 __all__ = [
-    "ActivateSyncEnvelope",
-    "ActivateSyncInput",
-    "ActivateSyncOutput",
     "ApiError",
-    "ApiKeyResponse",
-    "ApiKeyResponseEnvelope",
     "BackendConnectionCapabilities",
     "BackendOAuthPrompt",
     "BulkBulkSyncSchedule",
     "BulkDiscover",
     "BulkExecutionStatus",
-    "BulkFetchMode",
-    "BulkField",
-    "BulkFilter",
     "BulkItemizedSchedule",
     "BulkMultiScheduleConfiguration",
     "BulkNormalizeNames",
     "BulkSchedule",
-    "BulkSchema",
-    "BulkSchemaEnvelope",
     "BulkSchemaExecutionStatus",
     "BulkSelectiveMode",
-    "BulkSyncCanceledEvent",
-    "BulkSyncCompletedEvent",
-    "BulkSyncCompletedWithErrorEvent",
-    "BulkSyncDest",
-    "BulkSyncDestEnvelope",
-    "BulkSyncExecution",
-    "BulkSyncExecutionEnvelope",
-    "BulkSyncExecutionStatus",
-    "BulkSyncFailedEvent",
-    "BulkSyncListEnvelope",
-    "BulkSyncMode",
-    "BulkSyncResponse",
-    "BulkSyncResponseEnvelope",
-    "BulkSyncRunningEvent",
-    "BulkSyncSchemaExecution",
-    "BulkSyncSchemaExecutionStatus",
-    "BulkSyncSource",
-    "BulkSyncSourceEnvelope",
-    "BulkSyncSourceSchemaEnvelope",
-    "BulkSyncSourceStatus",
-    "BulkSyncSourceStatusEnvelope",
-    "BulkSyncStatusEnvelope",
-    "BulkSyncStatusResponse",
-    "CancelModelSyncResponse",
-    "CancelModelSyncResponseEnvelope",
+    "BulkSyncTargetMode",
     "CommonOutputActor",
-    "ConfigurationValue",
-    "ConnectCardResponse",
-    "ConnectCardResponseEnvelope",
-    "ConnectionListResponseEnvelope",
-    "ConnectionMeta",
-    "ConnectionMetaResponse",
-    "ConnectionParameterValue",
-    "ConnectionParameterValuesResp",
-    "ConnectionParameterValuesResponseEnvelope",
-    "ConnectionResponseEnvelope",
-    "ConnectionResponseSchema",
-    "ConnectionType",
-    "ConnectionTypeResponseEnvelope",
-    "ConnectionTypeSchema",
-    "CreateConnectionResponseEnvelope",
-    "CreateConnectionResponseSchema",
-    "CreateModelRequest",
-    "Enrichment",
-    "Event",
-    "EventBody",
-    "EventTypesEnvelope",
-    "EventsEnvelope",
-    "ExecutionCounts",
-    "ExecutionLogResponse",
-    "ExecutionLogsResponseEnvelope",
-    "ExecutionStatus",
-    "FieldConfiguration",
-    "Filter",
+    "EventingBulkSyncCanceledEvent",
+    "EventingBulkSyncCompletedEvent",
+    "EventingBulkSyncCompletedWithErrorEvent",
+    "EventingBulkSyncFailedEvent",
+    "EventingBulkSyncRunningEvent",
+    "EventingSyncCanceledEvent",
+    "EventingSyncCompletedEvent",
+    "EventingSyncCompletedWithErrorsEvent",
+    "EventingSyncFailedEvent",
+    "EventingSyncRunningEvent",
     "FilterFieldReferenceType",
     "FilterFunction",
-    "GetConnectionMetaEnvelope",
-    "GetExecutionResponseEnvelope",
-    "GetExecutionResponseSchema",
-    "GetIdentityResponseEnvelope",
-    "GetIdentityResponseSchema",
-    "GetModelSyncSourceMetaEnvelope",
-    "Identity",
-    "IdentityFunction",
-    "JobResponse",
-    "JobResponseEnvelope",
     "JsonschemaDefinitions",
     "JsonschemaForm",
     "JsonschemaSchema",
     "LabelLabel",
-    "ListBulkSchema",
-    "ListBulkSyncExecutionStatusEnvelope",
-    "ListBulkSyncExecutionsEnvelope",
-    "ListExecutionResponseEnvelope",
-    "ListModelSyncResponseEnvelope",
-    "ListPoliciesResponseEnvelope",
-    "ListUsersEnvelope",
-    "Mode",
-    "ModelField",
-    "ModelFieldResponse",
-    "ModelListResponseEnvelope",
     "ModelModelFieldRequest",
     "ModelRelation",
     "ModelRelationTo",
-    "ModelResponse",
-    "ModelResponseEnvelope",
-    "ModelSample",
-    "ModelSampleResponseEnvelope",
-    "ModelSyncField",
-    "ModelSyncMode",
-    "ModelSyncResponse",
-    "ModelSyncResponseEnvelope",
-    "ModelSyncSourceMetaResponse",
-    "Organization",
-    "OrganizationEnvelope",
-    "OrganizationsEnvelope",
-    "Override",
-    "Pagination",
-    "PaginationDetails",
-    "PickValue",
-    "PolicyAction",
-    "PolicyResponse",
-    "PolicyResponseEnvelope",
-    "Relation",
-    "RelationTo",
+    "ModelsyncSyncTargetMode",
     "RestErrResponse",
-    "RoleListResponseEnvelope",
-    "RoleResponse",
-    "RoleResponseEnvelope",
-    "RunAfter",
-    "Schedule",
-    "ScheduleEnvelope",
     "ScheduleFrequency",
-    "ScheduleOptionResponse",
-    "ScheduleOptionResponseEnvelope",
     "ScheduleScheduleOption",
-    "SchedulesEnvelope",
-    "Schema",
     "SchemaAssociation",
-    "SchemaConfiguration",
-    "SchemaField",
     "SchemaIdentityFunction",
     "SchemaPrimaryKeyOverrideInput",
-    "SchemaRecordsResponseEnvelope",
-    "Source",
-    "SourceMeta",
-    "StartModelSyncResponseEnvelope",
-    "StartModelSyncResponseSchema",
-    "SupportedBulkMode",
-    "SupportedMode",
-    "SyncCanceledEvent",
-    "SyncCompletedEvent",
-    "SyncCompletedWithErrorsEvent",
     "SyncDestinationProperties",
-    "SyncFailedEvent",
-    "SyncRunningEvent",
-    "SyncStatusEnvelope",
-    "SyncStatusResponse",
-    "Target",
     "TargetCreateInput",
-    "TargetField",
-    "TargetObject",
-    "TargetResponse",
-    "TargetResponseEnvelope",
     "TypesType",
-    "UpdateBulkField",
-    "User",
-    "UserEnvelope",
     "UtilEnumValue",
+    "UtilExecutionStatus",
     "UtilFieldType",
+    "V2ActivateSyncEnvelope",
+    "V2ActivateSyncInput",
+    "V2ActivateSyncOutput",
+    "V2ApiKeyResponse",
+    "V2ApiKeyResponseEnvelope",
+    "V2BulkFilter",
+    "V2BulkSyncDest",
+    "V2BulkSyncDestEnvelope",
+    "V2BulkSyncListEnvelope",
+    "V2BulkSyncResponse",
+    "V2ConfigurationValue",
     "V2ConnectionForm",
+    "V2ConnectionListResponseEnvelope",
+    "V2ConnectionMeta",
+    "V2ConnectionMetaResponse",
+    "V2ConnectionParameterValue",
+    "V2ConnectionParameterValuesResp",
+    "V2ConnectionParameterValuesResponseEnvelope",
+    "V2ConnectionResponseEnvelope",
+    "V2ConnectionResponseSchema",
+    "V2ConnectionType",
+    "V2ConnectionTypeResponseEnvelope",
+    "V2ConnectionTypeSchema",
+    "V2CreateConnectionResponseEnvelope",
+    "V2CreateConnectionResponseSchema",
+    "V2CreateModelRequest",
     "V2EnricherConfiguration",
     "V2EnricherMapping",
+    "V2Enrichment",
+    "V2Event",
+    "V2EventPayload",
+    "V2EventTypesEnvelope",
+    "V2EventsEnvelope",
+    "V2ExecutionCounts",
+    "V2ExecutionLogResponse",
     "V2ExecutionLogType",
+    "V2ExecutionLogsResponseEnvelope",
+    "V2FieldConfiguration",
+    "V2Filter",
+    "V2GetConnectionMetaEnvelope",
     "V2GetEnrichmentInputFieldsResponseEnvelope",
+    "V2GetExecutionResponseEnvelope",
+    "V2GetExecutionResponseSchema",
+    "V2GetIdentityResponseEnvelope",
+    "V2GetIdentityResponseSchema",
+    "V2Identity",
+    "V2IdentityFunction",
+    "V2JobResponse",
+    "V2JobResponseEnvelope",
+    "V2ListExecutionResponseEnvelope",
+    "V2ListPoliciesResponseEnvelope",
+    "V2ListUsersEnvelope",
+    "V2Mode",
+    "V2ModelField",
+    "V2ModelFieldResponse",
+    "V2ModelListResponseEnvelope",
+    "V2ModelResponse",
+    "V2ModelResponseEnvelope",
+    "V2ModelSample",
+    "V2ModelSampleResponseEnvelope",
     "V2OrderedMapStringGithubComInvopopJsonschemaSchema",
+    "V2Organization",
+    "V2OrganizationEnvelope",
+    "V2OrganizationsEnvelope",
+    "V2Override",
+    "V2PaginationDetails",
+    "V2PolicyAction",
+    "V2PolicyResponse",
+    "V2PolicyResponseEnvelope",
+    "V2Relation",
+    "V2RelationTo",
+    "V2RoleListResponseEnvelope",
+    "V2RoleResponse",
+    "V2RoleResponseEnvelope",
+    "V2RunAfter",
     "V2SampleRecord",
+    "V2Schedule",
+    "V2ScheduleOptionResponse",
+    "V2ScheduleOptionResponseEnvelope",
+    "V2SchemaConfiguration",
     "V2SchemaConfigurationFieldsItem",
+    "V2Source",
+    "V2StartSyncResponseEnvelope",
+    "V2StartSyncResponseSchema",
+    "V2SupportedBulkMode",
+    "V2SyncField",
+    "V2SyncResponse",
+    "V2SyncResponseEnvelope",
+    "V2SyncStatusEnvelope",
+    "V2SyncStatusResponse",
+    "V2Target",
+    "V2TargetField",
+    "V2TargetResponse",
+    "V2TargetResponseEnvelope",
+    "V2User",
+    "V2UserEnvelope",
+    "V2Webhook",
+    "V2WebhookEnvelope",
+    "V2WebhookListEnvelope",
+    "V3BulkFetchMode",
+    "V3BulkField",
+    "V3BulkFilter",
+    "V3BulkSchema",
+    "V3BulkSchemaEnvelope",
+    "V3BulkSyncExecution",
+    "V3BulkSyncExecutionEnvelope",
+    "V3BulkSyncSchemaExecution",
+    "V3BulkSyncSource",
+    "V3BulkSyncSourceEnvelope",
+    "V3BulkSyncSourceSchemaEnvelope",
+    "V3BulkSyncSourceStatus",
+    "V3BulkSyncSourceStatusEnvelope",
+    "V3BulkSyncStatusEnvelope",
+    "V3BulkSyncStatusResponse",
+    "V3ConnectCardResponse",
+    "V3ConnectCardResponseEnvelope",
+    "V3ListBulkSchemaEnvelope",
+    "V3ListBulkSyncExecutionsEnvelope",
+    "V3PaginationDetails",
+    "V3PickValue",
+    "V3Schema",
+    "V3SchemaField",
+    "V3SchemaRecordsResponseEnvelope",
+    "V3UpdateBulkField",
     "V4BulkSyncExecutionLogs",
     "V4BulkSyncExecutionLogsEnvelope",
+    "V4BulkSyncExecutionStatus",
     "V4BulkSyncScheduleApi",
+    "V4BulkSyncSchemaExecutionStatus",
+    "V4ConfigurationValue",
     "V4ExportSyncLogsEnvelope",
     "V4ExportSyncLogsResponse",
+    "V4GetSyncSourceMetaEnvelope",
     "V4GlobalErrorSubscribersResponse",
+    "V4ListBulkSyncExecutionsStatusEnvelope",
     "V4QueryResultsEnvelope",
     "V4RunQueryEnvelope",
+    "V4RunQueryPagination",
     "V4RunQueryResult",
+    "V4ScheduleEnvelope",
+    "V4SchedulesEnvelope",
+    "V4SourceMeta",
+    "V4SupportedMode",
+    "V4SyncSourceMetaResponse",
     "V4TargetCreator",
+    "V4TargetObject",
     "V4TargetObjectsResponseEnvelope",
     "V4TargetPropertyValues",
     "V4TargetPropertyValuesEnvelope",
     "V4UserFieldRequest",
-    "Webhook",
-    "WebhookEnvelope",
-    "WebhookListEnvelope",
+    "V5BulkSyncResponse",
+    "V5BulkSyncResponseEnvelope",
+    "V5BulkSyncScheduleRequest",
+    "V5BulkSyncScheduleResponse",
+    "V5ListSyncItem",
+    "V5ListSyncResponseEnvelope",
+    "V5PaginationDetails",
+    "V5RunAfter",
+    "V5Schedule",
     "WorkTaskStatus",
 ]
diff --git a/src/polytomic/types/bulk_fetch_mode.py b/src/polytomic/types/bulk_fetch_mode.py
deleted file mode 100644
index 42ff01e..0000000
--- a/src/polytomic/types/bulk_fetch_mode.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import typing
-
-BulkFetchMode = typing.Union[typing.Literal["none", "incremental", "full"], typing.Any]
diff --git a/src/polytomic/types/bulk_sync_dest_envelope.py b/src/polytomic/types/bulk_sync_dest_envelope.py
deleted file mode 100644
index 1c193f4..0000000
--- a/src/polytomic/types/bulk_sync_dest_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .bulk_sync_dest import BulkSyncDest
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class BulkSyncDestEnvelope(UniversalBaseModel):
-    data: typing.Optional[BulkSyncDest] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_execution_envelope.py b/src/polytomic/types/bulk_sync_execution_envelope.py
deleted file mode 100644
index 65464e0..0000000
--- a/src/polytomic/types/bulk_sync_execution_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .bulk_sync_execution import BulkSyncExecution
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class BulkSyncExecutionEnvelope(UniversalBaseModel):
-    data: typing.Optional[BulkSyncExecution] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_mode.py b/src/polytomic/types/bulk_sync_mode.py
deleted file mode 100644
index 90d42f3..0000000
--- a/src/polytomic/types/bulk_sync_mode.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import typing
-
-BulkSyncMode = typing.Union[typing.Literal["snapshot", "replicate"], typing.Any]
diff --git a/src/polytomic/types/bulk_sync_response_envelope.py b/src/polytomic/types/bulk_sync_response_envelope.py
deleted file mode 100644
index 5a9db4c..0000000
--- a/src/polytomic/types/bulk_sync_response_envelope.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-from .bulk_itemized_schedule import BulkItemizedSchedule
-from .bulk_multi_schedule_configuration import BulkMultiScheduleConfiguration
-from .bulk_schedule import BulkSchedule
-import typing
-from .bulk_sync_response import BulkSyncResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class BulkSyncResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[BulkSyncResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_source_envelope.py b/src/polytomic/types/bulk_sync_source_envelope.py
deleted file mode 100644
index 9401ad8..0000000
--- a/src/polytomic/types/bulk_sync_source_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .bulk_sync_source import BulkSyncSource
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class BulkSyncSourceEnvelope(UniversalBaseModel):
-    data: typing.Optional[BulkSyncSource] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_source_schema_envelope.py b/src/polytomic/types/bulk_sync_source_schema_envelope.py
deleted file mode 100644
index 941b8a9..0000000
--- a/src/polytomic/types/bulk_sync_source_schema_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .schema import Schema
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class BulkSyncSourceSchemaEnvelope(UniversalBaseModel):
-    data: typing.Optional[Schema] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_source_status_envelope.py b/src/polytomic/types/bulk_sync_source_status_envelope.py
deleted file mode 100644
index cfbf051..0000000
--- a/src/polytomic/types/bulk_sync_source_status_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .bulk_sync_source_status import BulkSyncSourceStatus
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class BulkSyncSourceStatusEnvelope(UniversalBaseModel):
-    data: typing.Optional[BulkSyncSourceStatus] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_status_envelope.py b/src/polytomic/types/bulk_sync_status_envelope.py
deleted file mode 100644
index 8f08427..0000000
--- a/src/polytomic/types/bulk_sync_status_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .bulk_sync_status_response import BulkSyncStatusResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class BulkSyncStatusEnvelope(UniversalBaseModel):
-    data: typing.Optional[BulkSyncStatusResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_target_mode.py b/src/polytomic/types/bulk_sync_target_mode.py
new file mode 100644
index 0000000..5b882ba
--- /dev/null
+++ b/src/polytomic/types/bulk_sync_target_mode.py
@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+BulkSyncTargetMode = typing.Union[typing.Literal["snapshot", "replicate"], typing.Any]
diff --git a/src/polytomic/types/cancel_model_sync_response_envelope.py b/src/polytomic/types/cancel_model_sync_response_envelope.py
deleted file mode 100644
index 0e32aa2..0000000
--- a/src/polytomic/types/cancel_model_sync_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .cancel_model_sync_response import CancelModelSyncResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class CancelModelSyncResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[CancelModelSyncResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/connect_card_response_envelope.py b/src/polytomic/types/connect_card_response_envelope.py
deleted file mode 100644
index 15129ac..0000000
--- a/src/polytomic/types/connect_card_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .connect_card_response import ConnectCardResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ConnectCardResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[ConnectCardResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/connection_list_response_envelope.py b/src/polytomic/types/connection_list_response_envelope.py
deleted file mode 100644
index 756361c..0000000
--- a/src/polytomic/types/connection_list_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .connection_response_schema import ConnectionResponseSchema
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ConnectionListResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[ConnectionResponseSchema]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/connection_parameter_values_response_envelope.py b/src/polytomic/types/connection_parameter_values_response_envelope.py
deleted file mode 100644
index 2668ab3..0000000
--- a/src/polytomic/types/connection_parameter_values_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .connection_parameter_values_resp import ConnectionParameterValuesResp
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ConnectionParameterValuesResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.Dict[str, typing.Optional[ConnectionParameterValuesResp]]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/connection_type_response_envelope.py b/src/polytomic/types/connection_type_response_envelope.py
deleted file mode 100644
index 2f17156..0000000
--- a/src/polytomic/types/connection_type_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .connection_type import ConnectionType
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ConnectionTypeResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[ConnectionType]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/create_connection_response_envelope.py b/src/polytomic/types/create_connection_response_envelope.py
deleted file mode 100644
index 0e944b6..0000000
--- a/src/polytomic/types/create_connection_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .create_connection_response_schema import CreateConnectionResponseSchema
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class CreateConnectionResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[CreateConnectionResponseSchema] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/event_body.py b/src/polytomic/types/event_body.py
deleted file mode 100644
index 6ea03e1..0000000
--- a/src/polytomic/types/event_body.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import typing
-from .sync_running_event import SyncRunningEvent
-from .sync_completed_event import SyncCompletedEvent
-from .sync_failed_event import SyncFailedEvent
-from .sync_canceled_event import SyncCanceledEvent
-from .sync_completed_with_errors_event import SyncCompletedWithErrorsEvent
-from .bulk_sync_running_event import BulkSyncRunningEvent
-from .bulk_sync_completed_event import BulkSyncCompletedEvent
-from .bulk_sync_canceled_event import BulkSyncCanceledEvent
-from .bulk_sync_completed_with_error_event import BulkSyncCompletedWithErrorEvent
-from .bulk_sync_failed_event import BulkSyncFailedEvent
-
-EventBody = typing.Union[
-    SyncRunningEvent,
-    SyncCompletedEvent,
-    SyncFailedEvent,
-    SyncCanceledEvent,
-    SyncCompletedWithErrorsEvent,
-    BulkSyncRunningEvent,
-    BulkSyncCompletedEvent,
-    BulkSyncCanceledEvent,
-    BulkSyncCompletedWithErrorEvent,
-    BulkSyncFailedEvent,
-]
diff --git a/src/polytomic/types/bulk_sync_running_event.py b/src/polytomic/types/eventing_bulk_sync_canceled_event.py
similarity index 93%
rename from src/polytomic/types/bulk_sync_running_event.py
rename to src/polytomic/types/eventing_bulk_sync_canceled_event.py
index adda8d7..4332070 100644
--- a/src/polytomic/types/bulk_sync_running_event.py
+++ b/src/polytomic/types/eventing_bulk_sync_canceled_event.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class BulkSyncRunningEvent(UniversalBaseModel):
+class EventingBulkSyncCanceledEvent(UniversalBaseModel):
     destination_connection_id: typing.Optional[str] = None
     execution_id: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/bulk_sync_completed_event.py b/src/polytomic/types/eventing_bulk_sync_completed_event.py
similarity index 93%
rename from src/polytomic/types/bulk_sync_completed_event.py
rename to src/polytomic/types/eventing_bulk_sync_completed_event.py
index 904f8df..c755dab 100644
--- a/src/polytomic/types/bulk_sync_completed_event.py
+++ b/src/polytomic/types/eventing_bulk_sync_completed_event.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class BulkSyncCompletedEvent(UniversalBaseModel):
+class EventingBulkSyncCompletedEvent(UniversalBaseModel):
     destination_connection_id: typing.Optional[str] = None
     execution_id: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/bulk_sync_completed_with_error_event.py b/src/polytomic/types/eventing_bulk_sync_completed_with_error_event.py
similarity index 92%
rename from src/polytomic/types/bulk_sync_completed_with_error_event.py
rename to src/polytomic/types/eventing_bulk_sync_completed_with_error_event.py
index 7b892a4..4365d46 100644
--- a/src/polytomic/types/bulk_sync_completed_with_error_event.py
+++ b/src/polytomic/types/eventing_bulk_sync_completed_with_error_event.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class BulkSyncCompletedWithErrorEvent(UniversalBaseModel):
+class EventingBulkSyncCompletedWithErrorEvent(UniversalBaseModel):
     destination_connection_id: typing.Optional[str] = None
     execution_id: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/bulk_sync_failed_event.py b/src/polytomic/types/eventing_bulk_sync_failed_event.py
similarity index 94%
rename from src/polytomic/types/bulk_sync_failed_event.py
rename to src/polytomic/types/eventing_bulk_sync_failed_event.py
index ae66b76..5f4170b 100644
--- a/src/polytomic/types/bulk_sync_failed_event.py
+++ b/src/polytomic/types/eventing_bulk_sync_failed_event.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class BulkSyncFailedEvent(UniversalBaseModel):
+class EventingBulkSyncFailedEvent(UniversalBaseModel):
     destination_connection_id: typing.Optional[str] = None
     error: typing.Optional[str] = None
     execution_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/bulk_sync_canceled_event.py b/src/polytomic/types/eventing_bulk_sync_running_event.py
similarity index 93%
rename from src/polytomic/types/bulk_sync_canceled_event.py
rename to src/polytomic/types/eventing_bulk_sync_running_event.py
index e6e4e69..c473e15 100644
--- a/src/polytomic/types/bulk_sync_canceled_event.py
+++ b/src/polytomic/types/eventing_bulk_sync_running_event.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class BulkSyncCanceledEvent(UniversalBaseModel):
+class EventingBulkSyncRunningEvent(UniversalBaseModel):
     destination_connection_id: typing.Optional[str] = None
     execution_id: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/sync_canceled_event.py b/src/polytomic/types/eventing_sync_canceled_event.py
similarity index 81%
rename from src/polytomic/types/sync_canceled_event.py
rename to src/polytomic/types/eventing_sync_canceled_event.py
index caf552e..cd2f215 100644
--- a/src/polytomic/types/sync_canceled_event.py
+++ b/src/polytomic/types/eventing_sync_canceled_event.py
@@ -2,15 +2,15 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .execution_status import ExecutionStatus
+from .util_execution_status import UtilExecutionStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class SyncCanceledEvent(UniversalBaseModel):
+class EventingSyncCanceledEvent(UniversalBaseModel):
     execution_id: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
-    status: typing.Optional[ExecutionStatus] = None
+    status: typing.Optional[UtilExecutionStatus] = None
     sync_id: typing.Optional[str] = None
     sync_name: typing.Optional[str] = None
     target_connection_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/sync_completed_event.py b/src/polytomic/types/eventing_sync_completed_event.py
similarity index 89%
rename from src/polytomic/types/sync_completed_event.py
rename to src/polytomic/types/eventing_sync_completed_event.py
index 64e935c..f60a062 100644
--- a/src/polytomic/types/sync_completed_event.py
+++ b/src/polytomic/types/eventing_sync_completed_event.py
@@ -2,12 +2,12 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .execution_status import ExecutionStatus
+from .util_execution_status import UtilExecutionStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class SyncCompletedEvent(UniversalBaseModel):
+class EventingSyncCompletedEvent(UniversalBaseModel):
     deleted_records: typing.Optional[typing.List[str]] = None
     error_count: typing.Optional[int] = None
     errored_records: typing.Optional[typing.List[str]] = None
@@ -16,7 +16,7 @@ class SyncCompletedEvent(UniversalBaseModel):
     inserted_records: typing.Optional[typing.List[str]] = None
     organization_id: typing.Optional[str] = None
     record_count: typing.Optional[int] = None
-    status: typing.Optional[ExecutionStatus] = None
+    status: typing.Optional[UtilExecutionStatus] = None
     sync_id: typing.Optional[str] = None
     sync_name: typing.Optional[str] = None
     target_connection_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/sync_completed_with_errors_event.py b/src/polytomic/types/eventing_sync_completed_with_errors_event.py
similarity index 93%
rename from src/polytomic/types/sync_completed_with_errors_event.py
rename to src/polytomic/types/eventing_sync_completed_with_errors_event.py
index ad86808..b3ce85a 100644
--- a/src/polytomic/types/sync_completed_with_errors_event.py
+++ b/src/polytomic/types/eventing_sync_completed_with_errors_event.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class SyncCompletedWithErrorsEvent(UniversalBaseModel):
+class EventingSyncCompletedWithErrorsEvent(UniversalBaseModel):
     error: typing.Optional[str] = None
     execution_id: typing.Optional[str] = None
     number_of_errors: typing.Optional[int] = None
diff --git a/src/polytomic/types/sync_failed_event.py b/src/polytomic/types/eventing_sync_failed_event.py
similarity index 93%
rename from src/polytomic/types/sync_failed_event.py
rename to src/polytomic/types/eventing_sync_failed_event.py
index c345f09..2a8d9d9 100644
--- a/src/polytomic/types/sync_failed_event.py
+++ b/src/polytomic/types/eventing_sync_failed_event.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class SyncFailedEvent(UniversalBaseModel):
+class EventingSyncFailedEvent(UniversalBaseModel):
     error: typing.Optional[str] = None
     execution_id: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/sync_running_event.py b/src/polytomic/types/eventing_sync_running_event.py
similarity index 93%
rename from src/polytomic/types/sync_running_event.py
rename to src/polytomic/types/eventing_sync_running_event.py
index a79fc2b..0d8e78f 100644
--- a/src/polytomic/types/sync_running_event.py
+++ b/src/polytomic/types/eventing_sync_running_event.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class SyncRunningEvent(UniversalBaseModel):
+class EventingSyncRunningEvent(UniversalBaseModel):
     execution_id: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
     sync_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/events_envelope.py b/src/polytomic/types/events_envelope.py
deleted file mode 100644
index b540371..0000000
--- a/src/polytomic/types/events_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .event import Event
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class EventsEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[Event]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/execution_logs_response_envelope.py b/src/polytomic/types/execution_logs_response_envelope.py
deleted file mode 100644
index 63cbcd2..0000000
--- a/src/polytomic/types/execution_logs_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .execution_log_response import ExecutionLogResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ExecutionLogsResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[ExecutionLogResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/get_connection_meta_envelope.py b/src/polytomic/types/get_connection_meta_envelope.py
deleted file mode 100644
index e387173..0000000
--- a/src/polytomic/types/get_connection_meta_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .connection_meta_response import ConnectionMetaResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class GetConnectionMetaEnvelope(UniversalBaseModel):
-    data: typing.Optional[ConnectionMetaResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/get_execution_response_envelope.py b/src/polytomic/types/get_execution_response_envelope.py
deleted file mode 100644
index 4edb7db..0000000
--- a/src/polytomic/types/get_execution_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .get_execution_response_schema import GetExecutionResponseSchema
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class GetExecutionResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[GetExecutionResponseSchema] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/get_model_sync_source_meta_envelope.py b/src/polytomic/types/get_model_sync_source_meta_envelope.py
deleted file mode 100644
index 731c14a..0000000
--- a/src/polytomic/types/get_model_sync_source_meta_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .model_sync_source_meta_response import ModelSyncSourceMetaResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class GetModelSyncSourceMetaEnvelope(UniversalBaseModel):
-    data: typing.Optional[ModelSyncSourceMetaResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/job_response_envelope.py b/src/polytomic/types/job_response_envelope.py
deleted file mode 100644
index 8097319..0000000
--- a/src/polytomic/types/job_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .job_response import JobResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class JobResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[JobResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/jsonschema_schema.py b/src/polytomic/types/jsonschema_schema.py
index cc657fb..335b46c 100644
--- a/src/polytomic/types/jsonschema_schema.py
+++ b/src/polytomic/types/jsonschema_schema.py
@@ -5,7 +5,7 @@
 import typing_extensions
 import typing
 from ..core.serialization import FieldMetadata
-from .v_2_ordered_map_string_github_com_invopop_jsonschema_schema import (
+from .v2ordered_map_string_github_com_invopop_jsonschema_schema import (
     V2OrderedMapStringGithubComInvopopJsonschemaSchema,
 )
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
diff --git a/src/polytomic/types/list_bulk_schema.py b/src/polytomic/types/list_bulk_schema.py
deleted file mode 100644
index 6a6640b..0000000
--- a/src/polytomic/types/list_bulk_schema.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .bulk_schema import BulkSchema
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ListBulkSchema(UniversalBaseModel):
-    data: typing.Optional[typing.List[BulkSchema]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/list_bulk_sync_execution_status_envelope.py b/src/polytomic/types/list_bulk_sync_execution_status_envelope.py
deleted file mode 100644
index 92d9d14..0000000
--- a/src/polytomic/types/list_bulk_sync_execution_status_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .bulk_sync_execution_status import BulkSyncExecutionStatus
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ListBulkSyncExecutionStatusEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[BulkSyncExecutionStatus]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/list_bulk_sync_executions_envelope.py b/src/polytomic/types/list_bulk_sync_executions_envelope.py
deleted file mode 100644
index a63f897..0000000
--- a/src/polytomic/types/list_bulk_sync_executions_envelope.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .bulk_sync_execution import BulkSyncExecution
-from .pagination_details import PaginationDetails
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ListBulkSyncExecutionsEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[BulkSyncExecution]] = None
-    pagination: typing.Optional[PaginationDetails] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/list_execution_response_envelope.py b/src/polytomic/types/list_execution_response_envelope.py
deleted file mode 100644
index 8705e5b..0000000
--- a/src/polytomic/types/list_execution_response_envelope.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .get_execution_response_schema import GetExecutionResponseSchema
-from .pagination_details import PaginationDetails
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ListExecutionResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[GetExecutionResponseSchema]] = None
-    pagination: typing.Optional[PaginationDetails] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/list_policies_response_envelope.py b/src/polytomic/types/list_policies_response_envelope.py
deleted file mode 100644
index 06b5313..0000000
--- a/src/polytomic/types/list_policies_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .policy_response import PolicyResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ListPoliciesResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[PolicyResponse]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/list_users_envelope.py b/src/polytomic/types/list_users_envelope.py
deleted file mode 100644
index 3f0e8e7..0000000
--- a/src/polytomic/types/list_users_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .user import User
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ListUsersEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[User]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/model_field_response.py b/src/polytomic/types/model_field_response.py
deleted file mode 100644
index 1fd1092..0000000
--- a/src/polytomic/types/model_field_response.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .model_field import ModelField
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ModelFieldResponse(UniversalBaseModel):
-    data: typing.Optional[typing.List[ModelField]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/model_list_response_envelope.py b/src/polytomic/types/model_list_response_envelope.py
deleted file mode 100644
index 67be25f..0000000
--- a/src/polytomic/types/model_list_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .model_response import ModelResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ModelListResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[ModelResponse]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/model_response_envelope.py b/src/polytomic/types/model_response_envelope.py
deleted file mode 100644
index 61df370..0000000
--- a/src/polytomic/types/model_response_envelope.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .model_response import ModelResponse
-from .job_response import JobResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ModelResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[ModelResponse] = None
-    job: typing.Optional[JobResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/model_sample_response_envelope.py b/src/polytomic/types/model_sample_response_envelope.py
deleted file mode 100644
index 1889c54..0000000
--- a/src/polytomic/types/model_sample_response_envelope.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .model_sample import ModelSample
-from .job_response import JobResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ModelSampleResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[ModelSample] = None
-    job: typing.Optional[JobResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/model_sync_response_envelope.py b/src/polytomic/types/model_sync_response_envelope.py
deleted file mode 100644
index 7b4afe2..0000000
--- a/src/polytomic/types/model_sync_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .model_sync_response import ModelSyncResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ModelSyncResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[ModelSyncResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/model_sync_mode.py b/src/polytomic/types/modelsync_sync_target_mode.py
similarity index 81%
rename from src/polytomic/types/model_sync_mode.py
rename to src/polytomic/types/modelsync_sync_target_mode.py
index 7a21004..fbd47e9 100644
--- a/src/polytomic/types/model_sync_mode.py
+++ b/src/polytomic/types/modelsync_sync_target_mode.py
@@ -2,6 +2,6 @@
 
 import typing
 
-ModelSyncMode = typing.Union[
+ModelsyncSyncTargetMode = typing.Union[
     typing.Literal["create", "update", "updateOrCreate", "replace", "append", "remove"], typing.Any
 ]
diff --git a/src/polytomic/types/organization_envelope.py b/src/polytomic/types/organization_envelope.py
deleted file mode 100644
index 11b776a..0000000
--- a/src/polytomic/types/organization_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .organization import Organization
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class OrganizationEnvelope(UniversalBaseModel):
-    data: typing.Optional[Organization] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/organizations_envelope.py b/src/polytomic/types/organizations_envelope.py
deleted file mode 100644
index 693c6e2..0000000
--- a/src/polytomic/types/organizations_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .organization import Organization
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class OrganizationsEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[Organization]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/policy_response_envelope.py b/src/polytomic/types/policy_response_envelope.py
deleted file mode 100644
index a41c20c..0000000
--- a/src/polytomic/types/policy_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .policy_response import PolicyResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class PolicyResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[PolicyResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/role_list_response_envelope.py b/src/polytomic/types/role_list_response_envelope.py
deleted file mode 100644
index 39f5468..0000000
--- a/src/polytomic/types/role_list_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .role_response import RoleResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class RoleListResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[RoleResponse]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/role_response_envelope.py b/src/polytomic/types/role_response_envelope.py
deleted file mode 100644
index fee70d7..0000000
--- a/src/polytomic/types/role_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .role_response import RoleResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class RoleResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[RoleResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/schedule_option_response_envelope.py b/src/polytomic/types/schedule_option_response_envelope.py
deleted file mode 100644
index 93f4e55..0000000
--- a/src/polytomic/types/schedule_option_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .schedule_option_response import ScheduleOptionResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class ScheduleOptionResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[ScheduleOptionResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/start_model_sync_response_envelope.py b/src/polytomic/types/start_model_sync_response_envelope.py
deleted file mode 100644
index f6b46c2..0000000
--- a/src/polytomic/types/start_model_sync_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .start_model_sync_response_schema import StartModelSyncResponseSchema
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class StartModelSyncResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[StartModelSyncResponseSchema] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/sync_status_envelope.py b/src/polytomic/types/sync_status_envelope.py
deleted file mode 100644
index 2e6ca0a..0000000
--- a/src/polytomic/types/sync_status_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .sync_status_response import SyncStatusResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class SyncStatusEnvelope(UniversalBaseModel):
-    data: typing.Optional[SyncStatusResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/target_response_envelope.py b/src/polytomic/types/target_response_envelope.py
deleted file mode 100644
index c5659f6..0000000
--- a/src/polytomic/types/target_response_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .target_response import TargetResponse
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class TargetResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[TargetResponse] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/user_envelope.py b/src/polytomic/types/user_envelope.py
deleted file mode 100644
index ace238e..0000000
--- a/src/polytomic/types/user_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .user import User
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class UserEnvelope(UniversalBaseModel):
-    data: typing.Optional[User] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/execution_status.py b/src/polytomic/types/util_execution_status.py
similarity index 90%
rename from src/polytomic/types/execution_status.py
rename to src/polytomic/types/util_execution_status.py
index fb7f6f5..630ad17 100644
--- a/src/polytomic/types/execution_status.py
+++ b/src/polytomic/types/util_execution_status.py
@@ -2,7 +2,7 @@
 
 import typing
 
-ExecutionStatus = typing.Union[
+UtilExecutionStatus = typing.Union[
     typing.Literal[
         "created",
         "scheduled",
diff --git a/src/polytomic/types/v2activate_sync_envelope.py b/src/polytomic/types/v2activate_sync_envelope.py
new file mode 100644
index 0000000..f86821d
--- /dev/null
+++ b/src/polytomic/types/v2activate_sync_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2activate_sync_output import V2ActivateSyncOutput
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ActivateSyncEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2ActivateSyncOutput] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/activate_sync_input.py b/src/polytomic/types/v2activate_sync_input.py
similarity index 91%
rename from src/polytomic/types/activate_sync_input.py
rename to src/polytomic/types/v2activate_sync_input.py
index 3508640..2e73945 100644
--- a/src/polytomic/types/activate_sync_input.py
+++ b/src/polytomic/types/v2activate_sync_input.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class ActivateSyncInput(UniversalBaseModel):
+class V2ActivateSyncInput(UniversalBaseModel):
     active: bool
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/activate_sync_output.py b/src/polytomic/types/v2activate_sync_output.py
similarity index 92%
rename from src/polytomic/types/activate_sync_output.py
rename to src/polytomic/types/v2activate_sync_output.py
index bceaf9d..7f1db79 100644
--- a/src/polytomic/types/activate_sync_output.py
+++ b/src/polytomic/types/v2activate_sync_output.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class ActivateSyncOutput(UniversalBaseModel):
+class V2ActivateSyncOutput(UniversalBaseModel):
     active: typing.Optional[bool] = None
     id: typing.Optional[str] = None
 
diff --git a/src/polytomic/types/api_key_response.py b/src/polytomic/types/v2api_key_response.py
similarity index 92%
rename from src/polytomic/types/api_key_response.py
rename to src/polytomic/types/v2api_key_response.py
index a8c634e..0353a6a 100644
--- a/src/polytomic/types/api_key_response.py
+++ b/src/polytomic/types/v2api_key_response.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class ApiKeyResponse(UniversalBaseModel):
+class V2ApiKeyResponse(UniversalBaseModel):
     value: typing.Optional[str] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/v2api_key_response_envelope.py b/src/polytomic/types/v2api_key_response_envelope.py
new file mode 100644
index 0000000..f8b3533
--- /dev/null
+++ b/src/polytomic/types/v2api_key_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2api_key_response import V2ApiKeyResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ApiKeyResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2ApiKeyResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_filter.py b/src/polytomic/types/v2bulk_filter.py
similarity index 94%
rename from src/polytomic/types/bulk_filter.py
rename to src/polytomic/types/v2bulk_filter.py
index 7651644..4321011 100644
--- a/src/polytomic/types/bulk_filter.py
+++ b/src/polytomic/types/v2bulk_filter.py
@@ -7,7 +7,7 @@
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class BulkFilter(UniversalBaseModel):
+class V2BulkFilter(UniversalBaseModel):
     field_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     Schema field ID to filter on.
diff --git a/src/polytomic/types/bulk_sync_dest.py b/src/polytomic/types/v2bulk_sync_dest.py
similarity index 78%
rename from src/polytomic/types/bulk_sync_dest.py
rename to src/polytomic/types/v2bulk_sync_dest.py
index 2a9540e..e60be52 100644
--- a/src/polytomic/types/bulk_sync_dest.py
+++ b/src/polytomic/types/v2bulk_sync_dest.py
@@ -2,14 +2,14 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .supported_bulk_mode import SupportedBulkMode
+from .v2supported_bulk_mode import V2SupportedBulkMode
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class BulkSyncDest(UniversalBaseModel):
+class V2BulkSyncDest(UniversalBaseModel):
     configuration: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
-    modes: typing.Optional[typing.List[SupportedBulkMode]] = None
+    modes: typing.Optional[typing.List[V2SupportedBulkMode]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/api_key_response_envelope.py b/src/polytomic/types/v2bulk_sync_dest_envelope.py
similarity index 77%
rename from src/polytomic/types/api_key_response_envelope.py
rename to src/polytomic/types/v2bulk_sync_dest_envelope.py
index e4c0d18..a83e9eb 100644
--- a/src/polytomic/types/api_key_response_envelope.py
+++ b/src/polytomic/types/v2bulk_sync_dest_envelope.py
@@ -2,13 +2,13 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .api_key_response import ApiKeyResponse
+from .v2bulk_sync_dest import V2BulkSyncDest
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ApiKeyResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[ApiKeyResponse] = None
+class V2BulkSyncDestEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2BulkSyncDest] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/bulk_sync_list_envelope.py b/src/polytomic/types/v2bulk_sync_list_envelope.py
similarity index 80%
rename from src/polytomic/types/bulk_sync_list_envelope.py
rename to src/polytomic/types/v2bulk_sync_list_envelope.py
index 4fb285b..53f781c 100644
--- a/src/polytomic/types/bulk_sync_list_envelope.py
+++ b/src/polytomic/types/v2bulk_sync_list_envelope.py
@@ -5,13 +5,13 @@
 from .bulk_multi_schedule_configuration import BulkMultiScheduleConfiguration
 from .bulk_schedule import BulkSchedule
 import typing
-from .bulk_sync_response import BulkSyncResponse
+from .v2bulk_sync_response import V2BulkSyncResponse
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class BulkSyncListEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[BulkSyncResponse]] = None
+class V2BulkSyncListEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2BulkSyncResponse]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/bulk_sync_response.py b/src/polytomic/types/v2bulk_sync_response.py
similarity index 94%
rename from src/polytomic/types/bulk_sync_response.py
rename to src/polytomic/types/v2bulk_sync_response.py
index 1331e4e..3c4fe79 100644
--- a/src/polytomic/types/bulk_sync_response.py
+++ b/src/polytomic/types/v2bulk_sync_response.py
@@ -9,12 +9,12 @@
 import pydantic
 import datetime as dt
 from .common_output_actor import CommonOutputActor
-from .bulk_sync_mode import BulkSyncMode
+from .bulk_sync_target_mode import BulkSyncTargetMode
 from .bulk_normalize_names import BulkNormalizeNames
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class BulkSyncResponse(UniversalBaseModel):
+class V2BulkSyncResponse(UniversalBaseModel):
     active: typing.Optional[bool] = None
     automatically_add_new_fields: typing.Optional[BulkDiscover] = None
     automatically_add_new_objects: typing.Optional[BulkDiscover] = None
@@ -41,7 +41,7 @@ class BulkSyncResponse(UniversalBaseModel):
     """
 
     id: typing.Optional[str] = None
-    mode: typing.Optional[BulkSyncMode] = None
+    mode: typing.Optional[BulkSyncTargetMode] = None
     name: typing.Optional[str] = pydantic.Field(default=None)
     """
     Name of the bulk sync
diff --git a/src/polytomic/types/configuration_value.py b/src/polytomic/types/v2configuration_value.py
similarity index 92%
rename from src/polytomic/types/configuration_value.py
rename to src/polytomic/types/v2configuration_value.py
index 02e7209..d23ecb3 100644
--- a/src/polytomic/types/configuration_value.py
+++ b/src/polytomic/types/v2configuration_value.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class ConfigurationValue(UniversalBaseModel):
+class V2ConfigurationValue(UniversalBaseModel):
     items: typing.Optional[typing.List[typing.Optional[typing.Any]]] = None
     type: typing.Optional[str] = None
 
diff --git a/src/polytomic/types/v_2_connection_form.py b/src/polytomic/types/v2connection_form.py
similarity index 100%
rename from src/polytomic/types/v_2_connection_form.py
rename to src/polytomic/types/v2connection_form.py
diff --git a/src/polytomic/types/v2connection_list_response_envelope.py b/src/polytomic/types/v2connection_list_response_envelope.py
new file mode 100644
index 0000000..f9840f6
--- /dev/null
+++ b/src/polytomic/types/v2connection_list_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2connection_response_schema import V2ConnectionResponseSchema
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ConnectionListResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2ConnectionResponseSchema]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/connection_meta.py b/src/polytomic/types/v2connection_meta.py
similarity index 93%
rename from src/polytomic/types/connection_meta.py
rename to src/polytomic/types/v2connection_meta.py
index 67f1eca..5520066 100644
--- a/src/polytomic/types/connection_meta.py
+++ b/src/polytomic/types/v2connection_meta.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class ConnectionMeta(UniversalBaseModel):
+class V2ConnectionMeta(UniversalBaseModel):
     has_items: typing.Optional[bool] = None
     items: typing.Optional[typing.List[typing.Optional[typing.Any]]] = None
     requires_one_of: typing.Optional[typing.List[str]] = None
diff --git a/src/polytomic/types/model_sync_source_meta_response.py b/src/polytomic/types/v2connection_meta_response.py
similarity index 63%
rename from src/polytomic/types/model_sync_source_meta_response.py
rename to src/polytomic/types/v2connection_meta_response.py
index 552befd..b72bda6 100644
--- a/src/polytomic/types/model_sync_source_meta_response.py
+++ b/src/polytomic/types/v2connection_meta_response.py
@@ -2,15 +2,15 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .configuration_value import ConfigurationValue
-from .source_meta import SourceMeta
+from .v2configuration_value import V2ConfigurationValue
+from .v2connection_meta import V2ConnectionMeta
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ModelSyncSourceMetaResponse(UniversalBaseModel):
-    configuration: typing.Optional[typing.Dict[str, ConfigurationValue]] = None
-    items: typing.Optional[typing.Dict[str, typing.Optional[SourceMeta]]] = None
+class V2ConnectionMetaResponse(UniversalBaseModel):
+    configuration: typing.Optional[typing.Dict[str, V2ConfigurationValue]] = None
+    items: typing.Optional[typing.Dict[str, typing.Optional[V2ConnectionMeta]]] = None
     requires_one_of: typing.Optional[typing.List[str]] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/connection_parameter_value.py b/src/polytomic/types/v2connection_parameter_value.py
similarity index 91%
rename from src/polytomic/types/connection_parameter_value.py
rename to src/polytomic/types/v2connection_parameter_value.py
index c93bcc0..77c9213 100644
--- a/src/polytomic/types/connection_parameter_value.py
+++ b/src/polytomic/types/v2connection_parameter_value.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class ConnectionParameterValue(UniversalBaseModel):
+class V2ConnectionParameterValue(UniversalBaseModel):
     label: typing.Optional[str] = None
     value: typing.Optional[typing.Optional[typing.Any]] = None
 
diff --git a/src/polytomic/types/connection_parameter_values_resp.py b/src/polytomic/types/v2connection_parameter_values_resp.py
similarity index 72%
rename from src/polytomic/types/connection_parameter_values_resp.py
rename to src/polytomic/types/v2connection_parameter_values_resp.py
index a400205..f9b5d94 100644
--- a/src/polytomic/types/connection_parameter_values_resp.py
+++ b/src/polytomic/types/v2connection_parameter_values_resp.py
@@ -2,14 +2,14 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .connection_parameter_value import ConnectionParameterValue
+from .v2connection_parameter_value import V2ConnectionParameterValue
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ConnectionParameterValuesResp(UniversalBaseModel):
+class V2ConnectionParameterValuesResp(UniversalBaseModel):
     allows_creation: typing.Optional[bool] = None
-    values: typing.Optional[typing.List[ConnectionParameterValue]] = None
+    values: typing.Optional[typing.List[V2ConnectionParameterValue]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/v2connection_parameter_values_response_envelope.py b/src/polytomic/types/v2connection_parameter_values_response_envelope.py
new file mode 100644
index 0000000..04bf228
--- /dev/null
+++ b/src/polytomic/types/v2connection_parameter_values_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2connection_parameter_values_resp import V2ConnectionParameterValuesResp
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ConnectionParameterValuesResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.Dict[str, typing.Optional[V2ConnectionParameterValuesResp]]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v2connection_response_envelope.py b/src/polytomic/types/v2connection_response_envelope.py
new file mode 100644
index 0000000..4b99a21
--- /dev/null
+++ b/src/polytomic/types/v2connection_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2connection_response_schema import V2ConnectionResponseSchema
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ConnectionResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2ConnectionResponseSchema] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/connection_response_schema.py b/src/polytomic/types/v2connection_response_schema.py
similarity index 75%
rename from src/polytomic/types/connection_response_schema.py
rename to src/polytomic/types/v2connection_response_schema.py
index cf08ff0..831c532 100644
--- a/src/polytomic/types/connection_response_schema.py
+++ b/src/polytomic/types/v2connection_response_schema.py
@@ -1,16 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from ..core.pydantic_utilities import UniversalBaseModel
+import typing_extensions
 import typing
+from ..core.serialization import FieldMetadata
 import pydantic
 import datetime as dt
 from .common_output_actor import CommonOutputActor
-from .connection_type_schema import ConnectionTypeSchema
+from .v2connection_type_schema import V2ConnectionTypeSchema
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class ConnectionResponseSchema(UniversalBaseModel):
-    api_calls_last_24_hours: typing.Optional[int] = pydantic.Field(default=None)
+class V2ConnectionResponseSchema(UniversalBaseModel):
+    api_calls_last24hours: typing_extensions.Annotated[
+        typing.Optional[int], FieldMetadata(alias="api_calls_last_24_hours")
+    ] = pydantic.Field(default=None)
     """
     API calls made to service in the last 24h (supported integrations only).
     """
@@ -25,7 +29,7 @@ class ConnectionResponseSchema(UniversalBaseModel):
     saved: typing.Optional[bool] = None
     status: typing.Optional[str] = None
     status_error: typing.Optional[str] = None
-    type: typing.Optional[ConnectionTypeSchema] = None
+    type: typing.Optional[V2ConnectionTypeSchema] = None
     updated_at: typing.Optional[dt.datetime] = None
     updated_by: typing.Optional[CommonOutputActor] = None
 
diff --git a/src/polytomic/types/connection_type.py b/src/polytomic/types/v2connection_type.py
similarity index 94%
rename from src/polytomic/types/connection_type.py
rename to src/polytomic/types/v2connection_type.py
index fe2bd1f..a0944c1 100644
--- a/src/polytomic/types/connection_type.py
+++ b/src/polytomic/types/v2connection_type.py
@@ -4,14 +4,14 @@
 from .backend_connection_capabilities import BackendConnectionCapabilities
 import typing_extensions
 import typing
-from .v_2_connection_form import V2ConnectionForm
+from .v2connection_form import V2ConnectionForm
 from ..core.serialization import FieldMetadata
 from .backend_o_auth_prompt import BackendOAuthPrompt
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ConnectionType(UniversalBaseModel):
+class V2ConnectionType(UniversalBaseModel):
     capabilities: BackendConnectionCapabilities
     configuration_form: typing_extensions.Annotated[
         typing.Optional[V2ConnectionForm], FieldMetadata(alias="configurationForm")
diff --git a/src/polytomic/types/v2connection_type_response_envelope.py b/src/polytomic/types/v2connection_type_response_envelope.py
new file mode 100644
index 0000000..85d8f4c
--- /dev/null
+++ b/src/polytomic/types/v2connection_type_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2connection_type import V2ConnectionType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ConnectionTypeResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2ConnectionType]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/connection_type_schema.py b/src/polytomic/types/v2connection_type_schema.py
similarity index 93%
rename from src/polytomic/types/connection_type_schema.py
rename to src/polytomic/types/v2connection_type_schema.py
index ad0aa37..6d989e1 100644
--- a/src/polytomic/types/connection_type_schema.py
+++ b/src/polytomic/types/v2connection_type_schema.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class ConnectionTypeSchema(UniversalBaseModel):
+class V2ConnectionTypeSchema(UniversalBaseModel):
     id: typing.Optional[str] = None
     logo_url: typing.Optional[str] = None
     name: typing.Optional[str] = None
diff --git a/src/polytomic/types/v2create_connection_response_envelope.py b/src/polytomic/types/v2create_connection_response_envelope.py
new file mode 100644
index 0000000..eb41ed0
--- /dev/null
+++ b/src/polytomic/types/v2create_connection_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2create_connection_response_schema import V2CreateConnectionResponseSchema
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2CreateConnectionResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2CreateConnectionResponseSchema] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/create_connection_response_schema.py b/src/polytomic/types/v2create_connection_response_schema.py
similarity index 88%
rename from src/polytomic/types/create_connection_response_schema.py
rename to src/polytomic/types/v2create_connection_response_schema.py
index 7502eea..5814f54 100644
--- a/src/polytomic/types/create_connection_response_schema.py
+++ b/src/polytomic/types/v2create_connection_response_schema.py
@@ -3,11 +3,11 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 import pydantic
-from .connection_type_schema import ConnectionTypeSchema
+from .v2connection_type_schema import V2ConnectionTypeSchema
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class CreateConnectionResponseSchema(UniversalBaseModel):
+class V2CreateConnectionResponseSchema(UniversalBaseModel):
     auth_code: typing.Optional[str] = pydantic.Field(default=None)
     """
     Code to enter in order to complete connection authentication.
@@ -31,7 +31,7 @@ class CreateConnectionResponseSchema(UniversalBaseModel):
     saved: typing.Optional[bool] = None
     status: typing.Optional[str] = None
     status_error: typing.Optional[str] = None
-    type: typing.Optional[ConnectionTypeSchema] = None
+    type: typing.Optional[V2ConnectionTypeSchema] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/create_model_request.py b/src/polytomic/types/v2create_model_request.py
similarity index 89%
rename from src/polytomic/types/create_model_request.py
rename to src/polytomic/types/v2create_model_request.py
index 6c50475..bc4bc98 100644
--- a/src/polytomic/types/create_model_request.py
+++ b/src/polytomic/types/v2create_model_request.py
@@ -3,17 +3,17 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 from .model_model_field_request import ModelModelFieldRequest
-from .enrichment import Enrichment
+from .v2enrichment import V2Enrichment
 from .model_relation import ModelRelation
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class CreateModelRequest(UniversalBaseModel):
+class V2CreateModelRequest(UniversalBaseModel):
     additional_fields: typing.Optional[typing.List[ModelModelFieldRequest]] = None
     configuration: typing.Dict[str, typing.Optional[typing.Any]]
     connection_id: str
-    enricher: typing.Optional[Enrichment] = None
+    enricher: typing.Optional[V2Enrichment] = None
     fields: typing.Optional[typing.List[str]] = None
     identifier: typing.Optional[str] = None
     labels: typing.Optional[typing.List[str]] = None
diff --git a/src/polytomic/types/v_2_enricher_configuration.py b/src/polytomic/types/v2enricher_configuration.py
similarity index 100%
rename from src/polytomic/types/v_2_enricher_configuration.py
rename to src/polytomic/types/v2enricher_configuration.py
diff --git a/src/polytomic/types/v_2_enricher_mapping.py b/src/polytomic/types/v2enricher_mapping.py
similarity index 100%
rename from src/polytomic/types/v_2_enricher_mapping.py
rename to src/polytomic/types/v2enricher_mapping.py
diff --git a/src/polytomic/types/enrichment.py b/src/polytomic/types/v2enrichment.py
similarity index 75%
rename from src/polytomic/types/enrichment.py
rename to src/polytomic/types/v2enrichment.py
index 7def672..f77352d 100644
--- a/src/polytomic/types/enrichment.py
+++ b/src/polytomic/types/v2enrichment.py
@@ -2,14 +2,14 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .v_2_enricher_configuration import V2EnricherConfiguration
+from .v2enricher_configuration import V2EnricherConfiguration
 import pydantic
-from .model_field import ModelField
-from .v_2_enricher_mapping import V2EnricherMapping
+from .v2model_field import V2ModelField
+from .v2enricher_mapping import V2EnricherMapping
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class Enrichment(UniversalBaseModel):
+class V2Enrichment(UniversalBaseModel):
     configuration: typing.Optional[V2EnricherConfiguration] = None
     connection_id: typing.Optional[str] = None
     enricher_id: typing.Optional[str] = pydantic.Field(default=None)
@@ -17,7 +17,7 @@ class Enrichment(UniversalBaseModel):
     Must be provided to update an existing enrichment
     """
 
-    fields: typing.Optional[typing.List[ModelField]] = pydantic.Field(default=None)
+    fields: typing.Optional[typing.List[V2ModelField]] = pydantic.Field(default=None)
     """
     If not provided, all fields will be enabled.
     """
diff --git a/src/polytomic/types/event.py b/src/polytomic/types/v2event.py
similarity index 84%
rename from src/polytomic/types/event.py
rename to src/polytomic/types/v2event.py
index 963d107..9a0c1bb 100644
--- a/src/polytomic/types/event.py
+++ b/src/polytomic/types/v2event.py
@@ -3,14 +3,14 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 import datetime as dt
-from .event_body import EventBody
+from .v2event_payload import V2EventPayload
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class Event(UniversalBaseModel):
+class V2Event(UniversalBaseModel):
     created_at: typing.Optional[dt.datetime] = None
-    event: typing.Optional[EventBody] = None
+    event: typing.Optional[V2EventPayload] = None
     id: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
     type: typing.Optional[str] = None
diff --git a/src/polytomic/types/v2event_payload.py b/src/polytomic/types/v2event_payload.py
new file mode 100644
index 0000000..674ce1c
--- /dev/null
+++ b/src/polytomic/types/v2event_payload.py
@@ -0,0 +1,26 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+from .eventing_sync_running_event import EventingSyncRunningEvent
+from .eventing_sync_completed_event import EventingSyncCompletedEvent
+from .eventing_sync_failed_event import EventingSyncFailedEvent
+from .eventing_sync_canceled_event import EventingSyncCanceledEvent
+from .eventing_sync_completed_with_errors_event import EventingSyncCompletedWithErrorsEvent
+from .eventing_bulk_sync_running_event import EventingBulkSyncRunningEvent
+from .eventing_bulk_sync_completed_event import EventingBulkSyncCompletedEvent
+from .eventing_bulk_sync_canceled_event import EventingBulkSyncCanceledEvent
+from .eventing_bulk_sync_completed_with_error_event import EventingBulkSyncCompletedWithErrorEvent
+from .eventing_bulk_sync_failed_event import EventingBulkSyncFailedEvent
+
+V2EventPayload = typing.Union[
+    EventingSyncRunningEvent,
+    EventingSyncCompletedEvent,
+    EventingSyncFailedEvent,
+    EventingSyncCanceledEvent,
+    EventingSyncCompletedWithErrorsEvent,
+    EventingBulkSyncRunningEvent,
+    EventingBulkSyncCompletedEvent,
+    EventingBulkSyncCanceledEvent,
+    EventingBulkSyncCompletedWithErrorEvent,
+    EventingBulkSyncFailedEvent,
+]
diff --git a/src/polytomic/types/event_types_envelope.py b/src/polytomic/types/v2event_types_envelope.py
similarity index 92%
rename from src/polytomic/types/event_types_envelope.py
rename to src/polytomic/types/v2event_types_envelope.py
index 57c5088..77f3d0f 100644
--- a/src/polytomic/types/event_types_envelope.py
+++ b/src/polytomic/types/v2event_types_envelope.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class EventTypesEnvelope(UniversalBaseModel):
+class V2EventTypesEnvelope(UniversalBaseModel):
     data: typing.Optional[typing.List[str]] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/bulk_schema_envelope.py b/src/polytomic/types/v2events_envelope.py
similarity index 79%
rename from src/polytomic/types/bulk_schema_envelope.py
rename to src/polytomic/types/v2events_envelope.py
index 7c42446..adf798f 100644
--- a/src/polytomic/types/bulk_schema_envelope.py
+++ b/src/polytomic/types/v2events_envelope.py
@@ -2,13 +2,13 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .bulk_schema import BulkSchema
+from .v2event import V2Event
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class BulkSchemaEnvelope(UniversalBaseModel):
-    data: typing.Optional[BulkSchema] = None
+class V2EventsEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2Event]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/execution_counts.py b/src/polytomic/types/v2execution_counts.py
similarity index 94%
rename from src/polytomic/types/execution_counts.py
rename to src/polytomic/types/v2execution_counts.py
index efcb81f..3593a14 100644
--- a/src/polytomic/types/execution_counts.py
+++ b/src/polytomic/types/v2execution_counts.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class ExecutionCounts(UniversalBaseModel):
+class V2ExecutionCounts(UniversalBaseModel):
     delete: typing.Optional[int] = None
     error: typing.Optional[int] = None
     insert: typing.Optional[int] = None
diff --git a/src/polytomic/types/execution_log_response.py b/src/polytomic/types/v2execution_log_response.py
similarity index 92%
rename from src/polytomic/types/execution_log_response.py
rename to src/polytomic/types/v2execution_log_response.py
index bcef29e..77defd7 100644
--- a/src/polytomic/types/execution_log_response.py
+++ b/src/polytomic/types/v2execution_log_response.py
@@ -7,7 +7,7 @@
 import pydantic
 
 
-class ExecutionLogResponse(UniversalBaseModel):
+class V2ExecutionLogResponse(UniversalBaseModel):
     expires: typing.Optional[dt.datetime] = None
     urls: typing.Optional[typing.List[str]] = None
 
diff --git a/src/polytomic/types/v_2_execution_log_type.py b/src/polytomic/types/v2execution_log_type.py
similarity index 100%
rename from src/polytomic/types/v_2_execution_log_type.py
rename to src/polytomic/types/v2execution_log_type.py
diff --git a/src/polytomic/types/v2execution_logs_response_envelope.py b/src/polytomic/types/v2execution_logs_response_envelope.py
new file mode 100644
index 0000000..2397d55
--- /dev/null
+++ b/src/polytomic/types/v2execution_logs_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2execution_log_response import V2ExecutionLogResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ExecutionLogsResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2ExecutionLogResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/field_configuration.py b/src/polytomic/types/v2field_configuration.py
similarity index 94%
rename from src/polytomic/types/field_configuration.py
rename to src/polytomic/types/v2field_configuration.py
index 07057de..29dc152 100644
--- a/src/polytomic/types/field_configuration.py
+++ b/src/polytomic/types/v2field_configuration.py
@@ -6,7 +6,7 @@
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class FieldConfiguration(UniversalBaseModel):
+class V2FieldConfiguration(UniversalBaseModel):
     enabled: typing.Optional[bool] = pydantic.Field(default=None)
     """
     Whether the field is enabled for syncing.
diff --git a/src/polytomic/types/filter.py b/src/polytomic/types/v2filter.py
similarity index 90%
rename from src/polytomic/types/filter.py
rename to src/polytomic/types/v2filter.py
index b95dbc9..d3c880c 100644
--- a/src/polytomic/types/filter.py
+++ b/src/polytomic/types/v2filter.py
@@ -2,19 +2,19 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .source import Source
+from .v2source import V2Source
 import pydantic
 from .filter_field_reference_type import FilterFieldReferenceType
 from .filter_function import FilterFunction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class Filter(UniversalBaseModel):
+class V2Filter(UniversalBaseModel):
     """
     Either `field` or `field_id` must be provided. If `field` is provided, `field_id` is ignored.
     """
 
-    field: typing.Optional[Source] = None
+    field: typing.Optional[V2Source] = None
     field_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     Model or Target field name to filter on.
diff --git a/src/polytomic/types/connection_response_envelope.py b/src/polytomic/types/v2get_connection_meta_envelope.py
similarity index 73%
rename from src/polytomic/types/connection_response_envelope.py
rename to src/polytomic/types/v2get_connection_meta_envelope.py
index 8fde2d5..058948e 100644
--- a/src/polytomic/types/connection_response_envelope.py
+++ b/src/polytomic/types/v2get_connection_meta_envelope.py
@@ -2,13 +2,13 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .connection_response_schema import ConnectionResponseSchema
+from .v2connection_meta_response import V2ConnectionMetaResponse
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ConnectionResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[ConnectionResponseSchema] = None
+class V2GetConnectionMetaEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2ConnectionMetaResponse] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/v_2_get_enrichment_input_fields_response_envelope.py b/src/polytomic/types/v2get_enrichment_input_fields_response_envelope.py
similarity index 100%
rename from src/polytomic/types/v_2_get_enrichment_input_fields_response_envelope.py
rename to src/polytomic/types/v2get_enrichment_input_fields_response_envelope.py
diff --git a/src/polytomic/types/v2get_execution_response_envelope.py b/src/polytomic/types/v2get_execution_response_envelope.py
new file mode 100644
index 0000000..8a0a965
--- /dev/null
+++ b/src/polytomic/types/v2get_execution_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2get_execution_response_schema import V2GetExecutionResponseSchema
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2GetExecutionResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2GetExecutionResponseSchema] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/get_execution_response_schema.py b/src/polytomic/types/v2get_execution_response_schema.py
similarity index 74%
rename from src/polytomic/types/get_execution_response_schema.py
rename to src/polytomic/types/v2get_execution_response_schema.py
index 543548a..69b9d75 100644
--- a/src/polytomic/types/get_execution_response_schema.py
+++ b/src/polytomic/types/v2get_execution_response_schema.py
@@ -3,20 +3,20 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 import datetime as dt
-from .execution_counts import ExecutionCounts
-from .execution_status import ExecutionStatus
+from .v2execution_counts import V2ExecutionCounts
+from .util_execution_status import UtilExecutionStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class GetExecutionResponseSchema(UniversalBaseModel):
+class V2GetExecutionResponseSchema(UniversalBaseModel):
     completed_at: typing.Optional[dt.datetime] = None
-    counts: typing.Optional[ExecutionCounts] = None
+    counts: typing.Optional[V2ExecutionCounts] = None
     created_at: typing.Optional[dt.datetime] = None
     errors: typing.Optional[typing.List[str]] = None
     id: typing.Optional[str] = None
     started_at: typing.Optional[dt.datetime] = None
-    status: typing.Optional[ExecutionStatus] = None
+    status: typing.Optional[UtilExecutionStatus] = None
     type: typing.Optional[str] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/v2get_identity_response_envelope.py b/src/polytomic/types/v2get_identity_response_envelope.py
new file mode 100644
index 0000000..99f1811
--- /dev/null
+++ b/src/polytomic/types/v2get_identity_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2get_identity_response_schema import V2GetIdentityResponseSchema
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2GetIdentityResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2GetIdentityResponseSchema] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/get_identity_response_schema.py b/src/polytomic/types/v2get_identity_response_schema.py
similarity index 96%
rename from src/polytomic/types/get_identity_response_schema.py
rename to src/polytomic/types/v2get_identity_response_schema.py
index 11b477f..31dba89 100644
--- a/src/polytomic/types/get_identity_response_schema.py
+++ b/src/polytomic/types/v2get_identity_response_schema.py
@@ -6,7 +6,7 @@
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class GetIdentityResponseSchema(UniversalBaseModel):
+class V2GetIdentityResponseSchema(UniversalBaseModel):
     email: typing.Optional[str] = pydantic.Field(default=None)
     """
     The email of the caller.
diff --git a/src/polytomic/types/identity.py b/src/polytomic/types/v2identity.py
similarity index 88%
rename from src/polytomic/types/identity.py
rename to src/polytomic/types/v2identity.py
index e34b270..08f91cc 100644
--- a/src/polytomic/types/identity.py
+++ b/src/polytomic/types/v2identity.py
@@ -3,16 +3,16 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 from .schema_identity_function import SchemaIdentityFunction
 import typing
-from .source import Source
+from .v2source import V2Source
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class Identity(UniversalBaseModel):
+class V2Identity(UniversalBaseModel):
     function: SchemaIdentityFunction
     new_field: typing.Optional[bool] = None
     remote_field_type_id: typing.Optional[str] = None
-    source: Source
+    source: V2Source
     target: str
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/identity_function.py b/src/polytomic/types/v2identity_function.py
similarity index 92%
rename from src/polytomic/types/identity_function.py
rename to src/polytomic/types/v2identity_function.py
index 429e1ae..d2378eb 100644
--- a/src/polytomic/types/identity_function.py
+++ b/src/polytomic/types/v2identity_function.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class IdentityFunction(UniversalBaseModel):
+class V2IdentityFunction(UniversalBaseModel):
     id: typing.Optional[str] = None
     label: typing.Optional[str] = None
 
diff --git a/src/polytomic/types/job_response.py b/src/polytomic/types/v2job_response.py
similarity index 94%
rename from src/polytomic/types/job_response.py
rename to src/polytomic/types/v2job_response.py
index 7d601ad..6203877 100644
--- a/src/polytomic/types/job_response.py
+++ b/src/polytomic/types/v2job_response.py
@@ -7,7 +7,7 @@
 import pydantic
 
 
-class JobResponse(UniversalBaseModel):
+class V2JobResponse(UniversalBaseModel):
     error: typing.Optional[str] = None
     job_id: typing.Optional[str] = None
     result: typing.Optional[typing.Optional[typing.Any]] = None
diff --git a/src/polytomic/types/v2job_response_envelope.py b/src/polytomic/types/v2job_response_envelope.py
new file mode 100644
index 0000000..0c596db
--- /dev/null
+++ b/src/polytomic/types/v2job_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2job_response import V2JobResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2JobResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2JobResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v2list_execution_response_envelope.py b/src/polytomic/types/v2list_execution_response_envelope.py
new file mode 100644
index 0000000..707410c
--- /dev/null
+++ b/src/polytomic/types/v2list_execution_response_envelope.py
@@ -0,0 +1,22 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2get_execution_response_schema import V2GetExecutionResponseSchema
+from .v2pagination_details import V2PaginationDetails
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ListExecutionResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2GetExecutionResponseSchema]] = None
+    pagination: typing.Optional[V2PaginationDetails] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v2list_policies_response_envelope.py b/src/polytomic/types/v2list_policies_response_envelope.py
new file mode 100644
index 0000000..fb7a3da
--- /dev/null
+++ b/src/polytomic/types/v2list_policies_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2policy_response import V2PolicyResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ListPoliciesResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2PolicyResponse]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v2list_users_envelope.py b/src/polytomic/types/v2list_users_envelope.py
new file mode 100644
index 0000000..0942884
--- /dev/null
+++ b/src/polytomic/types/v2list_users_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2user import V2User
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ListUsersEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2User]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/mode.py b/src/polytomic/types/v2mode.py
similarity index 95%
rename from src/polytomic/types/mode.py
rename to src/polytomic/types/v2mode.py
index 3792f02..d80c72b 100644
--- a/src/polytomic/types/mode.py
+++ b/src/polytomic/types/v2mode.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class Mode(UniversalBaseModel):
+class V2Mode(UniversalBaseModel):
     description: typing.Optional[str] = None
     label: typing.Optional[str] = None
     mode: typing.Optional[str] = None
diff --git a/src/polytomic/types/model_field.py b/src/polytomic/types/v2model_field.py
similarity index 96%
rename from src/polytomic/types/model_field.py
rename to src/polytomic/types/v2model_field.py
index aa4a1c9..f193ccf 100644
--- a/src/polytomic/types/model_field.py
+++ b/src/polytomic/types/v2model_field.py
@@ -8,7 +8,7 @@
 import pydantic
 
 
-class ModelField(UniversalBaseModel):
+class V2ModelField(UniversalBaseModel):
     created_at: typing.Optional[dt.datetime] = None
     created_by: typing.Optional[CommonOutputActor] = None
     description: typing.Optional[str] = None
diff --git a/src/polytomic/types/v2model_field_response.py b/src/polytomic/types/v2model_field_response.py
new file mode 100644
index 0000000..ddb858c
--- /dev/null
+++ b/src/polytomic/types/v2model_field_response.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2model_field import V2ModelField
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ModelFieldResponse(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2ModelField]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v2model_list_response_envelope.py b/src/polytomic/types/v2model_list_response_envelope.py
new file mode 100644
index 0000000..4a397aa
--- /dev/null
+++ b/src/polytomic/types/v2model_list_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2model_response import V2ModelResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ModelListResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2ModelResponse]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/model_response.py b/src/polytomic/types/v2model_response.py
similarity index 80%
rename from src/polytomic/types/model_response.py
rename to src/polytomic/types/v2model_response.py
index d4e1f71..136e7ea 100644
--- a/src/polytomic/types/model_response.py
+++ b/src/polytomic/types/v2model_response.py
@@ -4,28 +4,28 @@
 import typing
 import datetime as dt
 from .common_output_actor import CommonOutputActor
-from .enrichment import Enrichment
-from .model_field import ModelField
+from .v2enrichment import V2Enrichment
+from .v2model_field import V2ModelField
 from .label_label import LabelLabel
-from .relation import Relation
+from .v2relation import V2Relation
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ModelResponse(UniversalBaseModel):
+class V2ModelResponse(UniversalBaseModel):
     configuration: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
     connection_id: typing.Optional[str] = None
     created_at: typing.Optional[dt.datetime] = None
     created_by: typing.Optional[CommonOutputActor] = None
-    enricher: typing.Optional[Enrichment] = None
-    fields: typing.Optional[typing.List[ModelField]] = None
+    enricher: typing.Optional[V2Enrichment] = None
+    fields: typing.Optional[typing.List[V2ModelField]] = None
     id: typing.Optional[str] = None
     identifier: typing.Optional[str] = None
     labels: typing.Optional[typing.List[LabelLabel]] = None
     name: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
     policies: typing.Optional[typing.List[str]] = None
-    relations: typing.Optional[typing.List[Relation]] = None
+    relations: typing.Optional[typing.List[V2Relation]] = None
     tracking_columns: typing.Optional[typing.List[str]] = None
     type: typing.Optional[str] = None
     updated_at: typing.Optional[dt.datetime] = None
diff --git a/src/polytomic/types/v2model_response_envelope.py b/src/polytomic/types/v2model_response_envelope.py
new file mode 100644
index 0000000..7b26177
--- /dev/null
+++ b/src/polytomic/types/v2model_response_envelope.py
@@ -0,0 +1,22 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2model_response import V2ModelResponse
+from .v2job_response import V2JobResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ModelResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2ModelResponse] = None
+    job: typing.Optional[V2JobResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/model_sample.py b/src/polytomic/types/v2model_sample.py
similarity index 87%
rename from src/polytomic/types/model_sample.py
rename to src/polytomic/types/v2model_sample.py
index 10ce391..9b120b7 100644
--- a/src/polytomic/types/model_sample.py
+++ b/src/polytomic/types/v2model_sample.py
@@ -2,12 +2,12 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .v_2_sample_record import V2SampleRecord
+from .v2sample_record import V2SampleRecord
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ModelSample(UniversalBaseModel):
+class V2ModelSample(UniversalBaseModel):
     records: typing.Optional[typing.List[V2SampleRecord]] = None
     warnings: typing.Optional[typing.List[str]] = None
 
diff --git a/src/polytomic/types/v2model_sample_response_envelope.py b/src/polytomic/types/v2model_sample_response_envelope.py
new file mode 100644
index 0000000..aac81ac
--- /dev/null
+++ b/src/polytomic/types/v2model_sample_response_envelope.py
@@ -0,0 +1,22 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2model_sample import V2ModelSample
+from .v2job_response import V2JobResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2ModelSampleResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2ModelSample] = None
+    job: typing.Optional[V2JobResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v_2_ordered_map_string_github_com_invopop_jsonschema_schema.py b/src/polytomic/types/v2ordered_map_string_github_com_invopop_jsonschema_schema.py
similarity index 100%
rename from src/polytomic/types/v_2_ordered_map_string_github_com_invopop_jsonschema_schema.py
rename to src/polytomic/types/v2ordered_map_string_github_com_invopop_jsonschema_schema.py
diff --git a/src/polytomic/types/organization.py b/src/polytomic/types/v2organization.py
similarity index 94%
rename from src/polytomic/types/organization.py
rename to src/polytomic/types/v2organization.py
index 18977d0..a7a0708 100644
--- a/src/polytomic/types/organization.py
+++ b/src/polytomic/types/v2organization.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class Organization(UniversalBaseModel):
+class V2Organization(UniversalBaseModel):
     id: typing.Optional[str] = None
     issuer: typing.Optional[str] = None
     name: typing.Optional[str] = None
diff --git a/src/polytomic/types/v2organization_envelope.py b/src/polytomic/types/v2organization_envelope.py
new file mode 100644
index 0000000..5e63617
--- /dev/null
+++ b/src/polytomic/types/v2organization_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2organization import V2Organization
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2OrganizationEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2Organization] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/activate_sync_envelope.py b/src/polytomic/types/v2organizations_envelope.py
similarity index 76%
rename from src/polytomic/types/activate_sync_envelope.py
rename to src/polytomic/types/v2organizations_envelope.py
index 3c5646c..d5959fe 100644
--- a/src/polytomic/types/activate_sync_envelope.py
+++ b/src/polytomic/types/v2organizations_envelope.py
@@ -2,13 +2,13 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .activate_sync_output import ActivateSyncOutput
+from .v2organization import V2Organization
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ActivateSyncEnvelope(UniversalBaseModel):
-    data: typing.Optional[ActivateSyncOutput] = None
+class V2OrganizationsEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2Organization]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/override.py b/src/polytomic/types/v2override.py
similarity index 89%
rename from src/polytomic/types/override.py
rename to src/polytomic/types/v2override.py
index b44a322..a4295c9 100644
--- a/src/polytomic/types/override.py
+++ b/src/polytomic/types/v2override.py
@@ -2,18 +2,18 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .source import Source
+from .v2source import V2Source
 import pydantic
 from .filter_function import FilterFunction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class Override(UniversalBaseModel):
+class V2Override(UniversalBaseModel):
     """
     Either `field` or `field_id` must be provided. If `field_id` is provided, `field` is ignored.
     """
 
-    field: typing.Optional[Source] = None
+    field: typing.Optional[V2Source] = None
     field_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     Field ID of the model field to override.
diff --git a/src/polytomic/types/pagination_details.py b/src/polytomic/types/v2pagination_details.py
similarity index 92%
rename from src/polytomic/types/pagination_details.py
rename to src/polytomic/types/v2pagination_details.py
index 72837f1..2a46c66 100644
--- a/src/polytomic/types/pagination_details.py
+++ b/src/polytomic/types/v2pagination_details.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class PaginationDetails(UniversalBaseModel):
+class V2PaginationDetails(UniversalBaseModel):
     next_page_token: typing.Optional[str] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/policy_action.py b/src/polytomic/types/v2policy_action.py
similarity index 93%
rename from src/polytomic/types/policy_action.py
rename to src/polytomic/types/v2policy_action.py
index b7a5614..830764d 100644
--- a/src/polytomic/types/policy_action.py
+++ b/src/polytomic/types/v2policy_action.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class PolicyAction(UniversalBaseModel):
+class V2PolicyAction(UniversalBaseModel):
     action: str
     role_ids: typing.Optional[typing.List[str]] = None
 
diff --git a/src/polytomic/types/policy_response.py b/src/polytomic/types/v2policy_response.py
similarity index 80%
rename from src/polytomic/types/policy_response.py
rename to src/polytomic/types/v2policy_response.py
index 91d3259..51fea56 100644
--- a/src/polytomic/types/policy_response.py
+++ b/src/polytomic/types/v2policy_response.py
@@ -2,16 +2,16 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .policy_action import PolicyAction
+from .v2policy_action import V2PolicyAction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class PolicyResponse(UniversalBaseModel):
+class V2PolicyResponse(UniversalBaseModel):
     id: typing.Optional[str] = None
     name: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
-    policy_actions: typing.Optional[typing.List[PolicyAction]] = None
+    policy_actions: typing.Optional[typing.List[V2PolicyAction]] = None
     system: typing.Optional[bool] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/v2policy_response_envelope.py b/src/polytomic/types/v2policy_response_envelope.py
new file mode 100644
index 0000000..69bce77
--- /dev/null
+++ b/src/polytomic/types/v2policy_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2policy_response import V2PolicyResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2PolicyResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2PolicyResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/relation.py b/src/polytomic/types/v2relation.py
similarity index 84%
rename from src/polytomic/types/relation.py
rename to src/polytomic/types/v2relation.py
index 2813968..f4e1406 100644
--- a/src/polytomic/types/relation.py
+++ b/src/polytomic/types/v2relation.py
@@ -4,14 +4,14 @@
 import typing_extensions
 import typing
 from ..core.serialization import FieldMetadata
-from .relation_to import RelationTo
+from .v2relation_to import V2RelationTo
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class Relation(UniversalBaseModel):
+class V2Relation(UniversalBaseModel):
     from_: typing_extensions.Annotated[typing.Optional[str], FieldMetadata(alias="from")] = None
-    to: typing.Optional[RelationTo] = None
+    to: typing.Optional[V2RelationTo] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/relation_to.py b/src/polytomic/types/v2relation_to.py
similarity index 93%
rename from src/polytomic/types/relation_to.py
rename to src/polytomic/types/v2relation_to.py
index 4139bf1..26481f3 100644
--- a/src/polytomic/types/relation_to.py
+++ b/src/polytomic/types/v2relation_to.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class RelationTo(UniversalBaseModel):
+class V2RelationTo(UniversalBaseModel):
     field: typing.Optional[str] = None
     model_id: typing.Optional[str] = None
 
diff --git a/src/polytomic/types/v2role_list_response_envelope.py b/src/polytomic/types/v2role_list_response_envelope.py
new file mode 100644
index 0000000..70fe6ce
--- /dev/null
+++ b/src/polytomic/types/v2role_list_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2role_response import V2RoleResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2RoleListResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2RoleResponse]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/role_response.py b/src/polytomic/types/v2role_response.py
similarity index 94%
rename from src/polytomic/types/role_response.py
rename to src/polytomic/types/v2role_response.py
index efd272c..c79fc10 100644
--- a/src/polytomic/types/role_response.py
+++ b/src/polytomic/types/v2role_response.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class RoleResponse(UniversalBaseModel):
+class V2RoleResponse(UniversalBaseModel):
     id: typing.Optional[str] = None
     name: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/v2role_response_envelope.py b/src/polytomic/types/v2role_response_envelope.py
new file mode 100644
index 0000000..cb8b0b5
--- /dev/null
+++ b/src/polytomic/types/v2role_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2role_response import V2RoleResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2RoleResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2RoleResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/run_after.py b/src/polytomic/types/v2run_after.py
similarity index 94%
rename from src/polytomic/types/run_after.py
rename to src/polytomic/types/v2run_after.py
index d3e5ea5..8d35c68 100644
--- a/src/polytomic/types/run_after.py
+++ b/src/polytomic/types/v2run_after.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class RunAfter(UniversalBaseModel):
+class V2RunAfter(UniversalBaseModel):
     bulk_sync_ids: typing.Optional[typing.List[str]] = None
     sync_ids: typing.Optional[typing.List[str]] = None
 
diff --git a/src/polytomic/types/v_2_sample_record.py b/src/polytomic/types/v2sample_record.py
similarity index 100%
rename from src/polytomic/types/v_2_sample_record.py
rename to src/polytomic/types/v2sample_record.py
diff --git a/src/polytomic/types/schedule.py b/src/polytomic/types/v2schedule.py
similarity index 89%
rename from src/polytomic/types/schedule.py
rename to src/polytomic/types/v2schedule.py
index c3525a2..3c446d9 100644
--- a/src/polytomic/types/schedule.py
+++ b/src/polytomic/types/v2schedule.py
@@ -3,12 +3,12 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 from .schedule_frequency import ScheduleFrequency
-from .run_after import RunAfter
+from .v2run_after import V2RunAfter
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class Schedule(UniversalBaseModel):
+class V2Schedule(UniversalBaseModel):
     connection_id: typing.Optional[str] = None
     day_of_month: typing.Optional[str] = None
     day_of_week: typing.Optional[str] = None
@@ -17,7 +17,7 @@ class Schedule(UniversalBaseModel):
     job_id: typing.Optional[int] = None
     minute: typing.Optional[str] = None
     month: typing.Optional[str] = None
-    run_after: typing.Optional[RunAfter] = None
+    run_after: typing.Optional[V2RunAfter] = None
     run_after_success_only: typing.Optional[bool] = pydantic.Field(default=None)
     """
     If true, the sync will only run if the dependent syncs completed successfully.
diff --git a/src/polytomic/types/schedule_option_response.py b/src/polytomic/types/v2schedule_option_response.py
similarity index 92%
rename from src/polytomic/types/schedule_option_response.py
rename to src/polytomic/types/v2schedule_option_response.py
index 1c7a29d..a538491 100644
--- a/src/polytomic/types/schedule_option_response.py
+++ b/src/polytomic/types/v2schedule_option_response.py
@@ -7,7 +7,7 @@
 import pydantic
 
 
-class ScheduleOptionResponse(UniversalBaseModel):
+class V2ScheduleOptionResponse(UniversalBaseModel):
     schedule_options: typing.Optional[typing.List[ScheduleScheduleOption]] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/list_model_sync_response_envelope.py b/src/polytomic/types/v2schedule_option_response_envelope.py
similarity index 73%
rename from src/polytomic/types/list_model_sync_response_envelope.py
rename to src/polytomic/types/v2schedule_option_response_envelope.py
index f4d9ade..f3a1a02 100644
--- a/src/polytomic/types/list_model_sync_response_envelope.py
+++ b/src/polytomic/types/v2schedule_option_response_envelope.py
@@ -2,13 +2,13 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .model_sync_response import ModelSyncResponse
+from .v2schedule_option_response import V2ScheduleOptionResponse
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ListModelSyncResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[ModelSyncResponse]] = None
+class V2ScheduleOptionResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2ScheduleOptionResponse] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/schema_configuration.py b/src/polytomic/types/v2schema_configuration.py
similarity index 82%
rename from src/polytomic/types/schema_configuration.py
rename to src/polytomic/types/v2schema_configuration.py
index 530c3f4..f2b4e18 100644
--- a/src/polytomic/types/schema_configuration.py
+++ b/src/polytomic/types/v2schema_configuration.py
@@ -4,12 +4,12 @@
 import typing
 import datetime as dt
 import pydantic
-from .v_2_schema_configuration_fields_item import V2SchemaConfigurationFieldsItem
-from .bulk_filter import BulkFilter
+from .v2schema_configuration_fields_item import V2SchemaConfigurationFieldsItem
+from .v2bulk_filter import V2BulkFilter
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class SchemaConfiguration(UniversalBaseModel):
+class V2SchemaConfiguration(UniversalBaseModel):
     data_cutoff_timestamp: typing.Optional[dt.datetime] = None
     disable_data_cutoff: typing.Optional[bool] = pydantic.Field(default=None)
     """
@@ -22,7 +22,7 @@ class SchemaConfiguration(UniversalBaseModel):
     """
 
     fields: typing.Optional[typing.List[V2SchemaConfigurationFieldsItem]] = None
-    filters: typing.Optional[typing.List[BulkFilter]] = None
+    filters: typing.Optional[typing.List[V2BulkFilter]] = None
     id: typing.Optional[str] = None
     partition_key: typing.Optional[str] = None
     tracking_field: typing.Optional[str] = None
diff --git a/src/polytomic/types/v2schema_configuration_fields_item.py b/src/polytomic/types/v2schema_configuration_fields_item.py
new file mode 100644
index 0000000..b2cf0de
--- /dev/null
+++ b/src/polytomic/types/v2schema_configuration_fields_item.py
@@ -0,0 +1,6 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+from .v2field_configuration import V2FieldConfiguration
+
+V2SchemaConfigurationFieldsItem = typing.Union[str, V2FieldConfiguration]
diff --git a/src/polytomic/types/source.py b/src/polytomic/types/v2source.py
similarity index 93%
rename from src/polytomic/types/source.py
rename to src/polytomic/types/v2source.py
index f5e6def..8a64dd9 100644
--- a/src/polytomic/types/source.py
+++ b/src/polytomic/types/v2source.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class Source(UniversalBaseModel):
+class V2Source(UniversalBaseModel):
     field: str
     model_id: str
 
diff --git a/src/polytomic/types/get_identity_response_envelope.py b/src/polytomic/types/v2start_sync_response_envelope.py
similarity index 73%
rename from src/polytomic/types/get_identity_response_envelope.py
rename to src/polytomic/types/v2start_sync_response_envelope.py
index 306c001..55b08ea 100644
--- a/src/polytomic/types/get_identity_response_envelope.py
+++ b/src/polytomic/types/v2start_sync_response_envelope.py
@@ -2,13 +2,13 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .get_identity_response_schema import GetIdentityResponseSchema
+from .v2start_sync_response_schema import V2StartSyncResponseSchema
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class GetIdentityResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[GetIdentityResponseSchema] = None
+class V2StartSyncResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2StartSyncResponseSchema] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/start_model_sync_response_schema.py b/src/polytomic/types/v2start_sync_response_schema.py
similarity index 80%
rename from src/polytomic/types/start_model_sync_response_schema.py
rename to src/polytomic/types/v2start_sync_response_schema.py
index e1be713..e93f68a 100644
--- a/src/polytomic/types/start_model_sync_response_schema.py
+++ b/src/polytomic/types/v2start_sync_response_schema.py
@@ -4,18 +4,18 @@
 import typing
 import datetime as dt
 import pydantic
-from .execution_status import ExecutionStatus
+from .util_execution_status import UtilExecutionStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class StartModelSyncResponseSchema(UniversalBaseModel):
+class V2StartSyncResponseSchema(UniversalBaseModel):
     created_at: typing.Optional[dt.datetime] = None
     id: typing.Optional[str] = pydantic.Field(default=None)
     """
     Execution ID
     """
 
-    status: typing.Optional[ExecutionStatus] = None
+    status: typing.Optional[UtilExecutionStatus] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/supported_bulk_mode.py b/src/polytomic/types/v2supported_bulk_mode.py
similarity index 83%
rename from src/polytomic/types/supported_bulk_mode.py
rename to src/polytomic/types/v2supported_bulk_mode.py
index 04c9eac..0dfa52e 100644
--- a/src/polytomic/types/supported_bulk_mode.py
+++ b/src/polytomic/types/v2supported_bulk_mode.py
@@ -2,14 +2,14 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .bulk_sync_mode import BulkSyncMode
+from .bulk_sync_target_mode import BulkSyncTargetMode
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class SupportedBulkMode(UniversalBaseModel):
+class V2SupportedBulkMode(UniversalBaseModel):
     description: typing.Optional[str] = None
-    id: typing.Optional[BulkSyncMode] = None
+    id: typing.Optional[BulkSyncTargetMode] = None
     label: typing.Optional[str] = None
     requires_identity: typing.Optional[bool] = None
     supports_field_sync_mode: typing.Optional[bool] = None
diff --git a/src/polytomic/types/model_sync_field.py b/src/polytomic/types/v2sync_field.py
similarity index 92%
rename from src/polytomic/types/model_sync_field.py
rename to src/polytomic/types/v2sync_field.py
index 6adc215..b475d84 100644
--- a/src/polytomic/types/model_sync_field.py
+++ b/src/polytomic/types/v2sync_field.py
@@ -3,11 +3,11 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 import pydantic
-from .source import Source
+from .v2source import V2Source
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class ModelSyncField(UniversalBaseModel):
+class V2SyncField(UniversalBaseModel):
     encryption_enabled: typing.Optional[bool] = pydantic.Field(default=None)
     """
     Whether the field should be encrypted.
@@ -23,7 +23,7 @@ class ModelSyncField(UniversalBaseModel):
     Value to set in the target field; if provided, 'source' is ignored.
     """
 
-    source: typing.Optional[Source] = None
+    source: typing.Optional[V2Source] = None
     sync_mode: typing.Optional[str] = pydantic.Field(default=None)
     """
     Sync mode for the field; defaults to 'updateOrCreate'. If set to 'create', the field will not be synced if it already has a value. This is not supported by all backends.
diff --git a/src/polytomic/types/model_sync_response.py b/src/polytomic/types/v2sync_response.py
similarity index 64%
rename from src/polytomic/types/model_sync_response.py
rename to src/polytomic/types/v2sync_response.py
index 57e0e83..336469b 100644
--- a/src/polytomic/types/model_sync_response.py
+++ b/src/polytomic/types/v2sync_response.py
@@ -4,28 +4,28 @@
 import typing
 import datetime as dt
 from .common_output_actor import CommonOutputActor
-from .model_sync_field import ModelSyncField
-from .filter import Filter
-from .identity import Identity
-from .model_sync_mode import ModelSyncMode
+from .v2sync_field import V2SyncField
+from .v2filter import V2Filter
+from .v2identity import V2Identity
+from .modelsync_sync_target_mode import ModelsyncSyncTargetMode
 import pydantic
-from .override import Override
-from .schedule import Schedule
-from .target import Target
+from .v2override import V2Override
+from .v2schedule import V2Schedule
+from .v2target import V2Target
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class ModelSyncResponse(UniversalBaseModel):
+class V2SyncResponse(UniversalBaseModel):
     active: typing.Optional[bool] = None
     created_at: typing.Optional[dt.datetime] = None
     created_by: typing.Optional[CommonOutputActor] = None
     encryption_passphrase: typing.Optional[str] = None
-    fields: typing.Optional[typing.List[ModelSyncField]] = None
+    fields: typing.Optional[typing.List[V2SyncField]] = None
     filter_logic: typing.Optional[str] = None
-    filters: typing.Optional[typing.List[Filter]] = None
+    filters: typing.Optional[typing.List[V2Filter]] = None
     id: typing.Optional[str] = None
-    identity: typing.Optional[Identity] = None
-    mode: typing.Optional[ModelSyncMode] = None
+    identity: typing.Optional[V2Identity] = None
+    mode: typing.Optional[ModelsyncSyncTargetMode] = None
     model_ids: typing.Optional[typing.List[str]] = pydantic.Field(default=None)
     """
     Model IDs used in the sync.
@@ -34,13 +34,13 @@ class ModelSyncResponse(UniversalBaseModel):
     name: typing.Optional[str] = None
     only_enrich_updates: typing.Optional[bool] = None
     organization_id: typing.Optional[str] = None
-    override_fields: typing.Optional[typing.List[ModelSyncField]] = None
-    overrides: typing.Optional[typing.List[Override]] = None
+    override_fields: typing.Optional[typing.List[V2SyncField]] = None
+    overrides: typing.Optional[typing.List[V2Override]] = None
     policies: typing.Optional[typing.List[str]] = None
-    schedule: typing.Optional[Schedule] = None
+    schedule: typing.Optional[V2Schedule] = None
     skip_initial_backfill: typing.Optional[bool] = None
     sync_all_records: typing.Optional[bool] = None
-    target: typing.Optional[Target] = None
+    target: typing.Optional[V2Target] = None
     updated_at: typing.Optional[dt.datetime] = None
     updated_by: typing.Optional[CommonOutputActor] = None
 
diff --git a/src/polytomic/types/v2sync_response_envelope.py b/src/polytomic/types/v2sync_response_envelope.py
new file mode 100644
index 0000000..5ced788
--- /dev/null
+++ b/src/polytomic/types/v2sync_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2sync_response import V2SyncResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2SyncResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2SyncResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v2sync_status_envelope.py b/src/polytomic/types/v2sync_status_envelope.py
new file mode 100644
index 0000000..1c9dc17
--- /dev/null
+++ b/src/polytomic/types/v2sync_status_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2sync_status_response import V2SyncStatusResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2SyncStatusEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2SyncStatusResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/sync_status_response.py b/src/polytomic/types/v2sync_status_response.py
similarity index 68%
rename from src/polytomic/types/sync_status_response.py
rename to src/polytomic/types/v2sync_status_response.py
index 0b48c5d..c2c86be 100644
--- a/src/polytomic/types/sync_status_response.py
+++ b/src/polytomic/types/v2sync_status_response.py
@@ -2,15 +2,15 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .get_execution_response_schema import GetExecutionResponseSchema
+from .v2get_execution_response_schema import V2GetExecutionResponseSchema
 import datetime as dt
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class SyncStatusResponse(UniversalBaseModel):
-    current_execution: typing.Optional[GetExecutionResponseSchema] = None
-    last_execution: typing.Optional[GetExecutionResponseSchema] = None
+class V2SyncStatusResponse(UniversalBaseModel):
+    current_execution: typing.Optional[V2GetExecutionResponseSchema] = None
+    last_execution: typing.Optional[V2GetExecutionResponseSchema] = None
     next_execution_time: typing.Optional[dt.datetime] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/target.py b/src/polytomic/types/v2target.py
similarity index 96%
rename from src/polytomic/types/target.py
rename to src/polytomic/types/v2target.py
index a93eff5..f9ce54b 100644
--- a/src/polytomic/types/target.py
+++ b/src/polytomic/types/v2target.py
@@ -6,7 +6,7 @@
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class Target(UniversalBaseModel):
+class V2Target(UniversalBaseModel):
     configuration: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
     connection_id: str
     create: typing.Optional[typing.Dict[str, str]] = pydantic.Field(default=None)
diff --git a/src/polytomic/types/target_field.py b/src/polytomic/types/v2target_field.py
similarity index 85%
rename from src/polytomic/types/target_field.py
rename to src/polytomic/types/v2target_field.py
index 3f7c044..1724f82 100644
--- a/src/polytomic/types/target_field.py
+++ b/src/polytomic/types/v2target_field.py
@@ -2,19 +2,19 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .identity_function import IdentityFunction
+from .v2identity_function import V2IdentityFunction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class TargetField(UniversalBaseModel):
+class V2TargetField(UniversalBaseModel):
     association: typing.Optional[bool] = None
     createable: typing.Optional[bool] = None
     description: typing.Optional[str] = None
     encryptable: typing.Optional[bool] = None
     filterable: typing.Optional[bool] = None
     id: typing.Optional[str] = None
-    identity_functions: typing.Optional[typing.List[IdentityFunction]] = None
+    identity_functions: typing.Optional[typing.List[V2IdentityFunction]] = None
     name: typing.Optional[str] = None
     required: typing.Optional[bool] = None
     source_type: typing.Optional[str] = None
diff --git a/src/polytomic/types/target_response.py b/src/polytomic/types/v2target_response.py
similarity index 77%
rename from src/polytomic/types/target_response.py
rename to src/polytomic/types/v2target_response.py
index 476b504..1fd6c33 100644
--- a/src/polytomic/types/target_response.py
+++ b/src/polytomic/types/v2target_response.py
@@ -2,18 +2,18 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .target_field import TargetField
-from .mode import Mode
+from .v2target_field import V2TargetField
+from .v2mode import V2Mode
 from .sync_destination_properties import SyncDestinationProperties
 import datetime as dt
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class TargetResponse(UniversalBaseModel):
-    fields: typing.Optional[typing.List[TargetField]] = None
+class V2TargetResponse(UniversalBaseModel):
+    fields: typing.Optional[typing.List[V2TargetField]] = None
     id: typing.Optional[str] = None
-    modes: typing.Optional[typing.List[Mode]] = None
+    modes: typing.Optional[typing.List[V2Mode]] = None
     name: typing.Optional[str] = None
     properties: typing.Optional[SyncDestinationProperties] = None
     refreshed_at: typing.Optional[dt.datetime] = None
diff --git a/src/polytomic/types/v2target_response_envelope.py b/src/polytomic/types/v2target_response_envelope.py
new file mode 100644
index 0000000..68d2e63
--- /dev/null
+++ b/src/polytomic/types/v2target_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2target_response import V2TargetResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2TargetResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2TargetResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/user.py b/src/polytomic/types/v2user.py
similarity index 95%
rename from src/polytomic/types/user.py
rename to src/polytomic/types/v2user.py
index 85f2544..3c00351 100644
--- a/src/polytomic/types/user.py
+++ b/src/polytomic/types/v2user.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class User(UniversalBaseModel):
+class V2User(UniversalBaseModel):
     email: typing.Optional[str] = None
     id: typing.Optional[str] = None
     organization_id: typing.Optional[str] = None
diff --git a/src/polytomic/types/v2user_envelope.py b/src/polytomic/types/v2user_envelope.py
new file mode 100644
index 0000000..327ac93
--- /dev/null
+++ b/src/polytomic/types/v2user_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2user import V2User
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2UserEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2User] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/webhook.py b/src/polytomic/types/v2webhook.py
similarity index 95%
rename from src/polytomic/types/webhook.py
rename to src/polytomic/types/v2webhook.py
index 0aaa250..7d0098b 100644
--- a/src/polytomic/types/webhook.py
+++ b/src/polytomic/types/v2webhook.py
@@ -7,7 +7,7 @@
 import pydantic
 
 
-class Webhook(UniversalBaseModel):
+class V2Webhook(UniversalBaseModel):
     created_at: typing.Optional[dt.datetime] = None
     disabled: typing.Optional[bool] = None
     endpoint: typing.Optional[str] = None
diff --git a/src/polytomic/types/v2webhook_envelope.py b/src/polytomic/types/v2webhook_envelope.py
new file mode 100644
index 0000000..2f98a05
--- /dev/null
+++ b/src/polytomic/types/v2webhook_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2webhook import V2Webhook
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2WebhookEnvelope(UniversalBaseModel):
+    data: typing.Optional[V2Webhook] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v2webhook_list_envelope.py b/src/polytomic/types/v2webhook_list_envelope.py
new file mode 100644
index 0000000..2a3723e
--- /dev/null
+++ b/src/polytomic/types/v2webhook_list_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v2webhook import V2Webhook
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V2WebhookListEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V2Webhook]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v3bulk_fetch_mode.py b/src/polytomic/types/v3bulk_fetch_mode.py
new file mode 100644
index 0000000..67c1373
--- /dev/null
+++ b/src/polytomic/types/v3bulk_fetch_mode.py
@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+V3BulkFetchMode = typing.Union[typing.Literal["none", "incremental", "full"], typing.Any]
diff --git a/src/polytomic/types/bulk_field.py b/src/polytomic/types/v3bulk_field.py
similarity index 94%
rename from src/polytomic/types/bulk_field.py
rename to src/polytomic/types/v3bulk_field.py
index 5648ab6..8a962eb 100644
--- a/src/polytomic/types/bulk_field.py
+++ b/src/polytomic/types/v3bulk_field.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class BulkField(UniversalBaseModel):
+class V3BulkField(UniversalBaseModel):
     enabled: typing.Optional[bool] = None
     id: typing.Optional[str] = None
     obfuscated: typing.Optional[bool] = None
diff --git a/src/polytomic/types/v3bulk_filter.py b/src/polytomic/types/v3bulk_filter.py
new file mode 100644
index 0000000..30a6f29
--- /dev/null
+++ b/src/polytomic/types/v3bulk_filter.py
@@ -0,0 +1,26 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+import pydantic
+from .filter_function import FilterFunction
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+
+
+class V3BulkFilter(UniversalBaseModel):
+    field_id: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    Schema field ID to filter on.
+    """
+
+    function: FilterFunction
+    value: typing.Optional[typing.Optional[typing.Any]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_schema.py b/src/polytomic/types/v3bulk_schema.py
similarity index 78%
rename from src/polytomic/types/bulk_schema.py
rename to src/polytomic/types/v3bulk_schema.py
index 22ce3f7..1ffee08 100644
--- a/src/polytomic/types/bulk_schema.py
+++ b/src/polytomic/types/v3bulk_schema.py
@@ -3,18 +3,18 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 import datetime as dt
-from .bulk_field import BulkField
-from .bulk_filter import BulkFilter
+from .v3bulk_field import V3BulkField
+from .v3bulk_filter import V3BulkFilter
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class BulkSchema(UniversalBaseModel):
+class V3BulkSchema(UniversalBaseModel):
     data_cutoff_timestamp: typing.Optional[dt.datetime] = None
     disable_data_cutoff: typing.Optional[bool] = None
     enabled: typing.Optional[bool] = None
-    fields: typing.Optional[typing.List[BulkField]] = None
-    filters: typing.Optional[typing.List[BulkFilter]] = None
+    fields: typing.Optional[typing.List[V3BulkField]] = None
+    filters: typing.Optional[typing.List[V3BulkFilter]] = None
     id: typing.Optional[str] = None
     output_name: typing.Optional[str] = None
     partition_key: typing.Optional[str] = None
diff --git a/src/polytomic/types/v3bulk_schema_envelope.py b/src/polytomic/types/v3bulk_schema_envelope.py
new file mode 100644
index 0000000..c880b16
--- /dev/null
+++ b/src/polytomic/types/v3bulk_schema_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v3bulk_schema import V3BulkSchema
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V3BulkSchemaEnvelope(UniversalBaseModel):
+    data: typing.Optional[V3BulkSchema] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_execution.py b/src/polytomic/types/v3bulk_sync_execution.py
similarity index 80%
rename from src/polytomic/types/bulk_sync_execution.py
rename to src/polytomic/types/v3bulk_sync_execution.py
index 40e2a4b..1d108da 100644
--- a/src/polytomic/types/bulk_sync_execution.py
+++ b/src/polytomic/types/v3bulk_sync_execution.py
@@ -3,24 +3,24 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 import datetime as dt
-from .bulk_fetch_mode import BulkFetchMode
-from .bulk_sync_schema_execution import BulkSyncSchemaExecution
+from .v3bulk_fetch_mode import V3BulkFetchMode
+from .v3bulk_sync_schema_execution import V3BulkSyncSchemaExecution
 from .bulk_execution_status import BulkExecutionStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class BulkSyncExecution(UniversalBaseModel):
+class V3BulkSyncExecution(UniversalBaseModel):
     completed_at: typing.Optional[dt.datetime] = None
     created_at: typing.Optional[dt.datetime] = None
     error_count: typing.Optional[int] = None
-    fetch_mode: typing.Optional[BulkFetchMode] = None
+    fetch_mode: typing.Optional[V3BulkFetchMode] = None
     id: typing.Optional[str] = None
     is_partial: typing.Optional[bool] = None
     is_resync: typing.Optional[bool] = None
     is_test: typing.Optional[bool] = None
     record_count: typing.Optional[int] = None
-    schemas: typing.Optional[typing.List[BulkSyncSchemaExecution]] = None
+    schemas: typing.Optional[typing.List[V3BulkSyncSchemaExecution]] = None
     started_at: typing.Optional[dt.datetime] = None
     status: typing.Optional[BulkExecutionStatus] = None
     status_message: typing.Optional[str] = None
diff --git a/src/polytomic/types/v3bulk_sync_execution_envelope.py b/src/polytomic/types/v3bulk_sync_execution_envelope.py
new file mode 100644
index 0000000..08121b9
--- /dev/null
+++ b/src/polytomic/types/v3bulk_sync_execution_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v3bulk_sync_execution import V3BulkSyncExecution
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V3BulkSyncExecutionEnvelope(UniversalBaseModel):
+    data: typing.Optional[V3BulkSyncExecution] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_schema_execution.py b/src/polytomic/types/v3bulk_sync_schema_execution.py
similarity index 95%
rename from src/polytomic/types/bulk_sync_schema_execution.py
rename to src/polytomic/types/v3bulk_sync_schema_execution.py
index 3e9f0c5..3b32107 100644
--- a/src/polytomic/types/bulk_sync_schema_execution.py
+++ b/src/polytomic/types/v3bulk_sync_schema_execution.py
@@ -10,7 +10,7 @@
 import pydantic
 
 
-class BulkSyncSchemaExecution(UniversalBaseModel):
+class V3BulkSyncSchemaExecution(UniversalBaseModel):
     completed_at: typing.Optional[dt.datetime] = None
     created_at: typing.Optional[dt.datetime] = None
     error_count: typing.Optional[int] = None
diff --git a/src/polytomic/types/bulk_sync_source.py b/src/polytomic/types/v3bulk_sync_source.py
similarity index 81%
rename from src/polytomic/types/bulk_sync_source.py
rename to src/polytomic/types/v3bulk_sync_source.py
index 969fc68..a73b539 100644
--- a/src/polytomic/types/bulk_sync_source.py
+++ b/src/polytomic/types/v3bulk_sync_source.py
@@ -2,14 +2,14 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .schema import Schema
+from .v3schema import V3Schema
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class BulkSyncSource(UniversalBaseModel):
+class V3BulkSyncSource(UniversalBaseModel):
     configuration: typing.Optional[typing.Optional[typing.Any]] = None
-    schemas: typing.Optional[typing.List[Schema]] = None
+    schemas: typing.Optional[typing.List[V3Schema]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/v3bulk_sync_source_envelope.py b/src/polytomic/types/v3bulk_sync_source_envelope.py
new file mode 100644
index 0000000..3d05630
--- /dev/null
+++ b/src/polytomic/types/v3bulk_sync_source_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v3bulk_sync_source import V3BulkSyncSource
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V3BulkSyncSourceEnvelope(UniversalBaseModel):
+    data: typing.Optional[V3BulkSyncSource] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v3bulk_sync_source_schema_envelope.py b/src/polytomic/types/v3bulk_sync_source_schema_envelope.py
new file mode 100644
index 0000000..8c928af
--- /dev/null
+++ b/src/polytomic/types/v3bulk_sync_source_schema_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v3schema import V3Schema
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V3BulkSyncSourceSchemaEnvelope(UniversalBaseModel):
+    data: typing.Optional[V3Schema] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_source_status.py b/src/polytomic/types/v3bulk_sync_source_status.py
similarity index 93%
rename from src/polytomic/types/bulk_sync_source_status.py
rename to src/polytomic/types/v3bulk_sync_source_status.py
index 21e437a..d1de454 100644
--- a/src/polytomic/types/bulk_sync_source_status.py
+++ b/src/polytomic/types/v3bulk_sync_source_status.py
@@ -7,7 +7,7 @@
 import pydantic
 
 
-class BulkSyncSourceStatus(UniversalBaseModel):
+class V3BulkSyncSourceStatus(UniversalBaseModel):
     cache_status: typing.Optional[str] = None
     last_refresh_finished: typing.Optional[dt.datetime] = None
     last_refresh_started: typing.Optional[dt.datetime] = None
diff --git a/src/polytomic/types/v3bulk_sync_source_status_envelope.py b/src/polytomic/types/v3bulk_sync_source_status_envelope.py
new file mode 100644
index 0000000..00d3b61
--- /dev/null
+++ b/src/polytomic/types/v3bulk_sync_source_status_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v3bulk_sync_source_status import V3BulkSyncSourceStatus
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V3BulkSyncSourceStatusEnvelope(UniversalBaseModel):
+    data: typing.Optional[V3BulkSyncSourceStatus] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v3bulk_sync_status_envelope.py b/src/polytomic/types/v3bulk_sync_status_envelope.py
new file mode 100644
index 0000000..b6d6cb0
--- /dev/null
+++ b/src/polytomic/types/v3bulk_sync_status_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v3bulk_sync_status_response import V3BulkSyncStatusResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V3BulkSyncStatusEnvelope(UniversalBaseModel):
+    data: typing.Optional[V3BulkSyncStatusResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/bulk_sync_status_response.py b/src/polytomic/types/v3bulk_sync_status_response.py
similarity index 71%
rename from src/polytomic/types/bulk_sync_status_response.py
rename to src/polytomic/types/v3bulk_sync_status_response.py
index 680022f..eba543d 100644
--- a/src/polytomic/types/bulk_sync_status_response.py
+++ b/src/polytomic/types/v3bulk_sync_status_response.py
@@ -2,15 +2,15 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .bulk_sync_execution import BulkSyncExecution
+from .v3bulk_sync_execution import V3BulkSyncExecution
 import datetime as dt
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class BulkSyncStatusResponse(UniversalBaseModel):
-    current_execution: typing.Optional[BulkSyncExecution] = None
-    last_execution: typing.Optional[BulkSyncExecution] = None
+class V3BulkSyncStatusResponse(UniversalBaseModel):
+    current_execution: typing.Optional[V3BulkSyncExecution] = None
+    last_execution: typing.Optional[V3BulkSyncExecution] = None
     next_execution_time: typing.Optional[dt.datetime] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/connect_card_response.py b/src/polytomic/types/v3connect_card_response.py
similarity index 93%
rename from src/polytomic/types/connect_card_response.py
rename to src/polytomic/types/v3connect_card_response.py
index bc4963d..2c74bf0 100644
--- a/src/polytomic/types/connect_card_response.py
+++ b/src/polytomic/types/v3connect_card_response.py
@@ -6,7 +6,7 @@
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class ConnectCardResponse(UniversalBaseModel):
+class V3ConnectCardResponse(UniversalBaseModel):
     redirect_url: typing.Optional[str] = pydantic.Field(default=None)
     """
     URL to redirect the user to in order to create the new connection.
diff --git a/src/polytomic/types/v3connect_card_response_envelope.py b/src/polytomic/types/v3connect_card_response_envelope.py
new file mode 100644
index 0000000..fa6a27c
--- /dev/null
+++ b/src/polytomic/types/v3connect_card_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v3connect_card_response import V3ConnectCardResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V3ConnectCardResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V3ConnectCardResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v3list_bulk_schema_envelope.py b/src/polytomic/types/v3list_bulk_schema_envelope.py
new file mode 100644
index 0000000..42c4b7f
--- /dev/null
+++ b/src/polytomic/types/v3list_bulk_schema_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v3bulk_schema import V3BulkSchema
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V3ListBulkSchemaEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V3BulkSchema]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v3list_bulk_sync_executions_envelope.py b/src/polytomic/types/v3list_bulk_sync_executions_envelope.py
new file mode 100644
index 0000000..fc2d7f2
--- /dev/null
+++ b/src/polytomic/types/v3list_bulk_sync_executions_envelope.py
@@ -0,0 +1,22 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v3bulk_sync_execution import V3BulkSyncExecution
+from .v3pagination_details import V3PaginationDetails
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V3ListBulkSyncExecutionsEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V3BulkSyncExecution]] = None
+    pagination: typing.Optional[V3PaginationDetails] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/cancel_model_sync_response.py b/src/polytomic/types/v3pagination_details.py
similarity index 83%
rename from src/polytomic/types/cancel_model_sync_response.py
rename to src/polytomic/types/v3pagination_details.py
index e827be1..137434c 100644
--- a/src/polytomic/types/cancel_model_sync_response.py
+++ b/src/polytomic/types/v3pagination_details.py
@@ -6,8 +6,8 @@
 import pydantic
 
 
-class CancelModelSyncResponse(UniversalBaseModel):
-    message: typing.Optional[str] = None
+class V3PaginationDetails(UniversalBaseModel):
+    next_page_token: typing.Optional[str] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/pick_value.py b/src/polytomic/types/v3pick_value.py
similarity index 93%
rename from src/polytomic/types/pick_value.py
rename to src/polytomic/types/v3pick_value.py
index 46e6fce..3499e1a 100644
--- a/src/polytomic/types/pick_value.py
+++ b/src/polytomic/types/v3pick_value.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class PickValue(UniversalBaseModel):
+class V3PickValue(UniversalBaseModel):
     label: typing.Optional[str] = None
     value: typing.Optional[str] = None
 
diff --git a/src/polytomic/types/schema.py b/src/polytomic/types/v3schema.py
similarity index 80%
rename from src/polytomic/types/schema.py
rename to src/polytomic/types/v3schema.py
index ee95d24..1315fac 100644
--- a/src/polytomic/types/schema.py
+++ b/src/polytomic/types/v3schema.py
@@ -2,13 +2,13 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .schema_field import SchemaField
+from .v3schema_field import V3SchemaField
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class Schema(UniversalBaseModel):
-    fields: typing.Optional[typing.List[SchemaField]] = None
+class V3Schema(UniversalBaseModel):
+    fields: typing.Optional[typing.List[V3SchemaField]] = None
     id: typing.Optional[str] = None
     name: typing.Optional[str] = None
 
diff --git a/src/polytomic/types/schema_field.py b/src/polytomic/types/v3schema_field.py
similarity index 89%
rename from src/polytomic/types/schema_field.py
rename to src/polytomic/types/v3schema_field.py
index 49a849e..0f42c25 100644
--- a/src/polytomic/types/schema_field.py
+++ b/src/polytomic/types/v3schema_field.py
@@ -6,11 +6,11 @@
 import pydantic
 from .util_field_type import UtilFieldType
 from .types_type import TypesType
-from .pick_value import PickValue
+from .v3pick_value import V3PickValue
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class SchemaField(UniversalBaseModel):
+class V3SchemaField(UniversalBaseModel):
     association: typing.Optional[SchemaAssociation] = None
     id: typing.Optional[str] = None
     is_primary_key: typing.Optional[bool] = pydantic.Field(default=None)
@@ -26,7 +26,7 @@ class SchemaField(UniversalBaseModel):
 
     type: typing.Optional[UtilFieldType] = None
     type_spec: typing.Optional[TypesType] = None
-    values: typing.Optional[typing.List[PickValue]] = None
+    values: typing.Optional[typing.List[V3PickValue]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/schema_records_response_envelope.py b/src/polytomic/types/v3schema_records_response_envelope.py
similarity index 90%
rename from src/polytomic/types/schema_records_response_envelope.py
rename to src/polytomic/types/v3schema_records_response_envelope.py
index 5131def..b573a9b 100644
--- a/src/polytomic/types/schema_records_response_envelope.py
+++ b/src/polytomic/types/v3schema_records_response_envelope.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class SchemaRecordsResponseEnvelope(UniversalBaseModel):
+class V3SchemaRecordsResponseEnvelope(UniversalBaseModel):
     data: typing.Optional[typing.List[typing.Dict[str, typing.Optional[typing.Any]]]] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/update_bulk_field.py b/src/polytomic/types/v3update_bulk_field.py
similarity index 93%
rename from src/polytomic/types/update_bulk_field.py
rename to src/polytomic/types/v3update_bulk_field.py
index f2c7159..ddf3640 100644
--- a/src/polytomic/types/update_bulk_field.py
+++ b/src/polytomic/types/v3update_bulk_field.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class UpdateBulkField(UniversalBaseModel):
+class V3UpdateBulkField(UniversalBaseModel):
     enabled: typing.Optional[bool] = None
     id: typing.Optional[str] = None
     obfuscated: typing.Optional[bool] = None
diff --git a/src/polytomic/types/v_4_bulk_sync_execution_logs.py b/src/polytomic/types/v4bulk_sync_execution_logs.py
similarity index 100%
rename from src/polytomic/types/v_4_bulk_sync_execution_logs.py
rename to src/polytomic/types/v4bulk_sync_execution_logs.py
diff --git a/src/polytomic/types/v_4_bulk_sync_execution_logs_envelope.py b/src/polytomic/types/v4bulk_sync_execution_logs_envelope.py
similarity index 90%
rename from src/polytomic/types/v_4_bulk_sync_execution_logs_envelope.py
rename to src/polytomic/types/v4bulk_sync_execution_logs_envelope.py
index dc1a325..0107fa9 100644
--- a/src/polytomic/types/v_4_bulk_sync_execution_logs_envelope.py
+++ b/src/polytomic/types/v4bulk_sync_execution_logs_envelope.py
@@ -2,7 +2,7 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .v_4_bulk_sync_execution_logs import V4BulkSyncExecutionLogs
+from .v4bulk_sync_execution_logs import V4BulkSyncExecutionLogs
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
diff --git a/src/polytomic/types/bulk_sync_execution_status.py b/src/polytomic/types/v4bulk_sync_execution_status.py
similarity index 80%
rename from src/polytomic/types/bulk_sync_execution_status.py
rename to src/polytomic/types/v4bulk_sync_execution_status.py
index 08b1d4c..aecfd1c 100644
--- a/src/polytomic/types/bulk_sync_execution_status.py
+++ b/src/polytomic/types/v4bulk_sync_execution_status.py
@@ -5,17 +5,17 @@
 import typing
 import datetime as dt
 from ..core.serialization import FieldMetadata
-from .bulk_sync_schema_execution_status import BulkSyncSchemaExecutionStatus
+from .v4bulk_sync_schema_execution_status import V4BulkSyncSchemaExecutionStatus
 from .bulk_execution_status import BulkExecutionStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class BulkSyncExecutionStatus(UniversalBaseModel):
+class V4BulkSyncExecutionStatus(UniversalBaseModel):
     next_execution_time: typing_extensions.Annotated[
         typing.Optional[dt.datetime], FieldMetadata(alias="nextExecutionTime")
     ] = None
-    schemas: typing.Optional[typing.List[BulkSyncSchemaExecutionStatus]] = None
+    schemas: typing.Optional[typing.List[V4BulkSyncSchemaExecutionStatus]] = None
     status: typing.Optional[BulkExecutionStatus] = None
     sync_id: typing.Optional[str] = None
 
diff --git a/src/polytomic/types/v_4_bulk_sync_schedule_api.py b/src/polytomic/types/v4bulk_sync_schedule_api.py
similarity index 100%
rename from src/polytomic/types/v_4_bulk_sync_schedule_api.py
rename to src/polytomic/types/v4bulk_sync_schedule_api.py
diff --git a/src/polytomic/types/bulk_sync_schema_execution_status.py b/src/polytomic/types/v4bulk_sync_schema_execution_status.py
similarity index 95%
rename from src/polytomic/types/bulk_sync_schema_execution_status.py
rename to src/polytomic/types/v4bulk_sync_schema_execution_status.py
index 338eea0..4d376a3 100644
--- a/src/polytomic/types/bulk_sync_schema_execution_status.py
+++ b/src/polytomic/types/v4bulk_sync_schema_execution_status.py
@@ -10,7 +10,7 @@
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class BulkSyncSchemaExecutionStatus(UniversalBaseModel):
+class V4BulkSyncSchemaExecutionStatus(UniversalBaseModel):
     completed_at: typing.Optional[dt.datetime] = None
     error_count: typing.Optional[int] = None
     execution_id: typing.Optional[str] = pydantic.Field(default=None)
diff --git a/src/polytomic/types/v4configuration_value.py b/src/polytomic/types/v4configuration_value.py
new file mode 100644
index 0000000..6fc35aa
--- /dev/null
+++ b/src/polytomic/types/v4configuration_value.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V4ConfigurationValue(UniversalBaseModel):
+    items: typing.Optional[typing.List[typing.Optional[typing.Any]]] = None
+    type: typing.Optional[str] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v_4_export_sync_logs_envelope.py b/src/polytomic/types/v4export_sync_logs_envelope.py
similarity index 79%
rename from src/polytomic/types/v_4_export_sync_logs_envelope.py
rename to src/polytomic/types/v4export_sync_logs_envelope.py
index c4d35c0..20197f7 100644
--- a/src/polytomic/types/v_4_export_sync_logs_envelope.py
+++ b/src/polytomic/types/v4export_sync_logs_envelope.py
@@ -2,15 +2,15 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .v_4_export_sync_logs_response import V4ExportSyncLogsResponse
-from .job_response import JobResponse
+from .v4export_sync_logs_response import V4ExportSyncLogsResponse
+from .v2job_response import V2JobResponse
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
 class V4ExportSyncLogsEnvelope(UniversalBaseModel):
     data: typing.Optional[V4ExportSyncLogsResponse] = None
-    job: typing.Optional[JobResponse] = None
+    job: typing.Optional[V2JobResponse] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/v_4_export_sync_logs_response.py b/src/polytomic/types/v4export_sync_logs_response.py
similarity index 100%
rename from src/polytomic/types/v_4_export_sync_logs_response.py
rename to src/polytomic/types/v4export_sync_logs_response.py
diff --git a/src/polytomic/types/v4get_sync_source_meta_envelope.py b/src/polytomic/types/v4get_sync_source_meta_envelope.py
new file mode 100644
index 0000000..2ce0d32
--- /dev/null
+++ b/src/polytomic/types/v4get_sync_source_meta_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v4sync_source_meta_response import V4SyncSourceMetaResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V4GetSyncSourceMetaEnvelope(UniversalBaseModel):
+    data: typing.Optional[V4SyncSourceMetaResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v_4_global_error_subscribers_response.py b/src/polytomic/types/v4global_error_subscribers_response.py
similarity index 100%
rename from src/polytomic/types/v_4_global_error_subscribers_response.py
rename to src/polytomic/types/v4global_error_subscribers_response.py
diff --git a/src/polytomic/types/v4list_bulk_sync_executions_status_envelope.py b/src/polytomic/types/v4list_bulk_sync_executions_status_envelope.py
new file mode 100644
index 0000000..d9c6efd
--- /dev/null
+++ b/src/polytomic/types/v4list_bulk_sync_executions_status_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v4bulk_sync_execution_status import V4BulkSyncExecutionStatus
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V4ListBulkSyncExecutionsStatusEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V4BulkSyncExecutionStatus]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v_4_query_results_envelope.py b/src/polytomic/types/v4query_results_envelope.py
similarity index 78%
rename from src/polytomic/types/v_4_query_results_envelope.py
rename to src/polytomic/types/v4query_results_envelope.py
index ddadfc2..25e1d1c 100644
--- a/src/polytomic/types/v_4_query_results_envelope.py
+++ b/src/polytomic/types/v4query_results_envelope.py
@@ -2,15 +2,15 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .v_4_run_query_result import V4RunQueryResult
-from .pagination import Pagination
+from .v4run_query_result import V4RunQueryResult
+from .v4run_query_pagination import V4RunQueryPagination
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
 class V4QueryResultsEnvelope(UniversalBaseModel):
     data: typing.Optional[V4RunQueryResult] = None
-    links: typing.Optional[Pagination] = None
+    links: typing.Optional[V4RunQueryPagination] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
diff --git a/src/polytomic/types/v_4_run_query_envelope.py b/src/polytomic/types/v4run_query_envelope.py
similarity index 92%
rename from src/polytomic/types/v_4_run_query_envelope.py
rename to src/polytomic/types/v4run_query_envelope.py
index 9e16f20..ec8352b 100644
--- a/src/polytomic/types/v_4_run_query_envelope.py
+++ b/src/polytomic/types/v4run_query_envelope.py
@@ -2,7 +2,7 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .v_4_run_query_result import V4RunQueryResult
+from .v4run_query_result import V4RunQueryResult
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
diff --git a/src/polytomic/types/pagination.py b/src/polytomic/types/v4run_query_pagination.py
similarity index 94%
rename from src/polytomic/types/pagination.py
rename to src/polytomic/types/v4run_query_pagination.py
index 518a988..7c46e62 100644
--- a/src/polytomic/types/pagination.py
+++ b/src/polytomic/types/v4run_query_pagination.py
@@ -6,7 +6,7 @@
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class Pagination(UniversalBaseModel):
+class V4RunQueryPagination(UniversalBaseModel):
     next: typing.Optional[str] = pydantic.Field(default=None)
     """
     URL to the next page of results, if available. This may be returned as a host relative path.
diff --git a/src/polytomic/types/v_4_run_query_result.py b/src/polytomic/types/v4run_query_result.py
similarity index 100%
rename from src/polytomic/types/v_4_run_query_result.py
rename to src/polytomic/types/v4run_query_result.py
diff --git a/src/polytomic/types/schedule_envelope.py b/src/polytomic/types/v4schedule_envelope.py
similarity index 93%
rename from src/polytomic/types/schedule_envelope.py
rename to src/polytomic/types/v4schedule_envelope.py
index e015142..c54d868 100644
--- a/src/polytomic/types/schedule_envelope.py
+++ b/src/polytomic/types/v4schedule_envelope.py
@@ -7,7 +7,7 @@
 import pydantic
 
 
-class ScheduleEnvelope(UniversalBaseModel):
+class V4ScheduleEnvelope(UniversalBaseModel):
     data: typing.Optional[BulkBulkSyncSchedule] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/schedules_envelope.py b/src/polytomic/types/v4schedules_envelope.py
similarity index 93%
rename from src/polytomic/types/schedules_envelope.py
rename to src/polytomic/types/v4schedules_envelope.py
index 1e853d6..3009248 100644
--- a/src/polytomic/types/schedules_envelope.py
+++ b/src/polytomic/types/v4schedules_envelope.py
@@ -7,7 +7,7 @@
 import pydantic
 
 
-class SchedulesEnvelope(UniversalBaseModel):
+class V4SchedulesEnvelope(UniversalBaseModel):
     data: typing.Optional[typing.List[BulkBulkSyncSchedule]] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/source_meta.py b/src/polytomic/types/v4source_meta.py
similarity index 94%
rename from src/polytomic/types/source_meta.py
rename to src/polytomic/types/v4source_meta.py
index a447157..5f2dbbc 100644
--- a/src/polytomic/types/source_meta.py
+++ b/src/polytomic/types/v4source_meta.py
@@ -6,7 +6,7 @@
 import pydantic
 
 
-class SourceMeta(UniversalBaseModel):
+class V4SourceMeta(UniversalBaseModel):
     has_items: typing.Optional[bool] = None
     items: typing.Optional[typing.List[typing.Optional[typing.Any]]] = None
     requires_one_of: typing.Optional[typing.List[str]] = None
diff --git a/src/polytomic/types/supported_mode.py b/src/polytomic/types/v4supported_mode.py
similarity index 85%
rename from src/polytomic/types/supported_mode.py
rename to src/polytomic/types/v4supported_mode.py
index ff34d79..02f4af0 100644
--- a/src/polytomic/types/supported_mode.py
+++ b/src/polytomic/types/v4supported_mode.py
@@ -2,13 +2,13 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .model_sync_mode import ModelSyncMode
+from .modelsync_sync_target_mode import ModelsyncSyncTargetMode
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class SupportedMode(UniversalBaseModel):
-    id: typing.Optional[ModelSyncMode] = None
+class V4SupportedMode(UniversalBaseModel):
+    id: typing.Optional[ModelsyncSyncTargetMode] = None
     requires_identity: typing.Optional[bool] = pydantic.Field(default=None)
     """
     True if the sync mode requires an identity field mapping.
diff --git a/src/polytomic/types/connection_meta_response.py b/src/polytomic/types/v4sync_source_meta_response.py
similarity index 64%
rename from src/polytomic/types/connection_meta_response.py
rename to src/polytomic/types/v4sync_source_meta_response.py
index 6811a25..249c9a3 100644
--- a/src/polytomic/types/connection_meta_response.py
+++ b/src/polytomic/types/v4sync_source_meta_response.py
@@ -2,15 +2,15 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .configuration_value import ConfigurationValue
-from .connection_meta import ConnectionMeta
+from .v4configuration_value import V4ConfigurationValue
+from .v4source_meta import V4SourceMeta
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
-class ConnectionMetaResponse(UniversalBaseModel):
-    configuration: typing.Optional[typing.Dict[str, ConfigurationValue]] = None
-    items: typing.Optional[typing.Dict[str, typing.Optional[ConnectionMeta]]] = None
+class V4SyncSourceMetaResponse(UniversalBaseModel):
+    configuration: typing.Optional[typing.Dict[str, V4ConfigurationValue]] = None
+    items: typing.Optional[typing.Dict[str, typing.Optional[V4SourceMeta]]] = None
     requires_one_of: typing.Optional[typing.List[str]] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/v_4_target_creator.py b/src/polytomic/types/v4target_creator.py
similarity index 100%
rename from src/polytomic/types/v_4_target_creator.py
rename to src/polytomic/types/v4target_creator.py
diff --git a/src/polytomic/types/target_object.py b/src/polytomic/types/v4target_object.py
similarity index 82%
rename from src/polytomic/types/target_object.py
rename to src/polytomic/types/v4target_object.py
index c0f677e..16cec11 100644
--- a/src/polytomic/types/target_object.py
+++ b/src/polytomic/types/v4target_object.py
@@ -3,17 +3,17 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 import pydantic
-from .supported_mode import SupportedMode
+from .v4supported_mode import V4SupportedMode
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class TargetObject(UniversalBaseModel):
+class V4TargetObject(UniversalBaseModel):
     id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The identifier of the target object.
     """
 
-    modes: typing.Optional[typing.List[SupportedMode]] = pydantic.Field(default=None)
+    modes: typing.Optional[typing.List[V4SupportedMode]] = pydantic.Field(default=None)
     """
     The supported sync modes and their properties for the target object.
     """
diff --git a/src/polytomic/types/v_4_target_objects_response_envelope.py b/src/polytomic/types/v4target_objects_response_envelope.py
similarity index 80%
rename from src/polytomic/types/v_4_target_objects_response_envelope.py
rename to src/polytomic/types/v4target_objects_response_envelope.py
index 178d0f9..c017461 100644
--- a/src/polytomic/types/v_4_target_objects_response_envelope.py
+++ b/src/polytomic/types/v4target_objects_response_envelope.py
@@ -2,14 +2,14 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .target_object import TargetObject
-from .v_4_target_creator import V4TargetCreator
+from .v4target_object import V4TargetObject
+from .v4target_creator import V4TargetCreator
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
 class V4TargetObjectsResponseEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[TargetObject]] = None
+    data: typing.Optional[typing.List[V4TargetObject]] = None
     target_creation: typing.Optional[V4TargetCreator] = None
 
     if IS_PYDANTIC_V2:
diff --git a/src/polytomic/types/v_4_target_property_values.py b/src/polytomic/types/v4target_property_values.py
similarity index 100%
rename from src/polytomic/types/v_4_target_property_values.py
rename to src/polytomic/types/v4target_property_values.py
diff --git a/src/polytomic/types/v_4_target_property_values_envelope.py b/src/polytomic/types/v4target_property_values_envelope.py
similarity index 90%
rename from src/polytomic/types/v_4_target_property_values_envelope.py
rename to src/polytomic/types/v4target_property_values_envelope.py
index 1986743..9a97e3a 100644
--- a/src/polytomic/types/v_4_target_property_values_envelope.py
+++ b/src/polytomic/types/v4target_property_values_envelope.py
@@ -2,7 +2,7 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-from .v_4_target_property_values import V4TargetPropertyValues
+from .v4target_property_values import V4TargetPropertyValues
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
diff --git a/src/polytomic/types/v_4_user_field_request.py b/src/polytomic/types/v4user_field_request.py
similarity index 100%
rename from src/polytomic/types/v_4_user_field_request.py
rename to src/polytomic/types/v4user_field_request.py
diff --git a/src/polytomic/types/v5bulk_sync_response.py b/src/polytomic/types/v5bulk_sync_response.py
new file mode 100644
index 0000000..09dc6f4
--- /dev/null
+++ b/src/polytomic/types/v5bulk_sync_response.py
@@ -0,0 +1,72 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .bulk_discover import BulkDiscover
+import pydantic
+import datetime as dt
+from .common_output_actor import CommonOutputActor
+from .bulk_sync_target_mode import BulkSyncTargetMode
+from .bulk_normalize_names import BulkNormalizeNames
+from .v5bulk_sync_schedule_response import V5BulkSyncScheduleResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+
+
+class V5BulkSyncResponse(UniversalBaseModel):
+    active: typing.Optional[bool] = None
+    automatically_add_new_fields: typing.Optional[BulkDiscover] = None
+    automatically_add_new_objects: typing.Optional[BulkDiscover] = None
+    concurrency_limit: typing.Optional[int] = pydantic.Field(default=None)
+    """
+    Per-sync concurrency limit override.
+    """
+
+    created_at: typing.Optional[dt.datetime] = None
+    created_by: typing.Optional[CommonOutputActor] = None
+    data_cutoff_timestamp: typing.Optional[dt.datetime] = None
+    destination_configuration: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = pydantic.Field(
+        default=None
+    )
+    """
+    Destination-specific bulk sync configuration. e.g. output schema name, s3 file format, etc.
+    """
+
+    destination_connection_id: typing.Optional[str] = None
+    disable_record_timestamps: typing.Optional[bool] = None
+    id: typing.Optional[str] = None
+    mode: typing.Optional[BulkSyncTargetMode] = None
+    name: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    Name of the bulk sync
+    """
+
+    normalize_names: typing.Optional[BulkNormalizeNames] = None
+    organization_id: typing.Optional[str] = None
+    policies: typing.Optional[typing.List[str]] = pydantic.Field(default=None)
+    """
+    List of permissions policies applied to the bulk sync.
+    """
+
+    resync_concurrency_limit: typing.Optional[int] = pydantic.Field(default=None)
+    """
+    Per-sync resync concurrency limit override.
+    """
+
+    schedules: typing.Optional[typing.List[V5BulkSyncScheduleResponse]] = None
+    source_configuration: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = pydantic.Field(default=None)
+    """
+    Source-specific bulk sync configuration. e.g. replication slot name, sync lookback, etc.
+    """
+
+    source_connection_id: typing.Optional[str] = None
+    updated_at: typing.Optional[dt.datetime] = None
+    updated_by: typing.Optional[CommonOutputActor] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v5bulk_sync_response_envelope.py b/src/polytomic/types/v5bulk_sync_response_envelope.py
new file mode 100644
index 0000000..2e5d539
--- /dev/null
+++ b/src/polytomic/types/v5bulk_sync_response_envelope.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v5bulk_sync_response import V5BulkSyncResponse
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V5BulkSyncResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[V5BulkSyncResponse] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v5bulk_sync_schedule_request.py b/src/polytomic/types/v5bulk_sync_schedule_request.py
new file mode 100644
index 0000000..8b2b7ce
--- /dev/null
+++ b/src/polytomic/types/v5bulk_sync_schedule_request.py
@@ -0,0 +1,27 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .schedule_frequency import ScheduleFrequency
+from .bulk_selective_mode import BulkSelectiveMode
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V5BulkSyncScheduleRequest(UniversalBaseModel):
+    day_of_month: typing.Optional[str] = None
+    day_of_week: typing.Optional[str] = None
+    frequency: ScheduleFrequency
+    hour: typing.Optional[str] = None
+    minute: typing.Optional[str] = None
+    month: typing.Optional[str] = None
+    selective_mode: typing.Optional[BulkSelectiveMode] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v5bulk_sync_schedule_response.py b/src/polytomic/types/v5bulk_sync_schedule_response.py
new file mode 100644
index 0000000..2e1edcf
--- /dev/null
+++ b/src/polytomic/types/v5bulk_sync_schedule_response.py
@@ -0,0 +1,34 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+import datetime as dt
+from .common_output_actor import CommonOutputActor
+from .schedule_frequency import ScheduleFrequency
+from .bulk_selective_mode import BulkSelectiveMode
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V5BulkSyncScheduleResponse(UniversalBaseModel):
+    created_at: typing.Optional[dt.datetime] = None
+    created_by: typing.Optional[CommonOutputActor] = None
+    day_of_month: typing.Optional[str] = None
+    day_of_week: typing.Optional[str] = None
+    frequency: ScheduleFrequency
+    hour: typing.Optional[str] = None
+    id: typing.Optional[str] = None
+    minute: typing.Optional[str] = None
+    month: typing.Optional[str] = None
+    selective_mode: typing.Optional[BulkSelectiveMode] = None
+    updated_at: typing.Optional[dt.datetime] = None
+    updated_by: typing.Optional[CommonOutputActor] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v5list_sync_item.py b/src/polytomic/types/v5list_sync_item.py
new file mode 100644
index 0000000..9a7132a
--- /dev/null
+++ b/src/polytomic/types/v5list_sync_item.py
@@ -0,0 +1,41 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+import datetime as dt
+from .common_output_actor import CommonOutputActor
+import pydantic
+from .v5schedule import V5Schedule
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+
+
+class V5ListSyncItem(UniversalBaseModel):
+    active: typing.Optional[bool] = None
+    created_at: typing.Optional[dt.datetime] = None
+    created_by: typing.Optional[CommonOutputActor] = None
+    id: typing.Optional[str] = None
+    mode: typing.Optional[str] = None
+    model_ids: typing.Optional[typing.List[str]] = pydantic.Field(default=None)
+    """
+    Model IDs used in the sync.
+    """
+
+    name: typing.Optional[str] = None
+    only_enrich_updates: typing.Optional[bool] = None
+    organization_id: typing.Optional[str] = None
+    schedule: typing.Optional[V5Schedule] = None
+    skip_initial_backfill: typing.Optional[bool] = None
+    sync_all_records: typing.Optional[bool] = None
+    target_connection_id: typing.Optional[str] = None
+    target_object: typing.Optional[str] = None
+    updated_at: typing.Optional[dt.datetime] = None
+    updated_by: typing.Optional[CommonOutputActor] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v5list_sync_response_envelope.py b/src/polytomic/types/v5list_sync_response_envelope.py
new file mode 100644
index 0000000..8f0cdc1
--- /dev/null
+++ b/src/polytomic/types/v5list_sync_response_envelope.py
@@ -0,0 +1,22 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .v5list_sync_item import V5ListSyncItem
+from .v5pagination_details import V5PaginationDetails
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V5ListSyncResponseEnvelope(UniversalBaseModel):
+    data: typing.Optional[typing.List[V5ListSyncItem]] = None
+    pagination: typing.Optional[V5PaginationDetails] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v5pagination_details.py b/src/polytomic/types/v5pagination_details.py
new file mode 100644
index 0000000..7ee60a3
--- /dev/null
+++ b/src/polytomic/types/v5pagination_details.py
@@ -0,0 +1,19 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V5PaginationDetails(UniversalBaseModel):
+    next_page_token: typing.Optional[str] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v5run_after.py b/src/polytomic/types/v5run_after.py
new file mode 100644
index 0000000..9794e54
--- /dev/null
+++ b/src/polytomic/types/v5run_after.py
@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class V5RunAfter(UniversalBaseModel):
+    bulk_sync_ids: typing.Optional[typing.List[str]] = None
+    sync_ids: typing.Optional[typing.List[str]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v5schedule.py b/src/polytomic/types/v5schedule.py
new file mode 100644
index 0000000..ca155bf
--- /dev/null
+++ b/src/polytomic/types/v5schedule.py
@@ -0,0 +1,33 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .schedule_frequency import ScheduleFrequency
+from .v5run_after import V5RunAfter
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+
+
+class V5Schedule(UniversalBaseModel):
+    connection_id: typing.Optional[str] = None
+    day_of_month: typing.Optional[str] = None
+    day_of_week: typing.Optional[str] = None
+    frequency: typing.Optional[ScheduleFrequency] = None
+    hour: typing.Optional[str] = None
+    job_id: typing.Optional[int] = None
+    minute: typing.Optional[str] = None
+    month: typing.Optional[str] = None
+    run_after: typing.Optional[V5RunAfter] = None
+    run_after_success_only: typing.Optional[bool] = pydantic.Field(default=None)
+    """
+    If true, the sync will only run if the dependent syncs completed successfully.
+    """
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/v_2_schema_configuration_fields_item.py b/src/polytomic/types/v_2_schema_configuration_fields_item.py
deleted file mode 100644
index 6dd310f..0000000
--- a/src/polytomic/types/v_2_schema_configuration_fields_item.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import typing
-from .field_configuration import FieldConfiguration
-
-V2SchemaConfigurationFieldsItem = typing.Union[str, FieldConfiguration]
diff --git a/src/polytomic/types/webhook_envelope.py b/src/polytomic/types/webhook_envelope.py
deleted file mode 100644
index 442d571..0000000
--- a/src/polytomic/types/webhook_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .webhook import Webhook
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class WebhookEnvelope(UniversalBaseModel):
-    data: typing.Optional[Webhook] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/types/webhook_list_envelope.py b/src/polytomic/types/webhook_list_envelope.py
deleted file mode 100644
index 8e6c30d..0000000
--- a/src/polytomic/types/webhook_list_envelope.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from ..core.pydantic_utilities import UniversalBaseModel
-import typing
-from .webhook import Webhook
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
-
-
-class WebhookListEnvelope(UniversalBaseModel):
-    data: typing.Optional[typing.List[Webhook]] = None
-
-    if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
-    else:
-
-        class Config:
-            frozen = True
-            smart_union = True
-            extra = pydantic.Extra.allow
diff --git a/src/polytomic/users/client.py b/src/polytomic/users/client.py
index aa0148e..db540ab 100644
--- a/src/polytomic/users/client.py
+++ b/src/polytomic/users/client.py
@@ -3,7 +3,7 @@
 import typing
 from ..core.client_wrapper import SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.list_users_envelope import ListUsersEnvelope
+from ..types.v2list_users_envelope import V2ListUsersEnvelope
 from ..core.jsonable_encoder import jsonable_encoder
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.unauthorized_error import UnauthorizedError
@@ -12,10 +12,10 @@
 from ..types.api_error import ApiError as types_api_error_ApiError
 from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError as core_api_error_ApiError
-from ..types.user_envelope import UserEnvelope
+from ..types.v2user_envelope import V2UserEnvelope
 from ..errors.unprocessable_entity_error import UnprocessableEntityError
 from ..errors.internal_server_error import InternalServerError
-from ..types.api_key_response_envelope import ApiKeyResponseEnvelope
+from ..types.v2api_key_response_envelope import V2ApiKeyResponseEnvelope
 from ..core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
@@ -26,7 +26,7 @@ class UsersClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def list(self, org_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> ListUsersEnvelope:
+    def list(self, org_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2ListUsersEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -41,7 +41,7 @@ def list(self, org_id: str, *, request_options: typing.Optional[RequestOptions]
 
         Returns
         -------
-        ListUsersEnvelope
+        V2ListUsersEnvelope
             OK
 
         Examples
@@ -53,7 +53,7 @@ def list(self, org_id: str, *, request_options: typing.Optional[RequestOptions]
             token="YOUR_TOKEN",
         )
         client.users.list(
-            org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            org_id="org_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -64,9 +64,9 @@ def list(self, org_id: str, *, request_options: typing.Optional[RequestOptions]
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListUsersEnvelope,
+                    V2ListUsersEnvelope,
                     parse_obj_as(
-                        type_=ListUsersEnvelope,  # type: ignore
+                        type_=V2ListUsersEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -102,7 +102,7 @@ def create(
         email: str,
         role: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> UserEnvelope:
+    ) -> V2UserEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -121,7 +121,7 @@ def create(
 
         Returns
         -------
-        UserEnvelope
+        V2UserEnvelope
             OK
 
         Examples
@@ -133,8 +133,8 @@ def create(
             token="YOUR_TOKEN",
         )
         client.users.create(
-            org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            email="mail@example.com",
+            org_id="org_id",
+            email="email",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -153,9 +153,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    UserEnvelope,
+                    V2UserEnvelope,
                     parse_obj_as(
-                        type_=UserEnvelope,  # type: ignore
+                        type_=V2UserEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -194,7 +194,7 @@ def create(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get(self, id: str, org_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> UserEnvelope:
+    def get(self, org_id: str, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2UserEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -202,16 +202,16 @@ def get(self, id: str, org_id: str, *, request_options: typing.Optional[RequestO
 
         Parameters
         ----------
-        id : str
-
         org_id : str
 
+        id : str
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        UserEnvelope
+        V2UserEnvelope
             OK
 
         Examples
@@ -223,8 +223,8 @@ def get(self, id: str, org_id: str, *, request_options: typing.Optional[RequestO
             token="YOUR_TOKEN",
         )
         client.users.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            org_id="org_id",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -235,9 +235,9 @@ def get(self, id: str, org_id: str, *, request_options: typing.Optional[RequestO
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    UserEnvelope,
+                    V2UserEnvelope,
                     parse_obj_as(
-                        type_=UserEnvelope,  # type: ignore
+                        type_=V2UserEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -278,13 +278,13 @@ def get(self, id: str, org_id: str, *, request_options: typing.Optional[RequestO
 
     def update(
         self,
-        id: str,
         org_id: str,
+        id: str,
         *,
         email: str,
         role: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> UserEnvelope:
+    ) -> V2UserEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -292,10 +292,10 @@ def update(
 
         Parameters
         ----------
-        id : str
-
         org_id : str
 
+        id : str
+
         email : str
 
         role : typing.Optional[str]
@@ -305,7 +305,7 @@ def update(
 
         Returns
         -------
-        UserEnvelope
+        V2UserEnvelope
             OK
 
         Examples
@@ -317,9 +317,9 @@ def update(
             token="YOUR_TOKEN",
         )
         client.users.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            email="mail@example.com",
+            org_id="org_id",
+            id="id",
+            email="email",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -338,9 +338,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    UserEnvelope,
+                    V2UserEnvelope,
                     parse_obj_as(
-                        type_=UserEnvelope,  # type: ignore
+                        type_=V2UserEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -379,7 +379,9 @@ def update(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def remove(self, id: str, org_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> UserEnvelope:
+    def remove(
+        self, org_id: str, id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V2UserEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -387,16 +389,16 @@ def remove(self, id: str, org_id: str, *, request_options: typing.Optional[Reque
 
         Parameters
         ----------
-        id : str
-
         org_id : str
 
+        id : str
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        UserEnvelope
+        V2UserEnvelope
             OK
 
         Examples
@@ -408,8 +410,8 @@ def remove(self, id: str, org_id: str, *, request_options: typing.Optional[Reque
             token="YOUR_TOKEN",
         )
         client.users.remove(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            org_id="org_id",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -420,9 +422,9 @@ def remove(self, id: str, org_id: str, *, request_options: typing.Optional[Reque
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    UserEnvelope,
+                    V2UserEnvelope,
                     parse_obj_as(
-                        type_=UserEnvelope,  # type: ignore
+                        type_=V2UserEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -468,7 +470,7 @@ def create_api_key(
         *,
         force: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ApiKeyResponseEnvelope:
+    ) -> V2ApiKeyResponseEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -487,7 +489,7 @@ def create_api_key(
 
         Returns
         -------
-        ApiKeyResponseEnvelope
+        V2ApiKeyResponseEnvelope
             OK
 
         Examples
@@ -499,9 +501,8 @@ def create_api_key(
             token="YOUR_TOKEN",
         )
         client.users.create_api_key(
-            org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            force=True,
+            org_id="org_id",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -515,9 +516,9 @@ def create_api_key(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ApiKeyResponseEnvelope,
+                    V2ApiKeyResponseEnvelope,
                     parse_obj_as(
-                        type_=ApiKeyResponseEnvelope,  # type: ignore
+                        type_=V2ApiKeyResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -561,7 +562,9 @@ class AsyncUsersClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def list(self, org_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> ListUsersEnvelope:
+    async def list(
+        self, org_id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V2ListUsersEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -576,7 +579,7 @@ async def list(self, org_id: str, *, request_options: typing.Optional[RequestOpt
 
         Returns
         -------
-        ListUsersEnvelope
+        V2ListUsersEnvelope
             OK
 
         Examples
@@ -593,7 +596,7 @@ async def list(self, org_id: str, *, request_options: typing.Optional[RequestOpt
 
         async def main() -> None:
             await client.users.list(
-                org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                org_id="org_id",
             )
 
 
@@ -607,9 +610,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ListUsersEnvelope,
+                    V2ListUsersEnvelope,
                     parse_obj_as(
-                        type_=ListUsersEnvelope,  # type: ignore
+                        type_=V2ListUsersEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -645,7 +648,7 @@ async def create(
         email: str,
         role: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> UserEnvelope:
+    ) -> V2UserEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -664,7 +667,7 @@ async def create(
 
         Returns
         -------
-        UserEnvelope
+        V2UserEnvelope
             OK
 
         Examples
@@ -681,8 +684,8 @@ async def create(
 
         async def main() -> None:
             await client.users.create(
-                org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                email="mail@example.com",
+                org_id="org_id",
+                email="email",
             )
 
 
@@ -704,9 +707,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    UserEnvelope,
+                    V2UserEnvelope,
                     parse_obj_as(
-                        type_=UserEnvelope,  # type: ignore
+                        type_=V2UserEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -746,8 +749,8 @@ async def main() -> None:
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
-        self, id: str, org_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> UserEnvelope:
+        self, org_id: str, id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V2UserEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -755,16 +758,16 @@ async def get(
 
         Parameters
         ----------
-        id : str
-
         org_id : str
 
+        id : str
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        UserEnvelope
+        V2UserEnvelope
             OK
 
         Examples
@@ -781,8 +784,8 @@ async def get(
 
         async def main() -> None:
             await client.users.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                org_id="org_id",
+                id="id",
             )
 
 
@@ -796,9 +799,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    UserEnvelope,
+                    V2UserEnvelope,
                     parse_obj_as(
-                        type_=UserEnvelope,  # type: ignore
+                        type_=V2UserEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -839,13 +842,13 @@ async def main() -> None:
 
     async def update(
         self,
-        id: str,
         org_id: str,
+        id: str,
         *,
         email: str,
         role: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> UserEnvelope:
+    ) -> V2UserEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -853,10 +856,10 @@ async def update(
 
         Parameters
         ----------
-        id : str
-
         org_id : str
 
+        id : str
+
         email : str
 
         role : typing.Optional[str]
@@ -866,7 +869,7 @@ async def update(
 
         Returns
         -------
-        UserEnvelope
+        V2UserEnvelope
             OK
 
         Examples
@@ -883,9 +886,9 @@ async def update(
 
         async def main() -> None:
             await client.users.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                email="mail@example.com",
+                org_id="org_id",
+                id="id",
+                email="email",
             )
 
 
@@ -907,9 +910,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    UserEnvelope,
+                    V2UserEnvelope,
                     parse_obj_as(
-                        type_=UserEnvelope,  # type: ignore
+                        type_=V2UserEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -949,8 +952,8 @@ async def main() -> None:
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
     async def remove(
-        self, id: str, org_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> UserEnvelope:
+        self, org_id: str, id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> V2UserEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -958,16 +961,16 @@ async def remove(
 
         Parameters
         ----------
-        id : str
-
         org_id : str
 
+        id : str
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        UserEnvelope
+        V2UserEnvelope
             OK
 
         Examples
@@ -984,8 +987,8 @@ async def remove(
 
         async def main() -> None:
             await client.users.remove(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                org_id="org_id",
+                id="id",
             )
 
 
@@ -999,9 +1002,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    UserEnvelope,
+                    V2UserEnvelope,
                     parse_obj_as(
-                        type_=UserEnvelope,  # type: ignore
+                        type_=V2UserEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1047,7 +1050,7 @@ async def create_api_key(
         *,
         force: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> ApiKeyResponseEnvelope:
+    ) -> V2ApiKeyResponseEnvelope:
         """
         > 🚧 Requires partner key
         >
@@ -1066,7 +1069,7 @@ async def create_api_key(
 
         Returns
         -------
-        ApiKeyResponseEnvelope
+        V2ApiKeyResponseEnvelope
             OK
 
         Examples
@@ -1083,9 +1086,8 @@ async def create_api_key(
 
         async def main() -> None:
             await client.users.create_api_key(
-                org_id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                force=True,
+                org_id="org_id",
+                id="id",
             )
 
 
@@ -1102,9 +1104,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    ApiKeyResponseEnvelope,
+                    V2ApiKeyResponseEnvelope,
                     parse_obj_as(
-                        type_=ApiKeyResponseEnvelope,  # type: ignore
+                        type_=V2ApiKeyResponseEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
diff --git a/src/polytomic/webhooks/client.py b/src/polytomic/webhooks/client.py
index e50958d..90b0149 100644
--- a/src/polytomic/webhooks/client.py
+++ b/src/polytomic/webhooks/client.py
@@ -3,7 +3,7 @@
 import typing
 from ..core.client_wrapper import SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.webhook_list_envelope import WebhookListEnvelope
+from ..types.v2webhook_list_envelope import V2WebhookListEnvelope
 from ..core.pydantic_utilities import parse_obj_as
 from ..errors.unauthorized_error import UnauthorizedError
 from ..types.rest_err_response import RestErrResponse
@@ -11,7 +11,7 @@
 from ..types.api_error import ApiError as types_api_error_ApiError
 from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError as core_api_error_ApiError
-from ..types.webhook_envelope import WebhookEnvelope
+from ..types.v2webhook_envelope import V2WebhookEnvelope
 from ..errors.unprocessable_entity_error import UnprocessableEntityError
 from ..core.jsonable_encoder import jsonable_encoder
 from ..errors.not_found_error import NotFoundError
@@ -25,7 +25,7 @@ class WebhooksClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> WebhookListEnvelope:
+    def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2WebhookListEnvelope:
         """
         Webooks can be set up using the webhook API endpoints. Currently, only one
         webhook may be created per organization. The webhook will be called for events
@@ -40,7 +40,7 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> We
 
         Returns
         -------
-        WebhookListEnvelope
+        V2WebhookListEnvelope
             OK
 
         Examples
@@ -61,9 +61,9 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> We
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookListEnvelope,
+                    V2WebhookListEnvelope,
                     parse_obj_as(
-                        type_=WebhookListEnvelope,  # type: ignore
+                        type_=V2WebhookListEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -99,7 +99,7 @@ def create(
         secret: str,
         organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> WebhookEnvelope:
+    ) -> V2WebhookEnvelope:
         """
         Webooks can be set up using the webhook API endpoints. Currently, only one
         webhook may be created per organization. The webhook will be called for events
@@ -120,7 +120,7 @@ def create(
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -132,8 +132,8 @@ def create(
             token="YOUR_TOKEN",
         )
         client.webhooks.create(
-            endpoint="https://example.com/webhook",
-            secret="secret",
+            endpoint="endpoint",
+            secret="banana",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -153,9 +153,9 @@ def create(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -194,7 +194,7 @@ def create(
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> WebhookEnvelope:
+    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2WebhookEnvelope:
         """
         Webooks can be set up using the webhook API endpoints. Currently, only one
         webhook may be created per organization. The webhook will be called for events
@@ -211,7 +211,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -223,7 +223,7 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             token="YOUR_TOKEN",
         )
         client.webhooks.get(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -234,9 +234,9 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -273,7 +273,7 @@ def update(
         secret: str,
         organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> WebhookEnvelope:
+    ) -> V2WebhookEnvelope:
         """
         Webooks can be set up using the webhook API endpoints. Currently, only one
         webhook may be created per organization. The webhook will be called for events
@@ -296,7 +296,7 @@ def update(
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -308,9 +308,9 @@ def update(
             token="YOUR_TOKEN",
         )
         client.webhooks.update(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
-            endpoint="https://example.com/webhook",
-            secret="secret",
+            id="id",
+            endpoint="endpoint",
+            secret="banana",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -330,9 +330,9 @@ def update(
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -393,7 +393,7 @@ def remove(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             token="YOUR_TOKEN",
         )
         client.webhooks.remove(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -439,7 +439,7 @@ def remove(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def disable(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> WebhookEnvelope:
+    def disable(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2WebhookEnvelope:
         """
         Parameters
         ----------
@@ -450,7 +450,7 @@ def disable(self, id: str, *, request_options: typing.Optional[RequestOptions] =
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -462,7 +462,7 @@ def disable(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             token="YOUR_TOKEN",
         )
         client.webhooks.disable(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -473,9 +473,9 @@ def disable(self, id: str, *, request_options: typing.Optional[RequestOptions] =
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -514,7 +514,7 @@ def disable(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    def enable(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> WebhookEnvelope:
+    def enable(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2WebhookEnvelope:
         """
         Parameters
         ----------
@@ -525,7 +525,7 @@ def enable(self, id: str, *, request_options: typing.Optional[RequestOptions] =
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -537,7 +537,7 @@ def enable(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             token="YOUR_TOKEN",
         )
         client.webhooks.enable(
-            id="248df4b7-aa70-47b8-a036-33ac447e668d",
+            id="id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -548,9 +548,9 @@ def enable(self, id: str, *, request_options: typing.Optional[RequestOptions] =
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -594,7 +594,7 @@ class AsyncWebhooksClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> WebhookListEnvelope:
+    async def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> V2WebhookListEnvelope:
         """
         Webooks can be set up using the webhook API endpoints. Currently, only one
         webhook may be created per organization. The webhook will be called for events
@@ -609,7 +609,7 @@ async def list(self, *, request_options: typing.Optional[RequestOptions] = None)
 
         Returns
         -------
-        WebhookListEnvelope
+        V2WebhookListEnvelope
             OK
 
         Examples
@@ -638,9 +638,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookListEnvelope,
+                    V2WebhookListEnvelope,
                     parse_obj_as(
-                        type_=WebhookListEnvelope,  # type: ignore
+                        type_=V2WebhookListEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -676,7 +676,7 @@ async def create(
         secret: str,
         organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> WebhookEnvelope:
+    ) -> V2WebhookEnvelope:
         """
         Webooks can be set up using the webhook API endpoints. Currently, only one
         webhook may be created per organization. The webhook will be called for events
@@ -697,7 +697,7 @@ async def create(
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -714,8 +714,8 @@ async def create(
 
         async def main() -> None:
             await client.webhooks.create(
-                endpoint="https://example.com/webhook",
-                secret="secret",
+                endpoint="endpoint",
+                secret="banana",
             )
 
 
@@ -738,9 +738,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -779,7 +779,7 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> WebhookEnvelope:
+    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2WebhookEnvelope:
         """
         Webooks can be set up using the webhook API endpoints. Currently, only one
         webhook may be created per organization. The webhook will be called for events
@@ -796,7 +796,7 @@ async def get(self, id: str, *, request_options: typing.Optional[RequestOptions]
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -813,7 +813,7 @@ async def get(self, id: str, *, request_options: typing.Optional[RequestOptions]
 
         async def main() -> None:
             await client.webhooks.get(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -827,9 +827,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -866,7 +866,7 @@ async def update(
         secret: str,
         organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> WebhookEnvelope:
+    ) -> V2WebhookEnvelope:
         """
         Webooks can be set up using the webhook API endpoints. Currently, only one
         webhook may be created per organization. The webhook will be called for events
@@ -889,7 +889,7 @@ async def update(
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -906,9 +906,9 @@ async def update(
 
         async def main() -> None:
             await client.webhooks.update(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
-                endpoint="https://example.com/webhook",
-                secret="secret",
+                id="id",
+                endpoint="endpoint",
+                secret="banana",
             )
 
 
@@ -931,9 +931,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -999,7 +999,7 @@ async def remove(self, id: str, *, request_options: typing.Optional[RequestOptio
 
         async def main() -> None:
             await client.webhooks.remove(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1048,7 +1048,7 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def disable(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> WebhookEnvelope:
+    async def disable(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2WebhookEnvelope:
         """
         Parameters
         ----------
@@ -1059,7 +1059,7 @@ async def disable(self, id: str, *, request_options: typing.Optional[RequestOpti
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -1076,7 +1076,7 @@ async def disable(self, id: str, *, request_options: typing.Optional[RequestOpti
 
         async def main() -> None:
             await client.webhooks.disable(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1090,9 +1090,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
@@ -1131,7 +1131,7 @@ async def main() -> None:
             raise core_api_error_ApiError(status_code=_response.status_code, body=_response.text)
         raise core_api_error_ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def enable(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> WebhookEnvelope:
+    async def enable(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> V2WebhookEnvelope:
         """
         Parameters
         ----------
@@ -1142,7 +1142,7 @@ async def enable(self, id: str, *, request_options: typing.Optional[RequestOptio
 
         Returns
         -------
-        WebhookEnvelope
+        V2WebhookEnvelope
             OK
 
         Examples
@@ -1159,7 +1159,7 @@ async def enable(self, id: str, *, request_options: typing.Optional[RequestOptio
 
         async def main() -> None:
             await client.webhooks.enable(
-                id="248df4b7-aa70-47b8-a036-33ac447e668d",
+                id="id",
             )
 
 
@@ -1173,9 +1173,9 @@ async def main() -> None:
         try:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
-                    WebhookEnvelope,
+                    V2WebhookEnvelope,
                     parse_obj_as(
-                        type_=WebhookEnvelope,  # type: ignore
+                        type_=V2WebhookEnvelope,  # type: ignore
                         object_=_response.json(),
                     ),
                 )