diff --git a/examples/workspace/alerts/create_alerts.py b/examples/workspace/alerts/create_alerts.py
index 72367ca8..308d3c39 100755
--- a/examples/workspace/alerts/create_alerts.py
+++ b/examples/workspace/alerts/create_alerts.py
@@ -5,17 +5,28 @@
 
 w = WorkspaceClient()
 
-srcs = w.data_sources.list()
+query = w.queries.create(
+    query=sql.CreateQueryRequestQuery(
+        display_name=f"sdk-{time.time_ns()}",
+        description="This is a test query created from the SDK",
+        query_text="SELECT 1",
+    )
+)
 
-query = w.queries.create(name=f'sdk-{time.time_ns()}',
-                         data_source_id=srcs[0].id,
-                         description="test query from Go SDK",
-                         query="SELECT 1")
-
-alert = w.alerts.create(options=sql.AlertOptions(column="1", op="==", value="1"),
-                        name=f'sdk-{time.time_ns()}',
-                        query_id=query.id)
+alert = w.alerts.create(
+    alert=sql.CreateAlertRequestAlert(
+        display_name=f"sdk-{time.time_ns()}",
+        query_id=query.id,
+        condition=sql.AlertCondition(
+            op=sql.AlertOperator.LESS_THAN,
+            operand=sql.AlertConditionOperand(column=sql.AlertOperandColumn(name="1")),
+            threshold=sql.AlertConditionThreshold(
+                value=sql.AlertOperandValue(double_value=1.5)
+            ),
+        ),
+    )
+)
 
 # cleanup
-w.queries.delete(query_id=query.id)
-w.alerts.delete(alert_id=alert.id)
+w.queries.delete(id=query.id)
+w.alerts.delete(id=alert.id)
diff --git a/examples/workspace/alerts/get_alerts.py b/examples/workspace/alerts/get_alerts.py
index 3c24e856..a220f7c6 100755
--- a/examples/workspace/alerts/get_alerts.py
+++ b/examples/workspace/alerts/get_alerts.py
@@ -5,19 +5,30 @@
 
 w = WorkspaceClient()
 
-srcs = w.data_sources.list()
+query = w.queries.create(
+    query=sql.CreateQueryRequestQuery(
+        display_name=f"sdk-{time.time_ns()}",
+        description="This is a test query created from the SDK",
+        query_text="SELECT 1",
+    )
+)
 
-query = w.queries.create(name=f'sdk-{time.time_ns()}',
-                         data_source_id=srcs[0].id,
-                         description="test query from Go SDK",
-                         query="SELECT 1")
+alert = w.alerts.create(
+    alert=sql.CreateAlertRequestAlert(
+        display_name=f"sdk-{time.time_ns()}",
+        query_id=query.id,
+        condition=sql.AlertCondition(
+            op=sql.AlertOperator.LESS_THAN,
+            operand=sql.AlertConditionOperand(column=sql.AlertOperandColumn(name="1")),
+            threshold=sql.AlertConditionThreshold(
+                value=sql.AlertOperandValue(double_value=1.5)
+            ),
+        ),
+    )
+)
 
-alert = w.alerts.create(options=sql.AlertOptions(column="1", op="==", value="1"),
-                        name=f'sdk-{time.time_ns()}',
-                        query_id=query.id)
-
-by_id = w.alerts.get(alert_id=alert.id)
+by_id = w.alerts.get(id=alert.id)
 
 # cleanup
-w.queries.delete(query_id=query.id)
-w.alerts.delete(alert_id=alert.id)
+w.queries.delete(id=query.id)
+w.alerts.delete(id=alert.id)
diff --git a/examples/workspace/alerts/update_alerts.py b/examples/workspace/alerts/update_alerts.py
index 130f7191..0f4f1c71 100755
--- a/examples/workspace/alerts/update_alerts.py
+++ b/examples/workspace/alerts/update_alerts.py
@@ -5,22 +5,42 @@
 
 w = WorkspaceClient()
 
-srcs = w.data_sources.list()
+query = w.queries.create(
+    query=sql.CreateQueryRequestQuery(
+        display_name=f'sdk-{time.time_ns()}',
+        description="This is a test query created from the SDK",
+        query_text="SELECT 1"
+    )
+)
 
-query = w.queries.create(name=f'sdk-{time.time_ns()}',
-                         data_source_id=srcs[0].id,
-                         description="test query from Go SDK",
-                         query="SELECT 1")
+alert = w.alerts.create(
+    alert=sql.CreateAlertRequestAlert(
+        display_name=f'sdk-{time.time_ns()}',
+        query_id=query.id,
+        condition=sql.AlertCondition(
+            op=sql.AlertOperator.LESS_THAN,
+            operand=sql.AlertConditionOperand(column=sql.AlertOperandColumn(name="1")),
+            threshold=sql.AlertConditionThreshold(
+                value=sql.AlertOperandValue(double_value=1.5)
+            ),
+        ),
+    )
+)
 
-alert = w.alerts.create(options=sql.AlertOptions(column="1", op="==", value="1"),
-                        name=f'sdk-{time.time_ns()}',
-                        query_id=query.id)
-
-w.alerts.update(options=sql.AlertOptions(column="1", op="==", value="1"),
-                alert_id=alert.id,
-                name=f'sdk-{time.time_ns()}',
-                query_id=query.id)
+w.alerts.update(
+    id=alert.id,
+    alert=sql.UpdateAlertRequestAlert(
+        condition=sql.AlertCondition(
+            op=sql.AlertOperator.GREATER_THAN,
+            operand=sql.AlertConditionOperand(column=sql.AlertOperandColumn(name="1")),
+            threshold=sql.AlertConditionThreshold(
+                value=sql.AlertOperandValue(double_value=99)
+            ),
+        ),
+    ),
+    update_mask="condition",
+)
 
 # cleanup
-w.queries.delete(query_id=query.id)
-w.alerts.delete(alert_id=alert.id)
+w.queries.delete(id=query.id)
+w.alerts.delete(id=alert.id)
diff --git a/examples/workspace/queries/create_alerts.py b/examples/workspace/queries/create_alerts.py
deleted file mode 100755
index 37d71ac6..00000000
--- a/examples/workspace/queries/create_alerts.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import time
-
-from databricks.sdk import WorkspaceClient
-
-w = WorkspaceClient()
-
-srcs = w.data_sources.list()
-
-query = w.queries.create(name=f'sdk-{time.time_ns()}',
-                         data_source_id=srcs[0].id,
-                         description="test query from Go SDK",
-                         query="SELECT 1")
-
-# cleanup
-w.queries.delete(query_id=query.id)
diff --git a/examples/workspace/queries/create_queries.py b/examples/workspace/queries/create_queries.py
index c8d5ac93..7c033743 100755
--- a/examples/workspace/queries/create_queries.py
+++ b/examples/workspace/queries/create_queries.py
@@ -1,15 +1,17 @@
 import time
 
 from databricks.sdk import WorkspaceClient
+from databricks.sdk.service import sql
 
 w = WorkspaceClient()
 
-srcs = w.data_sources.list()
-
-query = w.queries.create(name=f'sdk-{time.time_ns()}',
-                         data_source_id=srcs[0].id,
-                         description="test query from Go SDK",
-                         query="SHOW TABLES")
+query = w.queries.create(
+    query=sql.CreateQueryRequestQuery(
+        display_name=f"sdk-{time.time_ns()}",
+        description="This is a test query created from the SDK",
+        query_text="SELECT 1",
+    )
+)
 
 # cleanup
-w.queries.delete(query_id=query.id)
+w.queries.delete(id=query.id)
diff --git a/examples/workspace/queries/get_queries.py b/examples/workspace/queries/get_queries.py
index d29b7598..5920a2fe 100755
--- a/examples/workspace/queries/get_queries.py
+++ b/examples/workspace/queries/get_queries.py
@@ -1,17 +1,19 @@
 import time
 
 from databricks.sdk import WorkspaceClient
+from databricks.sdk.service import sql
 
 w = WorkspaceClient()
 
-srcs = w.data_sources.list()
+query = w.queries.create(
+    query=sql.CreateQueryRequestQuery(
+        display_name=f"sdk-{time.time_ns()}",
+        description="This is a test query created from the SDK",
+        query_text="SELECT 1",
+    )
+)
 
-query = w.queries.create(name=f'sdk-{time.time_ns()}',
-                         data_source_id=srcs[0].id,
-                         description="test query from Go SDK",
-                         query="SHOW TABLES")
-
-by_id = w.queries.get(query_id=query.id)
+by_id = w.queries.get(id=query.id)
 
 # cleanup
-w.queries.delete(query_id=query.id)
+w.queries.delete(id=query.id)
diff --git a/examples/workspace/queries/list_queries.py b/examples/workspace/queries/list_queries.py
new file mode 100644
index 00000000..8dbb49ed
--- /dev/null
+++ b/examples/workspace/queries/list_queries.py
@@ -0,0 +1,5 @@
+from databricks.sdk import WorkspaceClient
+
+w = WorkspaceClient()
+
+all = w.queries.list()
diff --git a/examples/workspace/queries/update_queries.py b/examples/workspace/queries/update_queries.py
index 85a9609a..ad085fc5 100755
--- a/examples/workspace/queries/update_queries.py
+++ b/examples/workspace/queries/update_queries.py
@@ -1,21 +1,26 @@
 import time
 
 from databricks.sdk import WorkspaceClient
+from databricks.sdk.service import sql
 
 w = WorkspaceClient()
 
-srcs = w.data_sources.list()
+query = w.queries.create(
+    query=sql.CreateQueryRequestQuery(
+        display_name=f"sdk-{time.time_ns()}",
+        description="This is a test query created from the SDK",
+        query_text="SELECT 1",
+    )
+)
 
-query = w.queries.create(name=f'sdk-{time.time_ns()}',
-                         data_source_id=srcs[0].id,
-                         description="test query from Go SDK",
-                         query="SHOW TABLES")
-
-updated = w.queries.update(query_id=query.id,
-                           name=f'sdk-{time.time_ns()}',
-                           data_source_id=srcs[0].id,
-                           description="UPDATED: test query from Go SDK",
-                           query="SELECT 2+2")
+w.queries.update(
+    id=query.id,
+    query=sql.UpdateQueryRequestQuery(
+        description="This is a test query updated from the SDK",
+        query_text="SELECT 2",
+    ),
+    update_mask="description,query_text",
+)
 
 # cleanup
-w.queries.delete(query_id=query.id)
+w.queries.delete(id=query.id)