diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index c7159c1..3d2ac0b 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.0.2"
+  ".": "0.1.0"
 }
\ No newline at end of file
diff --git a/.stats.yml b/.stats.yml
index 754d90b..ddb1fe8 100644
--- a/.stats.yml
+++ b/.stats.yml
@@ -1,4 +1,4 @@
-configured_endpoints: 138
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/zavu/zavudev-86aec85be1021cea51f9fc0bb95248276c8b85e3ac0fd810490114599ed7cf00.yml
-openapi_spec_hash: 6b119a3213e324f3826453deca57f10b
-config_hash: 7fca08d9dae18513f5d7451cea11e34c
+configured_endpoints: 183
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/zavu/zavudev-5d75bbdcac3a0b0a8b798c0b4ef0dacfbc64ad4a20605489dc46dda7c8d1d8d8.yml
+openapi_spec_hash: bb242cfd8cc43354412164c2dceae89c
+config_hash: 261e1b852ca7f8364e4a283a3edd350a
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7093826..be543db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.1.0 (2026-09-08)
+
+Full Changelog: [v0.0.2...v0.1.0](https://github.com/zavudev/sdk-csharp/compare/v0.0.2...v0.1.0)
+
+### Features
+
+* **api:** api update ([9d9ab4a](https://github.com/zavudev/sdk-csharp/commit/9d9ab4ae87c2113e5f6b5ac15dfd0f92e77d6729))
+* **api:** api update ([e5056d9](https://github.com/zavudev/sdk-csharp/commit/e5056d98cb153e995d446f6db6a2108c650b32f0))
+* **api:** api update ([96ab7f3](https://github.com/zavudev/sdk-csharp/commit/96ab7f3c8699713449314334fb4fd6da77328e45))
+* **api:** api update ([4e858c7](https://github.com/zavudev/sdk-csharp/commit/4e858c781f3fed4c097fd183e7100e7a2fb820f6))
+* **api:** api update ([b4437bc](https://github.com/zavudev/sdk-csharp/commit/b4437bc578ddee38ed35c2b36bfd7c56668ac899))
+* **api:** api update ([158b835](https://github.com/zavudev/sdk-csharp/commit/158b83539d3d2e5ff856370d135046f3c86d648f))
+* **api:** api update ([ab63674](https://github.com/zavudev/sdk-csharp/commit/ab63674d56ece9623457bc26b3e7f7de61dc56af))
+* **api:** api update ([075d0c2](https://github.com/zavudev/sdk-csharp/commit/075d0c247aee199ad08c180fa65925beb52b0f08))
+* **api:** api update ([c89fc7b](https://github.com/zavudev/sdk-csharp/commit/c89fc7b716dc67adaeebc0389d47bee998137f05))
+* **api:** api update ([47de211](https://github.com/zavudev/sdk-csharp/commit/47de211deff2c722fe0158faedbf35690434fcdc))
+* **api:** manual updates ([18aecff](https://github.com/zavudev/sdk-csharp/commit/18aecff0d1bd009748ef781eb2261cc219ed6aef))
+
 ## 0.0.2 (2026-08-10)
 
 Full Changelog: [v0.0.1...v0.0.2](https://github.com/zavudev/sdk-csharp/compare/v0.0.1...v0.0.2)
diff --git a/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateListParamsTest.cs b/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateListParamsTest.cs
new file mode 100644
index 0000000..b6ba8d8
--- /dev/null
+++ b/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateListParamsTest.cs
@@ -0,0 +1 @@
+namespace Zavudev.Tests.Models.AgentTemplates;
diff --git a/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateListResponseTest.cs b/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateListResponseTest.cs
new file mode 100644
index 0000000..c28ba8c
--- /dev/null
+++ b/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateListResponseTest.cs
@@ -0,0 +1,347 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.AgentTemplates;
+
+namespace Zavudev.Tests.Models.AgentTemplates;
+
+public class AgentTemplateListResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new AgentTemplateListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "fermi",
+                    Category = ItemCategory.Sales,
+                    Name = "name",
+                    Summary = "summary",
+                    ToolCount = 0,
+                    Voice = true,
+                },
+            ],
+        };
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "fermi",
+                Category = ItemCategory.Sales,
+                Name = "name",
+                Summary = "summary",
+                ToolCount = 0,
+                Voice = true,
+            },
+        ];
+
+        Assert.Equal(expectedItems.Count, model.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], model.Items[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new AgentTemplateListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "fermi",
+                    Category = ItemCategory.Sales,
+                    Name = "name",
+                    Summary = "summary",
+                    ToolCount = 0,
+                    Voice = true,
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentTemplateListResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new AgentTemplateListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "fermi",
+                    Category = ItemCategory.Sales,
+                    Name = "name",
+                    Summary = "summary",
+                    ToolCount = 0,
+                    Voice = true,
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentTemplateListResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "fermi",
+                Category = ItemCategory.Sales,
+                Name = "name",
+                Summary = "summary",
+                ToolCount = 0,
+                Voice = true,
+            },
+        ];
+
+        Assert.Equal(expectedItems.Count, deserialized.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], deserialized.Items[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new AgentTemplateListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "fermi",
+                    Category = ItemCategory.Sales,
+                    Name = "name",
+                    Summary = "summary",
+                    ToolCount = 0,
+                    Voice = true,
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new AgentTemplateListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "fermi",
+                    Category = ItemCategory.Sales,
+                    Name = "name",
+                    Summary = "summary",
+                    ToolCount = 0,
+                    Voice = true,
+                },
+            ],
+        };
+
+        AgentTemplateListResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ItemTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "fermi",
+            Category = ItemCategory.Sales,
+            Name = "name",
+            Summary = "summary",
+            ToolCount = 0,
+            Voice = true,
+        };
+
+        string expectedID = "fermi";
+        ApiEnum<string, ItemCategory> expectedCategory = ItemCategory.Sales;
+        string expectedName = "name";
+        string expectedSummary = "summary";
+        long expectedToolCount = 0;
+        bool expectedVoice = true;
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedCategory, model.Category);
+        Assert.Equal(expectedName, model.Name);
+        Assert.Equal(expectedSummary, model.Summary);
+        Assert.Equal(expectedToolCount, model.ToolCount);
+        Assert.Equal(expectedVoice, model.Voice);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "fermi",
+            Category = ItemCategory.Sales,
+            Name = "name",
+            Summary = "summary",
+            ToolCount = 0,
+            Voice = true,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Item
+        {
+            ID = "fermi",
+            Category = ItemCategory.Sales,
+            Name = "name",
+            Summary = "summary",
+            ToolCount = 0,
+            Voice = true,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedID = "fermi";
+        ApiEnum<string, ItemCategory> expectedCategory = ItemCategory.Sales;
+        string expectedName = "name";
+        string expectedSummary = "summary";
+        long expectedToolCount = 0;
+        bool expectedVoice = true;
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedCategory, deserialized.Category);
+        Assert.Equal(expectedName, deserialized.Name);
+        Assert.Equal(expectedSummary, deserialized.Summary);
+        Assert.Equal(expectedToolCount, deserialized.ToolCount);
+        Assert.Equal(expectedVoice, deserialized.Voice);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Item
+        {
+            ID = "fermi",
+            Category = ItemCategory.Sales,
+            Name = "name",
+            Summary = "summary",
+            ToolCount = 0,
+            Voice = true,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Item
+        {
+            ID = "fermi",
+            Category = ItemCategory.Sales,
+            Name = "name",
+            Summary = "summary",
+            ToolCount = 0,
+            Voice = true,
+        };
+
+        Item copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ItemCategoryTest : TestBase
+{
+    [Theory]
+    [InlineData(ItemCategory.Sales)]
+    [InlineData(ItemCategory.Support)]
+    [InlineData(ItemCategory.FrontDesk)]
+    [InlineData(ItemCategory.Ops)]
+    public void Validation_Works(ItemCategory rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, ItemCategory> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, ItemCategory>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(ItemCategory.Sales)]
+    [InlineData(ItemCategory.Support)]
+    [InlineData(ItemCategory.FrontDesk)]
+    [InlineData(ItemCategory.Ops)]
+    public void SerializationRoundtrip_Works(ItemCategory rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, ItemCategory> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, ItemCategory>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, ItemCategory>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, ItemCategory>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateRetrieveParamsTest.cs b/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateRetrieveParamsTest.cs
new file mode 100644
index 0000000..9d22f68
--- /dev/null
+++ b/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateRetrieveParamsTest.cs
@@ -0,0 +1,39 @@
+using System;
+using Zavudev.Models.AgentTemplates;
+
+namespace Zavudev.Tests.Models.AgentTemplates;
+
+public class AgentTemplateRetrieveParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new AgentTemplateRetrieveParams { TemplateID = "fermi" };
+
+        string expectedTemplateID = "fermi";
+
+        Assert.Equal(expectedTemplateID, parameters.TemplateID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        AgentTemplateRetrieveParams parameters = new() { TemplateID = "fermi" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/agent-templates/fermi"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new AgentTemplateRetrieveParams { TemplateID = "fermi" };
+
+        AgentTemplateRetrieveParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateRetrieveResponseTest.cs b/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateRetrieveResponseTest.cs
new file mode 100644
index 0000000..8522bf9
--- /dev/null
+++ b/src/Zavudev.Tests/Models/AgentTemplates/AgentTemplateRetrieveResponseTest.cs
@@ -0,0 +1,523 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.AgentTemplates;
+
+namespace Zavudev.Tests.Models.AgentTemplates;
+
+public class AgentTemplateRetrieveResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new AgentTemplateRetrieveResponse
+        {
+            Template = new()
+            {
+                ID = "fermi",
+                Category = Category.Sales,
+                DefaultSlug = "fermi",
+                Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+                Files = [new() { Content = "content", Path = "index.ts" }],
+                Name = "name",
+                RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+                Summary = "summary",
+                Voice = true,
+            },
+        };
+
+        Template expectedTemplate = new()
+        {
+            ID = "fermi",
+            Category = Category.Sales,
+            DefaultSlug = "fermi",
+            Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Files = [new() { Content = "content", Path = "index.ts" }],
+            Name = "name",
+            RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+            Summary = "summary",
+            Voice = true,
+        };
+
+        Assert.Equal(expectedTemplate, model.Template);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new AgentTemplateRetrieveResponse
+        {
+            Template = new()
+            {
+                ID = "fermi",
+                Category = Category.Sales,
+                DefaultSlug = "fermi",
+                Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+                Files = [new() { Content = "content", Path = "index.ts" }],
+                Name = "name",
+                RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+                Summary = "summary",
+                Voice = true,
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentTemplateRetrieveResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new AgentTemplateRetrieveResponse
+        {
+            Template = new()
+            {
+                ID = "fermi",
+                Category = Category.Sales,
+                DefaultSlug = "fermi",
+                Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+                Files = [new() { Content = "content", Path = "index.ts" }],
+                Name = "name",
+                RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+                Summary = "summary",
+                Voice = true,
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentTemplateRetrieveResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        Template expectedTemplate = new()
+        {
+            ID = "fermi",
+            Category = Category.Sales,
+            DefaultSlug = "fermi",
+            Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Files = [new() { Content = "content", Path = "index.ts" }],
+            Name = "name",
+            RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+            Summary = "summary",
+            Voice = true,
+        };
+
+        Assert.Equal(expectedTemplate, deserialized.Template);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new AgentTemplateRetrieveResponse
+        {
+            Template = new()
+            {
+                ID = "fermi",
+                Category = Category.Sales,
+                DefaultSlug = "fermi",
+                Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+                Files = [new() { Content = "content", Path = "index.ts" }],
+                Name = "name",
+                RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+                Summary = "summary",
+                Voice = true,
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new AgentTemplateRetrieveResponse
+        {
+            Template = new()
+            {
+                ID = "fermi",
+                Category = Category.Sales,
+                DefaultSlug = "fermi",
+                Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+                Files = [new() { Content = "content", Path = "index.ts" }],
+                Name = "name",
+                RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+                Summary = "summary",
+                Voice = true,
+            },
+        };
+
+        AgentTemplateRetrieveResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class TemplateTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Template
+        {
+            ID = "fermi",
+            Category = Category.Sales,
+            DefaultSlug = "fermi",
+            Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Files = [new() { Content = "content", Path = "index.ts" }],
+            Name = "name",
+            RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+            Summary = "summary",
+            Voice = true,
+        };
+
+        string expectedID = "fermi";
+        ApiEnum<string, Category> expectedCategory = Category.Sales;
+        string expectedDefaultSlug = "fermi";
+        Dictionary<string, string> expectedDependencies = new() { { "foo", "string" } };
+        List<File> expectedFiles = [new() { Content = "content", Path = "index.ts" }];
+        string expectedName = "name";
+        List<RequiredSecret> expectedRequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }];
+        string expectedSummary = "summary";
+        bool expectedVoice = true;
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedCategory, model.Category);
+        Assert.Equal(expectedDefaultSlug, model.DefaultSlug);
+        Assert.Equal(expectedDependencies.Count, model.Dependencies.Count);
+        foreach (var item in expectedDependencies)
+        {
+            Assert.True(model.Dependencies.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, model.Dependencies[item.Key]);
+        }
+        Assert.Equal(expectedFiles.Count, model.Files.Count);
+        for (int i = 0; i < expectedFiles.Count; i++)
+        {
+            Assert.Equal(expectedFiles[i], model.Files[i]);
+        }
+        Assert.Equal(expectedName, model.Name);
+        Assert.Equal(expectedRequiredSecrets.Count, model.RequiredSecrets.Count);
+        for (int i = 0; i < expectedRequiredSecrets.Count; i++)
+        {
+            Assert.Equal(expectedRequiredSecrets[i], model.RequiredSecrets[i]);
+        }
+        Assert.Equal(expectedSummary, model.Summary);
+        Assert.Equal(expectedVoice, model.Voice);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Template
+        {
+            ID = "fermi",
+            Category = Category.Sales,
+            DefaultSlug = "fermi",
+            Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Files = [new() { Content = "content", Path = "index.ts" }],
+            Name = "name",
+            RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+            Summary = "summary",
+            Voice = true,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Template>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Template
+        {
+            ID = "fermi",
+            Category = Category.Sales,
+            DefaultSlug = "fermi",
+            Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Files = [new() { Content = "content", Path = "index.ts" }],
+            Name = "name",
+            RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+            Summary = "summary",
+            Voice = true,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Template>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "fermi";
+        ApiEnum<string, Category> expectedCategory = Category.Sales;
+        string expectedDefaultSlug = "fermi";
+        Dictionary<string, string> expectedDependencies = new() { { "foo", "string" } };
+        List<File> expectedFiles = [new() { Content = "content", Path = "index.ts" }];
+        string expectedName = "name";
+        List<RequiredSecret> expectedRequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }];
+        string expectedSummary = "summary";
+        bool expectedVoice = true;
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedCategory, deserialized.Category);
+        Assert.Equal(expectedDefaultSlug, deserialized.DefaultSlug);
+        Assert.Equal(expectedDependencies.Count, deserialized.Dependencies.Count);
+        foreach (var item in expectedDependencies)
+        {
+            Assert.True(deserialized.Dependencies.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, deserialized.Dependencies[item.Key]);
+        }
+        Assert.Equal(expectedFiles.Count, deserialized.Files.Count);
+        for (int i = 0; i < expectedFiles.Count; i++)
+        {
+            Assert.Equal(expectedFiles[i], deserialized.Files[i]);
+        }
+        Assert.Equal(expectedName, deserialized.Name);
+        Assert.Equal(expectedRequiredSecrets.Count, deserialized.RequiredSecrets.Count);
+        for (int i = 0; i < expectedRequiredSecrets.Count; i++)
+        {
+            Assert.Equal(expectedRequiredSecrets[i], deserialized.RequiredSecrets[i]);
+        }
+        Assert.Equal(expectedSummary, deserialized.Summary);
+        Assert.Equal(expectedVoice, deserialized.Voice);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Template
+        {
+            ID = "fermi",
+            Category = Category.Sales,
+            DefaultSlug = "fermi",
+            Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Files = [new() { Content = "content", Path = "index.ts" }],
+            Name = "name",
+            RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+            Summary = "summary",
+            Voice = true,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Template
+        {
+            ID = "fermi",
+            Category = Category.Sales,
+            DefaultSlug = "fermi",
+            Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Files = [new() { Content = "content", Path = "index.ts" }],
+            Name = "name",
+            RequiredSecrets = [new() { Hint = "hint", Key = "SENDER_ID" }],
+            Summary = "summary",
+            Voice = true,
+        };
+
+        Template copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CategoryTest : TestBase
+{
+    [Theory]
+    [InlineData(Category.Sales)]
+    [InlineData(Category.Support)]
+    [InlineData(Category.FrontDesk)]
+    [InlineData(Category.Ops)]
+    public void Validation_Works(Category rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Category> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Category>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Category.Sales)]
+    [InlineData(Category.Support)]
+    [InlineData(Category.FrontDesk)]
+    [InlineData(Category.Ops)]
+    public void SerializationRoundtrip_Works(Category rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Category> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Category>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Category>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Category>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class FileTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new File { Content = "content", Path = "index.ts" };
+
+        string expectedContent = "content";
+        string expectedPath = "index.ts";
+
+        Assert.Equal(expectedContent, model.Content);
+        Assert.Equal(expectedPath, model.Path);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new File { Content = "content", Path = "index.ts" };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<File>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new File { Content = "content", Path = "index.ts" };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<File>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedContent = "content";
+        string expectedPath = "index.ts";
+
+        Assert.Equal(expectedContent, deserialized.Content);
+        Assert.Equal(expectedPath, deserialized.Path);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new File { Content = "content", Path = "index.ts" };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new File { Content = "content", Path = "index.ts" };
+
+        File copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class RequiredSecretTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new RequiredSecret { Hint = "hint", Key = "SENDER_ID" };
+
+        string expectedHint = "hint";
+        string expectedKey = "SENDER_ID";
+
+        Assert.Equal(expectedHint, model.Hint);
+        Assert.Equal(expectedKey, model.Key);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new RequiredSecret { Hint = "hint", Key = "SENDER_ID" };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<RequiredSecret>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new RequiredSecret { Hint = "hint", Key = "SENDER_ID" };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<RequiredSecret>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedHint = "hint";
+        string expectedKey = "SENDER_ID";
+
+        Assert.Equal(expectedHint, deserialized.Hint);
+        Assert.Equal(expectedKey, deserialized.Key);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new RequiredSecret { Hint = "hint", Key = "SENDER_ID" };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new RequiredSecret { Hint = "hint", Key = "SENDER_ID" };
+
+        RequiredSecret copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentCreateParamsTest.cs b/src/Zavudev.Tests/Models/Agents/AgentCreateParamsTest.cs
new file mode 100644
index 0000000..f0da064
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentCreateParamsTest.cs
@@ -0,0 +1,677 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Agents;
+using Agent = Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentCreateParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new AgentCreateParams
+        {
+            Model = "model",
+            Name = "name",
+            Provider = Agent::AgentProvider.OpenAI,
+            SystemPrompt = "systemPrompt",
+            ContextWindowMessages = 1,
+            IncludeContactMetadata = true,
+            MaxTokens = 1,
+            Temperature = 0,
+            TriggerOnChannels = ["string"],
+            TriggerOnMessageTypes = ["string"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = VoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        string expectedModel = "model";
+        string expectedName = "name";
+        ApiEnum<string, Agent::AgentProvider> expectedProvider = Agent::AgentProvider.OpenAI;
+        string expectedSystemPrompt = "systemPrompt";
+        long expectedContextWindowMessages = 1;
+        bool expectedIncludeContactMetadata = true;
+        long expectedMaxTokens = 1;
+        double expectedTemperature = 0;
+        List<string> expectedTriggerOnChannels = ["string"];
+        List<string> expectedTriggerOnMessageTypes = ["string"];
+        Voice expectedVoice = new()
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = VoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        Assert.Equal(expectedModel, parameters.Model);
+        Assert.Equal(expectedName, parameters.Name);
+        Assert.Equal(expectedProvider, parameters.Provider);
+        Assert.Equal(expectedSystemPrompt, parameters.SystemPrompt);
+        Assert.Equal(expectedContextWindowMessages, parameters.ContextWindowMessages);
+        Assert.Equal(expectedIncludeContactMetadata, parameters.IncludeContactMetadata);
+        Assert.Equal(expectedMaxTokens, parameters.MaxTokens);
+        Assert.Equal(expectedTemperature, parameters.Temperature);
+        Assert.NotNull(parameters.TriggerOnChannels);
+        Assert.Equal(expectedTriggerOnChannels.Count, parameters.TriggerOnChannels.Count);
+        for (int i = 0; i < expectedTriggerOnChannels.Count; i++)
+        {
+            Assert.Equal(expectedTriggerOnChannels[i], parameters.TriggerOnChannels[i]);
+        }
+        Assert.NotNull(parameters.TriggerOnMessageTypes);
+        Assert.Equal(expectedTriggerOnMessageTypes.Count, parameters.TriggerOnMessageTypes.Count);
+        for (int i = 0; i < expectedTriggerOnMessageTypes.Count; i++)
+        {
+            Assert.Equal(expectedTriggerOnMessageTypes[i], parameters.TriggerOnMessageTypes[i]);
+        }
+        Assert.Equal(expectedVoice, parameters.Voice);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new AgentCreateParams
+        {
+            Model = "model",
+            Name = "name",
+            Provider = Agent::AgentProvider.OpenAI,
+            SystemPrompt = "systemPrompt",
+        };
+
+        Assert.Null(parameters.ContextWindowMessages);
+        Assert.False(parameters.RawBodyData.ContainsKey("contextWindowMessages"));
+        Assert.Null(parameters.IncludeContactMetadata);
+        Assert.False(parameters.RawBodyData.ContainsKey("includeContactMetadata"));
+        Assert.Null(parameters.MaxTokens);
+        Assert.False(parameters.RawBodyData.ContainsKey("maxTokens"));
+        Assert.Null(parameters.Temperature);
+        Assert.False(parameters.RawBodyData.ContainsKey("temperature"));
+        Assert.Null(parameters.TriggerOnChannels);
+        Assert.False(parameters.RawBodyData.ContainsKey("triggerOnChannels"));
+        Assert.Null(parameters.TriggerOnMessageTypes);
+        Assert.False(parameters.RawBodyData.ContainsKey("triggerOnMessageTypes"));
+        Assert.Null(parameters.Voice);
+        Assert.False(parameters.RawBodyData.ContainsKey("voice"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new AgentCreateParams
+        {
+            Model = "model",
+            Name = "name",
+            Provider = Agent::AgentProvider.OpenAI,
+            SystemPrompt = "systemPrompt",
+
+            // Null should be interpreted as omitted for these properties
+            ContextWindowMessages = null,
+            IncludeContactMetadata = null,
+            MaxTokens = null,
+            Temperature = null,
+            TriggerOnChannels = null,
+            TriggerOnMessageTypes = null,
+            Voice = null,
+        };
+
+        Assert.Null(parameters.ContextWindowMessages);
+        Assert.False(parameters.RawBodyData.ContainsKey("contextWindowMessages"));
+        Assert.Null(parameters.IncludeContactMetadata);
+        Assert.False(parameters.RawBodyData.ContainsKey("includeContactMetadata"));
+        Assert.Null(parameters.MaxTokens);
+        Assert.False(parameters.RawBodyData.ContainsKey("maxTokens"));
+        Assert.Null(parameters.Temperature);
+        Assert.False(parameters.RawBodyData.ContainsKey("temperature"));
+        Assert.Null(parameters.TriggerOnChannels);
+        Assert.False(parameters.RawBodyData.ContainsKey("triggerOnChannels"));
+        Assert.Null(parameters.TriggerOnMessageTypes);
+        Assert.False(parameters.RawBodyData.ContainsKey("triggerOnMessageTypes"));
+        Assert.Null(parameters.Voice);
+        Assert.False(parameters.RawBodyData.ContainsKey("voice"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        AgentCreateParams parameters = new()
+        {
+            Model = "model",
+            Name = "name",
+            Provider = Agent::AgentProvider.OpenAI,
+            SystemPrompt = "systemPrompt",
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/agents"), url));
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new AgentCreateParams
+        {
+            Model = "model",
+            Name = "name",
+            Provider = Agent::AgentProvider.OpenAI,
+            SystemPrompt = "systemPrompt",
+            ContextWindowMessages = 1,
+            IncludeContactMetadata = true,
+            MaxTokens = 1,
+            Temperature = 0,
+            TriggerOnChannels = ["string"],
+            TriggerOnMessageTypes = ["string"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = VoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        AgentCreateParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
+
+public class VoiceTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Voice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = VoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        bool expectedEnabled = true;
+        string expectedGreeting = "Hi, thanks for calling Acme. How can I help you today?";
+        Dictionary<string, string> expectedGreetings = new()
+        {
+            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+        };
+        bool expectedInterruptible = true;
+        string expectedLanguage = "en";
+        long expectedMaxCallDurationMinutes = 1;
+        long expectedMaxIdleSeconds = 5;
+        string expectedModel = "openai/gpt-4o";
+        bool expectedRecordCalls = true;
+        string expectedSttModel = "sttModel";
+        string expectedSttProvider = "sttProvider";
+        string expectedTransferPhoneNumber = "+14155551234";
+        string expectedTtsProvider = "ttsProvider";
+        string expectedTtsVoiceID = "aria";
+        ApiEnum<string, VoicemailAction> expectedVoicemailAction = VoicemailAction.Hangup;
+        string expectedVoicemailMessage = "voicemailMessage";
+        double expectedVoiceSpeed = 0.5;
+
+        Assert.Equal(expectedEnabled, model.Enabled);
+        Assert.Equal(expectedGreeting, model.Greeting);
+        Assert.NotNull(model.Greetings);
+        Assert.Equal(expectedGreetings.Count, model.Greetings.Count);
+        foreach (var item in expectedGreetings)
+        {
+            Assert.True(model.Greetings.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, model.Greetings[item.Key]);
+        }
+        Assert.Equal(expectedInterruptible, model.Interruptible);
+        Assert.Equal(expectedLanguage, model.Language);
+        Assert.Equal(expectedMaxCallDurationMinutes, model.MaxCallDurationMinutes);
+        Assert.Equal(expectedMaxIdleSeconds, model.MaxIdleSeconds);
+        Assert.Equal(expectedModel, model.Model);
+        Assert.Equal(expectedRecordCalls, model.RecordCalls);
+        Assert.Equal(expectedSttModel, model.SttModel);
+        Assert.Equal(expectedSttProvider, model.SttProvider);
+        Assert.Equal(expectedTransferPhoneNumber, model.TransferPhoneNumber);
+        Assert.Equal(expectedTtsProvider, model.TtsProvider);
+        Assert.Equal(expectedTtsVoiceID, model.TtsVoiceID);
+        Assert.Equal(expectedVoicemailAction, model.VoicemailAction);
+        Assert.Equal(expectedVoicemailMessage, model.VoicemailMessage);
+        Assert.Equal(expectedVoiceSpeed, model.VoiceSpeed);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Voice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = VoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Voice>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Voice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = VoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Voice>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        bool expectedEnabled = true;
+        string expectedGreeting = "Hi, thanks for calling Acme. How can I help you today?";
+        Dictionary<string, string> expectedGreetings = new()
+        {
+            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+        };
+        bool expectedInterruptible = true;
+        string expectedLanguage = "en";
+        long expectedMaxCallDurationMinutes = 1;
+        long expectedMaxIdleSeconds = 5;
+        string expectedModel = "openai/gpt-4o";
+        bool expectedRecordCalls = true;
+        string expectedSttModel = "sttModel";
+        string expectedSttProvider = "sttProvider";
+        string expectedTransferPhoneNumber = "+14155551234";
+        string expectedTtsProvider = "ttsProvider";
+        string expectedTtsVoiceID = "aria";
+        ApiEnum<string, VoicemailAction> expectedVoicemailAction = VoicemailAction.Hangup;
+        string expectedVoicemailMessage = "voicemailMessage";
+        double expectedVoiceSpeed = 0.5;
+
+        Assert.Equal(expectedEnabled, deserialized.Enabled);
+        Assert.Equal(expectedGreeting, deserialized.Greeting);
+        Assert.NotNull(deserialized.Greetings);
+        Assert.Equal(expectedGreetings.Count, deserialized.Greetings.Count);
+        foreach (var item in expectedGreetings)
+        {
+            Assert.True(deserialized.Greetings.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, deserialized.Greetings[item.Key]);
+        }
+        Assert.Equal(expectedInterruptible, deserialized.Interruptible);
+        Assert.Equal(expectedLanguage, deserialized.Language);
+        Assert.Equal(expectedMaxCallDurationMinutes, deserialized.MaxCallDurationMinutes);
+        Assert.Equal(expectedMaxIdleSeconds, deserialized.MaxIdleSeconds);
+        Assert.Equal(expectedModel, deserialized.Model);
+        Assert.Equal(expectedRecordCalls, deserialized.RecordCalls);
+        Assert.Equal(expectedSttModel, deserialized.SttModel);
+        Assert.Equal(expectedSttProvider, deserialized.SttProvider);
+        Assert.Equal(expectedTransferPhoneNumber, deserialized.TransferPhoneNumber);
+        Assert.Equal(expectedTtsProvider, deserialized.TtsProvider);
+        Assert.Equal(expectedTtsVoiceID, deserialized.TtsVoiceID);
+        Assert.Equal(expectedVoicemailAction, deserialized.VoicemailAction);
+        Assert.Equal(expectedVoicemailMessage, deserialized.VoicemailMessage);
+        Assert.Equal(expectedVoiceSpeed, deserialized.VoiceSpeed);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Voice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = VoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Voice { Enabled = true };
+
+        Assert.Null(model.Greeting);
+        Assert.False(model.RawData.ContainsKey("greeting"));
+        Assert.Null(model.Greetings);
+        Assert.False(model.RawData.ContainsKey("greetings"));
+        Assert.Null(model.Interruptible);
+        Assert.False(model.RawData.ContainsKey("interruptible"));
+        Assert.Null(model.Language);
+        Assert.False(model.RawData.ContainsKey("language"));
+        Assert.Null(model.MaxCallDurationMinutes);
+        Assert.False(model.RawData.ContainsKey("maxCallDurationMinutes"));
+        Assert.Null(model.MaxIdleSeconds);
+        Assert.False(model.RawData.ContainsKey("maxIdleSeconds"));
+        Assert.Null(model.Model);
+        Assert.False(model.RawData.ContainsKey("model"));
+        Assert.Null(model.RecordCalls);
+        Assert.False(model.RawData.ContainsKey("recordCalls"));
+        Assert.Null(model.SttModel);
+        Assert.False(model.RawData.ContainsKey("sttModel"));
+        Assert.Null(model.SttProvider);
+        Assert.False(model.RawData.ContainsKey("sttProvider"));
+        Assert.Null(model.TransferPhoneNumber);
+        Assert.False(model.RawData.ContainsKey("transferPhoneNumber"));
+        Assert.Null(model.TtsProvider);
+        Assert.False(model.RawData.ContainsKey("ttsProvider"));
+        Assert.Null(model.TtsVoiceID);
+        Assert.False(model.RawData.ContainsKey("ttsVoiceId"));
+        Assert.Null(model.VoicemailAction);
+        Assert.False(model.RawData.ContainsKey("voicemailAction"));
+        Assert.Null(model.VoicemailMessage);
+        Assert.False(model.RawData.ContainsKey("voicemailMessage"));
+        Assert.Null(model.VoiceSpeed);
+        Assert.False(model.RawData.ContainsKey("voiceSpeed"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Voice { Enabled = true };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new Voice
+        {
+            Enabled = true,
+
+            // Null should be interpreted as omitted for these properties
+            Greeting = null,
+            Greetings = null,
+            Interruptible = null,
+            Language = null,
+            MaxCallDurationMinutes = null,
+            MaxIdleSeconds = null,
+            Model = null,
+            RecordCalls = null,
+            SttModel = null,
+            SttProvider = null,
+            TransferPhoneNumber = null,
+            TtsProvider = null,
+            TtsVoiceID = null,
+            VoicemailAction = null,
+            VoicemailMessage = null,
+            VoiceSpeed = null,
+        };
+
+        Assert.Null(model.Greeting);
+        Assert.False(model.RawData.ContainsKey("greeting"));
+        Assert.Null(model.Greetings);
+        Assert.False(model.RawData.ContainsKey("greetings"));
+        Assert.Null(model.Interruptible);
+        Assert.False(model.RawData.ContainsKey("interruptible"));
+        Assert.Null(model.Language);
+        Assert.False(model.RawData.ContainsKey("language"));
+        Assert.Null(model.MaxCallDurationMinutes);
+        Assert.False(model.RawData.ContainsKey("maxCallDurationMinutes"));
+        Assert.Null(model.MaxIdleSeconds);
+        Assert.False(model.RawData.ContainsKey("maxIdleSeconds"));
+        Assert.Null(model.Model);
+        Assert.False(model.RawData.ContainsKey("model"));
+        Assert.Null(model.RecordCalls);
+        Assert.False(model.RawData.ContainsKey("recordCalls"));
+        Assert.Null(model.SttModel);
+        Assert.False(model.RawData.ContainsKey("sttModel"));
+        Assert.Null(model.SttProvider);
+        Assert.False(model.RawData.ContainsKey("sttProvider"));
+        Assert.Null(model.TransferPhoneNumber);
+        Assert.False(model.RawData.ContainsKey("transferPhoneNumber"));
+        Assert.Null(model.TtsProvider);
+        Assert.False(model.RawData.ContainsKey("ttsProvider"));
+        Assert.Null(model.TtsVoiceID);
+        Assert.False(model.RawData.ContainsKey("ttsVoiceId"));
+        Assert.Null(model.VoicemailAction);
+        Assert.False(model.RawData.ContainsKey("voicemailAction"));
+        Assert.Null(model.VoicemailMessage);
+        Assert.False(model.RawData.ContainsKey("voicemailMessage"));
+        Assert.Null(model.VoiceSpeed);
+        Assert.False(model.RawData.ContainsKey("voiceSpeed"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Voice
+        {
+            Enabled = true,
+
+            // Null should be interpreted as omitted for these properties
+            Greeting = null,
+            Greetings = null,
+            Interruptible = null,
+            Language = null,
+            MaxCallDurationMinutes = null,
+            MaxIdleSeconds = null,
+            Model = null,
+            RecordCalls = null,
+            SttModel = null,
+            SttProvider = null,
+            TransferPhoneNumber = null,
+            TtsProvider = null,
+            TtsVoiceID = null,
+            VoicemailAction = null,
+            VoicemailMessage = null,
+            VoiceSpeed = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Voice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = VoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        Voice copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class VoicemailActionTest : TestBase
+{
+    [Theory]
+    [InlineData(VoicemailAction.Hangup)]
+    [InlineData(VoicemailAction.LeaveMessage)]
+    public void Validation_Works(VoicemailAction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, VoicemailAction> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, VoicemailAction>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(VoicemailAction.Hangup)]
+    [InlineData(VoicemailAction.LeaveMessage)]
+    public void SerializationRoundtrip_Works(VoicemailAction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, VoicemailAction> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, VoicemailAction>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, VoicemailAction>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, VoicemailAction>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentCreateResponseTest.cs b/src/Zavudev.Tests/Models/Agents/AgentCreateResponseTest.cs
new file mode 100644
index 0000000..f145dc0
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentCreateResponseTest.cs
@@ -0,0 +1,414 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Agents;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentCreateResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new AgentCreateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        AgentAgent expectedAgent = new()
+        {
+            ID = "agent_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Enabled = true,
+            Model = "gpt-4o-mini",
+            Name = "Customer Support Agent",
+            Provider = AgentProvider.OpenAI,
+            SenderID = "sender_12345",
+            SystemPrompt = "systemPrompt",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContextWindowMessages = 0,
+            IncludeContactMetadata = true,
+            MaxTokens = 0,
+            SenderIds = ["string"],
+            Stats = new()
+            {
+                TotalCost = 0,
+                TotalInvocations = 0,
+                TotalTokensUsed = 0,
+            },
+            Temperature = 0,
+            TriggerOnChannels = ["sms", "whatsapp"],
+            TriggerOnMessageTypes = ["text"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        Assert.Equal(expectedAgent, model.Agent);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new AgentCreateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentCreateResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new AgentCreateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentCreateResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        AgentAgent expectedAgent = new()
+        {
+            ID = "agent_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Enabled = true,
+            Model = "gpt-4o-mini",
+            Name = "Customer Support Agent",
+            Provider = AgentProvider.OpenAI,
+            SenderID = "sender_12345",
+            SystemPrompt = "systemPrompt",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContextWindowMessages = 0,
+            IncludeContactMetadata = true,
+            MaxTokens = 0,
+            SenderIds = ["string"],
+            Stats = new()
+            {
+                TotalCost = 0,
+                TotalInvocations = 0,
+                TotalTokensUsed = 0,
+            },
+            Temperature = 0,
+            TriggerOnChannels = ["sms", "whatsapp"],
+            TriggerOnMessageTypes = ["text"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        Assert.Equal(expectedAgent, deserialized.Agent);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new AgentCreateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new AgentCreateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        AgentCreateResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentDeleteParamsTest.cs b/src/Zavudev.Tests/Models/Agents/AgentDeleteParamsTest.cs
new file mode 100644
index 0000000..c1f04f5
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentDeleteParamsTest.cs
@@ -0,0 +1,37 @@
+using System;
+using Zavudev.Models.Agents;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentDeleteParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new AgentDeleteParams { AgentID = "agentId" };
+
+        string expectedAgentID = "agentId";
+
+        Assert.Equal(expectedAgentID, parameters.AgentID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        AgentDeleteParams parameters = new() { AgentID = "agentId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/agents/agentId"), url));
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new AgentDeleteParams { AgentID = "agentId" };
+
+        AgentDeleteParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentListPageResponseTest.cs b/src/Zavudev.Tests/Models/Agents/AgentListPageResponseTest.cs
new file mode 100644
index 0000000..59bf3bf
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentListPageResponseTest.cs
@@ -0,0 +1,702 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Agents;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentListPageResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new AgentListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "agent_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Enabled = true,
+                    Model = "gpt-4o-mini",
+                    Name = "Customer Support Agent",
+                    Provider = AgentProvider.OpenAI,
+                    SenderID = "sender_12345",
+                    SystemPrompt = "systemPrompt",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContextWindowMessages = 0,
+                    IncludeContactMetadata = true,
+                    MaxTokens = 0,
+                    SenderIds = ["string"],
+                    Stats = new()
+                    {
+                        TotalCost = 0,
+                        TotalInvocations = 0,
+                        TotalTokensUsed = 0,
+                    },
+                    Temperature = 0,
+                    TriggerOnChannels = ["sms", "whatsapp"],
+                    TriggerOnMessageTypes = ["text"],
+                    Voice = new()
+                    {
+                        Enabled = true,
+                        Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                        Greetings = new Dictionary<string, string>()
+                        {
+                            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                        },
+                        Interruptible = true,
+                        Language = "en",
+                        MaxCallDurationMinutes = 1,
+                        MaxIdleSeconds = 5,
+                        Model = "openai/gpt-4o",
+                        RecordCalls = true,
+                        SttModel = "sttModel",
+                        SttProvider = "sttProvider",
+                        TransferPhoneNumber = "+14155551234",
+                        TtsProvider = "ttsProvider",
+                        TtsVoiceID = "aria",
+                        VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                        VoicemailMessage = "voicemailMessage",
+                        VoiceSpeed = 0.5,
+                    },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        List<AgentAgent> expectedItems =
+        [
+            new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        ];
+        string expectedNextCursor = "nextCursor";
+
+        Assert.Equal(expectedItems.Count, model.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], model.Items[i]);
+        }
+        Assert.Equal(expectedNextCursor, model.NextCursor);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new AgentListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "agent_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Enabled = true,
+                    Model = "gpt-4o-mini",
+                    Name = "Customer Support Agent",
+                    Provider = AgentProvider.OpenAI,
+                    SenderID = "sender_12345",
+                    SystemPrompt = "systemPrompt",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContextWindowMessages = 0,
+                    IncludeContactMetadata = true,
+                    MaxTokens = 0,
+                    SenderIds = ["string"],
+                    Stats = new()
+                    {
+                        TotalCost = 0,
+                        TotalInvocations = 0,
+                        TotalTokensUsed = 0,
+                    },
+                    Temperature = 0,
+                    TriggerOnChannels = ["sms", "whatsapp"],
+                    TriggerOnMessageTypes = ["text"],
+                    Voice = new()
+                    {
+                        Enabled = true,
+                        Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                        Greetings = new Dictionary<string, string>()
+                        {
+                            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                        },
+                        Interruptible = true,
+                        Language = "en",
+                        MaxCallDurationMinutes = 1,
+                        MaxIdleSeconds = 5,
+                        Model = "openai/gpt-4o",
+                        RecordCalls = true,
+                        SttModel = "sttModel",
+                        SttProvider = "sttProvider",
+                        TransferPhoneNumber = "+14155551234",
+                        TtsProvider = "ttsProvider",
+                        TtsVoiceID = "aria",
+                        VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                        VoicemailMessage = "voicemailMessage",
+                        VoiceSpeed = 0.5,
+                    },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentListPageResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new AgentListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "agent_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Enabled = true,
+                    Model = "gpt-4o-mini",
+                    Name = "Customer Support Agent",
+                    Provider = AgentProvider.OpenAI,
+                    SenderID = "sender_12345",
+                    SystemPrompt = "systemPrompt",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContextWindowMessages = 0,
+                    IncludeContactMetadata = true,
+                    MaxTokens = 0,
+                    SenderIds = ["string"],
+                    Stats = new()
+                    {
+                        TotalCost = 0,
+                        TotalInvocations = 0,
+                        TotalTokensUsed = 0,
+                    },
+                    Temperature = 0,
+                    TriggerOnChannels = ["sms", "whatsapp"],
+                    TriggerOnMessageTypes = ["text"],
+                    Voice = new()
+                    {
+                        Enabled = true,
+                        Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                        Greetings = new Dictionary<string, string>()
+                        {
+                            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                        },
+                        Interruptible = true,
+                        Language = "en",
+                        MaxCallDurationMinutes = 1,
+                        MaxIdleSeconds = 5,
+                        Model = "openai/gpt-4o",
+                        RecordCalls = true,
+                        SttModel = "sttModel",
+                        SttProvider = "sttProvider",
+                        TransferPhoneNumber = "+14155551234",
+                        TtsProvider = "ttsProvider",
+                        TtsVoiceID = "aria",
+                        VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                        VoicemailMessage = "voicemailMessage",
+                        VoiceSpeed = 0.5,
+                    },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentListPageResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<AgentAgent> expectedItems =
+        [
+            new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        ];
+        string expectedNextCursor = "nextCursor";
+
+        Assert.Equal(expectedItems.Count, deserialized.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], deserialized.Items[i]);
+        }
+        Assert.Equal(expectedNextCursor, deserialized.NextCursor);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new AgentListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "agent_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Enabled = true,
+                    Model = "gpt-4o-mini",
+                    Name = "Customer Support Agent",
+                    Provider = AgentProvider.OpenAI,
+                    SenderID = "sender_12345",
+                    SystemPrompt = "systemPrompt",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContextWindowMessages = 0,
+                    IncludeContactMetadata = true,
+                    MaxTokens = 0,
+                    SenderIds = ["string"],
+                    Stats = new()
+                    {
+                        TotalCost = 0,
+                        TotalInvocations = 0,
+                        TotalTokensUsed = 0,
+                    },
+                    Temperature = 0,
+                    TriggerOnChannels = ["sms", "whatsapp"],
+                    TriggerOnMessageTypes = ["text"],
+                    Voice = new()
+                    {
+                        Enabled = true,
+                        Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                        Greetings = new Dictionary<string, string>()
+                        {
+                            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                        },
+                        Interruptible = true,
+                        Language = "en",
+                        MaxCallDurationMinutes = 1,
+                        MaxIdleSeconds = 5,
+                        Model = "openai/gpt-4o",
+                        RecordCalls = true,
+                        SttModel = "sttModel",
+                        SttProvider = "sttProvider",
+                        TransferPhoneNumber = "+14155551234",
+                        TtsProvider = "ttsProvider",
+                        TtsVoiceID = "aria",
+                        VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                        VoicemailMessage = "voicemailMessage",
+                        VoiceSpeed = 0.5,
+                    },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new AgentListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "agent_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Enabled = true,
+                    Model = "gpt-4o-mini",
+                    Name = "Customer Support Agent",
+                    Provider = AgentProvider.OpenAI,
+                    SenderID = "sender_12345",
+                    SystemPrompt = "systemPrompt",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContextWindowMessages = 0,
+                    IncludeContactMetadata = true,
+                    MaxTokens = 0,
+                    SenderIds = ["string"],
+                    Stats = new()
+                    {
+                        TotalCost = 0,
+                        TotalInvocations = 0,
+                        TotalTokensUsed = 0,
+                    },
+                    Temperature = 0,
+                    TriggerOnChannels = ["sms", "whatsapp"],
+                    TriggerOnMessageTypes = ["text"],
+                    Voice = new()
+                    {
+                        Enabled = true,
+                        Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                        Greetings = new Dictionary<string, string>()
+                        {
+                            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                        },
+                        Interruptible = true,
+                        Language = "en",
+                        MaxCallDurationMinutes = 1,
+                        MaxIdleSeconds = 5,
+                        Model = "openai/gpt-4o",
+                        RecordCalls = true,
+                        SttModel = "sttModel",
+                        SttProvider = "sttProvider",
+                        TransferPhoneNumber = "+14155551234",
+                        TtsProvider = "ttsProvider",
+                        TtsVoiceID = "aria",
+                        VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                        VoicemailMessage = "voicemailMessage",
+                        VoiceSpeed = 0.5,
+                    },
+                },
+            ],
+        };
+
+        Assert.Null(model.NextCursor);
+        Assert.False(model.RawData.ContainsKey("nextCursor"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new AgentListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "agent_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Enabled = true,
+                    Model = "gpt-4o-mini",
+                    Name = "Customer Support Agent",
+                    Provider = AgentProvider.OpenAI,
+                    SenderID = "sender_12345",
+                    SystemPrompt = "systemPrompt",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContextWindowMessages = 0,
+                    IncludeContactMetadata = true,
+                    MaxTokens = 0,
+                    SenderIds = ["string"],
+                    Stats = new()
+                    {
+                        TotalCost = 0,
+                        TotalInvocations = 0,
+                        TotalTokensUsed = 0,
+                    },
+                    Temperature = 0,
+                    TriggerOnChannels = ["sms", "whatsapp"],
+                    TriggerOnMessageTypes = ["text"],
+                    Voice = new()
+                    {
+                        Enabled = true,
+                        Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                        Greetings = new Dictionary<string, string>()
+                        {
+                            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                        },
+                        Interruptible = true,
+                        Language = "en",
+                        MaxCallDurationMinutes = 1,
+                        MaxIdleSeconds = 5,
+                        Model = "openai/gpt-4o",
+                        RecordCalls = true,
+                        SttModel = "sttModel",
+                        SttProvider = "sttProvider",
+                        TransferPhoneNumber = "+14155551234",
+                        TtsProvider = "ttsProvider",
+                        TtsVoiceID = "aria",
+                        VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                        VoicemailMessage = "voicemailMessage",
+                        VoiceSpeed = 0.5,
+                    },
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new AgentListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "agent_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Enabled = true,
+                    Model = "gpt-4o-mini",
+                    Name = "Customer Support Agent",
+                    Provider = AgentProvider.OpenAI,
+                    SenderID = "sender_12345",
+                    SystemPrompt = "systemPrompt",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContextWindowMessages = 0,
+                    IncludeContactMetadata = true,
+                    MaxTokens = 0,
+                    SenderIds = ["string"],
+                    Stats = new()
+                    {
+                        TotalCost = 0,
+                        TotalInvocations = 0,
+                        TotalTokensUsed = 0,
+                    },
+                    Temperature = 0,
+                    TriggerOnChannels = ["sms", "whatsapp"],
+                    TriggerOnMessageTypes = ["text"],
+                    Voice = new()
+                    {
+                        Enabled = true,
+                        Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                        Greetings = new Dictionary<string, string>()
+                        {
+                            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                        },
+                        Interruptible = true,
+                        Language = "en",
+                        MaxCallDurationMinutes = 1,
+                        MaxIdleSeconds = 5,
+                        Model = "openai/gpt-4o",
+                        RecordCalls = true,
+                        SttModel = "sttModel",
+                        SttProvider = "sttProvider",
+                        TransferPhoneNumber = "+14155551234",
+                        TtsProvider = "ttsProvider",
+                        TtsVoiceID = "aria",
+                        VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                        VoicemailMessage = "voicemailMessage",
+                        VoiceSpeed = 0.5,
+                    },
+                },
+            ],
+
+            NextCursor = null,
+        };
+
+        Assert.Null(model.NextCursor);
+        Assert.True(model.RawData.ContainsKey("nextCursor"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new AgentListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "agent_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Enabled = true,
+                    Model = "gpt-4o-mini",
+                    Name = "Customer Support Agent",
+                    Provider = AgentProvider.OpenAI,
+                    SenderID = "sender_12345",
+                    SystemPrompt = "systemPrompt",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContextWindowMessages = 0,
+                    IncludeContactMetadata = true,
+                    MaxTokens = 0,
+                    SenderIds = ["string"],
+                    Stats = new()
+                    {
+                        TotalCost = 0,
+                        TotalInvocations = 0,
+                        TotalTokensUsed = 0,
+                    },
+                    Temperature = 0,
+                    TriggerOnChannels = ["sms", "whatsapp"],
+                    TriggerOnMessageTypes = ["text"],
+                    Voice = new()
+                    {
+                        Enabled = true,
+                        Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                        Greetings = new Dictionary<string, string>()
+                        {
+                            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                        },
+                        Interruptible = true,
+                        Language = "en",
+                        MaxCallDurationMinutes = 1,
+                        MaxIdleSeconds = 5,
+                        Model = "openai/gpt-4o",
+                        RecordCalls = true,
+                        SttModel = "sttModel",
+                        SttProvider = "sttProvider",
+                        TransferPhoneNumber = "+14155551234",
+                        TtsProvider = "ttsProvider",
+                        TtsVoiceID = "aria",
+                        VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                        VoicemailMessage = "voicemailMessage",
+                        VoiceSpeed = 0.5,
+                    },
+                },
+            ],
+
+            NextCursor = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new AgentListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "agent_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Enabled = true,
+                    Model = "gpt-4o-mini",
+                    Name = "Customer Support Agent",
+                    Provider = AgentProvider.OpenAI,
+                    SenderID = "sender_12345",
+                    SystemPrompt = "systemPrompt",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContextWindowMessages = 0,
+                    IncludeContactMetadata = true,
+                    MaxTokens = 0,
+                    SenderIds = ["string"],
+                    Stats = new()
+                    {
+                        TotalCost = 0,
+                        TotalInvocations = 0,
+                        TotalTokensUsed = 0,
+                    },
+                    Temperature = 0,
+                    TriggerOnChannels = ["sms", "whatsapp"],
+                    TriggerOnMessageTypes = ["text"],
+                    Voice = new()
+                    {
+                        Enabled = true,
+                        Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                        Greetings = new Dictionary<string, string>()
+                        {
+                            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                        },
+                        Interruptible = true,
+                        Language = "en",
+                        MaxCallDurationMinutes = 1,
+                        MaxIdleSeconds = 5,
+                        Model = "openai/gpt-4o",
+                        RecordCalls = true,
+                        SttModel = "sttModel",
+                        SttProvider = "sttProvider",
+                        TransferPhoneNumber = "+14155551234",
+                        TtsProvider = "ttsProvider",
+                        TtsVoiceID = "aria",
+                        VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                        VoicemailMessage = "voicemailMessage",
+                        VoiceSpeed = 0.5,
+                    },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        AgentListPageResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentListParamsTest.cs b/src/Zavudev.Tests/Models/Agents/AgentListParamsTest.cs
new file mode 100644
index 0000000..610eed2
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentListParamsTest.cs
@@ -0,0 +1,71 @@
+using System;
+using Zavudev.Models.Agents;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentListParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new AgentListParams { Cursor = "cursor", Limit = 100 };
+
+        string expectedCursor = "cursor";
+        long expectedLimit = 100;
+
+        Assert.Equal(expectedCursor, parameters.Cursor);
+        Assert.Equal(expectedLimit, parameters.Limit);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new AgentListParams { };
+
+        Assert.Null(parameters.Cursor);
+        Assert.False(parameters.RawQueryData.ContainsKey("cursor"));
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new AgentListParams
+        {
+            // Null should be interpreted as omitted for these properties
+            Cursor = null,
+            Limit = null,
+        };
+
+        Assert.Null(parameters.Cursor);
+        Assert.False(parameters.RawQueryData.ContainsKey("cursor"));
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        AgentListParams parameters = new() { Cursor = "cursor", Limit = 100 };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/agents?cursor=cursor&limit=100"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new AgentListParams { Cursor = "cursor", Limit = 100 };
+
+        AgentListParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentListVoicesParamsTest.cs b/src/Zavudev.Tests/Models/Agents/AgentListVoicesParamsTest.cs
new file mode 100644
index 0000000..a0e0a37
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentListVoicesParamsTest.cs
@@ -0,0 +1,61 @@
+using System;
+using Zavudev.Models.Agents;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentListVoicesParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new AgentListVoicesParams { Language = "es" };
+
+        string expectedLanguage = "es";
+
+        Assert.Equal(expectedLanguage, parameters.Language);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new AgentListVoicesParams { };
+
+        Assert.Null(parameters.Language);
+        Assert.False(parameters.RawQueryData.ContainsKey("language"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new AgentListVoicesParams
+        {
+            // Null should be interpreted as omitted for these properties
+            Language = null,
+        };
+
+        Assert.Null(parameters.Language);
+        Assert.False(parameters.RawQueryData.ContainsKey("language"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        AgentListVoicesParams parameters = new() { Language = "es" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/agents/voices?language=es"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new AgentListVoicesParams { Language = "es" };
+
+        AgentListVoicesParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentListVoicesResponseTest.cs b/src/Zavudev.Tests/Models/Agents/AgentListVoicesResponseTest.cs
new file mode 100644
index 0000000..b111312
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentListVoicesResponseTest.cs
@@ -0,0 +1,350 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Agents;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentListVoicesResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new AgentListVoicesResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "aura-2-celeste-es",
+                    Language = "es",
+                    Name = "celeste",
+                },
+            ],
+            Languages = ["string"],
+            Total = 0,
+        };
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "aura-2-celeste-es",
+                Language = "es",
+                Name = "celeste",
+            },
+        ];
+        List<string> expectedLanguages = ["string"];
+        long expectedTotal = 0;
+
+        Assert.Equal(expectedItems.Count, model.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], model.Items[i]);
+        }
+        Assert.Equal(expectedLanguages.Count, model.Languages.Count);
+        for (int i = 0; i < expectedLanguages.Count; i++)
+        {
+            Assert.Equal(expectedLanguages[i], model.Languages[i]);
+        }
+        Assert.Equal(expectedTotal, model.Total);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new AgentListVoicesResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "aura-2-celeste-es",
+                    Language = "es",
+                    Name = "celeste",
+                },
+            ],
+            Languages = ["string"],
+            Total = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentListVoicesResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new AgentListVoicesResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "aura-2-celeste-es",
+                    Language = "es",
+                    Name = "celeste",
+                },
+            ],
+            Languages = ["string"],
+            Total = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentListVoicesResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "aura-2-celeste-es",
+                Language = "es",
+                Name = "celeste",
+            },
+        ];
+        List<string> expectedLanguages = ["string"];
+        long expectedTotal = 0;
+
+        Assert.Equal(expectedItems.Count, deserialized.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], deserialized.Items[i]);
+        }
+        Assert.Equal(expectedLanguages.Count, deserialized.Languages.Count);
+        for (int i = 0; i < expectedLanguages.Count; i++)
+        {
+            Assert.Equal(expectedLanguages[i], deserialized.Languages[i]);
+        }
+        Assert.Equal(expectedTotal, deserialized.Total);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new AgentListVoicesResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "aura-2-celeste-es",
+                    Language = "es",
+                    Name = "celeste",
+                },
+            ],
+            Languages = ["string"],
+            Total = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new AgentListVoicesResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "aura-2-celeste-es",
+                    Language = "es",
+                    Name = "celeste",
+                },
+            ],
+            Languages = ["string"],
+        };
+
+        Assert.Null(model.Total);
+        Assert.False(model.RawData.ContainsKey("total"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new AgentListVoicesResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "aura-2-celeste-es",
+                    Language = "es",
+                    Name = "celeste",
+                },
+            ],
+            Languages = ["string"],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new AgentListVoicesResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "aura-2-celeste-es",
+                    Language = "es",
+                    Name = "celeste",
+                },
+            ],
+            Languages = ["string"],
+
+            // Null should be interpreted as omitted for these properties
+            Total = null,
+        };
+
+        Assert.Null(model.Total);
+        Assert.False(model.RawData.ContainsKey("total"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new AgentListVoicesResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "aura-2-celeste-es",
+                    Language = "es",
+                    Name = "celeste",
+                },
+            ],
+            Languages = ["string"],
+
+            // Null should be interpreted as omitted for these properties
+            Total = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new AgentListVoicesResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "aura-2-celeste-es",
+                    Language = "es",
+                    Name = "celeste",
+                },
+            ],
+            Languages = ["string"],
+            Total = 0,
+        };
+
+        AgentListVoicesResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ItemTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "aura-2-celeste-es",
+            Language = "es",
+            Name = "celeste",
+        };
+
+        string expectedID = "aura-2-celeste-es";
+        string expectedLanguage = "es";
+        string expectedName = "celeste";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedLanguage, model.Language);
+        Assert.Equal(expectedName, model.Name);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "aura-2-celeste-es",
+            Language = "es",
+            Name = "celeste",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Item
+        {
+            ID = "aura-2-celeste-es",
+            Language = "es",
+            Name = "celeste",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedID = "aura-2-celeste-es";
+        string expectedLanguage = "es";
+        string expectedName = "celeste";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedLanguage, deserialized.Language);
+        Assert.Equal(expectedName, deserialized.Name);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Item
+        {
+            ID = "aura-2-celeste-es",
+            Language = "es",
+            Name = "celeste",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Item
+        {
+            ID = "aura-2-celeste-es",
+            Language = "es",
+            Name = "celeste",
+        };
+
+        Item copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentRetrieveParamsTest.cs b/src/Zavudev.Tests/Models/Agents/AgentRetrieveParamsTest.cs
new file mode 100644
index 0000000..92a254d
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentRetrieveParamsTest.cs
@@ -0,0 +1,37 @@
+using System;
+using Zavudev.Models.Agents;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentRetrieveParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new AgentRetrieveParams { AgentID = "agentId" };
+
+        string expectedAgentID = "agentId";
+
+        Assert.Equal(expectedAgentID, parameters.AgentID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        AgentRetrieveParams parameters = new() { AgentID = "agentId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/agents/agentId"), url));
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new AgentRetrieveParams { AgentID = "agentId" };
+
+        AgentRetrieveParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentRetrieveResponseTest.cs b/src/Zavudev.Tests/Models/Agents/AgentRetrieveResponseTest.cs
new file mode 100644
index 0000000..9149c82
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentRetrieveResponseTest.cs
@@ -0,0 +1,414 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Agents;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentRetrieveResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new AgentRetrieveResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        AgentAgent expectedAgent = new()
+        {
+            ID = "agent_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Enabled = true,
+            Model = "gpt-4o-mini",
+            Name = "Customer Support Agent",
+            Provider = AgentProvider.OpenAI,
+            SenderID = "sender_12345",
+            SystemPrompt = "systemPrompt",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContextWindowMessages = 0,
+            IncludeContactMetadata = true,
+            MaxTokens = 0,
+            SenderIds = ["string"],
+            Stats = new()
+            {
+                TotalCost = 0,
+                TotalInvocations = 0,
+                TotalTokensUsed = 0,
+            },
+            Temperature = 0,
+            TriggerOnChannels = ["sms", "whatsapp"],
+            TriggerOnMessageTypes = ["text"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        Assert.Equal(expectedAgent, model.Agent);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new AgentRetrieveResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentRetrieveResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new AgentRetrieveResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentRetrieveResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        AgentAgent expectedAgent = new()
+        {
+            ID = "agent_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Enabled = true,
+            Model = "gpt-4o-mini",
+            Name = "Customer Support Agent",
+            Provider = AgentProvider.OpenAI,
+            SenderID = "sender_12345",
+            SystemPrompt = "systemPrompt",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContextWindowMessages = 0,
+            IncludeContactMetadata = true,
+            MaxTokens = 0,
+            SenderIds = ["string"],
+            Stats = new()
+            {
+                TotalCost = 0,
+                TotalInvocations = 0,
+                TotalTokensUsed = 0,
+            },
+            Temperature = 0,
+            TriggerOnChannels = ["sms", "whatsapp"],
+            TriggerOnMessageTypes = ["text"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        Assert.Equal(expectedAgent, deserialized.Agent);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new AgentRetrieveResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new AgentRetrieveResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        AgentRetrieveResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentTestParamsTest.cs b/src/Zavudev.Tests/Models/Agents/AgentTestParamsTest.cs
new file mode 100644
index 0000000..0a7a19f
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentTestParamsTest.cs
@@ -0,0 +1,234 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Agents;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentTestParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new AgentTestParams
+        {
+            AgentID = "agentId",
+            Message = "Where is order ORD-12345?",
+            ExecuteTools = true,
+            History = [new() { Content = "content", Role = Role.User }],
+            UseKnowledgeBase = true,
+        };
+
+        string expectedAgentID = "agentId";
+        string expectedMessage = "Where is order ORD-12345?";
+        bool expectedExecuteTools = true;
+        List<History> expectedHistory = [new() { Content = "content", Role = Role.User }];
+        bool expectedUseKnowledgeBase = true;
+
+        Assert.Equal(expectedAgentID, parameters.AgentID);
+        Assert.Equal(expectedMessage, parameters.Message);
+        Assert.Equal(expectedExecuteTools, parameters.ExecuteTools);
+        Assert.NotNull(parameters.History);
+        Assert.Equal(expectedHistory.Count, parameters.History.Count);
+        for (int i = 0; i < expectedHistory.Count; i++)
+        {
+            Assert.Equal(expectedHistory[i], parameters.History[i]);
+        }
+        Assert.Equal(expectedUseKnowledgeBase, parameters.UseKnowledgeBase);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new AgentTestParams
+        {
+            AgentID = "agentId",
+            Message = "Where is order ORD-12345?",
+        };
+
+        Assert.Null(parameters.ExecuteTools);
+        Assert.False(parameters.RawBodyData.ContainsKey("executeTools"));
+        Assert.Null(parameters.History);
+        Assert.False(parameters.RawBodyData.ContainsKey("history"));
+        Assert.Null(parameters.UseKnowledgeBase);
+        Assert.False(parameters.RawBodyData.ContainsKey("useKnowledgeBase"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new AgentTestParams
+        {
+            AgentID = "agentId",
+            Message = "Where is order ORD-12345?",
+
+            // Null should be interpreted as omitted for these properties
+            ExecuteTools = null,
+            History = null,
+            UseKnowledgeBase = null,
+        };
+
+        Assert.Null(parameters.ExecuteTools);
+        Assert.False(parameters.RawBodyData.ContainsKey("executeTools"));
+        Assert.Null(parameters.History);
+        Assert.False(parameters.RawBodyData.ContainsKey("history"));
+        Assert.Null(parameters.UseKnowledgeBase);
+        Assert.False(parameters.RawBodyData.ContainsKey("useKnowledgeBase"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        AgentTestParams parameters = new()
+        {
+            AgentID = "agentId",
+            Message = "Where is order ORD-12345?",
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/agents/agentId/test"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new AgentTestParams
+        {
+            AgentID = "agentId",
+            Message = "Where is order ORD-12345?",
+            ExecuteTools = true,
+            History = [new() { Content = "content", Role = Role.User }],
+            UseKnowledgeBase = true,
+        };
+
+        AgentTestParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
+
+public class HistoryTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new History { Content = "content", Role = Role.User };
+
+        string expectedContent = "content";
+        ApiEnum<string, Role> expectedRole = Role.User;
+
+        Assert.Equal(expectedContent, model.Content);
+        Assert.Equal(expectedRole, model.Role);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new History { Content = "content", Role = Role.User };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<History>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new History { Content = "content", Role = Role.User };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<History>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedContent = "content";
+        ApiEnum<string, Role> expectedRole = Role.User;
+
+        Assert.Equal(expectedContent, deserialized.Content);
+        Assert.Equal(expectedRole, deserialized.Role);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new History { Content = "content", Role = Role.User };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new History { Content = "content", Role = Role.User };
+
+        History copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class RoleTest : TestBase
+{
+    [Theory]
+    [InlineData(Role.User)]
+    [InlineData(Role.Assistant)]
+    public void Validation_Works(Role rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Role> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Role>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Role.User)]
+    [InlineData(Role.Assistant)]
+    public void SerializationRoundtrip_Works(Role rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Role> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Role>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Role>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Role>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentTestResponseTest.cs b/src/Zavudev.Tests/Models/Agents/AgentTestResponseTest.cs
new file mode 100644
index 0000000..7927e9b
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentTestResponseTest.cs
@@ -0,0 +1,450 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Agents;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentTestResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new AgentTestResponse
+        {
+            Error = "error",
+            InputTokens = 0,
+            KnowledgeChunksUsed = 0,
+            LatencyMs = 0,
+            OutputTokens = 0,
+            Success = true,
+            Text = "text",
+            Warnings = ["string"],
+            ExecutedToolCalls =
+            [
+                new()
+                {
+                    Name = "name",
+                    Ok = true,
+                    Error = "error",
+                },
+            ],
+        };
+
+        string expectedError = "error";
+        long expectedInputTokens = 0;
+        long expectedKnowledgeChunksUsed = 0;
+        long expectedLatencyMs = 0;
+        long expectedOutputTokens = 0;
+        bool expectedSuccess = true;
+        string expectedText = "text";
+        List<string> expectedWarnings = ["string"];
+        List<ExecutedToolCall> expectedExecutedToolCalls =
+        [
+            new()
+            {
+                Name = "name",
+                Ok = true,
+                Error = "error",
+            },
+        ];
+
+        Assert.Equal(expectedError, model.Error);
+        Assert.Equal(expectedInputTokens, model.InputTokens);
+        Assert.Equal(expectedKnowledgeChunksUsed, model.KnowledgeChunksUsed);
+        Assert.Equal(expectedLatencyMs, model.LatencyMs);
+        Assert.Equal(expectedOutputTokens, model.OutputTokens);
+        Assert.Equal(expectedSuccess, model.Success);
+        Assert.Equal(expectedText, model.Text);
+        Assert.Equal(expectedWarnings.Count, model.Warnings.Count);
+        for (int i = 0; i < expectedWarnings.Count; i++)
+        {
+            Assert.Equal(expectedWarnings[i], model.Warnings[i]);
+        }
+        Assert.NotNull(model.ExecutedToolCalls);
+        Assert.Equal(expectedExecutedToolCalls.Count, model.ExecutedToolCalls.Count);
+        for (int i = 0; i < expectedExecutedToolCalls.Count; i++)
+        {
+            Assert.Equal(expectedExecutedToolCalls[i], model.ExecutedToolCalls[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new AgentTestResponse
+        {
+            Error = "error",
+            InputTokens = 0,
+            KnowledgeChunksUsed = 0,
+            LatencyMs = 0,
+            OutputTokens = 0,
+            Success = true,
+            Text = "text",
+            Warnings = ["string"],
+            ExecutedToolCalls =
+            [
+                new()
+                {
+                    Name = "name",
+                    Ok = true,
+                    Error = "error",
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentTestResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new AgentTestResponse
+        {
+            Error = "error",
+            InputTokens = 0,
+            KnowledgeChunksUsed = 0,
+            LatencyMs = 0,
+            OutputTokens = 0,
+            Success = true,
+            Text = "text",
+            Warnings = ["string"],
+            ExecutedToolCalls =
+            [
+                new()
+                {
+                    Name = "name",
+                    Ok = true,
+                    Error = "error",
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentTestResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedError = "error";
+        long expectedInputTokens = 0;
+        long expectedKnowledgeChunksUsed = 0;
+        long expectedLatencyMs = 0;
+        long expectedOutputTokens = 0;
+        bool expectedSuccess = true;
+        string expectedText = "text";
+        List<string> expectedWarnings = ["string"];
+        List<ExecutedToolCall> expectedExecutedToolCalls =
+        [
+            new()
+            {
+                Name = "name",
+                Ok = true,
+                Error = "error",
+            },
+        ];
+
+        Assert.Equal(expectedError, deserialized.Error);
+        Assert.Equal(expectedInputTokens, deserialized.InputTokens);
+        Assert.Equal(expectedKnowledgeChunksUsed, deserialized.KnowledgeChunksUsed);
+        Assert.Equal(expectedLatencyMs, deserialized.LatencyMs);
+        Assert.Equal(expectedOutputTokens, deserialized.OutputTokens);
+        Assert.Equal(expectedSuccess, deserialized.Success);
+        Assert.Equal(expectedText, deserialized.Text);
+        Assert.Equal(expectedWarnings.Count, deserialized.Warnings.Count);
+        for (int i = 0; i < expectedWarnings.Count; i++)
+        {
+            Assert.Equal(expectedWarnings[i], deserialized.Warnings[i]);
+        }
+        Assert.NotNull(deserialized.ExecutedToolCalls);
+        Assert.Equal(expectedExecutedToolCalls.Count, deserialized.ExecutedToolCalls.Count);
+        for (int i = 0; i < expectedExecutedToolCalls.Count; i++)
+        {
+            Assert.Equal(expectedExecutedToolCalls[i], deserialized.ExecutedToolCalls[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new AgentTestResponse
+        {
+            Error = "error",
+            InputTokens = 0,
+            KnowledgeChunksUsed = 0,
+            LatencyMs = 0,
+            OutputTokens = 0,
+            Success = true,
+            Text = "text",
+            Warnings = ["string"],
+            ExecutedToolCalls =
+            [
+                new()
+                {
+                    Name = "name",
+                    Ok = true,
+                    Error = "error",
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new AgentTestResponse
+        {
+            Error = "error",
+            InputTokens = 0,
+            KnowledgeChunksUsed = 0,
+            LatencyMs = 0,
+            OutputTokens = 0,
+            Success = true,
+            Text = "text",
+            Warnings = ["string"],
+        };
+
+        Assert.Null(model.ExecutedToolCalls);
+        Assert.False(model.RawData.ContainsKey("executedToolCalls"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new AgentTestResponse
+        {
+            Error = "error",
+            InputTokens = 0,
+            KnowledgeChunksUsed = 0,
+            LatencyMs = 0,
+            OutputTokens = 0,
+            Success = true,
+            Text = "text",
+            Warnings = ["string"],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new AgentTestResponse
+        {
+            Error = "error",
+            InputTokens = 0,
+            KnowledgeChunksUsed = 0,
+            LatencyMs = 0,
+            OutputTokens = 0,
+            Success = true,
+            Text = "text",
+            Warnings = ["string"],
+
+            // Null should be interpreted as omitted for these properties
+            ExecutedToolCalls = null,
+        };
+
+        Assert.Null(model.ExecutedToolCalls);
+        Assert.False(model.RawData.ContainsKey("executedToolCalls"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new AgentTestResponse
+        {
+            Error = "error",
+            InputTokens = 0,
+            KnowledgeChunksUsed = 0,
+            LatencyMs = 0,
+            OutputTokens = 0,
+            Success = true,
+            Text = "text",
+            Warnings = ["string"],
+
+            // Null should be interpreted as omitted for these properties
+            ExecutedToolCalls = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new AgentTestResponse
+        {
+            Error = "error",
+            InputTokens = 0,
+            KnowledgeChunksUsed = 0,
+            LatencyMs = 0,
+            OutputTokens = 0,
+            Success = true,
+            Text = "text",
+            Warnings = ["string"],
+            ExecutedToolCalls =
+            [
+                new()
+                {
+                    Name = "name",
+                    Ok = true,
+                    Error = "error",
+                },
+            ],
+        };
+
+        AgentTestResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ExecutedToolCallTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ExecutedToolCall
+        {
+            Name = "name",
+            Ok = true,
+            Error = "error",
+        };
+
+        string expectedName = "name";
+        bool expectedOk = true;
+        string expectedError = "error";
+
+        Assert.Equal(expectedName, model.Name);
+        Assert.Equal(expectedOk, model.Ok);
+        Assert.Equal(expectedError, model.Error);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ExecutedToolCall
+        {
+            Name = "name",
+            Ok = true,
+            Error = "error",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ExecutedToolCall>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ExecutedToolCall
+        {
+            Name = "name",
+            Ok = true,
+            Error = "error",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ExecutedToolCall>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedName = "name";
+        bool expectedOk = true;
+        string expectedError = "error";
+
+        Assert.Equal(expectedName, deserialized.Name);
+        Assert.Equal(expectedOk, deserialized.Ok);
+        Assert.Equal(expectedError, deserialized.Error);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ExecutedToolCall
+        {
+            Name = "name",
+            Ok = true,
+            Error = "error",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ExecutedToolCall { Name = "name", Ok = true };
+
+        Assert.Null(model.Error);
+        Assert.False(model.RawData.ContainsKey("error"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ExecutedToolCall { Name = "name", Ok = true };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new ExecutedToolCall
+        {
+            Name = "name",
+            Ok = true,
+
+            Error = null,
+        };
+
+        Assert.Null(model.Error);
+        Assert.True(model.RawData.ContainsKey("error"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ExecutedToolCall
+        {
+            Name = "name",
+            Ok = true,
+
+            Error = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ExecutedToolCall
+        {
+            Name = "name",
+            Ok = true,
+            Error = "error",
+        };
+
+        ExecutedToolCall copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentUpdateParamsTest.cs b/src/Zavudev.Tests/Models/Agents/AgentUpdateParamsTest.cs
new file mode 100644
index 0000000..c28bce3
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentUpdateParamsTest.cs
@@ -0,0 +1,802 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Agents;
+using Agent = Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentUpdateParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new AgentUpdateParams
+        {
+            AgentID = "agentId",
+            ApiKey = "apiKey",
+            ContextWindowMessages = 1,
+            Enabled = true,
+            IncludeContactMetadata = true,
+            MaxTokens = 1,
+            Model = "model",
+            Name = "name",
+            Provider = Agent::AgentProvider.OpenAI,
+            SystemPrompt = "systemPrompt",
+            Temperature = 0,
+            TriggerOnChannels = ["string"],
+            TriggerOnMessageTypes = ["string"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        string expectedAgentID = "agentId";
+        string expectedApiKey = "apiKey";
+        long expectedContextWindowMessages = 1;
+        bool expectedEnabled = true;
+        bool expectedIncludeContactMetadata = true;
+        long expectedMaxTokens = 1;
+        string expectedModel = "model";
+        string expectedName = "name";
+        ApiEnum<string, Agent::AgentProvider> expectedProvider = Agent::AgentProvider.OpenAI;
+        string expectedSystemPrompt = "systemPrompt";
+        double expectedTemperature = 0;
+        List<string> expectedTriggerOnChannels = ["string"];
+        List<string> expectedTriggerOnMessageTypes = ["string"];
+        AgentUpdateParamsVoice expectedVoice = new()
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        Assert.Equal(expectedAgentID, parameters.AgentID);
+        Assert.Equal(expectedApiKey, parameters.ApiKey);
+        Assert.Equal(expectedContextWindowMessages, parameters.ContextWindowMessages);
+        Assert.Equal(expectedEnabled, parameters.Enabled);
+        Assert.Equal(expectedIncludeContactMetadata, parameters.IncludeContactMetadata);
+        Assert.Equal(expectedMaxTokens, parameters.MaxTokens);
+        Assert.Equal(expectedModel, parameters.Model);
+        Assert.Equal(expectedName, parameters.Name);
+        Assert.Equal(expectedProvider, parameters.Provider);
+        Assert.Equal(expectedSystemPrompt, parameters.SystemPrompt);
+        Assert.Equal(expectedTemperature, parameters.Temperature);
+        Assert.NotNull(parameters.TriggerOnChannels);
+        Assert.Equal(expectedTriggerOnChannels.Count, parameters.TriggerOnChannels.Count);
+        for (int i = 0; i < expectedTriggerOnChannels.Count; i++)
+        {
+            Assert.Equal(expectedTriggerOnChannels[i], parameters.TriggerOnChannels[i]);
+        }
+        Assert.NotNull(parameters.TriggerOnMessageTypes);
+        Assert.Equal(expectedTriggerOnMessageTypes.Count, parameters.TriggerOnMessageTypes.Count);
+        for (int i = 0; i < expectedTriggerOnMessageTypes.Count; i++)
+        {
+            Assert.Equal(expectedTriggerOnMessageTypes[i], parameters.TriggerOnMessageTypes[i]);
+        }
+        Assert.Equal(expectedVoice, parameters.Voice);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new AgentUpdateParams
+        {
+            AgentID = "agentId",
+            MaxTokens = 1,
+            Temperature = 0,
+        };
+
+        Assert.Null(parameters.ApiKey);
+        Assert.False(parameters.RawBodyData.ContainsKey("apiKey"));
+        Assert.Null(parameters.ContextWindowMessages);
+        Assert.False(parameters.RawBodyData.ContainsKey("contextWindowMessages"));
+        Assert.Null(parameters.Enabled);
+        Assert.False(parameters.RawBodyData.ContainsKey("enabled"));
+        Assert.Null(parameters.IncludeContactMetadata);
+        Assert.False(parameters.RawBodyData.ContainsKey("includeContactMetadata"));
+        Assert.Null(parameters.Model);
+        Assert.False(parameters.RawBodyData.ContainsKey("model"));
+        Assert.Null(parameters.Name);
+        Assert.False(parameters.RawBodyData.ContainsKey("name"));
+        Assert.Null(parameters.Provider);
+        Assert.False(parameters.RawBodyData.ContainsKey("provider"));
+        Assert.Null(parameters.SystemPrompt);
+        Assert.False(parameters.RawBodyData.ContainsKey("systemPrompt"));
+        Assert.Null(parameters.TriggerOnChannels);
+        Assert.False(parameters.RawBodyData.ContainsKey("triggerOnChannels"));
+        Assert.Null(parameters.TriggerOnMessageTypes);
+        Assert.False(parameters.RawBodyData.ContainsKey("triggerOnMessageTypes"));
+        Assert.Null(parameters.Voice);
+        Assert.False(parameters.RawBodyData.ContainsKey("voice"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new AgentUpdateParams
+        {
+            AgentID = "agentId",
+            MaxTokens = 1,
+            Temperature = 0,
+
+            // Null should be interpreted as omitted for these properties
+            ApiKey = null,
+            ContextWindowMessages = null,
+            Enabled = null,
+            IncludeContactMetadata = null,
+            Model = null,
+            Name = null,
+            Provider = null,
+            SystemPrompt = null,
+            TriggerOnChannels = null,
+            TriggerOnMessageTypes = null,
+            Voice = null,
+        };
+
+        Assert.Null(parameters.ApiKey);
+        Assert.False(parameters.RawBodyData.ContainsKey("apiKey"));
+        Assert.Null(parameters.ContextWindowMessages);
+        Assert.False(parameters.RawBodyData.ContainsKey("contextWindowMessages"));
+        Assert.Null(parameters.Enabled);
+        Assert.False(parameters.RawBodyData.ContainsKey("enabled"));
+        Assert.Null(parameters.IncludeContactMetadata);
+        Assert.False(parameters.RawBodyData.ContainsKey("includeContactMetadata"));
+        Assert.Null(parameters.Model);
+        Assert.False(parameters.RawBodyData.ContainsKey("model"));
+        Assert.Null(parameters.Name);
+        Assert.False(parameters.RawBodyData.ContainsKey("name"));
+        Assert.Null(parameters.Provider);
+        Assert.False(parameters.RawBodyData.ContainsKey("provider"));
+        Assert.Null(parameters.SystemPrompt);
+        Assert.False(parameters.RawBodyData.ContainsKey("systemPrompt"));
+        Assert.Null(parameters.TriggerOnChannels);
+        Assert.False(parameters.RawBodyData.ContainsKey("triggerOnChannels"));
+        Assert.Null(parameters.TriggerOnMessageTypes);
+        Assert.False(parameters.RawBodyData.ContainsKey("triggerOnMessageTypes"));
+        Assert.Null(parameters.Voice);
+        Assert.False(parameters.RawBodyData.ContainsKey("voice"));
+    }
+
+    [Fact]
+    public void OptionalNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new AgentUpdateParams
+        {
+            AgentID = "agentId",
+            ApiKey = "apiKey",
+            ContextWindowMessages = 1,
+            Enabled = true,
+            IncludeContactMetadata = true,
+            Model = "model",
+            Name = "name",
+            Provider = Agent::AgentProvider.OpenAI,
+            SystemPrompt = "systemPrompt",
+            TriggerOnChannels = ["string"],
+            TriggerOnMessageTypes = ["string"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        Assert.Null(parameters.MaxTokens);
+        Assert.False(parameters.RawBodyData.ContainsKey("maxTokens"));
+        Assert.Null(parameters.Temperature);
+        Assert.False(parameters.RawBodyData.ContainsKey("temperature"));
+    }
+
+    [Fact]
+    public void OptionalNullableParamsSetToNullAreSetToNull_Works()
+    {
+        var parameters = new AgentUpdateParams
+        {
+            AgentID = "agentId",
+            ApiKey = "apiKey",
+            ContextWindowMessages = 1,
+            Enabled = true,
+            IncludeContactMetadata = true,
+            Model = "model",
+            Name = "name",
+            Provider = Agent::AgentProvider.OpenAI,
+            SystemPrompt = "systemPrompt",
+            TriggerOnChannels = ["string"],
+            TriggerOnMessageTypes = ["string"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+
+            MaxTokens = null,
+            Temperature = null,
+        };
+
+        Assert.Null(parameters.MaxTokens);
+        Assert.True(parameters.RawBodyData.ContainsKey("maxTokens"));
+        Assert.Null(parameters.Temperature);
+        Assert.True(parameters.RawBodyData.ContainsKey("temperature"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        AgentUpdateParams parameters = new() { AgentID = "agentId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/agents/agentId"), url));
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new AgentUpdateParams
+        {
+            AgentID = "agentId",
+            ApiKey = "apiKey",
+            ContextWindowMessages = 1,
+            Enabled = true,
+            IncludeContactMetadata = true,
+            MaxTokens = 1,
+            Model = "model",
+            Name = "name",
+            Provider = Agent::AgentProvider.OpenAI,
+            SystemPrompt = "systemPrompt",
+            Temperature = 0,
+            TriggerOnChannels = ["string"],
+            TriggerOnMessageTypes = ["string"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        AgentUpdateParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
+
+public class AgentUpdateParamsVoiceTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new AgentUpdateParamsVoice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        bool expectedEnabled = true;
+        string expectedGreeting = "Hi, thanks for calling Acme. How can I help you today?";
+        Dictionary<string, string> expectedGreetings = new()
+        {
+            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+        };
+        bool expectedInterruptible = true;
+        string expectedLanguage = "en";
+        long expectedMaxCallDurationMinutes = 1;
+        long expectedMaxIdleSeconds = 5;
+        string expectedModel = "openai/gpt-4o";
+        bool expectedRecordCalls = true;
+        string expectedSttModel = "sttModel";
+        string expectedSttProvider = "sttProvider";
+        string expectedTransferPhoneNumber = "+14155551234";
+        string expectedTtsProvider = "ttsProvider";
+        string expectedTtsVoiceID = "aria";
+        ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction> expectedVoicemailAction =
+            AgentUpdateParamsVoiceVoicemailAction.Hangup;
+        string expectedVoicemailMessage = "voicemailMessage";
+        double expectedVoiceSpeed = 0.5;
+
+        Assert.Equal(expectedEnabled, model.Enabled);
+        Assert.Equal(expectedGreeting, model.Greeting);
+        Assert.NotNull(model.Greetings);
+        Assert.Equal(expectedGreetings.Count, model.Greetings.Count);
+        foreach (var item in expectedGreetings)
+        {
+            Assert.True(model.Greetings.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, model.Greetings[item.Key]);
+        }
+        Assert.Equal(expectedInterruptible, model.Interruptible);
+        Assert.Equal(expectedLanguage, model.Language);
+        Assert.Equal(expectedMaxCallDurationMinutes, model.MaxCallDurationMinutes);
+        Assert.Equal(expectedMaxIdleSeconds, model.MaxIdleSeconds);
+        Assert.Equal(expectedModel, model.Model);
+        Assert.Equal(expectedRecordCalls, model.RecordCalls);
+        Assert.Equal(expectedSttModel, model.SttModel);
+        Assert.Equal(expectedSttProvider, model.SttProvider);
+        Assert.Equal(expectedTransferPhoneNumber, model.TransferPhoneNumber);
+        Assert.Equal(expectedTtsProvider, model.TtsProvider);
+        Assert.Equal(expectedTtsVoiceID, model.TtsVoiceID);
+        Assert.Equal(expectedVoicemailAction, model.VoicemailAction);
+        Assert.Equal(expectedVoicemailMessage, model.VoicemailMessage);
+        Assert.Equal(expectedVoiceSpeed, model.VoiceSpeed);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new AgentUpdateParamsVoice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentUpdateParamsVoice>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new AgentUpdateParamsVoice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentUpdateParamsVoice>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        bool expectedEnabled = true;
+        string expectedGreeting = "Hi, thanks for calling Acme. How can I help you today?";
+        Dictionary<string, string> expectedGreetings = new()
+        {
+            { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+        };
+        bool expectedInterruptible = true;
+        string expectedLanguage = "en";
+        long expectedMaxCallDurationMinutes = 1;
+        long expectedMaxIdleSeconds = 5;
+        string expectedModel = "openai/gpt-4o";
+        bool expectedRecordCalls = true;
+        string expectedSttModel = "sttModel";
+        string expectedSttProvider = "sttProvider";
+        string expectedTransferPhoneNumber = "+14155551234";
+        string expectedTtsProvider = "ttsProvider";
+        string expectedTtsVoiceID = "aria";
+        ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction> expectedVoicemailAction =
+            AgentUpdateParamsVoiceVoicemailAction.Hangup;
+        string expectedVoicemailMessage = "voicemailMessage";
+        double expectedVoiceSpeed = 0.5;
+
+        Assert.Equal(expectedEnabled, deserialized.Enabled);
+        Assert.Equal(expectedGreeting, deserialized.Greeting);
+        Assert.NotNull(deserialized.Greetings);
+        Assert.Equal(expectedGreetings.Count, deserialized.Greetings.Count);
+        foreach (var item in expectedGreetings)
+        {
+            Assert.True(deserialized.Greetings.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, deserialized.Greetings[item.Key]);
+        }
+        Assert.Equal(expectedInterruptible, deserialized.Interruptible);
+        Assert.Equal(expectedLanguage, deserialized.Language);
+        Assert.Equal(expectedMaxCallDurationMinutes, deserialized.MaxCallDurationMinutes);
+        Assert.Equal(expectedMaxIdleSeconds, deserialized.MaxIdleSeconds);
+        Assert.Equal(expectedModel, deserialized.Model);
+        Assert.Equal(expectedRecordCalls, deserialized.RecordCalls);
+        Assert.Equal(expectedSttModel, deserialized.SttModel);
+        Assert.Equal(expectedSttProvider, deserialized.SttProvider);
+        Assert.Equal(expectedTransferPhoneNumber, deserialized.TransferPhoneNumber);
+        Assert.Equal(expectedTtsProvider, deserialized.TtsProvider);
+        Assert.Equal(expectedTtsVoiceID, deserialized.TtsVoiceID);
+        Assert.Equal(expectedVoicemailAction, deserialized.VoicemailAction);
+        Assert.Equal(expectedVoicemailMessage, deserialized.VoicemailMessage);
+        Assert.Equal(expectedVoiceSpeed, deserialized.VoiceSpeed);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new AgentUpdateParamsVoice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new AgentUpdateParamsVoice { Enabled = true };
+
+        Assert.Null(model.Greeting);
+        Assert.False(model.RawData.ContainsKey("greeting"));
+        Assert.Null(model.Greetings);
+        Assert.False(model.RawData.ContainsKey("greetings"));
+        Assert.Null(model.Interruptible);
+        Assert.False(model.RawData.ContainsKey("interruptible"));
+        Assert.Null(model.Language);
+        Assert.False(model.RawData.ContainsKey("language"));
+        Assert.Null(model.MaxCallDurationMinutes);
+        Assert.False(model.RawData.ContainsKey("maxCallDurationMinutes"));
+        Assert.Null(model.MaxIdleSeconds);
+        Assert.False(model.RawData.ContainsKey("maxIdleSeconds"));
+        Assert.Null(model.Model);
+        Assert.False(model.RawData.ContainsKey("model"));
+        Assert.Null(model.RecordCalls);
+        Assert.False(model.RawData.ContainsKey("recordCalls"));
+        Assert.Null(model.SttModel);
+        Assert.False(model.RawData.ContainsKey("sttModel"));
+        Assert.Null(model.SttProvider);
+        Assert.False(model.RawData.ContainsKey("sttProvider"));
+        Assert.Null(model.TransferPhoneNumber);
+        Assert.False(model.RawData.ContainsKey("transferPhoneNumber"));
+        Assert.Null(model.TtsProvider);
+        Assert.False(model.RawData.ContainsKey("ttsProvider"));
+        Assert.Null(model.TtsVoiceID);
+        Assert.False(model.RawData.ContainsKey("ttsVoiceId"));
+        Assert.Null(model.VoicemailAction);
+        Assert.False(model.RawData.ContainsKey("voicemailAction"));
+        Assert.Null(model.VoicemailMessage);
+        Assert.False(model.RawData.ContainsKey("voicemailMessage"));
+        Assert.Null(model.VoiceSpeed);
+        Assert.False(model.RawData.ContainsKey("voiceSpeed"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new AgentUpdateParamsVoice { Enabled = true };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new AgentUpdateParamsVoice
+        {
+            Enabled = true,
+
+            // Null should be interpreted as omitted for these properties
+            Greeting = null,
+            Greetings = null,
+            Interruptible = null,
+            Language = null,
+            MaxCallDurationMinutes = null,
+            MaxIdleSeconds = null,
+            Model = null,
+            RecordCalls = null,
+            SttModel = null,
+            SttProvider = null,
+            TransferPhoneNumber = null,
+            TtsProvider = null,
+            TtsVoiceID = null,
+            VoicemailAction = null,
+            VoicemailMessage = null,
+            VoiceSpeed = null,
+        };
+
+        Assert.Null(model.Greeting);
+        Assert.False(model.RawData.ContainsKey("greeting"));
+        Assert.Null(model.Greetings);
+        Assert.False(model.RawData.ContainsKey("greetings"));
+        Assert.Null(model.Interruptible);
+        Assert.False(model.RawData.ContainsKey("interruptible"));
+        Assert.Null(model.Language);
+        Assert.False(model.RawData.ContainsKey("language"));
+        Assert.Null(model.MaxCallDurationMinutes);
+        Assert.False(model.RawData.ContainsKey("maxCallDurationMinutes"));
+        Assert.Null(model.MaxIdleSeconds);
+        Assert.False(model.RawData.ContainsKey("maxIdleSeconds"));
+        Assert.Null(model.Model);
+        Assert.False(model.RawData.ContainsKey("model"));
+        Assert.Null(model.RecordCalls);
+        Assert.False(model.RawData.ContainsKey("recordCalls"));
+        Assert.Null(model.SttModel);
+        Assert.False(model.RawData.ContainsKey("sttModel"));
+        Assert.Null(model.SttProvider);
+        Assert.False(model.RawData.ContainsKey("sttProvider"));
+        Assert.Null(model.TransferPhoneNumber);
+        Assert.False(model.RawData.ContainsKey("transferPhoneNumber"));
+        Assert.Null(model.TtsProvider);
+        Assert.False(model.RawData.ContainsKey("ttsProvider"));
+        Assert.Null(model.TtsVoiceID);
+        Assert.False(model.RawData.ContainsKey("ttsVoiceId"));
+        Assert.Null(model.VoicemailAction);
+        Assert.False(model.RawData.ContainsKey("voicemailAction"));
+        Assert.Null(model.VoicemailMessage);
+        Assert.False(model.RawData.ContainsKey("voicemailMessage"));
+        Assert.Null(model.VoiceSpeed);
+        Assert.False(model.RawData.ContainsKey("voiceSpeed"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new AgentUpdateParamsVoice
+        {
+            Enabled = true,
+
+            // Null should be interpreted as omitted for these properties
+            Greeting = null,
+            Greetings = null,
+            Interruptible = null,
+            Language = null,
+            MaxCallDurationMinutes = null,
+            MaxIdleSeconds = null,
+            Model = null,
+            RecordCalls = null,
+            SttModel = null,
+            SttProvider = null,
+            TransferPhoneNumber = null,
+            TtsProvider = null,
+            TtsVoiceID = null,
+            VoicemailAction = null,
+            VoicemailMessage = null,
+            VoiceSpeed = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new AgentUpdateParamsVoice
+        {
+            Enabled = true,
+            Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+            Greetings = new Dictionary<string, string>()
+            {
+                { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+            },
+            Interruptible = true,
+            Language = "en",
+            MaxCallDurationMinutes = 1,
+            MaxIdleSeconds = 5,
+            Model = "openai/gpt-4o",
+            RecordCalls = true,
+            SttModel = "sttModel",
+            SttProvider = "sttProvider",
+            TransferPhoneNumber = "+14155551234",
+            TtsProvider = "ttsProvider",
+            TtsVoiceID = "aria",
+            VoicemailAction = AgentUpdateParamsVoiceVoicemailAction.Hangup,
+            VoicemailMessage = "voicemailMessage",
+            VoiceSpeed = 0.5,
+        };
+
+        AgentUpdateParamsVoice copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class AgentUpdateParamsVoiceVoicemailActionTest : TestBase
+{
+    [Theory]
+    [InlineData(AgentUpdateParamsVoiceVoicemailAction.Hangup)]
+    [InlineData(AgentUpdateParamsVoiceVoicemailAction.LeaveMessage)]
+    public void Validation_Works(AgentUpdateParamsVoiceVoicemailAction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(AgentUpdateParamsVoiceVoicemailAction.Hangup)]
+    [InlineData(AgentUpdateParamsVoiceVoicemailAction.LeaveMessage)]
+    public void SerializationRoundtrip_Works(AgentUpdateParamsVoiceVoicemailAction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/AgentUpdateResponseTest.cs b/src/Zavudev.Tests/Models/Agents/AgentUpdateResponseTest.cs
new file mode 100644
index 0000000..b6f3e5f
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/AgentUpdateResponseTest.cs
@@ -0,0 +1,414 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Agents;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Tests.Models.Agents;
+
+public class AgentUpdateResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new AgentUpdateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        AgentAgent expectedAgent = new()
+        {
+            ID = "agent_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Enabled = true,
+            Model = "gpt-4o-mini",
+            Name = "Customer Support Agent",
+            Provider = AgentProvider.OpenAI,
+            SenderID = "sender_12345",
+            SystemPrompt = "systemPrompt",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContextWindowMessages = 0,
+            IncludeContactMetadata = true,
+            MaxTokens = 0,
+            SenderIds = ["string"],
+            Stats = new()
+            {
+                TotalCost = 0,
+                TotalInvocations = 0,
+                TotalTokensUsed = 0,
+            },
+            Temperature = 0,
+            TriggerOnChannels = ["sms", "whatsapp"],
+            TriggerOnMessageTypes = ["text"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        Assert.Equal(expectedAgent, model.Agent);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new AgentUpdateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentUpdateResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new AgentUpdateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<AgentUpdateResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        AgentAgent expectedAgent = new()
+        {
+            ID = "agent_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Enabled = true,
+            Model = "gpt-4o-mini",
+            Name = "Customer Support Agent",
+            Provider = AgentProvider.OpenAI,
+            SenderID = "sender_12345",
+            SystemPrompt = "systemPrompt",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContextWindowMessages = 0,
+            IncludeContactMetadata = true,
+            MaxTokens = 0,
+            SenderIds = ["string"],
+            Stats = new()
+            {
+                TotalCost = 0,
+                TotalInvocations = 0,
+                TotalTokensUsed = 0,
+            },
+            Temperature = 0,
+            TriggerOnChannels = ["sms", "whatsapp"],
+            TriggerOnMessageTypes = ["text"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        Assert.Equal(expectedAgent, deserialized.Agent);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new AgentUpdateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new AgentUpdateResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        AgentUpdateResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/Senders/SenderConnectParamsTest.cs b/src/Zavudev.Tests/Models/Agents/Senders/SenderConnectParamsTest.cs
new file mode 100644
index 0000000..88b04f5
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/Senders/SenderConnectParamsTest.cs
@@ -0,0 +1,41 @@
+using System;
+using Zavudev.Models.Agents.Senders;
+
+namespace Zavudev.Tests.Models.Agents.Senders;
+
+public class SenderConnectParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new SenderConnectParams { AgentID = "agentId", SenderID = "senderId" };
+
+        string expectedAgentID = "agentId";
+        string expectedSenderID = "senderId";
+
+        Assert.Equal(expectedAgentID, parameters.AgentID);
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        SenderConnectParams parameters = new() { AgentID = "agentId", SenderID = "senderId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/agents/agentId/senders"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new SenderConnectParams { AgentID = "agentId", SenderID = "senderId" };
+
+        SenderConnectParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/Senders/SenderConnectResponseTest.cs b/src/Zavudev.Tests/Models/Agents/Senders/SenderConnectResponseTest.cs
new file mode 100644
index 0000000..5df0be4
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/Senders/SenderConnectResponseTest.cs
@@ -0,0 +1,414 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Agents.Senders;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Tests.Models.Agents.Senders;
+
+public class SenderConnectResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new SenderConnectResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        AgentAgent expectedAgent = new()
+        {
+            ID = "agent_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Enabled = true,
+            Model = "gpt-4o-mini",
+            Name = "Customer Support Agent",
+            Provider = AgentProvider.OpenAI,
+            SenderID = "sender_12345",
+            SystemPrompt = "systemPrompt",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContextWindowMessages = 0,
+            IncludeContactMetadata = true,
+            MaxTokens = 0,
+            SenderIds = ["string"],
+            Stats = new()
+            {
+                TotalCost = 0,
+                TotalInvocations = 0,
+                TotalTokensUsed = 0,
+            },
+            Temperature = 0,
+            TriggerOnChannels = ["sms", "whatsapp"],
+            TriggerOnMessageTypes = ["text"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        Assert.Equal(expectedAgent, model.Agent);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new SenderConnectResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<SenderConnectResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new SenderConnectResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<SenderConnectResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        AgentAgent expectedAgent = new()
+        {
+            ID = "agent_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Enabled = true,
+            Model = "gpt-4o-mini",
+            Name = "Customer Support Agent",
+            Provider = AgentProvider.OpenAI,
+            SenderID = "sender_12345",
+            SystemPrompt = "systemPrompt",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContextWindowMessages = 0,
+            IncludeContactMetadata = true,
+            MaxTokens = 0,
+            SenderIds = ["string"],
+            Stats = new()
+            {
+                TotalCost = 0,
+                TotalInvocations = 0,
+                TotalTokensUsed = 0,
+            },
+            Temperature = 0,
+            TriggerOnChannels = ["sms", "whatsapp"],
+            TriggerOnMessageTypes = ["text"],
+            Voice = new()
+            {
+                Enabled = true,
+                Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                Greetings = new Dictionary<string, string>()
+                {
+                    { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                },
+                Interruptible = true,
+                Language = "en",
+                MaxCallDurationMinutes = 1,
+                MaxIdleSeconds = 5,
+                Model = "openai/gpt-4o",
+                RecordCalls = true,
+                SttModel = "sttModel",
+                SttProvider = "sttProvider",
+                TransferPhoneNumber = "+14155551234",
+                TtsProvider = "ttsProvider",
+                TtsVoiceID = "aria",
+                VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                VoicemailMessage = "voicemailMessage",
+                VoiceSpeed = 0.5,
+            },
+        };
+
+        Assert.Equal(expectedAgent, deserialized.Agent);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new SenderConnectResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new SenderConnectResponse
+        {
+            Agent = new()
+            {
+                ID = "agent_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Enabled = true,
+                Model = "gpt-4o-mini",
+                Name = "Customer Support Agent",
+                Provider = AgentProvider.OpenAI,
+                SenderID = "sender_12345",
+                SystemPrompt = "systemPrompt",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContextWindowMessages = 0,
+                IncludeContactMetadata = true,
+                MaxTokens = 0,
+                SenderIds = ["string"],
+                Stats = new()
+                {
+                    TotalCost = 0,
+                    TotalInvocations = 0,
+                    TotalTokensUsed = 0,
+                },
+                Temperature = 0,
+                TriggerOnChannels = ["sms", "whatsapp"],
+                TriggerOnMessageTypes = ["text"],
+                Voice = new()
+                {
+                    Enabled = true,
+                    Greeting = "Hi, thanks for calling Acme. How can I help you today?",
+                    Greetings = new Dictionary<string, string>()
+                    {
+                        { "es", "Hola, soy Atlas. Preguntame lo que quieras." },
+                    },
+                    Interruptible = true,
+                    Language = "en",
+                    MaxCallDurationMinutes = 1,
+                    MaxIdleSeconds = 5,
+                    Model = "openai/gpt-4o",
+                    RecordCalls = true,
+                    SttModel = "sttModel",
+                    SttProvider = "sttProvider",
+                    TransferPhoneNumber = "+14155551234",
+                    TtsProvider = "ttsProvider",
+                    TtsVoiceID = "aria",
+                    VoicemailAction = AgentAgentVoiceVoicemailAction.Hangup,
+                    VoicemailMessage = "voicemailMessage",
+                    VoiceSpeed = 0.5,
+                },
+            },
+        };
+
+        SenderConnectResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Agents/Senders/SenderDisconnectParamsTest.cs b/src/Zavudev.Tests/Models/Agents/Senders/SenderDisconnectParamsTest.cs
new file mode 100644
index 0000000..7c95ed3
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Agents/Senders/SenderDisconnectParamsTest.cs
@@ -0,0 +1,44 @@
+using System;
+using Zavudev.Models.Agents.Senders;
+
+namespace Zavudev.Tests.Models.Agents.Senders;
+
+public class SenderDisconnectParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new SenderDisconnectParams { AgentID = "agentId", SenderID = "senderId" };
+
+        string expectedAgentID = "agentId";
+        string expectedSenderID = "senderId";
+
+        Assert.Equal(expectedAgentID, parameters.AgentID);
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        SenderDisconnectParams parameters = new() { AgentID = "agentId", SenderID = "senderId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/agents/agentId/senders/senderId"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new SenderDisconnectParams { AgentID = "agentId", SenderID = "senderId" };
+
+        SenderDisconnectParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Calls/CallCreateParamsTest.cs b/src/Zavudev.Tests/Models/Calls/CallCreateParamsTest.cs
new file mode 100644
index 0000000..4a31560
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Calls/CallCreateParamsTest.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Tests.Models.Calls;
+
+public class CallCreateParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new CallCreateParams
+        {
+            To = "+56912345678",
+            Greeting = "greeting",
+            Language = "es-ES",
+            MaxDurationMinutes = 1,
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            SenderID = "sender_12345",
+        };
+
+        string expectedTo = "+56912345678";
+        string expectedGreeting = "greeting";
+        string expectedLanguage = "es-ES";
+        long expectedMaxDurationMinutes = 1;
+        Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
+        string expectedSenderID = "sender_12345";
+
+        Assert.Equal(expectedTo, parameters.To);
+        Assert.Equal(expectedGreeting, parameters.Greeting);
+        Assert.Equal(expectedLanguage, parameters.Language);
+        Assert.Equal(expectedMaxDurationMinutes, parameters.MaxDurationMinutes);
+        Assert.NotNull(parameters.Metadata);
+        Assert.Equal(expectedMetadata.Count, parameters.Metadata.Count);
+        foreach (var item in expectedMetadata)
+        {
+            Assert.True(parameters.Metadata.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, parameters.Metadata[item.Key]);
+        }
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new CallCreateParams { To = "+56912345678" };
+
+        Assert.Null(parameters.Greeting);
+        Assert.False(parameters.RawBodyData.ContainsKey("greeting"));
+        Assert.Null(parameters.Language);
+        Assert.False(parameters.RawBodyData.ContainsKey("language"));
+        Assert.Null(parameters.MaxDurationMinutes);
+        Assert.False(parameters.RawBodyData.ContainsKey("maxDurationMinutes"));
+        Assert.Null(parameters.Metadata);
+        Assert.False(parameters.RawBodyData.ContainsKey("metadata"));
+        Assert.Null(parameters.SenderID);
+        Assert.False(parameters.RawBodyData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new CallCreateParams
+        {
+            To = "+56912345678",
+
+            // Null should be interpreted as omitted for these properties
+            Greeting = null,
+            Language = null,
+            MaxDurationMinutes = null,
+            Metadata = null,
+            SenderID = null,
+        };
+
+        Assert.Null(parameters.Greeting);
+        Assert.False(parameters.RawBodyData.ContainsKey("greeting"));
+        Assert.Null(parameters.Language);
+        Assert.False(parameters.RawBodyData.ContainsKey("language"));
+        Assert.Null(parameters.MaxDurationMinutes);
+        Assert.False(parameters.RawBodyData.ContainsKey("maxDurationMinutes"));
+        Assert.Null(parameters.Metadata);
+        Assert.False(parameters.RawBodyData.ContainsKey("metadata"));
+        Assert.Null(parameters.SenderID);
+        Assert.False(parameters.RawBodyData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        CallCreateParams parameters = new() { To = "+56912345678" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/calls"), url));
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new CallCreateParams
+        {
+            To = "+56912345678",
+            Greeting = "greeting",
+            Language = "es-ES",
+            MaxDurationMinutes = 1,
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            SenderID = "sender_12345",
+        };
+
+        CallCreateParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Calls/CallCreateResponseTest.cs b/src/Zavudev.Tests/Models/Calls/CallCreateResponseTest.cs
new file mode 100644
index 0000000..2466808
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Calls/CallCreateResponseTest.cs
@@ -0,0 +1,1190 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Tests.Models.Calls;
+
+public class CallCreateResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallCreateResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = Role.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        Call expectedCall = new()
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedCall, model.Call);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallCreateResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = Role.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallCreateResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallCreateResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = Role.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallCreateResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        Call expectedCall = new()
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedCall, deserialized.Call);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallCreateResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = Role.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallCreateResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = Role.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        CallCreateResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string expectedID = "call_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, CallDirection> expectedDirection = CallDirection.Inbound;
+        string expectedFrom = "+13125551212";
+        ApiEnum<string, CallStatus> expectedStatus = CallStatus.Queued;
+        string expectedTo = "+56912345678";
+        DateTimeOffset expectedAnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        double expectedCost = 0;
+        long expectedDurationSeconds = 0;
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEndReason = "endReason";
+        Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
+        List<Transcript> expectedTranscript =
+        [
+            new()
+            {
+                Role = Role.User,
+                Seq = 0,
+                Text = "text",
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        long expectedTurnCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedDirection, model.Direction);
+        Assert.Equal(expectedFrom, model.From);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.Equal(expectedTo, model.To);
+        Assert.Equal(expectedAnsweredAt, model.AnsweredAt);
+        Assert.Equal(expectedCost, model.Cost);
+        Assert.Equal(expectedDurationSeconds, model.DurationSeconds);
+        Assert.Equal(expectedEndedAt, model.EndedAt);
+        Assert.Equal(expectedEndReason, model.EndReason);
+        Assert.NotNull(model.Metadata);
+        Assert.Equal(expectedMetadata.Count, model.Metadata.Count);
+        foreach (var item in expectedMetadata)
+        {
+            Assert.True(model.Metadata.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, model.Metadata[item.Key]);
+        }
+        Assert.NotNull(model.Transcript);
+        Assert.Equal(expectedTranscript.Count, model.Transcript.Count);
+        for (int i = 0; i < expectedTranscript.Count; i++)
+        {
+            Assert.Equal(expectedTranscript[i], model.Transcript[i]);
+        }
+        Assert.Equal(expectedTurnCount, model.TurnCount);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Call>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Call>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedID = "call_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, CallDirection> expectedDirection = CallDirection.Inbound;
+        string expectedFrom = "+13125551212";
+        ApiEnum<string, CallStatus> expectedStatus = CallStatus.Queued;
+        string expectedTo = "+56912345678";
+        DateTimeOffset expectedAnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        double expectedCost = 0;
+        long expectedDurationSeconds = 0;
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEndReason = "endReason";
+        Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
+        List<Transcript> expectedTranscript =
+        [
+            new()
+            {
+                Role = Role.User,
+                Seq = 0,
+                Text = "text",
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        long expectedTurnCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedDirection, deserialized.Direction);
+        Assert.Equal(expectedFrom, deserialized.From);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.Equal(expectedTo, deserialized.To);
+        Assert.Equal(expectedAnsweredAt, deserialized.AnsweredAt);
+        Assert.Equal(expectedCost, deserialized.Cost);
+        Assert.Equal(expectedDurationSeconds, deserialized.DurationSeconds);
+        Assert.Equal(expectedEndedAt, deserialized.EndedAt);
+        Assert.Equal(expectedEndReason, deserialized.EndReason);
+        Assert.NotNull(deserialized.Metadata);
+        Assert.Equal(expectedMetadata.Count, deserialized.Metadata.Count);
+        foreach (var item in expectedMetadata)
+        {
+            Assert.True(deserialized.Metadata.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, deserialized.Metadata[item.Key]);
+        }
+        Assert.NotNull(deserialized.Transcript);
+        Assert.Equal(expectedTranscript.Count, deserialized.Transcript.Count);
+        for (int i = 0; i < expectedTranscript.Count; i++)
+        {
+            Assert.Equal(expectedTranscript[i], deserialized.Transcript[i]);
+        }
+        Assert.Equal(expectedTurnCount, deserialized.TurnCount);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+        };
+
+        Assert.Null(model.Metadata);
+        Assert.False(model.RawData.ContainsKey("metadata"));
+        Assert.Null(model.Transcript);
+        Assert.False(model.RawData.ContainsKey("transcript"));
+        Assert.Null(model.UpdatedAt);
+        Assert.False(model.RawData.ContainsKey("updatedAt"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Metadata = null,
+            Transcript = null,
+            UpdatedAt = null,
+        };
+
+        Assert.Null(model.Metadata);
+        Assert.False(model.RawData.ContainsKey("metadata"));
+        Assert.Null(model.Transcript);
+        Assert.False(model.RawData.ContainsKey("transcript"));
+        Assert.Null(model.UpdatedAt);
+        Assert.False(model.RawData.ContainsKey("updatedAt"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Metadata = null,
+            Transcript = null,
+            UpdatedAt = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.AnsweredAt);
+        Assert.False(model.RawData.ContainsKey("answeredAt"));
+        Assert.Null(model.Cost);
+        Assert.False(model.RawData.ContainsKey("cost"));
+        Assert.Null(model.DurationSeconds);
+        Assert.False(model.RawData.ContainsKey("durationSeconds"));
+        Assert.Null(model.EndedAt);
+        Assert.False(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.EndReason);
+        Assert.False(model.RawData.ContainsKey("endReason"));
+        Assert.Null(model.TurnCount);
+        Assert.False(model.RawData.ContainsKey("turnCount"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            AnsweredAt = null,
+            Cost = null,
+            DurationSeconds = null,
+            EndedAt = null,
+            EndReason = null,
+            TurnCount = null,
+        };
+
+        Assert.Null(model.AnsweredAt);
+        Assert.True(model.RawData.ContainsKey("answeredAt"));
+        Assert.Null(model.Cost);
+        Assert.True(model.RawData.ContainsKey("cost"));
+        Assert.Null(model.DurationSeconds);
+        Assert.True(model.RawData.ContainsKey("durationSeconds"));
+        Assert.Null(model.EndedAt);
+        Assert.True(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.EndReason);
+        Assert.True(model.RawData.ContainsKey("endReason"));
+        Assert.Null(model.TurnCount);
+        Assert.True(model.RawData.ContainsKey("turnCount"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            AnsweredAt = null,
+            Cost = null,
+            DurationSeconds = null,
+            EndedAt = null,
+            EndReason = null,
+            TurnCount = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Call
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = Role.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Call copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallDirectionTest : TestBase
+{
+    [Theory]
+    [InlineData(CallDirection.Inbound)]
+    [InlineData(CallDirection.Outbound)]
+    public void Validation_Works(CallDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallDirection> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallDirection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallDirection.Inbound)]
+    [InlineData(CallDirection.Outbound)]
+    public void SerializationRoundtrip_Works(CallDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallDirection> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, CallDirection>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallDirection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, CallDirection>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class CallStatusTest : TestBase
+{
+    [Theory]
+    [InlineData(CallStatus.Queued)]
+    [InlineData(CallStatus.Ringing)]
+    [InlineData(CallStatus.InProgress)]
+    [InlineData(CallStatus.Completed)]
+    [InlineData(CallStatus.Failed)]
+    [InlineData(CallStatus.Busy)]
+    [InlineData(CallStatus.NoAnswer)]
+    [InlineData(CallStatus.Canceled)]
+    public void Validation_Works(CallStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallStatus> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallStatus.Queued)]
+    [InlineData(CallStatus.Ringing)]
+    [InlineData(CallStatus.InProgress)]
+    [InlineData(CallStatus.Completed)]
+    [InlineData(CallStatus.Failed)]
+    [InlineData(CallStatus.Busy)]
+    [InlineData(CallStatus.NoAnswer)]
+    [InlineData(CallStatus.Canceled)]
+    public void SerializationRoundtrip_Works(CallStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallStatus> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, CallStatus>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, CallStatus>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class TranscriptTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Transcript
+        {
+            Role = Role.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        ApiEnum<string, Role> expectedRole = Role.User;
+        long expectedSeq = 0;
+        string expectedText = "text";
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedStartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedRole, model.Role);
+        Assert.Equal(expectedSeq, model.Seq);
+        Assert.Equal(expectedText, model.Text);
+        Assert.Equal(expectedEndedAt, model.EndedAt);
+        Assert.Equal(expectedStartedAt, model.StartedAt);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Transcript
+        {
+            Role = Role.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Transcript>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Transcript
+        {
+            Role = Role.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Transcript>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        ApiEnum<string, Role> expectedRole = Role.User;
+        long expectedSeq = 0;
+        string expectedText = "text";
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedStartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedRole, deserialized.Role);
+        Assert.Equal(expectedSeq, deserialized.Seq);
+        Assert.Equal(expectedText, deserialized.Text);
+        Assert.Equal(expectedEndedAt, deserialized.EndedAt);
+        Assert.Equal(expectedStartedAt, deserialized.StartedAt);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Transcript
+        {
+            Role = Role.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Transcript
+        {
+            Role = Role.User,
+            Seq = 0,
+            Text = "text",
+        };
+
+        Assert.Null(model.EndedAt);
+        Assert.False(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.StartedAt);
+        Assert.False(model.RawData.ContainsKey("startedAt"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Transcript
+        {
+            Role = Role.User,
+            Seq = 0,
+            Text = "text",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new Transcript
+        {
+            Role = Role.User,
+            Seq = 0,
+            Text = "text",
+
+            EndedAt = null,
+            StartedAt = null,
+        };
+
+        Assert.Null(model.EndedAt);
+        Assert.True(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.StartedAt);
+        Assert.True(model.RawData.ContainsKey("startedAt"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Transcript
+        {
+            Role = Role.User,
+            Seq = 0,
+            Text = "text",
+
+            EndedAt = null,
+            StartedAt = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Transcript
+        {
+            Role = Role.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Transcript copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class RoleTest : TestBase
+{
+    [Theory]
+    [InlineData(Role.User)]
+    [InlineData(Role.Assistant)]
+    [InlineData(Role.Tool)]
+    public void Validation_Works(Role rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Role> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Role>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Role.User)]
+    [InlineData(Role.Assistant)]
+    [InlineData(Role.Tool)]
+    public void SerializationRoundtrip_Works(Role rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Role> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Role>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Role>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Role>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Calls/CallHangupParamsTest.cs b/src/Zavudev.Tests/Models/Calls/CallHangupParamsTest.cs
new file mode 100644
index 0000000..5a25961
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Calls/CallHangupParamsTest.cs
@@ -0,0 +1,39 @@
+using System;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Tests.Models.Calls;
+
+public class CallHangupParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new CallHangupParams { CallID = "callId" };
+
+        string expectedCallID = "callId";
+
+        Assert.Equal(expectedCallID, parameters.CallID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        CallHangupParams parameters = new() { CallID = "callId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/calls/callId/hangup"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new CallHangupParams { CallID = "callId" };
+
+        CallHangupParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Calls/CallHangupResponseTest.cs b/src/Zavudev.Tests/Models/Calls/CallHangupResponseTest.cs
new file mode 100644
index 0000000..826cf08
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Calls/CallHangupResponseTest.cs
@@ -0,0 +1,1194 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Tests.Models.Calls;
+
+public class CallHangupResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallHangupResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallHangupResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallHangupResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallHangupResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        CallHangupResponseCall expectedCall = new()
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedCall, model.Call);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallHangupResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallHangupResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallHangupResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallHangupResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallHangupResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallHangupResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallHangupResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallHangupResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallHangupResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallHangupResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        CallHangupResponseCall expectedCall = new()
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedCall, deserialized.Call);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallHangupResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallHangupResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallHangupResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallHangupResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallHangupResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallHangupResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallHangupResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallHangupResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        CallHangupResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallHangupResponseCallTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string expectedID = "call_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, CallHangupResponseCallDirection> expectedDirection =
+            CallHangupResponseCallDirection.Inbound;
+        string expectedFrom = "+13125551212";
+        ApiEnum<string, CallHangupResponseCallStatus> expectedStatus =
+            CallHangupResponseCallStatus.Queued;
+        string expectedTo = "+56912345678";
+        DateTimeOffset expectedAnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        double expectedCost = 0;
+        long expectedDurationSeconds = 0;
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEndReason = "endReason";
+        Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
+        List<CallHangupResponseCallTranscript> expectedTranscript =
+        [
+            new()
+            {
+                Role = CallHangupResponseCallTranscriptRole.User,
+                Seq = 0,
+                Text = "text",
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        long expectedTurnCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedDirection, model.Direction);
+        Assert.Equal(expectedFrom, model.From);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.Equal(expectedTo, model.To);
+        Assert.Equal(expectedAnsweredAt, model.AnsweredAt);
+        Assert.Equal(expectedCost, model.Cost);
+        Assert.Equal(expectedDurationSeconds, model.DurationSeconds);
+        Assert.Equal(expectedEndedAt, model.EndedAt);
+        Assert.Equal(expectedEndReason, model.EndReason);
+        Assert.NotNull(model.Metadata);
+        Assert.Equal(expectedMetadata.Count, model.Metadata.Count);
+        foreach (var item in expectedMetadata)
+        {
+            Assert.True(model.Metadata.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, model.Metadata[item.Key]);
+        }
+        Assert.NotNull(model.Transcript);
+        Assert.Equal(expectedTranscript.Count, model.Transcript.Count);
+        for (int i = 0; i < expectedTranscript.Count; i++)
+        {
+            Assert.Equal(expectedTranscript[i], model.Transcript[i]);
+        }
+        Assert.Equal(expectedTurnCount, model.TurnCount);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallHangupResponseCall>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallHangupResponseCall>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "call_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, CallHangupResponseCallDirection> expectedDirection =
+            CallHangupResponseCallDirection.Inbound;
+        string expectedFrom = "+13125551212";
+        ApiEnum<string, CallHangupResponseCallStatus> expectedStatus =
+            CallHangupResponseCallStatus.Queued;
+        string expectedTo = "+56912345678";
+        DateTimeOffset expectedAnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        double expectedCost = 0;
+        long expectedDurationSeconds = 0;
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEndReason = "endReason";
+        Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
+        List<CallHangupResponseCallTranscript> expectedTranscript =
+        [
+            new()
+            {
+                Role = CallHangupResponseCallTranscriptRole.User,
+                Seq = 0,
+                Text = "text",
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        long expectedTurnCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedDirection, deserialized.Direction);
+        Assert.Equal(expectedFrom, deserialized.From);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.Equal(expectedTo, deserialized.To);
+        Assert.Equal(expectedAnsweredAt, deserialized.AnsweredAt);
+        Assert.Equal(expectedCost, deserialized.Cost);
+        Assert.Equal(expectedDurationSeconds, deserialized.DurationSeconds);
+        Assert.Equal(expectedEndedAt, deserialized.EndedAt);
+        Assert.Equal(expectedEndReason, deserialized.EndReason);
+        Assert.NotNull(deserialized.Metadata);
+        Assert.Equal(expectedMetadata.Count, deserialized.Metadata.Count);
+        foreach (var item in expectedMetadata)
+        {
+            Assert.True(deserialized.Metadata.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, deserialized.Metadata[item.Key]);
+        }
+        Assert.NotNull(deserialized.Transcript);
+        Assert.Equal(expectedTranscript.Count, deserialized.Transcript.Count);
+        for (int i = 0; i < expectedTranscript.Count; i++)
+        {
+            Assert.Equal(expectedTranscript[i], deserialized.Transcript[i]);
+        }
+        Assert.Equal(expectedTurnCount, deserialized.TurnCount);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+        };
+
+        Assert.Null(model.Metadata);
+        Assert.False(model.RawData.ContainsKey("metadata"));
+        Assert.Null(model.Transcript);
+        Assert.False(model.RawData.ContainsKey("transcript"));
+        Assert.Null(model.UpdatedAt);
+        Assert.False(model.RawData.ContainsKey("updatedAt"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Metadata = null,
+            Transcript = null,
+            UpdatedAt = null,
+        };
+
+        Assert.Null(model.Metadata);
+        Assert.False(model.RawData.ContainsKey("metadata"));
+        Assert.Null(model.Transcript);
+        Assert.False(model.RawData.ContainsKey("transcript"));
+        Assert.Null(model.UpdatedAt);
+        Assert.False(model.RawData.ContainsKey("updatedAt"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Metadata = null,
+            Transcript = null,
+            UpdatedAt = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.AnsweredAt);
+        Assert.False(model.RawData.ContainsKey("answeredAt"));
+        Assert.Null(model.Cost);
+        Assert.False(model.RawData.ContainsKey("cost"));
+        Assert.Null(model.DurationSeconds);
+        Assert.False(model.RawData.ContainsKey("durationSeconds"));
+        Assert.Null(model.EndedAt);
+        Assert.False(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.EndReason);
+        Assert.False(model.RawData.ContainsKey("endReason"));
+        Assert.Null(model.TurnCount);
+        Assert.False(model.RawData.ContainsKey("turnCount"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            AnsweredAt = null,
+            Cost = null,
+            DurationSeconds = null,
+            EndedAt = null,
+            EndReason = null,
+            TurnCount = null,
+        };
+
+        Assert.Null(model.AnsweredAt);
+        Assert.True(model.RawData.ContainsKey("answeredAt"));
+        Assert.Null(model.Cost);
+        Assert.True(model.RawData.ContainsKey("cost"));
+        Assert.Null(model.DurationSeconds);
+        Assert.True(model.RawData.ContainsKey("durationSeconds"));
+        Assert.Null(model.EndedAt);
+        Assert.True(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.EndReason);
+        Assert.True(model.RawData.ContainsKey("endReason"));
+        Assert.Null(model.TurnCount);
+        Assert.True(model.RawData.ContainsKey("turnCount"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            AnsweredAt = null,
+            Cost = null,
+            DurationSeconds = null,
+            EndedAt = null,
+            EndReason = null,
+            TurnCount = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallHangupResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallHangupResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallHangupResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallHangupResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        CallHangupResponseCall copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallHangupResponseCallDirectionTest : TestBase
+{
+    [Theory]
+    [InlineData(CallHangupResponseCallDirection.Inbound)]
+    [InlineData(CallHangupResponseCallDirection.Outbound)]
+    public void Validation_Works(CallHangupResponseCallDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallHangupResponseCallDirection> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallHangupResponseCallDirection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallHangupResponseCallDirection.Inbound)]
+    [InlineData(CallHangupResponseCallDirection.Outbound)]
+    public void SerializationRoundtrip_Works(CallHangupResponseCallDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallHangupResponseCallDirection> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallHangupResponseCallDirection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallHangupResponseCallDirection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallHangupResponseCallDirection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class CallHangupResponseCallStatusTest : TestBase
+{
+    [Theory]
+    [InlineData(CallHangupResponseCallStatus.Queued)]
+    [InlineData(CallHangupResponseCallStatus.Ringing)]
+    [InlineData(CallHangupResponseCallStatus.InProgress)]
+    [InlineData(CallHangupResponseCallStatus.Completed)]
+    [InlineData(CallHangupResponseCallStatus.Failed)]
+    [InlineData(CallHangupResponseCallStatus.Busy)]
+    [InlineData(CallHangupResponseCallStatus.NoAnswer)]
+    [InlineData(CallHangupResponseCallStatus.Canceled)]
+    public void Validation_Works(CallHangupResponseCallStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallHangupResponseCallStatus> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallHangupResponseCallStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallHangupResponseCallStatus.Queued)]
+    [InlineData(CallHangupResponseCallStatus.Ringing)]
+    [InlineData(CallHangupResponseCallStatus.InProgress)]
+    [InlineData(CallHangupResponseCallStatus.Completed)]
+    [InlineData(CallHangupResponseCallStatus.Failed)]
+    [InlineData(CallHangupResponseCallStatus.Busy)]
+    [InlineData(CallHangupResponseCallStatus.NoAnswer)]
+    [InlineData(CallHangupResponseCallStatus.Canceled)]
+    public void SerializationRoundtrip_Works(CallHangupResponseCallStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallHangupResponseCallStatus> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallHangupResponseCallStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallHangupResponseCallStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallHangupResponseCallStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class CallHangupResponseCallTranscriptTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallHangupResponseCallTranscript
+        {
+            Role = CallHangupResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        ApiEnum<string, CallHangupResponseCallTranscriptRole> expectedRole =
+            CallHangupResponseCallTranscriptRole.User;
+        long expectedSeq = 0;
+        string expectedText = "text";
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedStartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedRole, model.Role);
+        Assert.Equal(expectedSeq, model.Seq);
+        Assert.Equal(expectedText, model.Text);
+        Assert.Equal(expectedEndedAt, model.EndedAt);
+        Assert.Equal(expectedStartedAt, model.StartedAt);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallHangupResponseCallTranscript
+        {
+            Role = CallHangupResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallHangupResponseCallTranscript>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallHangupResponseCallTranscript
+        {
+            Role = CallHangupResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallHangupResponseCallTranscript>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        ApiEnum<string, CallHangupResponseCallTranscriptRole> expectedRole =
+            CallHangupResponseCallTranscriptRole.User;
+        long expectedSeq = 0;
+        string expectedText = "text";
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedStartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedRole, deserialized.Role);
+        Assert.Equal(expectedSeq, deserialized.Seq);
+        Assert.Equal(expectedText, deserialized.Text);
+        Assert.Equal(expectedEndedAt, deserialized.EndedAt);
+        Assert.Equal(expectedStartedAt, deserialized.StartedAt);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallHangupResponseCallTranscript
+        {
+            Role = CallHangupResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallHangupResponseCallTranscript
+        {
+            Role = CallHangupResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+        };
+
+        Assert.Null(model.EndedAt);
+        Assert.False(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.StartedAt);
+        Assert.False(model.RawData.ContainsKey("startedAt"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallHangupResponseCallTranscript
+        {
+            Role = CallHangupResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new CallHangupResponseCallTranscript
+        {
+            Role = CallHangupResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+
+            EndedAt = null,
+            StartedAt = null,
+        };
+
+        Assert.Null(model.EndedAt);
+        Assert.True(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.StartedAt);
+        Assert.True(model.RawData.ContainsKey("startedAt"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallHangupResponseCallTranscript
+        {
+            Role = CallHangupResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+
+            EndedAt = null,
+            StartedAt = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallHangupResponseCallTranscript
+        {
+            Role = CallHangupResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        CallHangupResponseCallTranscript copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallHangupResponseCallTranscriptRoleTest : TestBase
+{
+    [Theory]
+    [InlineData(CallHangupResponseCallTranscriptRole.User)]
+    [InlineData(CallHangupResponseCallTranscriptRole.Assistant)]
+    [InlineData(CallHangupResponseCallTranscriptRole.Tool)]
+    public void Validation_Works(CallHangupResponseCallTranscriptRole rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallHangupResponseCallTranscriptRole> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, CallHangupResponseCallTranscriptRole>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallHangupResponseCallTranscriptRole.User)]
+    [InlineData(CallHangupResponseCallTranscriptRole.Assistant)]
+    [InlineData(CallHangupResponseCallTranscriptRole.Tool)]
+    public void SerializationRoundtrip_Works(CallHangupResponseCallTranscriptRole rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallHangupResponseCallTranscriptRole> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallHangupResponseCallTranscriptRole>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, CallHangupResponseCallTranscriptRole>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallHangupResponseCallTranscriptRole>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Calls/CallListPageResponseTest.cs b/src/Zavudev.Tests/Models/Calls/CallListPageResponseTest.cs
new file mode 100644
index 0000000..4b4738c
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Calls/CallListPageResponseTest.cs
@@ -0,0 +1,481 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Tests.Models.Calls;
+
+public class CallListPageResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "call_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = CallListResponseDirection.Inbound,
+                    From = "+13125551212",
+                    Status = CallListResponseStatus.Queued,
+                    To = "+56912345678",
+                    AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cost = 0,
+                    DurationSeconds = 0,
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EndReason = "endReason",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    Transcript =
+                    [
+                        new()
+                        {
+                            Role = CallListResponseTranscriptRole.User,
+                            Seq = 0,
+                            Text = "text",
+                            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        },
+                    ],
+                    TurnCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        List<CallListResponse> expectedItems =
+        [
+            new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallListResponseDirection.Inbound,
+                From = "+13125551212",
+                Status = CallListResponseStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallListResponseTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        string expectedNextCursor = "nextCursor";
+
+        Assert.Equal(expectedItems.Count, model.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], model.Items[i]);
+        }
+        Assert.Equal(expectedNextCursor, model.NextCursor);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "call_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = CallListResponseDirection.Inbound,
+                    From = "+13125551212",
+                    Status = CallListResponseStatus.Queued,
+                    To = "+56912345678",
+                    AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cost = 0,
+                    DurationSeconds = 0,
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EndReason = "endReason",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    Transcript =
+                    [
+                        new()
+                        {
+                            Role = CallListResponseTranscriptRole.User,
+                            Seq = 0,
+                            Text = "text",
+                            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        },
+                    ],
+                    TurnCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallListPageResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "call_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = CallListResponseDirection.Inbound,
+                    From = "+13125551212",
+                    Status = CallListResponseStatus.Queued,
+                    To = "+56912345678",
+                    AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cost = 0,
+                    DurationSeconds = 0,
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EndReason = "endReason",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    Transcript =
+                    [
+                        new()
+                        {
+                            Role = CallListResponseTranscriptRole.User,
+                            Seq = 0,
+                            Text = "text",
+                            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        },
+                    ],
+                    TurnCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallListPageResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<CallListResponse> expectedItems =
+        [
+            new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallListResponseDirection.Inbound,
+                From = "+13125551212",
+                Status = CallListResponseStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallListResponseTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        string expectedNextCursor = "nextCursor";
+
+        Assert.Equal(expectedItems.Count, deserialized.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], deserialized.Items[i]);
+        }
+        Assert.Equal(expectedNextCursor, deserialized.NextCursor);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "call_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = CallListResponseDirection.Inbound,
+                    From = "+13125551212",
+                    Status = CallListResponseStatus.Queued,
+                    To = "+56912345678",
+                    AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cost = 0,
+                    DurationSeconds = 0,
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EndReason = "endReason",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    Transcript =
+                    [
+                        new()
+                        {
+                            Role = CallListResponseTranscriptRole.User,
+                            Seq = 0,
+                            Text = "text",
+                            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        },
+                    ],
+                    TurnCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "call_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = CallListResponseDirection.Inbound,
+                    From = "+13125551212",
+                    Status = CallListResponseStatus.Queued,
+                    To = "+56912345678",
+                    AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cost = 0,
+                    DurationSeconds = 0,
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EndReason = "endReason",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    Transcript =
+                    [
+                        new()
+                        {
+                            Role = CallListResponseTranscriptRole.User,
+                            Seq = 0,
+                            Text = "text",
+                            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        },
+                    ],
+                    TurnCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+        };
+
+        Assert.Null(model.NextCursor);
+        Assert.False(model.RawData.ContainsKey("nextCursor"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "call_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = CallListResponseDirection.Inbound,
+                    From = "+13125551212",
+                    Status = CallListResponseStatus.Queued,
+                    To = "+56912345678",
+                    AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cost = 0,
+                    DurationSeconds = 0,
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EndReason = "endReason",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    Transcript =
+                    [
+                        new()
+                        {
+                            Role = CallListResponseTranscriptRole.User,
+                            Seq = 0,
+                            Text = "text",
+                            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        },
+                    ],
+                    TurnCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new CallListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "call_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = CallListResponseDirection.Inbound,
+                    From = "+13125551212",
+                    Status = CallListResponseStatus.Queued,
+                    To = "+56912345678",
+                    AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cost = 0,
+                    DurationSeconds = 0,
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EndReason = "endReason",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    Transcript =
+                    [
+                        new()
+                        {
+                            Role = CallListResponseTranscriptRole.User,
+                            Seq = 0,
+                            Text = "text",
+                            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        },
+                    ],
+                    TurnCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+
+            NextCursor = null,
+        };
+
+        Assert.Null(model.NextCursor);
+        Assert.True(model.RawData.ContainsKey("nextCursor"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "call_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = CallListResponseDirection.Inbound,
+                    From = "+13125551212",
+                    Status = CallListResponseStatus.Queued,
+                    To = "+56912345678",
+                    AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cost = 0,
+                    DurationSeconds = 0,
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EndReason = "endReason",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    Transcript =
+                    [
+                        new()
+                        {
+                            Role = CallListResponseTranscriptRole.User,
+                            Seq = 0,
+                            Text = "text",
+                            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        },
+                    ],
+                    TurnCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+
+            NextCursor = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "call_abc123",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = CallListResponseDirection.Inbound,
+                    From = "+13125551212",
+                    Status = CallListResponseStatus.Queued,
+                    To = "+56912345678",
+                    AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cost = 0,
+                    DurationSeconds = 0,
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EndReason = "endReason",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    Transcript =
+                    [
+                        new()
+                        {
+                            Role = CallListResponseTranscriptRole.User,
+                            Seq = 0,
+                            Text = "text",
+                            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        },
+                    ],
+                    TurnCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        CallListPageResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Calls/CallListParamsTest.cs b/src/Zavudev.Tests/Models/Calls/CallListParamsTest.cs
new file mode 100644
index 0000000..eab26eb
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Calls/CallListParamsTest.cs
@@ -0,0 +1,236 @@
+using System;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Tests.Models.Calls;
+
+public class CallListParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new CallListParams
+        {
+            Cursor = "cursor",
+            Direction = Direction.Inbound,
+            Limit = 100,
+            Status = Status.Queued,
+        };
+
+        string expectedCursor = "cursor";
+        ApiEnum<string, Direction> expectedDirection = Direction.Inbound;
+        long expectedLimit = 100;
+        ApiEnum<string, Status> expectedStatus = Status.Queued;
+
+        Assert.Equal(expectedCursor, parameters.Cursor);
+        Assert.Equal(expectedDirection, parameters.Direction);
+        Assert.Equal(expectedLimit, parameters.Limit);
+        Assert.Equal(expectedStatus, parameters.Status);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new CallListParams { };
+
+        Assert.Null(parameters.Cursor);
+        Assert.False(parameters.RawQueryData.ContainsKey("cursor"));
+        Assert.Null(parameters.Direction);
+        Assert.False(parameters.RawQueryData.ContainsKey("direction"));
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+        Assert.Null(parameters.Status);
+        Assert.False(parameters.RawQueryData.ContainsKey("status"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new CallListParams
+        {
+            // Null should be interpreted as omitted for these properties
+            Cursor = null,
+            Direction = null,
+            Limit = null,
+            Status = null,
+        };
+
+        Assert.Null(parameters.Cursor);
+        Assert.False(parameters.RawQueryData.ContainsKey("cursor"));
+        Assert.Null(parameters.Direction);
+        Assert.False(parameters.RawQueryData.ContainsKey("direction"));
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+        Assert.Null(parameters.Status);
+        Assert.False(parameters.RawQueryData.ContainsKey("status"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        CallListParams parameters = new()
+        {
+            Cursor = "cursor",
+            Direction = Direction.Inbound,
+            Limit = 100,
+            Status = Status.Queued,
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri(
+                    "https://api.zavu.dev/v1/calls?cursor=cursor&direction=inbound&limit=100&status=queued"
+                ),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new CallListParams
+        {
+            Cursor = "cursor",
+            Direction = Direction.Inbound,
+            Limit = 100,
+            Status = Status.Queued,
+        };
+
+        CallListParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
+
+public class DirectionTest : TestBase
+{
+    [Theory]
+    [InlineData(Direction.Inbound)]
+    [InlineData(Direction.Outbound)]
+    public void Validation_Works(Direction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Direction> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Direction.Inbound)]
+    [InlineData(Direction.Outbound)]
+    public void SerializationRoundtrip_Works(Direction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Direction> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class StatusTest : TestBase
+{
+    [Theory]
+    [InlineData(Status.Queued)]
+    [InlineData(Status.Ringing)]
+    [InlineData(Status.InProgress)]
+    [InlineData(Status.Completed)]
+    [InlineData(Status.Failed)]
+    [InlineData(Status.Busy)]
+    [InlineData(Status.NoAnswer)]
+    [InlineData(Status.Canceled)]
+    public void Validation_Works(Status rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Status> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Status>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Status.Queued)]
+    [InlineData(Status.Ringing)]
+    [InlineData(Status.InProgress)]
+    [InlineData(Status.Completed)]
+    [InlineData(Status.Failed)]
+    [InlineData(Status.Busy)]
+    [InlineData(Status.NoAnswer)]
+    [InlineData(Status.Canceled)]
+    public void SerializationRoundtrip_Works(Status rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Status> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Status>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Status>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Status>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Calls/CallListResponseTest.cs b/src/Zavudev.Tests/Models/Calls/CallListResponseTest.cs
new file mode 100644
index 0000000..06814e3
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Calls/CallListResponseTest.cs
@@ -0,0 +1,932 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Tests.Models.Calls;
+
+public class CallListResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallListResponseTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string expectedID = "call_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, CallListResponseDirection> expectedDirection =
+            CallListResponseDirection.Inbound;
+        string expectedFrom = "+13125551212";
+        ApiEnum<string, CallListResponseStatus> expectedStatus = CallListResponseStatus.Queued;
+        string expectedTo = "+56912345678";
+        DateTimeOffset expectedAnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        double expectedCost = 0;
+        long expectedDurationSeconds = 0;
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEndReason = "endReason";
+        Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
+        List<CallListResponseTranscript> expectedTranscript =
+        [
+            new()
+            {
+                Role = CallListResponseTranscriptRole.User,
+                Seq = 0,
+                Text = "text",
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        long expectedTurnCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedDirection, model.Direction);
+        Assert.Equal(expectedFrom, model.From);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.Equal(expectedTo, model.To);
+        Assert.Equal(expectedAnsweredAt, model.AnsweredAt);
+        Assert.Equal(expectedCost, model.Cost);
+        Assert.Equal(expectedDurationSeconds, model.DurationSeconds);
+        Assert.Equal(expectedEndedAt, model.EndedAt);
+        Assert.Equal(expectedEndReason, model.EndReason);
+        Assert.NotNull(model.Metadata);
+        Assert.Equal(expectedMetadata.Count, model.Metadata.Count);
+        foreach (var item in expectedMetadata)
+        {
+            Assert.True(model.Metadata.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, model.Metadata[item.Key]);
+        }
+        Assert.NotNull(model.Transcript);
+        Assert.Equal(expectedTranscript.Count, model.Transcript.Count);
+        for (int i = 0; i < expectedTranscript.Count; i++)
+        {
+            Assert.Equal(expectedTranscript[i], model.Transcript[i]);
+        }
+        Assert.Equal(expectedTurnCount, model.TurnCount);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallListResponseTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallListResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallListResponseTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallListResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "call_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, CallListResponseDirection> expectedDirection =
+            CallListResponseDirection.Inbound;
+        string expectedFrom = "+13125551212";
+        ApiEnum<string, CallListResponseStatus> expectedStatus = CallListResponseStatus.Queued;
+        string expectedTo = "+56912345678";
+        DateTimeOffset expectedAnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        double expectedCost = 0;
+        long expectedDurationSeconds = 0;
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEndReason = "endReason";
+        Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
+        List<CallListResponseTranscript> expectedTranscript =
+        [
+            new()
+            {
+                Role = CallListResponseTranscriptRole.User,
+                Seq = 0,
+                Text = "text",
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        long expectedTurnCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedDirection, deserialized.Direction);
+        Assert.Equal(expectedFrom, deserialized.From);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.Equal(expectedTo, deserialized.To);
+        Assert.Equal(expectedAnsweredAt, deserialized.AnsweredAt);
+        Assert.Equal(expectedCost, deserialized.Cost);
+        Assert.Equal(expectedDurationSeconds, deserialized.DurationSeconds);
+        Assert.Equal(expectedEndedAt, deserialized.EndedAt);
+        Assert.Equal(expectedEndReason, deserialized.EndReason);
+        Assert.NotNull(deserialized.Metadata);
+        Assert.Equal(expectedMetadata.Count, deserialized.Metadata.Count);
+        foreach (var item in expectedMetadata)
+        {
+            Assert.True(deserialized.Metadata.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, deserialized.Metadata[item.Key]);
+        }
+        Assert.NotNull(deserialized.Transcript);
+        Assert.Equal(expectedTranscript.Count, deserialized.Transcript.Count);
+        for (int i = 0; i < expectedTranscript.Count; i++)
+        {
+            Assert.Equal(expectedTranscript[i], deserialized.Transcript[i]);
+        }
+        Assert.Equal(expectedTurnCount, deserialized.TurnCount);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallListResponseTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+        };
+
+        Assert.Null(model.Metadata);
+        Assert.False(model.RawData.ContainsKey("metadata"));
+        Assert.Null(model.Transcript);
+        Assert.False(model.RawData.ContainsKey("transcript"));
+        Assert.Null(model.UpdatedAt);
+        Assert.False(model.RawData.ContainsKey("updatedAt"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Metadata = null,
+            Transcript = null,
+            UpdatedAt = null,
+        };
+
+        Assert.Null(model.Metadata);
+        Assert.False(model.RawData.ContainsKey("metadata"));
+        Assert.Null(model.Transcript);
+        Assert.False(model.RawData.ContainsKey("transcript"));
+        Assert.Null(model.UpdatedAt);
+        Assert.False(model.RawData.ContainsKey("updatedAt"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Metadata = null,
+            Transcript = null,
+            UpdatedAt = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallListResponseTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.AnsweredAt);
+        Assert.False(model.RawData.ContainsKey("answeredAt"));
+        Assert.Null(model.Cost);
+        Assert.False(model.RawData.ContainsKey("cost"));
+        Assert.Null(model.DurationSeconds);
+        Assert.False(model.RawData.ContainsKey("durationSeconds"));
+        Assert.Null(model.EndedAt);
+        Assert.False(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.EndReason);
+        Assert.False(model.RawData.ContainsKey("endReason"));
+        Assert.Null(model.TurnCount);
+        Assert.False(model.RawData.ContainsKey("turnCount"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallListResponseTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallListResponseTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            AnsweredAt = null,
+            Cost = null,
+            DurationSeconds = null,
+            EndedAt = null,
+            EndReason = null,
+            TurnCount = null,
+        };
+
+        Assert.Null(model.AnsweredAt);
+        Assert.True(model.RawData.ContainsKey("answeredAt"));
+        Assert.Null(model.Cost);
+        Assert.True(model.RawData.ContainsKey("cost"));
+        Assert.Null(model.DurationSeconds);
+        Assert.True(model.RawData.ContainsKey("durationSeconds"));
+        Assert.Null(model.EndedAt);
+        Assert.True(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.EndReason);
+        Assert.True(model.RawData.ContainsKey("endReason"));
+        Assert.Null(model.TurnCount);
+        Assert.True(model.RawData.ContainsKey("turnCount"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallListResponseTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            AnsweredAt = null,
+            Cost = null,
+            DurationSeconds = null,
+            EndedAt = null,
+            EndReason = null,
+            TurnCount = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallListResponse
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallListResponseDirection.Inbound,
+            From = "+13125551212",
+            Status = CallListResponseStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallListResponseTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        CallListResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallListResponseDirectionTest : TestBase
+{
+    [Theory]
+    [InlineData(CallListResponseDirection.Inbound)]
+    [InlineData(CallListResponseDirection.Outbound)]
+    public void Validation_Works(CallListResponseDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallListResponseDirection> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseDirection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallListResponseDirection.Inbound)]
+    [InlineData(CallListResponseDirection.Outbound)]
+    public void SerializationRoundtrip_Works(CallListResponseDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallListResponseDirection> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseDirection>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseDirection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseDirection>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class CallListResponseStatusTest : TestBase
+{
+    [Theory]
+    [InlineData(CallListResponseStatus.Queued)]
+    [InlineData(CallListResponseStatus.Ringing)]
+    [InlineData(CallListResponseStatus.InProgress)]
+    [InlineData(CallListResponseStatus.Completed)]
+    [InlineData(CallListResponseStatus.Failed)]
+    [InlineData(CallListResponseStatus.Busy)]
+    [InlineData(CallListResponseStatus.NoAnswer)]
+    [InlineData(CallListResponseStatus.Canceled)]
+    public void Validation_Works(CallListResponseStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallListResponseStatus> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallListResponseStatus.Queued)]
+    [InlineData(CallListResponseStatus.Ringing)]
+    [InlineData(CallListResponseStatus.InProgress)]
+    [InlineData(CallListResponseStatus.Completed)]
+    [InlineData(CallListResponseStatus.Failed)]
+    [InlineData(CallListResponseStatus.Busy)]
+    [InlineData(CallListResponseStatus.NoAnswer)]
+    [InlineData(CallListResponseStatus.Canceled)]
+    public void SerializationRoundtrip_Works(CallListResponseStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallListResponseStatus> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseStatus>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseStatus>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class CallListResponseTranscriptTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallListResponseTranscript
+        {
+            Role = CallListResponseTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        ApiEnum<string, CallListResponseTranscriptRole> expectedRole =
+            CallListResponseTranscriptRole.User;
+        long expectedSeq = 0;
+        string expectedText = "text";
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedStartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedRole, model.Role);
+        Assert.Equal(expectedSeq, model.Seq);
+        Assert.Equal(expectedText, model.Text);
+        Assert.Equal(expectedEndedAt, model.EndedAt);
+        Assert.Equal(expectedStartedAt, model.StartedAt);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallListResponseTranscript
+        {
+            Role = CallListResponseTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallListResponseTranscript>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallListResponseTranscript
+        {
+            Role = CallListResponseTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallListResponseTranscript>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        ApiEnum<string, CallListResponseTranscriptRole> expectedRole =
+            CallListResponseTranscriptRole.User;
+        long expectedSeq = 0;
+        string expectedText = "text";
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedStartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedRole, deserialized.Role);
+        Assert.Equal(expectedSeq, deserialized.Seq);
+        Assert.Equal(expectedText, deserialized.Text);
+        Assert.Equal(expectedEndedAt, deserialized.EndedAt);
+        Assert.Equal(expectedStartedAt, deserialized.StartedAt);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallListResponseTranscript
+        {
+            Role = CallListResponseTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallListResponseTranscript
+        {
+            Role = CallListResponseTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+        };
+
+        Assert.Null(model.EndedAt);
+        Assert.False(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.StartedAt);
+        Assert.False(model.RawData.ContainsKey("startedAt"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallListResponseTranscript
+        {
+            Role = CallListResponseTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new CallListResponseTranscript
+        {
+            Role = CallListResponseTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+
+            EndedAt = null,
+            StartedAt = null,
+        };
+
+        Assert.Null(model.EndedAt);
+        Assert.True(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.StartedAt);
+        Assert.True(model.RawData.ContainsKey("startedAt"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallListResponseTranscript
+        {
+            Role = CallListResponseTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+
+            EndedAt = null,
+            StartedAt = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallListResponseTranscript
+        {
+            Role = CallListResponseTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        CallListResponseTranscript copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallListResponseTranscriptRoleTest : TestBase
+{
+    [Theory]
+    [InlineData(CallListResponseTranscriptRole.User)]
+    [InlineData(CallListResponseTranscriptRole.Assistant)]
+    [InlineData(CallListResponseTranscriptRole.Tool)]
+    public void Validation_Works(CallListResponseTranscriptRole rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallListResponseTranscriptRole> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseTranscriptRole>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallListResponseTranscriptRole.User)]
+    [InlineData(CallListResponseTranscriptRole.Assistant)]
+    [InlineData(CallListResponseTranscriptRole.Tool)]
+    public void SerializationRoundtrip_Works(CallListResponseTranscriptRole rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallListResponseTranscriptRole> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallListResponseTranscriptRole>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallListResponseTranscriptRole>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallListResponseTranscriptRole>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Calls/CallRetrieveParamsTest.cs b/src/Zavudev.Tests/Models/Calls/CallRetrieveParamsTest.cs
new file mode 100644
index 0000000..65c7680
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Calls/CallRetrieveParamsTest.cs
@@ -0,0 +1,37 @@
+using System;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Tests.Models.Calls;
+
+public class CallRetrieveParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new CallRetrieveParams { CallID = "callId" };
+
+        string expectedCallID = "callId";
+
+        Assert.Equal(expectedCallID, parameters.CallID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        CallRetrieveParams parameters = new() { CallID = "callId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/calls/callId"), url));
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new CallRetrieveParams { CallID = "callId" };
+
+        CallRetrieveParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Calls/CallRetrieveResponseTest.cs b/src/Zavudev.Tests/Models/Calls/CallRetrieveResponseTest.cs
new file mode 100644
index 0000000..f711f8b
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Calls/CallRetrieveResponseTest.cs
@@ -0,0 +1,1194 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Tests.Models.Calls;
+
+public class CallRetrieveResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallRetrieveResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallRetrieveResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallRetrieveResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallRetrieveResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        CallRetrieveResponseCall expectedCall = new()
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedCall, model.Call);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallRetrieveResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallRetrieveResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallRetrieveResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallRetrieveResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallRetrieveResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallRetrieveResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallRetrieveResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallRetrieveResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallRetrieveResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallRetrieveResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        CallRetrieveResponseCall expectedCall = new()
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedCall, deserialized.Call);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallRetrieveResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallRetrieveResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallRetrieveResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallRetrieveResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallRetrieveResponse
+        {
+            Call = new()
+            {
+                ID = "call_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = CallRetrieveResponseCallDirection.Inbound,
+                From = "+13125551212",
+                Status = CallRetrieveResponseCallStatus.Queued,
+                To = "+56912345678",
+                AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cost = 0,
+                DurationSeconds = 0,
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EndReason = "endReason",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                Transcript =
+                [
+                    new()
+                    {
+                        Role = CallRetrieveResponseCallTranscriptRole.User,
+                        Seq = 0,
+                        Text = "text",
+                        EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    },
+                ],
+                TurnCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        CallRetrieveResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallRetrieveResponseCallTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string expectedID = "call_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, CallRetrieveResponseCallDirection> expectedDirection =
+            CallRetrieveResponseCallDirection.Inbound;
+        string expectedFrom = "+13125551212";
+        ApiEnum<string, CallRetrieveResponseCallStatus> expectedStatus =
+            CallRetrieveResponseCallStatus.Queued;
+        string expectedTo = "+56912345678";
+        DateTimeOffset expectedAnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        double expectedCost = 0;
+        long expectedDurationSeconds = 0;
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEndReason = "endReason";
+        Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
+        List<CallRetrieveResponseCallTranscript> expectedTranscript =
+        [
+            new()
+            {
+                Role = CallRetrieveResponseCallTranscriptRole.User,
+                Seq = 0,
+                Text = "text",
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        long expectedTurnCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedDirection, model.Direction);
+        Assert.Equal(expectedFrom, model.From);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.Equal(expectedTo, model.To);
+        Assert.Equal(expectedAnsweredAt, model.AnsweredAt);
+        Assert.Equal(expectedCost, model.Cost);
+        Assert.Equal(expectedDurationSeconds, model.DurationSeconds);
+        Assert.Equal(expectedEndedAt, model.EndedAt);
+        Assert.Equal(expectedEndReason, model.EndReason);
+        Assert.NotNull(model.Metadata);
+        Assert.Equal(expectedMetadata.Count, model.Metadata.Count);
+        foreach (var item in expectedMetadata)
+        {
+            Assert.True(model.Metadata.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, model.Metadata[item.Key]);
+        }
+        Assert.NotNull(model.Transcript);
+        Assert.Equal(expectedTranscript.Count, model.Transcript.Count);
+        for (int i = 0; i < expectedTranscript.Count; i++)
+        {
+            Assert.Equal(expectedTranscript[i], model.Transcript[i]);
+        }
+        Assert.Equal(expectedTurnCount, model.TurnCount);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallRetrieveResponseCall>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallRetrieveResponseCall>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "call_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, CallRetrieveResponseCallDirection> expectedDirection =
+            CallRetrieveResponseCallDirection.Inbound;
+        string expectedFrom = "+13125551212";
+        ApiEnum<string, CallRetrieveResponseCallStatus> expectedStatus =
+            CallRetrieveResponseCallStatus.Queued;
+        string expectedTo = "+56912345678";
+        DateTimeOffset expectedAnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        double expectedCost = 0;
+        long expectedDurationSeconds = 0;
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEndReason = "endReason";
+        Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
+        List<CallRetrieveResponseCallTranscript> expectedTranscript =
+        [
+            new()
+            {
+                Role = CallRetrieveResponseCallTranscriptRole.User,
+                Seq = 0,
+                Text = "text",
+                EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        long expectedTurnCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedDirection, deserialized.Direction);
+        Assert.Equal(expectedFrom, deserialized.From);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.Equal(expectedTo, deserialized.To);
+        Assert.Equal(expectedAnsweredAt, deserialized.AnsweredAt);
+        Assert.Equal(expectedCost, deserialized.Cost);
+        Assert.Equal(expectedDurationSeconds, deserialized.DurationSeconds);
+        Assert.Equal(expectedEndedAt, deserialized.EndedAt);
+        Assert.Equal(expectedEndReason, deserialized.EndReason);
+        Assert.NotNull(deserialized.Metadata);
+        Assert.Equal(expectedMetadata.Count, deserialized.Metadata.Count);
+        foreach (var item in expectedMetadata)
+        {
+            Assert.True(deserialized.Metadata.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, deserialized.Metadata[item.Key]);
+        }
+        Assert.NotNull(deserialized.Transcript);
+        Assert.Equal(expectedTranscript.Count, deserialized.Transcript.Count);
+        for (int i = 0; i < expectedTranscript.Count; i++)
+        {
+            Assert.Equal(expectedTranscript[i], deserialized.Transcript[i]);
+        }
+        Assert.Equal(expectedTurnCount, deserialized.TurnCount);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+        };
+
+        Assert.Null(model.Metadata);
+        Assert.False(model.RawData.ContainsKey("metadata"));
+        Assert.Null(model.Transcript);
+        Assert.False(model.RawData.ContainsKey("transcript"));
+        Assert.Null(model.UpdatedAt);
+        Assert.False(model.RawData.ContainsKey("updatedAt"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Metadata = null,
+            Transcript = null,
+            UpdatedAt = null,
+        };
+
+        Assert.Null(model.Metadata);
+        Assert.False(model.RawData.ContainsKey("metadata"));
+        Assert.Null(model.Transcript);
+        Assert.False(model.RawData.ContainsKey("transcript"));
+        Assert.Null(model.UpdatedAt);
+        Assert.False(model.RawData.ContainsKey("updatedAt"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            TurnCount = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Metadata = null,
+            Transcript = null,
+            UpdatedAt = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.AnsweredAt);
+        Assert.False(model.RawData.ContainsKey("answeredAt"));
+        Assert.Null(model.Cost);
+        Assert.False(model.RawData.ContainsKey("cost"));
+        Assert.Null(model.DurationSeconds);
+        Assert.False(model.RawData.ContainsKey("durationSeconds"));
+        Assert.Null(model.EndedAt);
+        Assert.False(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.EndReason);
+        Assert.False(model.RawData.ContainsKey("endReason"));
+        Assert.Null(model.TurnCount);
+        Assert.False(model.RawData.ContainsKey("turnCount"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            AnsweredAt = null,
+            Cost = null,
+            DurationSeconds = null,
+            EndedAt = null,
+            EndReason = null,
+            TurnCount = null,
+        };
+
+        Assert.Null(model.AnsweredAt);
+        Assert.True(model.RawData.ContainsKey("answeredAt"));
+        Assert.Null(model.Cost);
+        Assert.True(model.RawData.ContainsKey("cost"));
+        Assert.Null(model.DurationSeconds);
+        Assert.True(model.RawData.ContainsKey("durationSeconds"));
+        Assert.Null(model.EndedAt);
+        Assert.True(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.EndReason);
+        Assert.True(model.RawData.ContainsKey("endReason"));
+        Assert.Null(model.TurnCount);
+        Assert.True(model.RawData.ContainsKey("turnCount"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            AnsweredAt = null,
+            Cost = null,
+            DurationSeconds = null,
+            EndedAt = null,
+            EndReason = null,
+            TurnCount = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallRetrieveResponseCall
+        {
+            ID = "call_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = CallRetrieveResponseCallDirection.Inbound,
+            From = "+13125551212",
+            Status = CallRetrieveResponseCallStatus.Queued,
+            To = "+56912345678",
+            AnsweredAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cost = 0,
+            DurationSeconds = 0,
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EndReason = "endReason",
+            Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+            Transcript =
+            [
+                new()
+                {
+                    Role = CallRetrieveResponseCallTranscriptRole.User,
+                    Seq = 0,
+                    Text = "text",
+                    EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            TurnCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        CallRetrieveResponseCall copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallRetrieveResponseCallDirectionTest : TestBase
+{
+    [Theory]
+    [InlineData(CallRetrieveResponseCallDirection.Inbound)]
+    [InlineData(CallRetrieveResponseCallDirection.Outbound)]
+    public void Validation_Works(CallRetrieveResponseCallDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallRetrieveResponseCallDirection> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallRetrieveResponseCallDirection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallRetrieveResponseCallDirection.Inbound)]
+    [InlineData(CallRetrieveResponseCallDirection.Outbound)]
+    public void SerializationRoundtrip_Works(CallRetrieveResponseCallDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallRetrieveResponseCallDirection> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallRetrieveResponseCallDirection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallRetrieveResponseCallDirection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallRetrieveResponseCallDirection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class CallRetrieveResponseCallStatusTest : TestBase
+{
+    [Theory]
+    [InlineData(CallRetrieveResponseCallStatus.Queued)]
+    [InlineData(CallRetrieveResponseCallStatus.Ringing)]
+    [InlineData(CallRetrieveResponseCallStatus.InProgress)]
+    [InlineData(CallRetrieveResponseCallStatus.Completed)]
+    [InlineData(CallRetrieveResponseCallStatus.Failed)]
+    [InlineData(CallRetrieveResponseCallStatus.Busy)]
+    [InlineData(CallRetrieveResponseCallStatus.NoAnswer)]
+    [InlineData(CallRetrieveResponseCallStatus.Canceled)]
+    public void Validation_Works(CallRetrieveResponseCallStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallRetrieveResponseCallStatus> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallRetrieveResponseCallStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallRetrieveResponseCallStatus.Queued)]
+    [InlineData(CallRetrieveResponseCallStatus.Ringing)]
+    [InlineData(CallRetrieveResponseCallStatus.InProgress)]
+    [InlineData(CallRetrieveResponseCallStatus.Completed)]
+    [InlineData(CallRetrieveResponseCallStatus.Failed)]
+    [InlineData(CallRetrieveResponseCallStatus.Busy)]
+    [InlineData(CallRetrieveResponseCallStatus.NoAnswer)]
+    [InlineData(CallRetrieveResponseCallStatus.Canceled)]
+    public void SerializationRoundtrip_Works(CallRetrieveResponseCallStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallRetrieveResponseCallStatus> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallRetrieveResponseCallStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, CallRetrieveResponseCallStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallRetrieveResponseCallStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class CallRetrieveResponseCallTranscriptTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new CallRetrieveResponseCallTranscript
+        {
+            Role = CallRetrieveResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        ApiEnum<string, CallRetrieveResponseCallTranscriptRole> expectedRole =
+            CallRetrieveResponseCallTranscriptRole.User;
+        long expectedSeq = 0;
+        string expectedText = "text";
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedStartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedRole, model.Role);
+        Assert.Equal(expectedSeq, model.Seq);
+        Assert.Equal(expectedText, model.Text);
+        Assert.Equal(expectedEndedAt, model.EndedAt);
+        Assert.Equal(expectedStartedAt, model.StartedAt);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new CallRetrieveResponseCallTranscript
+        {
+            Role = CallRetrieveResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallRetrieveResponseCallTranscript>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new CallRetrieveResponseCallTranscript
+        {
+            Role = CallRetrieveResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<CallRetrieveResponseCallTranscript>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        ApiEnum<string, CallRetrieveResponseCallTranscriptRole> expectedRole =
+            CallRetrieveResponseCallTranscriptRole.User;
+        long expectedSeq = 0;
+        string expectedText = "text";
+        DateTimeOffset expectedEndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedStartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+
+        Assert.Equal(expectedRole, deserialized.Role);
+        Assert.Equal(expectedSeq, deserialized.Seq);
+        Assert.Equal(expectedText, deserialized.Text);
+        Assert.Equal(expectedEndedAt, deserialized.EndedAt);
+        Assert.Equal(expectedStartedAt, deserialized.StartedAt);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new CallRetrieveResponseCallTranscript
+        {
+            Role = CallRetrieveResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new CallRetrieveResponseCallTranscript
+        {
+            Role = CallRetrieveResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+        };
+
+        Assert.Null(model.EndedAt);
+        Assert.False(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.StartedAt);
+        Assert.False(model.RawData.ContainsKey("startedAt"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new CallRetrieveResponseCallTranscript
+        {
+            Role = CallRetrieveResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new CallRetrieveResponseCallTranscript
+        {
+            Role = CallRetrieveResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+
+            EndedAt = null,
+            StartedAt = null,
+        };
+
+        Assert.Null(model.EndedAt);
+        Assert.True(model.RawData.ContainsKey("endedAt"));
+        Assert.Null(model.StartedAt);
+        Assert.True(model.RawData.ContainsKey("startedAt"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new CallRetrieveResponseCallTranscript
+        {
+            Role = CallRetrieveResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+
+            EndedAt = null,
+            StartedAt = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new CallRetrieveResponseCallTranscript
+        {
+            Role = CallRetrieveResponseCallTranscriptRole.User,
+            Seq = 0,
+            Text = "text",
+            EndedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            StartedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        CallRetrieveResponseCallTranscript copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class CallRetrieveResponseCallTranscriptRoleTest : TestBase
+{
+    [Theory]
+    [InlineData(CallRetrieveResponseCallTranscriptRole.User)]
+    [InlineData(CallRetrieveResponseCallTranscriptRole.Assistant)]
+    [InlineData(CallRetrieveResponseCallTranscriptRole.Tool)]
+    public void Validation_Works(CallRetrieveResponseCallTranscriptRole rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallRetrieveResponseCallTranscriptRole> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, CallRetrieveResponseCallTranscriptRole>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(CallRetrieveResponseCallTranscriptRole.User)]
+    [InlineData(CallRetrieveResponseCallTranscriptRole.Assistant)]
+    [InlineData(CallRetrieveResponseCallTranscriptRole.Tool)]
+    public void SerializationRoundtrip_Works(CallRetrieveResponseCallTranscriptRole rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, CallRetrieveResponseCallTranscriptRole> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallRetrieveResponseCallTranscriptRole>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, CallRetrieveResponseCallTranscriptRole>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, CallRetrieveResponseCallTranscriptRole>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Contacts/ContactDismissMergeSuggestionParamsTest.cs b/src/Zavudev.Tests/Models/Contacts/ContactDismissMergeSuggestionParamsTest.cs
deleted file mode 100644
index 438ac18..0000000
--- a/src/Zavudev.Tests/Models/Contacts/ContactDismissMergeSuggestionParamsTest.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using Zavudev.Models.Contacts;
-
-namespace Zavudev.Tests.Models.Contacts;
-
-public class ContactDismissMergeSuggestionParamsTest : TestBase
-{
-    [Fact]
-    public void FieldRoundtrip_Works()
-    {
-        var parameters = new ContactDismissMergeSuggestionParams { ContactID = "contactId" };
-
-        string expectedContactID = "contactId";
-
-        Assert.Equal(expectedContactID, parameters.ContactID);
-    }
-
-    [Fact]
-    public void Url_Works()
-    {
-        ContactDismissMergeSuggestionParams parameters = new() { ContactID = "contactId" };
-
-        var url = parameters.Url(new() { ApiKey = "My API Key" });
-
-        Assert.True(
-            TestBase.UrisEqual(
-                new Uri("https://api.zavu.dev/v1/contacts/contactId/merge-suggestion"),
-                url
-            )
-        );
-    }
-
-    [Fact]
-    public void CopyConstructor_Works()
-    {
-        var parameters = new ContactDismissMergeSuggestionParams { ContactID = "contactId" };
-
-        ContactDismissMergeSuggestionParams copied = new(parameters);
-
-        Assert.Equal(parameters, copied);
-    }
-}
diff --git a/src/Zavudev.Tests/Models/Contacts/ContactListPageResponseTest.cs b/src/Zavudev.Tests/Models/Contacts/ContactListPageResponseTest.cs
index 626744c..feecf20 100644
--- a/src/Zavudev.Tests/Models/Contacts/ContactListPageResponseTest.cs
+++ b/src/Zavudev.Tests/Models/Contacts/ContactListPageResponseTest.cs
@@ -54,7 +54,6 @@ public void FieldRoundtrip_Works()
                     PrimaryEmail = "john@example.com",
                     PrimaryPhone = "+56912345678",
                     ProfileName = "John Doe",
-                    SuggestedMergeWith = "suggestedMergeWith",
                     UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 },
             ],
@@ -102,7 +101,6 @@ public void FieldRoundtrip_Works()
                 PrimaryEmail = "john@example.com",
                 PrimaryPhone = "+56912345678",
                 ProfileName = "John Doe",
-                SuggestedMergeWith = "suggestedMergeWith",
                 UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             },
         ];
@@ -162,7 +160,6 @@ public void SerializationRoundtrip_Works()
                     PrimaryEmail = "john@example.com",
                     PrimaryPhone = "+56912345678",
                     ProfileName = "John Doe",
-                    SuggestedMergeWith = "suggestedMergeWith",
                     UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 },
             ],
@@ -224,7 +221,6 @@ public void FieldRoundtripThroughSerialization_Works()
                     PrimaryEmail = "john@example.com",
                     PrimaryPhone = "+56912345678",
                     ProfileName = "John Doe",
-                    SuggestedMergeWith = "suggestedMergeWith",
                     UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 },
             ],
@@ -279,7 +275,6 @@ public void FieldRoundtripThroughSerialization_Works()
                 PrimaryEmail = "john@example.com",
                 PrimaryPhone = "+56912345678",
                 ProfileName = "John Doe",
-                SuggestedMergeWith = "suggestedMergeWith",
                 UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             },
         ];
@@ -339,7 +334,6 @@ public void Validation_Works()
                     PrimaryEmail = "john@example.com",
                     PrimaryPhone = "+56912345678",
                     ProfileName = "John Doe",
-                    SuggestedMergeWith = "suggestedMergeWith",
                     UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 },
             ],
@@ -395,7 +389,6 @@ public void OptionalNullablePropertiesUnsetAreNotSet_Works()
                     PrimaryEmail = "john@example.com",
                     PrimaryPhone = "+56912345678",
                     ProfileName = "John Doe",
-                    SuggestedMergeWith = "suggestedMergeWith",
                     UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 },
             ],
@@ -451,7 +444,6 @@ public void OptionalNullablePropertiesUnsetValidation_Works()
                     PrimaryEmail = "john@example.com",
                     PrimaryPhone = "+56912345678",
                     ProfileName = "John Doe",
-                    SuggestedMergeWith = "suggestedMergeWith",
                     UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 },
             ],
@@ -506,7 +498,6 @@ public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
                     PrimaryEmail = "john@example.com",
                     PrimaryPhone = "+56912345678",
                     ProfileName = "John Doe",
-                    SuggestedMergeWith = "suggestedMergeWith",
                     UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 },
             ],
@@ -564,7 +555,6 @@ public void OptionalNullablePropertiesSetToNullValidation_Works()
                     PrimaryEmail = "john@example.com",
                     PrimaryPhone = "+56912345678",
                     ProfileName = "John Doe",
-                    SuggestedMergeWith = "suggestedMergeWith",
                     UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 },
             ],
@@ -621,7 +611,6 @@ public void CopyConstructor_Works()
                     PrimaryEmail = "john@example.com",
                     PrimaryPhone = "+56912345678",
                     ProfileName = "John Doe",
-                    SuggestedMergeWith = "suggestedMergeWith",
                     UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 },
             ],
diff --git a/src/Zavudev.Tests/Models/Contacts/ContactListParamsTest.cs b/src/Zavudev.Tests/Models/Contacts/ContactListParamsTest.cs
index 57fde30..b3b61c7 100644
--- a/src/Zavudev.Tests/Models/Contacts/ContactListParamsTest.cs
+++ b/src/Zavudev.Tests/Models/Contacts/ContactListParamsTest.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Zavudev.Models.Contacts;
 
 namespace Zavudev.Tests.Models.Contacts;
@@ -13,15 +14,26 @@ public void FieldRoundtrip_Works()
             Cursor = "cursor",
             Limit = 100,
             PhoneNumber = "phoneNumber",
+            Search = "search",
+            Tag = ["string"],
         };
 
         string expectedCursor = "cursor";
         long expectedLimit = 100;
         string expectedPhoneNumber = "phoneNumber";
+        string expectedSearch = "search";
+        List<string> expectedTag = ["string"];
 
         Assert.Equal(expectedCursor, parameters.Cursor);
         Assert.Equal(expectedLimit, parameters.Limit);
         Assert.Equal(expectedPhoneNumber, parameters.PhoneNumber);
+        Assert.Equal(expectedSearch, parameters.Search);
+        Assert.NotNull(parameters.Tag);
+        Assert.Equal(expectedTag.Count, parameters.Tag.Count);
+        for (int i = 0; i < expectedTag.Count; i++)
+        {
+            Assert.Equal(expectedTag[i], parameters.Tag[i]);
+        }
     }
 
     [Fact]
@@ -35,6 +47,10 @@ public void OptionalNonNullableParamsUnsetAreNotSet_Works()
         Assert.False(parameters.RawQueryData.ContainsKey("limit"));
         Assert.Null(parameters.PhoneNumber);
         Assert.False(parameters.RawQueryData.ContainsKey("phoneNumber"));
+        Assert.Null(parameters.Search);
+        Assert.False(parameters.RawQueryData.ContainsKey("search"));
+        Assert.Null(parameters.Tag);
+        Assert.False(parameters.RawQueryData.ContainsKey("tag"));
     }
 
     [Fact]
@@ -46,6 +62,8 @@ public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
             Cursor = null,
             Limit = null,
             PhoneNumber = null,
+            Search = null,
+            Tag = null,
         };
 
         Assert.Null(parameters.Cursor);
@@ -54,6 +72,10 @@ public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
         Assert.False(parameters.RawQueryData.ContainsKey("limit"));
         Assert.Null(parameters.PhoneNumber);
         Assert.False(parameters.RawQueryData.ContainsKey("phoneNumber"));
+        Assert.Null(parameters.Search);
+        Assert.False(parameters.RawQueryData.ContainsKey("search"));
+        Assert.Null(parameters.Tag);
+        Assert.False(parameters.RawQueryData.ContainsKey("tag"));
     }
 
     [Fact]
@@ -64,6 +86,8 @@ public void Url_Works()
             Cursor = "cursor",
             Limit = 100,
             PhoneNumber = "phoneNumber",
+            Search = "search",
+            Tag = ["string"],
         };
 
         var url = parameters.Url(new() { ApiKey = "My API Key" });
@@ -71,7 +95,7 @@ public void Url_Works()
         Assert.True(
             TestBase.UrisEqual(
                 new Uri(
-                    "https://api.zavu.dev/v1/contacts?cursor=cursor&limit=100&phoneNumber=phoneNumber"
+                    "https://api.zavu.dev/v1/contacts?cursor=cursor&limit=100&phoneNumber=phoneNumber&search=search&tag=string"
                 ),
                 url
             )
@@ -86,6 +110,8 @@ public void CopyConstructor_Works()
             Cursor = "cursor",
             Limit = 100,
             PhoneNumber = "phoneNumber",
+            Search = "search",
+            Tag = ["string"],
         };
 
         ContactListParams copied = new(parameters);
diff --git a/src/Zavudev.Tests/Models/Contacts/ContactTest.cs b/src/Zavudev.Tests/Models/Contacts/ContactTest.cs
index 123addd..f1e5150 100644
--- a/src/Zavudev.Tests/Models/Contacts/ContactTest.cs
+++ b/src/Zavudev.Tests/Models/Contacts/ContactTest.cs
@@ -51,7 +51,6 @@ public void FieldRoundtrip_Works()
             PrimaryEmail = "john@example.com",
             PrimaryPhone = "+56912345678",
             ProfileName = "John Doe",
-            SuggestedMergeWith = "suggestedMergeWith",
             UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
         };
 
@@ -92,7 +91,6 @@ public void FieldRoundtrip_Works()
         string expectedPrimaryEmail = "john@example.com";
         string expectedPrimaryPhone = "+56912345678";
         string expectedProfileName = "John Doe";
-        string expectedSuggestedMergeWith = "suggestedMergeWith";
         DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
 
         Assert.Equal(expectedID, model.ID);
@@ -123,7 +121,6 @@ public void FieldRoundtrip_Works()
         Assert.Equal(expectedPrimaryEmail, model.PrimaryEmail);
         Assert.Equal(expectedPrimaryPhone, model.PrimaryPhone);
         Assert.Equal(expectedProfileName, model.ProfileName);
-        Assert.Equal(expectedSuggestedMergeWith, model.SuggestedMergeWith);
         Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
     }
 
@@ -169,7 +166,6 @@ public void SerializationRoundtrip_Works()
             PrimaryEmail = "john@example.com",
             PrimaryPhone = "+56912345678",
             ProfileName = "John Doe",
-            SuggestedMergeWith = "suggestedMergeWith",
             UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
         };
 
@@ -221,7 +217,6 @@ public void FieldRoundtripThroughSerialization_Works()
             PrimaryEmail = "john@example.com",
             PrimaryPhone = "+56912345678",
             ProfileName = "John Doe",
-            SuggestedMergeWith = "suggestedMergeWith",
             UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
         };
 
@@ -269,7 +264,6 @@ public void FieldRoundtripThroughSerialization_Works()
         string expectedPrimaryEmail = "john@example.com";
         string expectedPrimaryPhone = "+56912345678";
         string expectedProfileName = "John Doe";
-        string expectedSuggestedMergeWith = "suggestedMergeWith";
         DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
 
         Assert.Equal(expectedID, deserialized.ID);
@@ -300,7 +294,6 @@ public void FieldRoundtripThroughSerialization_Works()
         Assert.Equal(expectedPrimaryEmail, deserialized.PrimaryEmail);
         Assert.Equal(expectedPrimaryPhone, deserialized.PrimaryPhone);
         Assert.Equal(expectedProfileName, deserialized.ProfileName);
-        Assert.Equal(expectedSuggestedMergeWith, deserialized.SuggestedMergeWith);
         Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
     }
 
@@ -346,7 +339,6 @@ public void Validation_Works()
             PrimaryEmail = "john@example.com",
             PrimaryPhone = "+56912345678",
             ProfileName = "John Doe",
-            SuggestedMergeWith = "suggestedMergeWith",
             UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
         };
 
@@ -380,8 +372,6 @@ public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
         Assert.False(model.RawData.ContainsKey("primaryEmail"));
         Assert.Null(model.PrimaryPhone);
         Assert.False(model.RawData.ContainsKey("primaryPhone"));
-        Assert.Null(model.SuggestedMergeWith);
-        Assert.False(model.RawData.ContainsKey("suggestedMergeWith"));
         Assert.Null(model.UpdatedAt);
         Assert.False(model.RawData.ContainsKey("updatedAt"));
     }
@@ -422,7 +412,6 @@ public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
             PhoneNumber = null,
             PrimaryEmail = null,
             PrimaryPhone = null,
-            SuggestedMergeWith = null,
             UpdatedAt = null,
         };
 
@@ -440,8 +429,6 @@ public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
         Assert.False(model.RawData.ContainsKey("primaryEmail"));
         Assert.Null(model.PrimaryPhone);
         Assert.False(model.RawData.ContainsKey("primaryPhone"));
-        Assert.Null(model.SuggestedMergeWith);
-        Assert.False(model.RawData.ContainsKey("suggestedMergeWith"));
         Assert.Null(model.UpdatedAt);
         Assert.False(model.RawData.ContainsKey("updatedAt"));
     }
@@ -466,7 +453,6 @@ public void OptionalNonNullablePropertiesSetToNullValidation_Works()
             PhoneNumber = null,
             PrimaryEmail = null,
             PrimaryPhone = null,
-            SuggestedMergeWith = null,
             UpdatedAt = null,
         };
 
@@ -514,7 +500,6 @@ public void OptionalNullablePropertiesUnsetAreNotSet_Works()
             PhoneNumber = "+56912345678",
             PrimaryEmail = "john@example.com",
             PrimaryPhone = "+56912345678",
-            SuggestedMergeWith = "suggestedMergeWith",
             UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
         };
 
@@ -563,7 +548,6 @@ public void OptionalNullablePropertiesUnsetValidation_Works()
             PhoneNumber = "+56912345678",
             PrimaryEmail = "john@example.com",
             PrimaryPhone = "+56912345678",
-            SuggestedMergeWith = "suggestedMergeWith",
             UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
         };
 
@@ -611,7 +595,6 @@ public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
             PhoneNumber = "+56912345678",
             PrimaryEmail = "john@example.com",
             PrimaryPhone = "+56912345678",
-            SuggestedMergeWith = "suggestedMergeWith",
             UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
 
             ProfileName = null,
@@ -662,7 +645,6 @@ public void OptionalNullablePropertiesSetToNullValidation_Works()
             PhoneNumber = "+56912345678",
             PrimaryEmail = "john@example.com",
             PrimaryPhone = "+56912345678",
-            SuggestedMergeWith = "suggestedMergeWith",
             UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
 
             ProfileName = null,
@@ -713,7 +695,6 @@ public void CopyConstructor_Works()
             PrimaryEmail = "john@example.com",
             PrimaryPhone = "+56912345678",
             ProfileName = "John Doe",
-            SuggestedMergeWith = "suggestedMergeWith",
             UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
         };
 
diff --git a/src/Zavudev.Tests/Models/Contacts/ContactUpdateParamsTest.cs b/src/Zavudev.Tests/Models/Contacts/ContactUpdateParamsTest.cs
index 729f48d..2d96777 100644
--- a/src/Zavudev.Tests/Models/Contacts/ContactUpdateParamsTest.cs
+++ b/src/Zavudev.Tests/Models/Contacts/ContactUpdateParamsTest.cs
@@ -16,15 +16,18 @@ public void FieldRoundtrip_Works()
         {
             ContactID = "contactId",
             DefaultChannel = DefaultChannel.Sms,
+            DisplayName = "John Doe",
             Metadata = new Dictionary<string, string>() { { "foo", "string" } },
         };
 
         string expectedContactID = "contactId";
         ApiEnum<string, DefaultChannel> expectedDefaultChannel = DefaultChannel.Sms;
+        string expectedDisplayName = "John Doe";
         Dictionary<string, string> expectedMetadata = new() { { "foo", "string" } };
 
         Assert.Equal(expectedContactID, parameters.ContactID);
         Assert.Equal(expectedDefaultChannel, parameters.DefaultChannel);
+        Assert.Equal(expectedDisplayName, parameters.DisplayName);
         Assert.NotNull(parameters.Metadata);
         Assert.Equal(expectedMetadata.Count, parameters.Metadata.Count);
         foreach (var item in expectedMetadata)
@@ -42,6 +45,7 @@ public void OptionalNonNullableParamsUnsetAreNotSet_Works()
         {
             ContactID = "contactId",
             DefaultChannel = DefaultChannel.Sms,
+            DisplayName = "John Doe",
         };
 
         Assert.Null(parameters.Metadata);
@@ -55,6 +59,7 @@ public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
         {
             ContactID = "contactId",
             DefaultChannel = DefaultChannel.Sms,
+            DisplayName = "John Doe",
 
             // Null should be interpreted as omitted for these properties
             Metadata = null,
@@ -75,6 +80,8 @@ public void OptionalNullableParamsUnsetAreNotSet_Works()
 
         Assert.Null(parameters.DefaultChannel);
         Assert.False(parameters.RawBodyData.ContainsKey("defaultChannel"));
+        Assert.Null(parameters.DisplayName);
+        Assert.False(parameters.RawBodyData.ContainsKey("displayName"));
     }
 
     [Fact]
@@ -86,10 +93,13 @@ public void OptionalNullableParamsSetToNullAreSetToNull_Works()
             Metadata = new Dictionary<string, string>() { { "foo", "string" } },
 
             DefaultChannel = null,
+            DisplayName = null,
         };
 
         Assert.Null(parameters.DefaultChannel);
         Assert.True(parameters.RawBodyData.ContainsKey("defaultChannel"));
+        Assert.Null(parameters.DisplayName);
+        Assert.True(parameters.RawBodyData.ContainsKey("displayName"));
     }
 
     [Fact]
@@ -109,6 +119,7 @@ public void CopyConstructor_Works()
         {
             ContactID = "contactId",
             DefaultChannel = DefaultChannel.Sms,
+            DisplayName = "John Doe",
             Metadata = new Dictionary<string, string>() { { "foo", "string" } },
         };
 
diff --git a/src/Zavudev.Tests/Models/Conversations/ConversationListMessagesPageResponseTest.cs b/src/Zavudev.Tests/Models/Conversations/ConversationListMessagesPageResponseTest.cs
new file mode 100644
index 0000000..d0b299d
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Conversations/ConversationListMessagesPageResponseTest.cs
@@ -0,0 +1,1186 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Conversations;
+using Messages = Zavudev.Models.Messages;
+
+namespace Zavudev.Tests.Models.Conversations;
+
+public class ConversationListMessagesPageResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationListMessagesPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    Channel = Messages::MessageChannel.Auto,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Messages::Direction.Inbound,
+                    MessageType = Messages::MessageType.Text,
+                    Status = Messages::MessageStatus.Queued,
+                    To = "+56912345678",
+                    Content = new()
+                    {
+                        Buttons = [new() { ID = "id", Title = "title" }],
+                        Contacts = [new() { Name = "name", Phones = ["string"] }],
+                        CtaDisplayText = "See Dates",
+                        CtaHeaderMediaUrl = "https://example.com",
+                        CtaHeaderText = "ctaHeaderText",
+                        CtaHeaderType = Messages::CtaHeaderType.Text,
+                        CtaUrl = "https://example.com/schedule",
+                        Emoji = "emoji",
+                        Filename = "invoice.pdf",
+                        FooterText = "Dates subject to change.",
+                        Latitude = 0,
+                        ListButton = "listButton",
+                        LocationAddress = "locationAddress",
+                        LocationName = "locationName",
+                        Longitude = 0,
+                        MediaID = "mediaId",
+                        MediaUrl = "https://example.com/image.jpg",
+                        MimeType = "image/jpeg",
+                        ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = Messages::MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = Messages::SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
+                        ReplyToFrom = "replyToFrom",
+                        ReplyToMessageID = "replyToMessageId",
+                        ReplyToMessageType = "replyToMessageType",
+                        ReplyToProviderMessageID = "replyToProviderMessageId",
+                        ReplyToText = "replyToText",
+                        Sections =
+                        [
+                            new()
+                            {
+                                Rows =
+                                [
+                                    new()
+                                    {
+                                        ID = "id",
+                                        Title = "title",
+                                        Description = "description",
+                                    },
+                                ],
+                                Title = "title",
+                            },
+                        ],
+                        TemplateButtonVariables = new Dictionary<string, string>()
+                        {
+                            { "0", "abc-report-token" },
+                        },
+                        TemplateHeaderVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "Jorge y Laura" },
+                        },
+                        TemplateID = "templateId",
+                        TemplateVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "John" },
+                            { "2", "ORD-12345" },
+                        },
+                    },
+                    ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Cost = 0,
+                    CostProvider = 0,
+                    CostTotal = 0,
+                    ErrorCode = "errorCode",
+                    ErrorMessage = "errorMessage",
+                    From = "+13125551212",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    ProviderMessageID = "providerMessageId",
+                    SenderID = "sender_12345",
+                    Text = "text",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        List<Messages::Message> expectedItems =
+        [
+            new()
+            {
+                ID = "jd7x2k3m4n5p6q7r8s9t0",
+                Channel = Messages::MessageChannel.Auto,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = Messages::Direction.Inbound,
+                MessageType = Messages::MessageType.Text,
+                Status = Messages::MessageStatus.Queued,
+                To = "+56912345678",
+                Content = new()
+                {
+                    Buttons = [new() { ID = "id", Title = "title" }],
+                    Contacts = [new() { Name = "name", Phones = ["string"] }],
+                    CtaDisplayText = "See Dates",
+                    CtaHeaderMediaUrl = "https://example.com",
+                    CtaHeaderText = "ctaHeaderText",
+                    CtaHeaderType = Messages::CtaHeaderType.Text,
+                    CtaUrl = "https://example.com/schedule",
+                    Emoji = "emoji",
+                    Filename = "invoice.pdf",
+                    FooterText = "Dates subject to change.",
+                    Latitude = 0,
+                    ListButton = "listButton",
+                    LocationAddress = "locationAddress",
+                    LocationName = "locationName",
+                    Longitude = 0,
+                    MediaID = "mediaId",
+                    MediaUrl = "https://example.com/image.jpg",
+                    MimeType = "image/jpeg",
+                    ReactToMessageID = "reactToMessageId",
+                    Referral = new()
+                    {
+                        Body = "body",
+                        CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                        Headline = "headline",
+                        ImageUrl = "https://example.com",
+                        MediaType = Messages::MediaType.Image,
+                        SourceID = "120210000000000000",
+                        SourceType = Messages::SourceType.Ad,
+                        SourceUrl = "https://example.com",
+                        ThumbnailUrl = "https://example.com",
+                        VideoUrl = "https://example.com",
+                    },
+                    ReplyToFrom = "replyToFrom",
+                    ReplyToMessageID = "replyToMessageId",
+                    ReplyToMessageType = "replyToMessageType",
+                    ReplyToProviderMessageID = "replyToProviderMessageId",
+                    ReplyToText = "replyToText",
+                    Sections =
+                    [
+                        new()
+                        {
+                            Rows =
+                            [
+                                new()
+                                {
+                                    ID = "id",
+                                    Title = "title",
+                                    Description = "description",
+                                },
+                            ],
+                            Title = "title",
+                        },
+                    ],
+                    TemplateButtonVariables = new Dictionary<string, string>()
+                    {
+                        { "0", "abc-report-token" },
+                    },
+                    TemplateHeaderVariables = new Dictionary<string, string>()
+                    {
+                        { "1", "Jorge y Laura" },
+                    },
+                    TemplateID = "templateId",
+                    TemplateVariables = new Dictionary<string, string>()
+                    {
+                        { "1", "John" },
+                        { "2", "ORD-12345" },
+                    },
+                },
+                ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                Cost = 0,
+                CostProvider = 0,
+                CostTotal = 0,
+                ErrorCode = "errorCode",
+                ErrorMessage = "errorMessage",
+                From = "+13125551212",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                ProviderMessageID = "providerMessageId",
+                SenderID = "sender_12345",
+                Text = "text",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        string expectedNextCursor = "nextCursor";
+
+        Assert.Equal(expectedItems.Count, model.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], model.Items[i]);
+        }
+        Assert.Equal(expectedNextCursor, model.NextCursor);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationListMessagesPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    Channel = Messages::MessageChannel.Auto,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Messages::Direction.Inbound,
+                    MessageType = Messages::MessageType.Text,
+                    Status = Messages::MessageStatus.Queued,
+                    To = "+56912345678",
+                    Content = new()
+                    {
+                        Buttons = [new() { ID = "id", Title = "title" }],
+                        Contacts = [new() { Name = "name", Phones = ["string"] }],
+                        CtaDisplayText = "See Dates",
+                        CtaHeaderMediaUrl = "https://example.com",
+                        CtaHeaderText = "ctaHeaderText",
+                        CtaHeaderType = Messages::CtaHeaderType.Text,
+                        CtaUrl = "https://example.com/schedule",
+                        Emoji = "emoji",
+                        Filename = "invoice.pdf",
+                        FooterText = "Dates subject to change.",
+                        Latitude = 0,
+                        ListButton = "listButton",
+                        LocationAddress = "locationAddress",
+                        LocationName = "locationName",
+                        Longitude = 0,
+                        MediaID = "mediaId",
+                        MediaUrl = "https://example.com/image.jpg",
+                        MimeType = "image/jpeg",
+                        ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = Messages::MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = Messages::SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
+                        ReplyToFrom = "replyToFrom",
+                        ReplyToMessageID = "replyToMessageId",
+                        ReplyToMessageType = "replyToMessageType",
+                        ReplyToProviderMessageID = "replyToProviderMessageId",
+                        ReplyToText = "replyToText",
+                        Sections =
+                        [
+                            new()
+                            {
+                                Rows =
+                                [
+                                    new()
+                                    {
+                                        ID = "id",
+                                        Title = "title",
+                                        Description = "description",
+                                    },
+                                ],
+                                Title = "title",
+                            },
+                        ],
+                        TemplateButtonVariables = new Dictionary<string, string>()
+                        {
+                            { "0", "abc-report-token" },
+                        },
+                        TemplateHeaderVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "Jorge y Laura" },
+                        },
+                        TemplateID = "templateId",
+                        TemplateVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "John" },
+                            { "2", "ORD-12345" },
+                        },
+                    },
+                    ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Cost = 0,
+                    CostProvider = 0,
+                    CostTotal = 0,
+                    ErrorCode = "errorCode",
+                    ErrorMessage = "errorMessage",
+                    From = "+13125551212",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    ProviderMessageID = "providerMessageId",
+                    SenderID = "sender_12345",
+                    Text = "text",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListMessagesPageResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationListMessagesPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    Channel = Messages::MessageChannel.Auto,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Messages::Direction.Inbound,
+                    MessageType = Messages::MessageType.Text,
+                    Status = Messages::MessageStatus.Queued,
+                    To = "+56912345678",
+                    Content = new()
+                    {
+                        Buttons = [new() { ID = "id", Title = "title" }],
+                        Contacts = [new() { Name = "name", Phones = ["string"] }],
+                        CtaDisplayText = "See Dates",
+                        CtaHeaderMediaUrl = "https://example.com",
+                        CtaHeaderText = "ctaHeaderText",
+                        CtaHeaderType = Messages::CtaHeaderType.Text,
+                        CtaUrl = "https://example.com/schedule",
+                        Emoji = "emoji",
+                        Filename = "invoice.pdf",
+                        FooterText = "Dates subject to change.",
+                        Latitude = 0,
+                        ListButton = "listButton",
+                        LocationAddress = "locationAddress",
+                        LocationName = "locationName",
+                        Longitude = 0,
+                        MediaID = "mediaId",
+                        MediaUrl = "https://example.com/image.jpg",
+                        MimeType = "image/jpeg",
+                        ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = Messages::MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = Messages::SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
+                        ReplyToFrom = "replyToFrom",
+                        ReplyToMessageID = "replyToMessageId",
+                        ReplyToMessageType = "replyToMessageType",
+                        ReplyToProviderMessageID = "replyToProviderMessageId",
+                        ReplyToText = "replyToText",
+                        Sections =
+                        [
+                            new()
+                            {
+                                Rows =
+                                [
+                                    new()
+                                    {
+                                        ID = "id",
+                                        Title = "title",
+                                        Description = "description",
+                                    },
+                                ],
+                                Title = "title",
+                            },
+                        ],
+                        TemplateButtonVariables = new Dictionary<string, string>()
+                        {
+                            { "0", "abc-report-token" },
+                        },
+                        TemplateHeaderVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "Jorge y Laura" },
+                        },
+                        TemplateID = "templateId",
+                        TemplateVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "John" },
+                            { "2", "ORD-12345" },
+                        },
+                    },
+                    ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Cost = 0,
+                    CostProvider = 0,
+                    CostTotal = 0,
+                    ErrorCode = "errorCode",
+                    ErrorMessage = "errorMessage",
+                    From = "+13125551212",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    ProviderMessageID = "providerMessageId",
+                    SenderID = "sender_12345",
+                    Text = "text",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListMessagesPageResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<Messages::Message> expectedItems =
+        [
+            new()
+            {
+                ID = "jd7x2k3m4n5p6q7r8s9t0",
+                Channel = Messages::MessageChannel.Auto,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = Messages::Direction.Inbound,
+                MessageType = Messages::MessageType.Text,
+                Status = Messages::MessageStatus.Queued,
+                To = "+56912345678",
+                Content = new()
+                {
+                    Buttons = [new() { ID = "id", Title = "title" }],
+                    Contacts = [new() { Name = "name", Phones = ["string"] }],
+                    CtaDisplayText = "See Dates",
+                    CtaHeaderMediaUrl = "https://example.com",
+                    CtaHeaderText = "ctaHeaderText",
+                    CtaHeaderType = Messages::CtaHeaderType.Text,
+                    CtaUrl = "https://example.com/schedule",
+                    Emoji = "emoji",
+                    Filename = "invoice.pdf",
+                    FooterText = "Dates subject to change.",
+                    Latitude = 0,
+                    ListButton = "listButton",
+                    LocationAddress = "locationAddress",
+                    LocationName = "locationName",
+                    Longitude = 0,
+                    MediaID = "mediaId",
+                    MediaUrl = "https://example.com/image.jpg",
+                    MimeType = "image/jpeg",
+                    ReactToMessageID = "reactToMessageId",
+                    Referral = new()
+                    {
+                        Body = "body",
+                        CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                        Headline = "headline",
+                        ImageUrl = "https://example.com",
+                        MediaType = Messages::MediaType.Image,
+                        SourceID = "120210000000000000",
+                        SourceType = Messages::SourceType.Ad,
+                        SourceUrl = "https://example.com",
+                        ThumbnailUrl = "https://example.com",
+                        VideoUrl = "https://example.com",
+                    },
+                    ReplyToFrom = "replyToFrom",
+                    ReplyToMessageID = "replyToMessageId",
+                    ReplyToMessageType = "replyToMessageType",
+                    ReplyToProviderMessageID = "replyToProviderMessageId",
+                    ReplyToText = "replyToText",
+                    Sections =
+                    [
+                        new()
+                        {
+                            Rows =
+                            [
+                                new()
+                                {
+                                    ID = "id",
+                                    Title = "title",
+                                    Description = "description",
+                                },
+                            ],
+                            Title = "title",
+                        },
+                    ],
+                    TemplateButtonVariables = new Dictionary<string, string>()
+                    {
+                        { "0", "abc-report-token" },
+                    },
+                    TemplateHeaderVariables = new Dictionary<string, string>()
+                    {
+                        { "1", "Jorge y Laura" },
+                    },
+                    TemplateID = "templateId",
+                    TemplateVariables = new Dictionary<string, string>()
+                    {
+                        { "1", "John" },
+                        { "2", "ORD-12345" },
+                    },
+                },
+                ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                Cost = 0,
+                CostProvider = 0,
+                CostTotal = 0,
+                ErrorCode = "errorCode",
+                ErrorMessage = "errorMessage",
+                From = "+13125551212",
+                Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                ProviderMessageID = "providerMessageId",
+                SenderID = "sender_12345",
+                Text = "text",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        ];
+        string expectedNextCursor = "nextCursor";
+
+        Assert.Equal(expectedItems.Count, deserialized.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], deserialized.Items[i]);
+        }
+        Assert.Equal(expectedNextCursor, deserialized.NextCursor);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationListMessagesPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    Channel = Messages::MessageChannel.Auto,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Messages::Direction.Inbound,
+                    MessageType = Messages::MessageType.Text,
+                    Status = Messages::MessageStatus.Queued,
+                    To = "+56912345678",
+                    Content = new()
+                    {
+                        Buttons = [new() { ID = "id", Title = "title" }],
+                        Contacts = [new() { Name = "name", Phones = ["string"] }],
+                        CtaDisplayText = "See Dates",
+                        CtaHeaderMediaUrl = "https://example.com",
+                        CtaHeaderText = "ctaHeaderText",
+                        CtaHeaderType = Messages::CtaHeaderType.Text,
+                        CtaUrl = "https://example.com/schedule",
+                        Emoji = "emoji",
+                        Filename = "invoice.pdf",
+                        FooterText = "Dates subject to change.",
+                        Latitude = 0,
+                        ListButton = "listButton",
+                        LocationAddress = "locationAddress",
+                        LocationName = "locationName",
+                        Longitude = 0,
+                        MediaID = "mediaId",
+                        MediaUrl = "https://example.com/image.jpg",
+                        MimeType = "image/jpeg",
+                        ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = Messages::MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = Messages::SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
+                        ReplyToFrom = "replyToFrom",
+                        ReplyToMessageID = "replyToMessageId",
+                        ReplyToMessageType = "replyToMessageType",
+                        ReplyToProviderMessageID = "replyToProviderMessageId",
+                        ReplyToText = "replyToText",
+                        Sections =
+                        [
+                            new()
+                            {
+                                Rows =
+                                [
+                                    new()
+                                    {
+                                        ID = "id",
+                                        Title = "title",
+                                        Description = "description",
+                                    },
+                                ],
+                                Title = "title",
+                            },
+                        ],
+                        TemplateButtonVariables = new Dictionary<string, string>()
+                        {
+                            { "0", "abc-report-token" },
+                        },
+                        TemplateHeaderVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "Jorge y Laura" },
+                        },
+                        TemplateID = "templateId",
+                        TemplateVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "John" },
+                            { "2", "ORD-12345" },
+                        },
+                    },
+                    ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Cost = 0,
+                    CostProvider = 0,
+                    CostTotal = 0,
+                    ErrorCode = "errorCode",
+                    ErrorMessage = "errorMessage",
+                    From = "+13125551212",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    ProviderMessageID = "providerMessageId",
+                    SenderID = "sender_12345",
+                    Text = "text",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ConversationListMessagesPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    Channel = Messages::MessageChannel.Auto,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Messages::Direction.Inbound,
+                    MessageType = Messages::MessageType.Text,
+                    Status = Messages::MessageStatus.Queued,
+                    To = "+56912345678",
+                    Content = new()
+                    {
+                        Buttons = [new() { ID = "id", Title = "title" }],
+                        Contacts = [new() { Name = "name", Phones = ["string"] }],
+                        CtaDisplayText = "See Dates",
+                        CtaHeaderMediaUrl = "https://example.com",
+                        CtaHeaderText = "ctaHeaderText",
+                        CtaHeaderType = Messages::CtaHeaderType.Text,
+                        CtaUrl = "https://example.com/schedule",
+                        Emoji = "emoji",
+                        Filename = "invoice.pdf",
+                        FooterText = "Dates subject to change.",
+                        Latitude = 0,
+                        ListButton = "listButton",
+                        LocationAddress = "locationAddress",
+                        LocationName = "locationName",
+                        Longitude = 0,
+                        MediaID = "mediaId",
+                        MediaUrl = "https://example.com/image.jpg",
+                        MimeType = "image/jpeg",
+                        ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = Messages::MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = Messages::SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
+                        ReplyToFrom = "replyToFrom",
+                        ReplyToMessageID = "replyToMessageId",
+                        ReplyToMessageType = "replyToMessageType",
+                        ReplyToProviderMessageID = "replyToProviderMessageId",
+                        ReplyToText = "replyToText",
+                        Sections =
+                        [
+                            new()
+                            {
+                                Rows =
+                                [
+                                    new()
+                                    {
+                                        ID = "id",
+                                        Title = "title",
+                                        Description = "description",
+                                    },
+                                ],
+                                Title = "title",
+                            },
+                        ],
+                        TemplateButtonVariables = new Dictionary<string, string>()
+                        {
+                            { "0", "abc-report-token" },
+                        },
+                        TemplateHeaderVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "Jorge y Laura" },
+                        },
+                        TemplateID = "templateId",
+                        TemplateVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "John" },
+                            { "2", "ORD-12345" },
+                        },
+                    },
+                    ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Cost = 0,
+                    CostProvider = 0,
+                    CostTotal = 0,
+                    ErrorCode = "errorCode",
+                    ErrorMessage = "errorMessage",
+                    From = "+13125551212",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    ProviderMessageID = "providerMessageId",
+                    SenderID = "sender_12345",
+                    Text = "text",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+        };
+
+        Assert.Null(model.NextCursor);
+        Assert.False(model.RawData.ContainsKey("nextCursor"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ConversationListMessagesPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    Channel = Messages::MessageChannel.Auto,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Messages::Direction.Inbound,
+                    MessageType = Messages::MessageType.Text,
+                    Status = Messages::MessageStatus.Queued,
+                    To = "+56912345678",
+                    Content = new()
+                    {
+                        Buttons = [new() { ID = "id", Title = "title" }],
+                        Contacts = [new() { Name = "name", Phones = ["string"] }],
+                        CtaDisplayText = "See Dates",
+                        CtaHeaderMediaUrl = "https://example.com",
+                        CtaHeaderText = "ctaHeaderText",
+                        CtaHeaderType = Messages::CtaHeaderType.Text,
+                        CtaUrl = "https://example.com/schedule",
+                        Emoji = "emoji",
+                        Filename = "invoice.pdf",
+                        FooterText = "Dates subject to change.",
+                        Latitude = 0,
+                        ListButton = "listButton",
+                        LocationAddress = "locationAddress",
+                        LocationName = "locationName",
+                        Longitude = 0,
+                        MediaID = "mediaId",
+                        MediaUrl = "https://example.com/image.jpg",
+                        MimeType = "image/jpeg",
+                        ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = Messages::MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = Messages::SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
+                        ReplyToFrom = "replyToFrom",
+                        ReplyToMessageID = "replyToMessageId",
+                        ReplyToMessageType = "replyToMessageType",
+                        ReplyToProviderMessageID = "replyToProviderMessageId",
+                        ReplyToText = "replyToText",
+                        Sections =
+                        [
+                            new()
+                            {
+                                Rows =
+                                [
+                                    new()
+                                    {
+                                        ID = "id",
+                                        Title = "title",
+                                        Description = "description",
+                                    },
+                                ],
+                                Title = "title",
+                            },
+                        ],
+                        TemplateButtonVariables = new Dictionary<string, string>()
+                        {
+                            { "0", "abc-report-token" },
+                        },
+                        TemplateHeaderVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "Jorge y Laura" },
+                        },
+                        TemplateID = "templateId",
+                        TemplateVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "John" },
+                            { "2", "ORD-12345" },
+                        },
+                    },
+                    ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Cost = 0,
+                    CostProvider = 0,
+                    CostTotal = 0,
+                    ErrorCode = "errorCode",
+                    ErrorMessage = "errorMessage",
+                    From = "+13125551212",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    ProviderMessageID = "providerMessageId",
+                    SenderID = "sender_12345",
+                    Text = "text",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new ConversationListMessagesPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    Channel = Messages::MessageChannel.Auto,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Messages::Direction.Inbound,
+                    MessageType = Messages::MessageType.Text,
+                    Status = Messages::MessageStatus.Queued,
+                    To = "+56912345678",
+                    Content = new()
+                    {
+                        Buttons = [new() { ID = "id", Title = "title" }],
+                        Contacts = [new() { Name = "name", Phones = ["string"] }],
+                        CtaDisplayText = "See Dates",
+                        CtaHeaderMediaUrl = "https://example.com",
+                        CtaHeaderText = "ctaHeaderText",
+                        CtaHeaderType = Messages::CtaHeaderType.Text,
+                        CtaUrl = "https://example.com/schedule",
+                        Emoji = "emoji",
+                        Filename = "invoice.pdf",
+                        FooterText = "Dates subject to change.",
+                        Latitude = 0,
+                        ListButton = "listButton",
+                        LocationAddress = "locationAddress",
+                        LocationName = "locationName",
+                        Longitude = 0,
+                        MediaID = "mediaId",
+                        MediaUrl = "https://example.com/image.jpg",
+                        MimeType = "image/jpeg",
+                        ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = Messages::MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = Messages::SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
+                        ReplyToFrom = "replyToFrom",
+                        ReplyToMessageID = "replyToMessageId",
+                        ReplyToMessageType = "replyToMessageType",
+                        ReplyToProviderMessageID = "replyToProviderMessageId",
+                        ReplyToText = "replyToText",
+                        Sections =
+                        [
+                            new()
+                            {
+                                Rows =
+                                [
+                                    new()
+                                    {
+                                        ID = "id",
+                                        Title = "title",
+                                        Description = "description",
+                                    },
+                                ],
+                                Title = "title",
+                            },
+                        ],
+                        TemplateButtonVariables = new Dictionary<string, string>()
+                        {
+                            { "0", "abc-report-token" },
+                        },
+                        TemplateHeaderVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "Jorge y Laura" },
+                        },
+                        TemplateID = "templateId",
+                        TemplateVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "John" },
+                            { "2", "ORD-12345" },
+                        },
+                    },
+                    ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Cost = 0,
+                    CostProvider = 0,
+                    CostTotal = 0,
+                    ErrorCode = "errorCode",
+                    ErrorMessage = "errorMessage",
+                    From = "+13125551212",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    ProviderMessageID = "providerMessageId",
+                    SenderID = "sender_12345",
+                    Text = "text",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+
+            NextCursor = null,
+        };
+
+        Assert.Null(model.NextCursor);
+        Assert.True(model.RawData.ContainsKey("nextCursor"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ConversationListMessagesPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    Channel = Messages::MessageChannel.Auto,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Messages::Direction.Inbound,
+                    MessageType = Messages::MessageType.Text,
+                    Status = Messages::MessageStatus.Queued,
+                    To = "+56912345678",
+                    Content = new()
+                    {
+                        Buttons = [new() { ID = "id", Title = "title" }],
+                        Contacts = [new() { Name = "name", Phones = ["string"] }],
+                        CtaDisplayText = "See Dates",
+                        CtaHeaderMediaUrl = "https://example.com",
+                        CtaHeaderText = "ctaHeaderText",
+                        CtaHeaderType = Messages::CtaHeaderType.Text,
+                        CtaUrl = "https://example.com/schedule",
+                        Emoji = "emoji",
+                        Filename = "invoice.pdf",
+                        FooterText = "Dates subject to change.",
+                        Latitude = 0,
+                        ListButton = "listButton",
+                        LocationAddress = "locationAddress",
+                        LocationName = "locationName",
+                        Longitude = 0,
+                        MediaID = "mediaId",
+                        MediaUrl = "https://example.com/image.jpg",
+                        MimeType = "image/jpeg",
+                        ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = Messages::MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = Messages::SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
+                        ReplyToFrom = "replyToFrom",
+                        ReplyToMessageID = "replyToMessageId",
+                        ReplyToMessageType = "replyToMessageType",
+                        ReplyToProviderMessageID = "replyToProviderMessageId",
+                        ReplyToText = "replyToText",
+                        Sections =
+                        [
+                            new()
+                            {
+                                Rows =
+                                [
+                                    new()
+                                    {
+                                        ID = "id",
+                                        Title = "title",
+                                        Description = "description",
+                                    },
+                                ],
+                                Title = "title",
+                            },
+                        ],
+                        TemplateButtonVariables = new Dictionary<string, string>()
+                        {
+                            { "0", "abc-report-token" },
+                        },
+                        TemplateHeaderVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "Jorge y Laura" },
+                        },
+                        TemplateID = "templateId",
+                        TemplateVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "John" },
+                            { "2", "ORD-12345" },
+                        },
+                    },
+                    ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Cost = 0,
+                    CostProvider = 0,
+                    CostTotal = 0,
+                    ErrorCode = "errorCode",
+                    ErrorMessage = "errorMessage",
+                    From = "+13125551212",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    ProviderMessageID = "providerMessageId",
+                    SenderID = "sender_12345",
+                    Text = "text",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+
+            NextCursor = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationListMessagesPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    Channel = Messages::MessageChannel.Auto,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Messages::Direction.Inbound,
+                    MessageType = Messages::MessageType.Text,
+                    Status = Messages::MessageStatus.Queued,
+                    To = "+56912345678",
+                    Content = new()
+                    {
+                        Buttons = [new() { ID = "id", Title = "title" }],
+                        Contacts = [new() { Name = "name", Phones = ["string"] }],
+                        CtaDisplayText = "See Dates",
+                        CtaHeaderMediaUrl = "https://example.com",
+                        CtaHeaderText = "ctaHeaderText",
+                        CtaHeaderType = Messages::CtaHeaderType.Text,
+                        CtaUrl = "https://example.com/schedule",
+                        Emoji = "emoji",
+                        Filename = "invoice.pdf",
+                        FooterText = "Dates subject to change.",
+                        Latitude = 0,
+                        ListButton = "listButton",
+                        LocationAddress = "locationAddress",
+                        LocationName = "locationName",
+                        Longitude = 0,
+                        MediaID = "mediaId",
+                        MediaUrl = "https://example.com/image.jpg",
+                        MimeType = "image/jpeg",
+                        ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = Messages::MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = Messages::SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
+                        ReplyToFrom = "replyToFrom",
+                        ReplyToMessageID = "replyToMessageId",
+                        ReplyToMessageType = "replyToMessageType",
+                        ReplyToProviderMessageID = "replyToProviderMessageId",
+                        ReplyToText = "replyToText",
+                        Sections =
+                        [
+                            new()
+                            {
+                                Rows =
+                                [
+                                    new()
+                                    {
+                                        ID = "id",
+                                        Title = "title",
+                                        Description = "description",
+                                    },
+                                ],
+                                Title = "title",
+                            },
+                        ],
+                        TemplateButtonVariables = new Dictionary<string, string>()
+                        {
+                            { "0", "abc-report-token" },
+                        },
+                        TemplateHeaderVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "Jorge y Laura" },
+                        },
+                        TemplateID = "templateId",
+                        TemplateVariables = new Dictionary<string, string>()
+                        {
+                            { "1", "John" },
+                            { "2", "ORD-12345" },
+                        },
+                    },
+                    ConversationID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Cost = 0,
+                    CostProvider = 0,
+                    CostTotal = 0,
+                    ErrorCode = "errorCode",
+                    ErrorMessage = "errorMessage",
+                    From = "+13125551212",
+                    Metadata = new Dictionary<string, string>() { { "foo", "string" } },
+                    ProviderMessageID = "providerMessageId",
+                    SenderID = "sender_12345",
+                    Text = "text",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        ConversationListMessagesPageResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Conversations/ConversationListMessagesParamsTest.cs b/src/Zavudev.Tests/Models/Conversations/ConversationListMessagesParamsTest.cs
new file mode 100644
index 0000000..1a808c3
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Conversations/ConversationListMessagesParamsTest.cs
@@ -0,0 +1,92 @@
+using System;
+using Zavudev.Models.Conversations;
+
+namespace Zavudev.Tests.Models.Conversations;
+
+public class ConversationListMessagesParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new ConversationListMessagesParams
+        {
+            ConversationID = "conversationId",
+            Cursor = "cursor",
+            Limit = 100,
+        };
+
+        string expectedConversationID = "conversationId";
+        string expectedCursor = "cursor";
+        long expectedLimit = 100;
+
+        Assert.Equal(expectedConversationID, parameters.ConversationID);
+        Assert.Equal(expectedCursor, parameters.Cursor);
+        Assert.Equal(expectedLimit, parameters.Limit);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new ConversationListMessagesParams { ConversationID = "conversationId" };
+
+        Assert.Null(parameters.Cursor);
+        Assert.False(parameters.RawQueryData.ContainsKey("cursor"));
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new ConversationListMessagesParams
+        {
+            ConversationID = "conversationId",
+
+            // Null should be interpreted as omitted for these properties
+            Cursor = null,
+            Limit = null,
+        };
+
+        Assert.Null(parameters.Cursor);
+        Assert.False(parameters.RawQueryData.ContainsKey("cursor"));
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        ConversationListMessagesParams parameters = new()
+        {
+            ConversationID = "conversationId",
+            Cursor = "cursor",
+            Limit = 100,
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri(
+                    "https://api.zavu.dev/v1/conversations/conversationId/messages?cursor=cursor&limit=100"
+                ),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new ConversationListMessagesParams
+        {
+            ConversationID = "conversationId",
+            Cursor = "cursor",
+            Limit = 100,
+        };
+
+        ConversationListMessagesParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Conversations/ConversationListPageResponseTest.cs b/src/Zavudev.Tests/Models/Conversations/ConversationListPageResponseTest.cs
new file mode 100644
index 0000000..a032098
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Conversations/ConversationListPageResponseTest.cs
@@ -0,0 +1,482 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Conversations;
+using Zavudev.Models.Messages;
+
+namespace Zavudev.Tests.Models.Conversations;
+
+public class ConversationListPageResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Channels = ["whatsapp", "sms"],
+                    ContactIdentifier = "+56912345678",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    LastMessage = new()
+                    {
+                        ID = "id",
+                        At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        Channel = MessageChannel.Auto,
+                        Direction = ConversationListResponseLastMessageDirection.Inbound,
+                        Text = "text",
+                    },
+                    MessageCount = 0,
+                    UnreadCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContactID = "contactId",
+                    Email = "email",
+                    Group = new()
+                    {
+                        ID = "id",
+                        ParticipantCount = 0,
+                        Subject = "subject",
+                    },
+                    SenderID = "senderId",
+                    Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        List<ConversationListResponse> expectedItems =
+        [
+            new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = MessageChannel.Auto,
+                    Direction = ConversationListResponseLastMessageDirection.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        ];
+        string expectedNextCursor = "nextCursor";
+
+        Assert.Equal(expectedItems.Count, model.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], model.Items[i]);
+        }
+        Assert.Equal(expectedNextCursor, model.NextCursor);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Channels = ["whatsapp", "sms"],
+                    ContactIdentifier = "+56912345678",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    LastMessage = new()
+                    {
+                        ID = "id",
+                        At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        Channel = MessageChannel.Auto,
+                        Direction = ConversationListResponseLastMessageDirection.Inbound,
+                        Text = "text",
+                    },
+                    MessageCount = 0,
+                    UnreadCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContactID = "contactId",
+                    Email = "email",
+                    Group = new()
+                    {
+                        ID = "id",
+                        ParticipantCount = 0,
+                        Subject = "subject",
+                    },
+                    SenderID = "senderId",
+                    Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListPageResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Channels = ["whatsapp", "sms"],
+                    ContactIdentifier = "+56912345678",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    LastMessage = new()
+                    {
+                        ID = "id",
+                        At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        Channel = MessageChannel.Auto,
+                        Direction = ConversationListResponseLastMessageDirection.Inbound,
+                        Text = "text",
+                    },
+                    MessageCount = 0,
+                    UnreadCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContactID = "contactId",
+                    Email = "email",
+                    Group = new()
+                    {
+                        ID = "id",
+                        ParticipantCount = 0,
+                        Subject = "subject",
+                    },
+                    SenderID = "senderId",
+                    Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListPageResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<ConversationListResponse> expectedItems =
+        [
+            new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = MessageChannel.Auto,
+                    Direction = ConversationListResponseLastMessageDirection.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        ];
+        string expectedNextCursor = "nextCursor";
+
+        Assert.Equal(expectedItems.Count, deserialized.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], deserialized.Items[i]);
+        }
+        Assert.Equal(expectedNextCursor, deserialized.NextCursor);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Channels = ["whatsapp", "sms"],
+                    ContactIdentifier = "+56912345678",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    LastMessage = new()
+                    {
+                        ID = "id",
+                        At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        Channel = MessageChannel.Auto,
+                        Direction = ConversationListResponseLastMessageDirection.Inbound,
+                        Text = "text",
+                    },
+                    MessageCount = 0,
+                    UnreadCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContactID = "contactId",
+                    Email = "email",
+                    Group = new()
+                    {
+                        ID = "id",
+                        ParticipantCount = 0,
+                        Subject = "subject",
+                    },
+                    SenderID = "senderId",
+                    Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ConversationListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Channels = ["whatsapp", "sms"],
+                    ContactIdentifier = "+56912345678",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    LastMessage = new()
+                    {
+                        ID = "id",
+                        At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        Channel = MessageChannel.Auto,
+                        Direction = ConversationListResponseLastMessageDirection.Inbound,
+                        Text = "text",
+                    },
+                    MessageCount = 0,
+                    UnreadCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContactID = "contactId",
+                    Email = "email",
+                    Group = new()
+                    {
+                        ID = "id",
+                        ParticipantCount = 0,
+                        Subject = "subject",
+                    },
+                    SenderID = "senderId",
+                    Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+                },
+            ],
+        };
+
+        Assert.Null(model.NextCursor);
+        Assert.False(model.RawData.ContainsKey("nextCursor"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ConversationListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Channels = ["whatsapp", "sms"],
+                    ContactIdentifier = "+56912345678",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    LastMessage = new()
+                    {
+                        ID = "id",
+                        At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        Channel = MessageChannel.Auto,
+                        Direction = ConversationListResponseLastMessageDirection.Inbound,
+                        Text = "text",
+                    },
+                    MessageCount = 0,
+                    UnreadCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContactID = "contactId",
+                    Email = "email",
+                    Group = new()
+                    {
+                        ID = "id",
+                        ParticipantCount = 0,
+                        Subject = "subject",
+                    },
+                    SenderID = "senderId",
+                    Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new ConversationListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Channels = ["whatsapp", "sms"],
+                    ContactIdentifier = "+56912345678",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    LastMessage = new()
+                    {
+                        ID = "id",
+                        At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        Channel = MessageChannel.Auto,
+                        Direction = ConversationListResponseLastMessageDirection.Inbound,
+                        Text = "text",
+                    },
+                    MessageCount = 0,
+                    UnreadCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContactID = "contactId",
+                    Email = "email",
+                    Group = new()
+                    {
+                        ID = "id",
+                        ParticipantCount = 0,
+                        Subject = "subject",
+                    },
+                    SenderID = "senderId",
+                    Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+                },
+            ],
+
+            NextCursor = null,
+        };
+
+        Assert.Null(model.NextCursor);
+        Assert.True(model.RawData.ContainsKey("nextCursor"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ConversationListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Channels = ["whatsapp", "sms"],
+                    ContactIdentifier = "+56912345678",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    LastMessage = new()
+                    {
+                        ID = "id",
+                        At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        Channel = MessageChannel.Auto,
+                        Direction = ConversationListResponseLastMessageDirection.Inbound,
+                        Text = "text",
+                    },
+                    MessageCount = 0,
+                    UnreadCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContactID = "contactId",
+                    Email = "email",
+                    Group = new()
+                    {
+                        ID = "id",
+                        ParticipantCount = 0,
+                        Subject = "subject",
+                    },
+                    SenderID = "senderId",
+                    Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+                },
+            ],
+
+            NextCursor = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationListPageResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "js723987cyghwqxxaxcf590qd18axd95",
+                    Channels = ["whatsapp", "sms"],
+                    ContactIdentifier = "+56912345678",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    LastMessage = new()
+                    {
+                        ID = "id",
+                        At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                        Channel = MessageChannel.Auto,
+                        Direction = ConversationListResponseLastMessageDirection.Inbound,
+                        Text = "text",
+                    },
+                    MessageCount = 0,
+                    UnreadCount = 0,
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ContactID = "contactId",
+                    Email = "email",
+                    Group = new()
+                    {
+                        ID = "id",
+                        ParticipantCount = 0,
+                        Subject = "subject",
+                    },
+                    SenderID = "senderId",
+                    Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+                },
+            ],
+            NextCursor = "nextCursor",
+        };
+
+        ConversationListPageResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Conversations/ConversationListParamsTest.cs b/src/Zavudev.Tests/Models/Conversations/ConversationListParamsTest.cs
new file mode 100644
index 0000000..8cd134b
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Conversations/ConversationListParamsTest.cs
@@ -0,0 +1,188 @@
+using System;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Conversations;
+
+namespace Zavudev.Tests.Models.Conversations;
+
+public class ConversationListParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new ConversationListParams
+        {
+            Channel = Channel.Sms,
+            Cursor = "cursor",
+            Limit = 100,
+            Search = "+56912345678",
+            SenderID = "senderId",
+        };
+
+        ApiEnum<string, Channel> expectedChannel = Channel.Sms;
+        string expectedCursor = "cursor";
+        long expectedLimit = 100;
+        string expectedSearch = "+56912345678";
+        string expectedSenderID = "senderId";
+
+        Assert.Equal(expectedChannel, parameters.Channel);
+        Assert.Equal(expectedCursor, parameters.Cursor);
+        Assert.Equal(expectedLimit, parameters.Limit);
+        Assert.Equal(expectedSearch, parameters.Search);
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new ConversationListParams { };
+
+        Assert.Null(parameters.Channel);
+        Assert.False(parameters.RawQueryData.ContainsKey("channel"));
+        Assert.Null(parameters.Cursor);
+        Assert.False(parameters.RawQueryData.ContainsKey("cursor"));
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+        Assert.Null(parameters.Search);
+        Assert.False(parameters.RawQueryData.ContainsKey("search"));
+        Assert.Null(parameters.SenderID);
+        Assert.False(parameters.RawQueryData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new ConversationListParams
+        {
+            // Null should be interpreted as omitted for these properties
+            Channel = null,
+            Cursor = null,
+            Limit = null,
+            Search = null,
+            SenderID = null,
+        };
+
+        Assert.Null(parameters.Channel);
+        Assert.False(parameters.RawQueryData.ContainsKey("channel"));
+        Assert.Null(parameters.Cursor);
+        Assert.False(parameters.RawQueryData.ContainsKey("cursor"));
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+        Assert.Null(parameters.Search);
+        Assert.False(parameters.RawQueryData.ContainsKey("search"));
+        Assert.Null(parameters.SenderID);
+        Assert.False(parameters.RawQueryData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        ConversationListParams parameters = new()
+        {
+            Channel = Channel.Sms,
+            Cursor = "cursor",
+            Limit = 100,
+            Search = "+56912345678",
+            SenderID = "senderId",
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri(
+                    "https://api.zavu.dev/v1/conversations?channel=sms&cursor=cursor&limit=100&search=%2b56912345678&senderId=senderId"
+                ),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new ConversationListParams
+        {
+            Channel = Channel.Sms,
+            Cursor = "cursor",
+            Limit = 100,
+            Search = "+56912345678",
+            SenderID = "senderId",
+        };
+
+        ConversationListParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
+
+public class ChannelTest : TestBase
+{
+    [Theory]
+    [InlineData(Channel.Sms)]
+    [InlineData(Channel.SmsOneway)]
+    [InlineData(Channel.Whatsapp)]
+    [InlineData(Channel.Email)]
+    [InlineData(Channel.Telegram)]
+    [InlineData(Channel.Instagram)]
+    [InlineData(Channel.Messenger)]
+    [InlineData(Channel.Voice)]
+    public void Validation_Works(Channel rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Channel> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Channel>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Channel.Sms)]
+    [InlineData(Channel.SmsOneway)]
+    [InlineData(Channel.Whatsapp)]
+    [InlineData(Channel.Email)]
+    [InlineData(Channel.Telegram)]
+    [InlineData(Channel.Instagram)]
+    [InlineData(Channel.Messenger)]
+    [InlineData(Channel.Voice)]
+    public void SerializationRoundtrip_Works(Channel rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Channel> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Channel>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Channel>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Channel>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Conversations/ConversationListResponseTest.cs b/src/Zavudev.Tests/Models/Conversations/ConversationListResponseTest.cs
new file mode 100644
index 0000000..cc2e2d3
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Conversations/ConversationListResponseTest.cs
@@ -0,0 +1,856 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Conversations;
+using Zavudev.Models.Messages;
+
+namespace Zavudev.Tests.Models.Conversations;
+
+public class ConversationListResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationListResponse
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationListResponseLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        string expectedID = "js723987cyghwqxxaxcf590qd18axd95";
+        List<string> expectedChannels = ["whatsapp", "sms"];
+        string expectedContactIdentifier = "+56912345678";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ConversationListResponseLastMessage expectedLastMessage = new()
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationListResponseLastMessageDirection.Inbound,
+            Text = "text",
+        };
+        long expectedMessageCount = 0;
+        long expectedUnreadCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedContactID = "contactId";
+        string expectedEmail = "email";
+        ConversationListResponseGroup expectedGroup = new()
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+        string expectedSenderID = "senderId";
+        ConversationListResponseWhatsapp expectedWhatsapp = new()
+        {
+            Bsuid = "bsuid",
+            Username = "username",
+        };
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedChannels.Count, model.Channels.Count);
+        for (int i = 0; i < expectedChannels.Count; i++)
+        {
+            Assert.Equal(expectedChannels[i], model.Channels[i]);
+        }
+        Assert.Equal(expectedContactIdentifier, model.ContactIdentifier);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedLastMessage, model.LastMessage);
+        Assert.Equal(expectedMessageCount, model.MessageCount);
+        Assert.Equal(expectedUnreadCount, model.UnreadCount);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+        Assert.Equal(expectedContactID, model.ContactID);
+        Assert.Equal(expectedEmail, model.Email);
+        Assert.Equal(expectedGroup, model.Group);
+        Assert.Equal(expectedSenderID, model.SenderID);
+        Assert.Equal(expectedWhatsapp, model.Whatsapp);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationListResponse
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationListResponseLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationListResponse
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationListResponseLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "js723987cyghwqxxaxcf590qd18axd95";
+        List<string> expectedChannels = ["whatsapp", "sms"];
+        string expectedContactIdentifier = "+56912345678";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ConversationListResponseLastMessage expectedLastMessage = new()
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationListResponseLastMessageDirection.Inbound,
+            Text = "text",
+        };
+        long expectedMessageCount = 0;
+        long expectedUnreadCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedContactID = "contactId";
+        string expectedEmail = "email";
+        ConversationListResponseGroup expectedGroup = new()
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+        string expectedSenderID = "senderId";
+        ConversationListResponseWhatsapp expectedWhatsapp = new()
+        {
+            Bsuid = "bsuid",
+            Username = "username",
+        };
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedChannels.Count, deserialized.Channels.Count);
+        for (int i = 0; i < expectedChannels.Count; i++)
+        {
+            Assert.Equal(expectedChannels[i], deserialized.Channels[i]);
+        }
+        Assert.Equal(expectedContactIdentifier, deserialized.ContactIdentifier);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedLastMessage, deserialized.LastMessage);
+        Assert.Equal(expectedMessageCount, deserialized.MessageCount);
+        Assert.Equal(expectedUnreadCount, deserialized.UnreadCount);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+        Assert.Equal(expectedContactID, deserialized.ContactID);
+        Assert.Equal(expectedEmail, deserialized.Email);
+        Assert.Equal(expectedGroup, deserialized.Group);
+        Assert.Equal(expectedSenderID, deserialized.SenderID);
+        Assert.Equal(expectedWhatsapp, deserialized.Whatsapp);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationListResponse
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationListResponseLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ConversationListResponse
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationListResponseLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.ContactID);
+        Assert.False(model.RawData.ContainsKey("contactId"));
+        Assert.Null(model.Email);
+        Assert.False(model.RawData.ContainsKey("email"));
+        Assert.Null(model.Group);
+        Assert.False(model.RawData.ContainsKey("group"));
+        Assert.Null(model.SenderID);
+        Assert.False(model.RawData.ContainsKey("senderId"));
+        Assert.Null(model.Whatsapp);
+        Assert.False(model.RawData.ContainsKey("whatsapp"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ConversationListResponse
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationListResponseLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new ConversationListResponse
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationListResponseLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            // Null should be interpreted as omitted for these properties
+            ContactID = null,
+            Email = null,
+            Group = null,
+            SenderID = null,
+            Whatsapp = null,
+        };
+
+        Assert.Null(model.ContactID);
+        Assert.False(model.RawData.ContainsKey("contactId"));
+        Assert.Null(model.Email);
+        Assert.False(model.RawData.ContainsKey("email"));
+        Assert.Null(model.Group);
+        Assert.False(model.RawData.ContainsKey("group"));
+        Assert.Null(model.SenderID);
+        Assert.False(model.RawData.ContainsKey("senderId"));
+        Assert.Null(model.Whatsapp);
+        Assert.False(model.RawData.ContainsKey("whatsapp"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ConversationListResponse
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationListResponseLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            // Null should be interpreted as omitted for these properties
+            ContactID = null,
+            Email = null,
+            Group = null,
+            SenderID = null,
+            Whatsapp = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationListResponse
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationListResponseLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        ConversationListResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ConversationListResponseLastMessageTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationListResponseLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationListResponseLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        string expectedID = "id";
+        DateTimeOffset expectedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, MessageChannel> expectedChannel = MessageChannel.Auto;
+        ApiEnum<string, ConversationListResponseLastMessageDirection> expectedDirection =
+            ConversationListResponseLastMessageDirection.Inbound;
+        string expectedText = "text";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedAt, model.At);
+        Assert.Equal(expectedChannel, model.Channel);
+        Assert.Equal(expectedDirection, model.Direction);
+        Assert.Equal(expectedText, model.Text);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationListResponseLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationListResponseLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListResponseLastMessage>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationListResponseLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationListResponseLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListResponseLastMessage>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        DateTimeOffset expectedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, MessageChannel> expectedChannel = MessageChannel.Auto;
+        ApiEnum<string, ConversationListResponseLastMessageDirection> expectedDirection =
+            ConversationListResponseLastMessageDirection.Inbound;
+        string expectedText = "text";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedAt, deserialized.At);
+        Assert.Equal(expectedChannel, deserialized.Channel);
+        Assert.Equal(expectedDirection, deserialized.Direction);
+        Assert.Equal(expectedText, deserialized.Text);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationListResponseLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationListResponseLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationListResponseLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationListResponseLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        ConversationListResponseLastMessage copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ConversationListResponseLastMessageDirectionTest : TestBase
+{
+    [Theory]
+    [InlineData(ConversationListResponseLastMessageDirection.Inbound)]
+    [InlineData(ConversationListResponseLastMessageDirection.Outbound)]
+    public void Validation_Works(ConversationListResponseLastMessageDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, ConversationListResponseLastMessageDirection> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, ConversationListResponseLastMessageDirection>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(ConversationListResponseLastMessageDirection.Inbound)]
+    [InlineData(ConversationListResponseLastMessageDirection.Outbound)]
+    public void SerializationRoundtrip_Works(ConversationListResponseLastMessageDirection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, ConversationListResponseLastMessageDirection> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, ConversationListResponseLastMessageDirection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, ConversationListResponseLastMessageDirection>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, ConversationListResponseLastMessageDirection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class ConversationListResponseGroupTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationListResponseGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        string expectedID = "id";
+        long expectedParticipantCount = 0;
+        string expectedSubject = "subject";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedParticipantCount, model.ParticipantCount);
+        Assert.Equal(expectedSubject, model.Subject);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationListResponseGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListResponseGroup>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationListResponseGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListResponseGroup>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        long expectedParticipantCount = 0;
+        string expectedSubject = "subject";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedParticipantCount, deserialized.ParticipantCount);
+        Assert.Equal(expectedSubject, deserialized.Subject);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationListResponseGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ConversationListResponseGroup { ID = "id" };
+
+        Assert.Null(model.ParticipantCount);
+        Assert.False(model.RawData.ContainsKey("participantCount"));
+        Assert.Null(model.Subject);
+        Assert.False(model.RawData.ContainsKey("subject"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ConversationListResponseGroup { ID = "id" };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new ConversationListResponseGroup
+        {
+            ID = "id",
+
+            // Null should be interpreted as omitted for these properties
+            ParticipantCount = null,
+            Subject = null,
+        };
+
+        Assert.Null(model.ParticipantCount);
+        Assert.False(model.RawData.ContainsKey("participantCount"));
+        Assert.Null(model.Subject);
+        Assert.False(model.RawData.ContainsKey("subject"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ConversationListResponseGroup
+        {
+            ID = "id",
+
+            // Null should be interpreted as omitted for these properties
+            ParticipantCount = null,
+            Subject = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationListResponseGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        ConversationListResponseGroup copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ConversationListResponseWhatsappTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationListResponseWhatsapp { Bsuid = "bsuid", Username = "username" };
+
+        string expectedBsuid = "bsuid";
+        string expectedUsername = "username";
+
+        Assert.Equal(expectedBsuid, model.Bsuid);
+        Assert.Equal(expectedUsername, model.Username);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationListResponseWhatsapp { Bsuid = "bsuid", Username = "username" };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListResponseWhatsapp>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationListResponseWhatsapp { Bsuid = "bsuid", Username = "username" };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationListResponseWhatsapp>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedBsuid = "bsuid";
+        string expectedUsername = "username";
+
+        Assert.Equal(expectedBsuid, deserialized.Bsuid);
+        Assert.Equal(expectedUsername, deserialized.Username);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationListResponseWhatsapp { Bsuid = "bsuid", Username = "username" };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ConversationListResponseWhatsapp { };
+
+        Assert.Null(model.Bsuid);
+        Assert.False(model.RawData.ContainsKey("bsuid"));
+        Assert.Null(model.Username);
+        Assert.False(model.RawData.ContainsKey("username"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ConversationListResponseWhatsapp { };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new ConversationListResponseWhatsapp
+        {
+            // Null should be interpreted as omitted for these properties
+            Bsuid = null,
+            Username = null,
+        };
+
+        Assert.Null(model.Bsuid);
+        Assert.False(model.RawData.ContainsKey("bsuid"));
+        Assert.Null(model.Username);
+        Assert.False(model.RawData.ContainsKey("username"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ConversationListResponseWhatsapp
+        {
+            // Null should be interpreted as omitted for these properties
+            Bsuid = null,
+            Username = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationListResponseWhatsapp { Bsuid = "bsuid", Username = "username" };
+
+        ConversationListResponseWhatsapp copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Conversations/ConversationMarkAsReadParamsTest.cs b/src/Zavudev.Tests/Models/Conversations/ConversationMarkAsReadParamsTest.cs
new file mode 100644
index 0000000..b00f246
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Conversations/ConversationMarkAsReadParamsTest.cs
@@ -0,0 +1,42 @@
+using System;
+using Zavudev.Models.Conversations;
+
+namespace Zavudev.Tests.Models.Conversations;
+
+public class ConversationMarkAsReadParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new ConversationMarkAsReadParams { ConversationID = "conversationId" };
+
+        string expectedConversationID = "conversationId";
+
+        Assert.Equal(expectedConversationID, parameters.ConversationID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        ConversationMarkAsReadParams parameters = new() { ConversationID = "conversationId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/conversations/conversationId/read"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new ConversationMarkAsReadParams { ConversationID = "conversationId" };
+
+        ConversationMarkAsReadParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Conversations/ConversationMarkAsReadResponseTest.cs b/src/Zavudev.Tests/Models/Conversations/ConversationMarkAsReadResponseTest.cs
new file mode 100644
index 0000000..7824aa1
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Conversations/ConversationMarkAsReadResponseTest.cs
@@ -0,0 +1,1165 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Conversations;
+using Zavudev.Models.Messages;
+
+namespace Zavudev.Tests.Models.Conversations;
+
+public class ConversationMarkAsReadResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = MessageChannel.Auto,
+                    Direction =
+                        ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        ConversationMarkAsReadResponseConversation expectedConversation = new()
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        Assert.Equal(expectedConversation, model.Conversation);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = MessageChannel.Auto,
+                    Direction =
+                        ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationMarkAsReadResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationMarkAsReadResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = MessageChannel.Auto,
+                    Direction =
+                        ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationMarkAsReadResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        ConversationMarkAsReadResponseConversation expectedConversation = new()
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        Assert.Equal(expectedConversation, deserialized.Conversation);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationMarkAsReadResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = MessageChannel.Auto,
+                    Direction =
+                        ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationMarkAsReadResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = MessageChannel.Auto,
+                    Direction =
+                        ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        ConversationMarkAsReadResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ConversationMarkAsReadResponseConversationTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        string expectedID = "js723987cyghwqxxaxcf590qd18axd95";
+        List<string> expectedChannels = ["whatsapp", "sms"];
+        string expectedContactIdentifier = "+56912345678";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ConversationMarkAsReadResponseConversationLastMessage expectedLastMessage = new()
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+            Text = "text",
+        };
+        long expectedMessageCount = 0;
+        long expectedUnreadCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedContactID = "contactId";
+        string expectedEmail = "email";
+        ConversationMarkAsReadResponseConversationGroup expectedGroup = new()
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+        string expectedSenderID = "senderId";
+        ConversationMarkAsReadResponseConversationWhatsapp expectedWhatsapp = new()
+        {
+            Bsuid = "bsuid",
+            Username = "username",
+        };
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedChannels.Count, model.Channels.Count);
+        for (int i = 0; i < expectedChannels.Count; i++)
+        {
+            Assert.Equal(expectedChannels[i], model.Channels[i]);
+        }
+        Assert.Equal(expectedContactIdentifier, model.ContactIdentifier);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedLastMessage, model.LastMessage);
+        Assert.Equal(expectedMessageCount, model.MessageCount);
+        Assert.Equal(expectedUnreadCount, model.UnreadCount);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+        Assert.Equal(expectedContactID, model.ContactID);
+        Assert.Equal(expectedEmail, model.Email);
+        Assert.Equal(expectedGroup, model.Group);
+        Assert.Equal(expectedSenderID, model.SenderID);
+        Assert.Equal(expectedWhatsapp, model.Whatsapp);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationMarkAsReadResponseConversation>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationMarkAsReadResponseConversation>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "js723987cyghwqxxaxcf590qd18axd95";
+        List<string> expectedChannels = ["whatsapp", "sms"];
+        string expectedContactIdentifier = "+56912345678";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ConversationMarkAsReadResponseConversationLastMessage expectedLastMessage = new()
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+            Text = "text",
+        };
+        long expectedMessageCount = 0;
+        long expectedUnreadCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedContactID = "contactId";
+        string expectedEmail = "email";
+        ConversationMarkAsReadResponseConversationGroup expectedGroup = new()
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+        string expectedSenderID = "senderId";
+        ConversationMarkAsReadResponseConversationWhatsapp expectedWhatsapp = new()
+        {
+            Bsuid = "bsuid",
+            Username = "username",
+        };
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedChannels.Count, deserialized.Channels.Count);
+        for (int i = 0; i < expectedChannels.Count; i++)
+        {
+            Assert.Equal(expectedChannels[i], deserialized.Channels[i]);
+        }
+        Assert.Equal(expectedContactIdentifier, deserialized.ContactIdentifier);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedLastMessage, deserialized.LastMessage);
+        Assert.Equal(expectedMessageCount, deserialized.MessageCount);
+        Assert.Equal(expectedUnreadCount, deserialized.UnreadCount);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+        Assert.Equal(expectedContactID, deserialized.ContactID);
+        Assert.Equal(expectedEmail, deserialized.Email);
+        Assert.Equal(expectedGroup, deserialized.Group);
+        Assert.Equal(expectedSenderID, deserialized.SenderID);
+        Assert.Equal(expectedWhatsapp, deserialized.Whatsapp);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.ContactID);
+        Assert.False(model.RawData.ContainsKey("contactId"));
+        Assert.Null(model.Email);
+        Assert.False(model.RawData.ContainsKey("email"));
+        Assert.Null(model.Group);
+        Assert.False(model.RawData.ContainsKey("group"));
+        Assert.Null(model.SenderID);
+        Assert.False(model.RawData.ContainsKey("senderId"));
+        Assert.Null(model.Whatsapp);
+        Assert.False(model.RawData.ContainsKey("whatsapp"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            // Null should be interpreted as omitted for these properties
+            ContactID = null,
+            Email = null,
+            Group = null,
+            SenderID = null,
+            Whatsapp = null,
+        };
+
+        Assert.Null(model.ContactID);
+        Assert.False(model.RawData.ContainsKey("contactId"));
+        Assert.Null(model.Email);
+        Assert.False(model.RawData.ContainsKey("email"));
+        Assert.Null(model.Group);
+        Assert.False(model.RawData.ContainsKey("group"));
+        Assert.Null(model.SenderID);
+        Assert.False(model.RawData.ContainsKey("senderId"));
+        Assert.Null(model.Whatsapp);
+        Assert.False(model.RawData.ContainsKey("whatsapp"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            // Null should be interpreted as omitted for these properties
+            ContactID = null,
+            Email = null,
+            Group = null,
+            SenderID = null,
+            Whatsapp = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = MessageChannel.Auto,
+                Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        ConversationMarkAsReadResponseConversation copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ConversationMarkAsReadResponseConversationLastMessageTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        string expectedID = "id";
+        DateTimeOffset expectedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, MessageChannel> expectedChannel = MessageChannel.Auto;
+        ApiEnum<
+            string,
+            ConversationMarkAsReadResponseConversationLastMessageDirection
+        > expectedDirection =
+            ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound;
+        string expectedText = "text";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedAt, model.At);
+        Assert.Equal(expectedChannel, model.Channel);
+        Assert.Equal(expectedDirection, model.Direction);
+        Assert.Equal(expectedText, model.Text);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized =
+            JsonSerializer.Deserialize<ConversationMarkAsReadResponseConversationLastMessage>(
+                json,
+                ModelBase.SerializerOptions
+            );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized =
+            JsonSerializer.Deserialize<ConversationMarkAsReadResponseConversationLastMessage>(
+                element,
+                ModelBase.SerializerOptions
+            );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        DateTimeOffset expectedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, MessageChannel> expectedChannel = MessageChannel.Auto;
+        ApiEnum<
+            string,
+            ConversationMarkAsReadResponseConversationLastMessageDirection
+        > expectedDirection =
+            ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound;
+        string expectedText = "text";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedAt, deserialized.At);
+        Assert.Equal(expectedChannel, deserialized.Channel);
+        Assert.Equal(expectedDirection, deserialized.Direction);
+        Assert.Equal(expectedText, deserialized.Text);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationLastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = MessageChannel.Auto,
+            Direction = ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+            Text = "text",
+        };
+
+        ConversationMarkAsReadResponseConversationLastMessage copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ConversationMarkAsReadResponseConversationLastMessageDirectionTest : TestBase
+{
+    [Theory]
+    [InlineData(ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound)]
+    [InlineData(ConversationMarkAsReadResponseConversationLastMessageDirection.Outbound)]
+    public void Validation_Works(
+        ConversationMarkAsReadResponseConversationLastMessageDirection rawValue
+    )
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, ConversationMarkAsReadResponseConversationLastMessageDirection> value =
+            rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, ConversationMarkAsReadResponseConversationLastMessageDirection>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound)]
+    [InlineData(ConversationMarkAsReadResponseConversationLastMessageDirection.Outbound)]
+    public void SerializationRoundtrip_Works(
+        ConversationMarkAsReadResponseConversationLastMessageDirection rawValue
+    )
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, ConversationMarkAsReadResponseConversationLastMessageDirection> value =
+            rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, ConversationMarkAsReadResponseConversationLastMessageDirection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, ConversationMarkAsReadResponseConversationLastMessageDirection>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, ConversationMarkAsReadResponseConversationLastMessageDirection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class ConversationMarkAsReadResponseConversationGroupTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        string expectedID = "id";
+        long expectedParticipantCount = 0;
+        string expectedSubject = "subject";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedParticipantCount, model.ParticipantCount);
+        Assert.Equal(expectedSubject, model.Subject);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized =
+            JsonSerializer.Deserialize<ConversationMarkAsReadResponseConversationGroup>(
+                json,
+                ModelBase.SerializerOptions
+            );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized =
+            JsonSerializer.Deserialize<ConversationMarkAsReadResponseConversationGroup>(
+                element,
+                ModelBase.SerializerOptions
+            );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        long expectedParticipantCount = 0;
+        string expectedSubject = "subject";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedParticipantCount, deserialized.ParticipantCount);
+        Assert.Equal(expectedSubject, deserialized.Subject);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationGroup { ID = "id" };
+
+        Assert.Null(model.ParticipantCount);
+        Assert.False(model.RawData.ContainsKey("participantCount"));
+        Assert.Null(model.Subject);
+        Assert.False(model.RawData.ContainsKey("subject"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationGroup { ID = "id" };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationGroup
+        {
+            ID = "id",
+
+            // Null should be interpreted as omitted for these properties
+            ParticipantCount = null,
+            Subject = null,
+        };
+
+        Assert.Null(model.ParticipantCount);
+        Assert.False(model.RawData.ContainsKey("participantCount"));
+        Assert.Null(model.Subject);
+        Assert.False(model.RawData.ContainsKey("subject"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationGroup
+        {
+            ID = "id",
+
+            // Null should be interpreted as omitted for these properties
+            ParticipantCount = null,
+            Subject = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationGroup
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        ConversationMarkAsReadResponseConversationGroup copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ConversationMarkAsReadResponseConversationWhatsappTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationWhatsapp
+        {
+            Bsuid = "bsuid",
+            Username = "username",
+        };
+
+        string expectedBsuid = "bsuid";
+        string expectedUsername = "username";
+
+        Assert.Equal(expectedBsuid, model.Bsuid);
+        Assert.Equal(expectedUsername, model.Username);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationWhatsapp
+        {
+            Bsuid = "bsuid",
+            Username = "username",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized =
+            JsonSerializer.Deserialize<ConversationMarkAsReadResponseConversationWhatsapp>(
+                json,
+                ModelBase.SerializerOptions
+            );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationWhatsapp
+        {
+            Bsuid = "bsuid",
+            Username = "username",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized =
+            JsonSerializer.Deserialize<ConversationMarkAsReadResponseConversationWhatsapp>(
+                element,
+                ModelBase.SerializerOptions
+            );
+        Assert.NotNull(deserialized);
+
+        string expectedBsuid = "bsuid";
+        string expectedUsername = "username";
+
+        Assert.Equal(expectedBsuid, deserialized.Bsuid);
+        Assert.Equal(expectedUsername, deserialized.Username);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationWhatsapp
+        {
+            Bsuid = "bsuid",
+            Username = "username",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationWhatsapp { };
+
+        Assert.Null(model.Bsuid);
+        Assert.False(model.RawData.ContainsKey("bsuid"));
+        Assert.Null(model.Username);
+        Assert.False(model.RawData.ContainsKey("username"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationWhatsapp { };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationWhatsapp
+        {
+            // Null should be interpreted as omitted for these properties
+            Bsuid = null,
+            Username = null,
+        };
+
+        Assert.Null(model.Bsuid);
+        Assert.False(model.RawData.ContainsKey("bsuid"));
+        Assert.Null(model.Username);
+        Assert.False(model.RawData.ContainsKey("username"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationWhatsapp
+        {
+            // Null should be interpreted as omitted for these properties
+            Bsuid = null,
+            Username = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationMarkAsReadResponseConversationWhatsapp
+        {
+            Bsuid = "bsuid",
+            Username = "username",
+        };
+
+        ConversationMarkAsReadResponseConversationWhatsapp copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Conversations/ConversationRetrieveParamsTest.cs b/src/Zavudev.Tests/Models/Conversations/ConversationRetrieveParamsTest.cs
new file mode 100644
index 0000000..f8d4727
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Conversations/ConversationRetrieveParamsTest.cs
@@ -0,0 +1,39 @@
+using System;
+using Zavudev.Models.Conversations;
+
+namespace Zavudev.Tests.Models.Conversations;
+
+public class ConversationRetrieveParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new ConversationRetrieveParams { ConversationID = "conversationId" };
+
+        string expectedConversationID = "conversationId";
+
+        Assert.Equal(expectedConversationID, parameters.ConversationID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        ConversationRetrieveParams parameters = new() { ConversationID = "conversationId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/conversations/conversationId"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new ConversationRetrieveParams { ConversationID = "conversationId" };
+
+        ConversationRetrieveParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Conversations/ConversationRetrieveResponseTest.cs b/src/Zavudev.Tests/Models/Conversations/ConversationRetrieveResponseTest.cs
new file mode 100644
index 0000000..18f5172
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Conversations/ConversationRetrieveResponseTest.cs
@@ -0,0 +1,1107 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Conversations;
+using Messages = Zavudev.Models.Messages;
+
+namespace Zavudev.Tests.Models.Conversations;
+
+public class ConversationRetrieveResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ConversationRetrieveResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = Messages::MessageChannel.Auto,
+                    Direction = Direction.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        Conversation expectedConversation = new()
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        Assert.Equal(expectedConversation, model.Conversation);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ConversationRetrieveResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = Messages::MessageChannel.Auto,
+                    Direction = Direction.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationRetrieveResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ConversationRetrieveResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = Messages::MessageChannel.Auto,
+                    Direction = Direction.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ConversationRetrieveResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        Conversation expectedConversation = new()
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        Assert.Equal(expectedConversation, deserialized.Conversation);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ConversationRetrieveResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = Messages::MessageChannel.Auto,
+                    Direction = Direction.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ConversationRetrieveResponse
+        {
+            Conversation = new()
+            {
+                ID = "js723987cyghwqxxaxcf590qd18axd95",
+                Channels = ["whatsapp", "sms"],
+                ContactIdentifier = "+56912345678",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastMessage = new()
+                {
+                    ID = "id",
+                    At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Channel = Messages::MessageChannel.Auto,
+                    Direction = Direction.Inbound,
+                    Text = "text",
+                },
+                MessageCount = 0,
+                UnreadCount = 0,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ContactID = "contactId",
+                Email = "email",
+                Group = new()
+                {
+                    ID = "id",
+                    ParticipantCount = 0,
+                    Subject = "subject",
+                },
+                SenderID = "senderId",
+                Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+            },
+        };
+
+        ConversationRetrieveResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ConversationTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Conversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        string expectedID = "js723987cyghwqxxaxcf590qd18axd95";
+        List<string> expectedChannels = ["whatsapp", "sms"];
+        string expectedContactIdentifier = "+56912345678";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        LastMessage expectedLastMessage = new()
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = Messages::MessageChannel.Auto,
+            Direction = Direction.Inbound,
+            Text = "text",
+        };
+        long expectedMessageCount = 0;
+        long expectedUnreadCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedContactID = "contactId";
+        string expectedEmail = "email";
+        Group expectedGroup = new()
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+        string expectedSenderID = "senderId";
+        Whatsapp expectedWhatsapp = new() { Bsuid = "bsuid", Username = "username" };
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedChannels.Count, model.Channels.Count);
+        for (int i = 0; i < expectedChannels.Count; i++)
+        {
+            Assert.Equal(expectedChannels[i], model.Channels[i]);
+        }
+        Assert.Equal(expectedContactIdentifier, model.ContactIdentifier);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedLastMessage, model.LastMessage);
+        Assert.Equal(expectedMessageCount, model.MessageCount);
+        Assert.Equal(expectedUnreadCount, model.UnreadCount);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+        Assert.Equal(expectedContactID, model.ContactID);
+        Assert.Equal(expectedEmail, model.Email);
+        Assert.Equal(expectedGroup, model.Group);
+        Assert.Equal(expectedSenderID, model.SenderID);
+        Assert.Equal(expectedWhatsapp, model.Whatsapp);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Conversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Conversation>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Conversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Conversation>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "js723987cyghwqxxaxcf590qd18axd95";
+        List<string> expectedChannels = ["whatsapp", "sms"];
+        string expectedContactIdentifier = "+56912345678";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        LastMessage expectedLastMessage = new()
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = Messages::MessageChannel.Auto,
+            Direction = Direction.Inbound,
+            Text = "text",
+        };
+        long expectedMessageCount = 0;
+        long expectedUnreadCount = 0;
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedContactID = "contactId";
+        string expectedEmail = "email";
+        Group expectedGroup = new()
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+        string expectedSenderID = "senderId";
+        Whatsapp expectedWhatsapp = new() { Bsuid = "bsuid", Username = "username" };
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedChannels.Count, deserialized.Channels.Count);
+        for (int i = 0; i < expectedChannels.Count; i++)
+        {
+            Assert.Equal(expectedChannels[i], deserialized.Channels[i]);
+        }
+        Assert.Equal(expectedContactIdentifier, deserialized.ContactIdentifier);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedLastMessage, deserialized.LastMessage);
+        Assert.Equal(expectedMessageCount, deserialized.MessageCount);
+        Assert.Equal(expectedUnreadCount, deserialized.UnreadCount);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+        Assert.Equal(expectedContactID, deserialized.ContactID);
+        Assert.Equal(expectedEmail, deserialized.Email);
+        Assert.Equal(expectedGroup, deserialized.Group);
+        Assert.Equal(expectedSenderID, deserialized.SenderID);
+        Assert.Equal(expectedWhatsapp, deserialized.Whatsapp);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Conversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Conversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.ContactID);
+        Assert.False(model.RawData.ContainsKey("contactId"));
+        Assert.Null(model.Email);
+        Assert.False(model.RawData.ContainsKey("email"));
+        Assert.Null(model.Group);
+        Assert.False(model.RawData.ContainsKey("group"));
+        Assert.Null(model.SenderID);
+        Assert.False(model.RawData.ContainsKey("senderId"));
+        Assert.Null(model.Whatsapp);
+        Assert.False(model.RawData.ContainsKey("whatsapp"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Conversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new Conversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            // Null should be interpreted as omitted for these properties
+            ContactID = null,
+            Email = null,
+            Group = null,
+            SenderID = null,
+            Whatsapp = null,
+        };
+
+        Assert.Null(model.ContactID);
+        Assert.False(model.RawData.ContainsKey("contactId"));
+        Assert.Null(model.Email);
+        Assert.False(model.RawData.ContainsKey("email"));
+        Assert.Null(model.Group);
+        Assert.False(model.RawData.ContainsKey("group"));
+        Assert.Null(model.SenderID);
+        Assert.False(model.RawData.ContainsKey("senderId"));
+        Assert.Null(model.Whatsapp);
+        Assert.False(model.RawData.ContainsKey("whatsapp"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Conversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            // Null should be interpreted as omitted for these properties
+            ContactID = null,
+            Email = null,
+            Group = null,
+            SenderID = null,
+            Whatsapp = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Conversation
+        {
+            ID = "js723987cyghwqxxaxcf590qd18axd95",
+            Channels = ["whatsapp", "sms"],
+            ContactIdentifier = "+56912345678",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastMessage = new()
+            {
+                ID = "id",
+                At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Channel = Messages::MessageChannel.Auto,
+                Direction = Direction.Inbound,
+                Text = "text",
+            },
+            MessageCount = 0,
+            UnreadCount = 0,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ContactID = "contactId",
+            Email = "email",
+            Group = new()
+            {
+                ID = "id",
+                ParticipantCount = 0,
+                Subject = "subject",
+            },
+            SenderID = "senderId",
+            Whatsapp = new() { Bsuid = "bsuid", Username = "username" },
+        };
+
+        Conversation copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class LastMessageTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new LastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = Messages::MessageChannel.Auto,
+            Direction = Direction.Inbound,
+            Text = "text",
+        };
+
+        string expectedID = "id";
+        DateTimeOffset expectedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, Messages::MessageChannel> expectedChannel = Messages::MessageChannel.Auto;
+        ApiEnum<string, Direction> expectedDirection = Direction.Inbound;
+        string expectedText = "text";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedAt, model.At);
+        Assert.Equal(expectedChannel, model.Channel);
+        Assert.Equal(expectedDirection, model.Direction);
+        Assert.Equal(expectedText, model.Text);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new LastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = Messages::MessageChannel.Auto,
+            Direction = Direction.Inbound,
+            Text = "text",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<LastMessage>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new LastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = Messages::MessageChannel.Auto,
+            Direction = Direction.Inbound,
+            Text = "text",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<LastMessage>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        DateTimeOffset expectedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, Messages::MessageChannel> expectedChannel = Messages::MessageChannel.Auto;
+        ApiEnum<string, Direction> expectedDirection = Direction.Inbound;
+        string expectedText = "text";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedAt, deserialized.At);
+        Assert.Equal(expectedChannel, deserialized.Channel);
+        Assert.Equal(expectedDirection, deserialized.Direction);
+        Assert.Equal(expectedText, deserialized.Text);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new LastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = Messages::MessageChannel.Auto,
+            Direction = Direction.Inbound,
+            Text = "text",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new LastMessage
+        {
+            ID = "id",
+            At = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Channel = Messages::MessageChannel.Auto,
+            Direction = Direction.Inbound,
+            Text = "text",
+        };
+
+        LastMessage copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class DirectionTest : TestBase
+{
+    [Theory]
+    [InlineData(Direction.Inbound)]
+    [InlineData(Direction.Outbound)]
+    public void Validation_Works(Direction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Direction> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Direction.Inbound)]
+    [InlineData(Direction.Outbound)]
+    public void SerializationRoundtrip_Works(Direction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Direction> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class GroupTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Group
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        string expectedID = "id";
+        long expectedParticipantCount = 0;
+        string expectedSubject = "subject";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedParticipantCount, model.ParticipantCount);
+        Assert.Equal(expectedSubject, model.Subject);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Group
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Group>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Group
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Group>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        long expectedParticipantCount = 0;
+        string expectedSubject = "subject";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedParticipantCount, deserialized.ParticipantCount);
+        Assert.Equal(expectedSubject, deserialized.Subject);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Group
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Group { ID = "id" };
+
+        Assert.Null(model.ParticipantCount);
+        Assert.False(model.RawData.ContainsKey("participantCount"));
+        Assert.Null(model.Subject);
+        Assert.False(model.RawData.ContainsKey("subject"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Group { ID = "id" };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new Group
+        {
+            ID = "id",
+
+            // Null should be interpreted as omitted for these properties
+            ParticipantCount = null,
+            Subject = null,
+        };
+
+        Assert.Null(model.ParticipantCount);
+        Assert.False(model.RawData.ContainsKey("participantCount"));
+        Assert.Null(model.Subject);
+        Assert.False(model.RawData.ContainsKey("subject"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Group
+        {
+            ID = "id",
+
+            // Null should be interpreted as omitted for these properties
+            ParticipantCount = null,
+            Subject = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Group
+        {
+            ID = "id",
+            ParticipantCount = 0,
+            Subject = "subject",
+        };
+
+        Group copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class WhatsappTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Whatsapp { Bsuid = "bsuid", Username = "username" };
+
+        string expectedBsuid = "bsuid";
+        string expectedUsername = "username";
+
+        Assert.Equal(expectedBsuid, model.Bsuid);
+        Assert.Equal(expectedUsername, model.Username);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Whatsapp { Bsuid = "bsuid", Username = "username" };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Whatsapp>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Whatsapp { Bsuid = "bsuid", Username = "username" };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Whatsapp>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedBsuid = "bsuid";
+        string expectedUsername = "username";
+
+        Assert.Equal(expectedBsuid, deserialized.Bsuid);
+        Assert.Equal(expectedUsername, deserialized.Username);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Whatsapp { Bsuid = "bsuid", Username = "username" };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Whatsapp { };
+
+        Assert.Null(model.Bsuid);
+        Assert.False(model.RawData.ContainsKey("bsuid"));
+        Assert.Null(model.Username);
+        Assert.False(model.RawData.ContainsKey("username"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Whatsapp { };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new Whatsapp
+        {
+            // Null should be interpreted as omitted for these properties
+            Bsuid = null,
+            Username = null,
+        };
+
+        Assert.Null(model.Bsuid);
+        Assert.False(model.RawData.ContainsKey("bsuid"));
+        Assert.Null(model.Username);
+        Assert.False(model.RawData.ContainsKey("username"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Whatsapp
+        {
+            // Null should be interpreted as omitted for these properties
+            Bsuid = null,
+            Username = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Whatsapp { Bsuid = "bsuid", Username = "username" };
+
+        Whatsapp copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/EmailDomains/EmailDomainCreateParamsTest.cs b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainCreateParamsTest.cs
new file mode 100644
index 0000000..5d2e721
--- /dev/null
+++ b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainCreateParamsTest.cs
@@ -0,0 +1,37 @@
+using System;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Tests.Models.EmailDomains;
+
+public class EmailDomainCreateParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new EmailDomainCreateParams { Domain = "example.com" };
+
+        string expectedDomain = "example.com";
+
+        Assert.Equal(expectedDomain, parameters.Domain);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        EmailDomainCreateParams parameters = new() { Domain = "example.com" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/email-domains"), url));
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new EmailDomainCreateParams { Domain = "example.com" };
+
+        EmailDomainCreateParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/EmailDomains/EmailDomainCreateResponseTest.cs b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainCreateResponseTest.cs
new file mode 100644
index 0000000..ab9daa6
--- /dev/null
+++ b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainCreateResponseTest.cs
@@ -0,0 +1,717 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Tests.Models.EmailDomains;
+
+public class EmailDomainCreateResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new EmailDomainCreateResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                DomainValue = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = Purpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        Domain expectedDomain = new()
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = Purpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        Assert.Equal(expectedDomain, model.Domain);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new EmailDomainCreateResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                DomainValue = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = Purpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainCreateResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new EmailDomainCreateResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                DomainValue = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = Purpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainCreateResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        Domain expectedDomain = new()
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = Purpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        Assert.Equal(expectedDomain, deserialized.Domain);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new EmailDomainCreateResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                DomainValue = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = Purpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new EmailDomainCreateResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                DomainValue = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = Purpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        EmailDomainCreateResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class DomainTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Domain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = Purpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string expectedID = "emd_abc123";
+        string expectedDkimStatus = "not_started";
+        string expectedDomainValue = "example.com";
+        string expectedStatus = "pending";
+        List<DnsRecord> expectedDnsRecords =
+        [
+            new()
+            {
+                Name = "name",
+                Purpose = Purpose.Dkim,
+                Required = true,
+                Type = "CNAME",
+                Value = "value",
+                Priority = 0,
+            },
+        ];
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedDkimStatus, model.DkimStatus);
+        Assert.Equal(expectedDomainValue, model.DomainValue);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.NotNull(model.DnsRecords);
+        Assert.Equal(expectedDnsRecords.Count, model.DnsRecords.Count);
+        for (int i = 0; i < expectedDnsRecords.Count; i++)
+        {
+            Assert.Equal(expectedDnsRecords[i], model.DnsRecords[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Domain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = Purpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Domain>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Domain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = Purpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Domain>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedID = "emd_abc123";
+        string expectedDkimStatus = "not_started";
+        string expectedDomainValue = "example.com";
+        string expectedStatus = "pending";
+        List<DnsRecord> expectedDnsRecords =
+        [
+            new()
+            {
+                Name = "name",
+                Purpose = Purpose.Dkim,
+                Required = true,
+                Type = "CNAME",
+                Value = "value",
+                Priority = 0,
+            },
+        ];
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedDkimStatus, deserialized.DkimStatus);
+        Assert.Equal(expectedDomainValue, deserialized.DomainValue);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.NotNull(deserialized.DnsRecords);
+        Assert.Equal(expectedDnsRecords.Count, deserialized.DnsRecords.Count);
+        for (int i = 0; i < expectedDnsRecords.Count; i++)
+        {
+            Assert.Equal(expectedDnsRecords[i], deserialized.DnsRecords[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Domain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = Purpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Domain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+        };
+
+        Assert.Null(model.DnsRecords);
+        Assert.False(model.RawData.ContainsKey("dnsRecords"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Domain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new Domain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+
+            // Null should be interpreted as omitted for these properties
+            DnsRecords = null,
+        };
+
+        Assert.Null(model.DnsRecords);
+        Assert.False(model.RawData.ContainsKey("dnsRecords"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Domain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+
+            // Null should be interpreted as omitted for these properties
+            DnsRecords = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Domain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            DomainValue = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = Purpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        Domain copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class DnsRecordTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new DnsRecord
+        {
+            Name = "name",
+            Purpose = Purpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string expectedName = "name";
+        ApiEnum<string, Purpose> expectedPurpose = Purpose.Dkim;
+        bool expectedRequired = true;
+        string expectedType = "CNAME";
+        string expectedValue = "value";
+        long expectedPriority = 0;
+
+        Assert.Equal(expectedName, model.Name);
+        Assert.Equal(expectedPurpose, model.Purpose);
+        Assert.Equal(expectedRequired, model.Required);
+        Assert.Equal(expectedType, model.Type);
+        Assert.Equal(expectedValue, model.Value);
+        Assert.Equal(expectedPriority, model.Priority);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new DnsRecord
+        {
+            Name = "name",
+            Purpose = Purpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<DnsRecord>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new DnsRecord
+        {
+            Name = "name",
+            Purpose = Purpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<DnsRecord>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedName = "name";
+        ApiEnum<string, Purpose> expectedPurpose = Purpose.Dkim;
+        bool expectedRequired = true;
+        string expectedType = "CNAME";
+        string expectedValue = "value";
+        long expectedPriority = 0;
+
+        Assert.Equal(expectedName, deserialized.Name);
+        Assert.Equal(expectedPurpose, deserialized.Purpose);
+        Assert.Equal(expectedRequired, deserialized.Required);
+        Assert.Equal(expectedType, deserialized.Type);
+        Assert.Equal(expectedValue, deserialized.Value);
+        Assert.Equal(expectedPriority, deserialized.Priority);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new DnsRecord
+        {
+            Name = "name",
+            Purpose = Purpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new DnsRecord
+        {
+            Name = "name",
+            Purpose = Purpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+        };
+
+        Assert.Null(model.Priority);
+        Assert.False(model.RawData.ContainsKey("priority"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new DnsRecord
+        {
+            Name = "name",
+            Purpose = Purpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new DnsRecord
+        {
+            Name = "name",
+            Purpose = Purpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+
+            // Null should be interpreted as omitted for these properties
+            Priority = null,
+        };
+
+        Assert.Null(model.Priority);
+        Assert.False(model.RawData.ContainsKey("priority"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new DnsRecord
+        {
+            Name = "name",
+            Purpose = Purpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+
+            // Null should be interpreted as omitted for these properties
+            Priority = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new DnsRecord
+        {
+            Name = "name",
+            Purpose = Purpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        DnsRecord copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class PurposeTest : TestBase
+{
+    [Theory]
+    [InlineData(Purpose.Dkim)]
+    [InlineData(Purpose.Spf)]
+    [InlineData(Purpose.Dmarc)]
+    [InlineData(Purpose.MailFrom)]
+    public void Validation_Works(Purpose rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Purpose> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Purpose>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Purpose.Dkim)]
+    [InlineData(Purpose.Spf)]
+    [InlineData(Purpose.Dmarc)]
+    [InlineData(Purpose.MailFrom)]
+    public void SerializationRoundtrip_Works(Purpose rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Purpose> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Purpose>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Purpose>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Purpose>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/EmailDomains/EmailDomainDeleteParamsTest.cs b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainDeleteParamsTest.cs
new file mode 100644
index 0000000..f6e678f
--- /dev/null
+++ b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainDeleteParamsTest.cs
@@ -0,0 +1,39 @@
+using System;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Tests.Models.EmailDomains;
+
+public class EmailDomainDeleteParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new EmailDomainDeleteParams { DomainID = "domainId" };
+
+        string expectedDomainID = "domainId";
+
+        Assert.Equal(expectedDomainID, parameters.DomainID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        EmailDomainDeleteParams parameters = new() { DomainID = "domainId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/email-domains/domainId"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new EmailDomainDeleteParams { DomainID = "domainId" };
+
+        EmailDomainDeleteParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/EmailDomains/EmailDomainListParamsTest.cs b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainListParamsTest.cs
new file mode 100644
index 0000000..7a19247
--- /dev/null
+++ b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainListParamsTest.cs
@@ -0,0 +1 @@
+namespace Zavudev.Tests.Models.EmailDomains;
diff --git a/src/Zavudev.Tests/Models/EmailDomains/EmailDomainListResponseTest.cs b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainListResponseTest.cs
new file mode 100644
index 0000000..92a1931
--- /dev/null
+++ b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainListResponseTest.cs
@@ -0,0 +1,749 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Tests.Models.EmailDomains;
+
+public class EmailDomainListResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new EmailDomainListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "emd_abc123",
+                    DkimStatus = "not_started",
+                    Domain = "example.com",
+                    Status = "pending",
+                    DnsRecords =
+                    [
+                        new()
+                        {
+                            Name = "name",
+                            Purpose = ItemDnsRecordPurpose.Dkim,
+                            Required = true,
+                            Type = "CNAME",
+                            Value = "value",
+                            Priority = 0,
+                        },
+                    ],
+                },
+            ],
+        };
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = ItemDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        ];
+
+        Assert.Equal(expectedItems.Count, model.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], model.Items[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new EmailDomainListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "emd_abc123",
+                    DkimStatus = "not_started",
+                    Domain = "example.com",
+                    Status = "pending",
+                    DnsRecords =
+                    [
+                        new()
+                        {
+                            Name = "name",
+                            Purpose = ItemDnsRecordPurpose.Dkim,
+                            Required = true,
+                            Type = "CNAME",
+                            Value = "value",
+                            Priority = 0,
+                        },
+                    ],
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainListResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new EmailDomainListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "emd_abc123",
+                    DkimStatus = "not_started",
+                    Domain = "example.com",
+                    Status = "pending",
+                    DnsRecords =
+                    [
+                        new()
+                        {
+                            Name = "name",
+                            Purpose = ItemDnsRecordPurpose.Dkim,
+                            Required = true,
+                            Type = "CNAME",
+                            Value = "value",
+                            Priority = 0,
+                        },
+                    ],
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainListResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = ItemDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        ];
+
+        Assert.Equal(expectedItems.Count, deserialized.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], deserialized.Items[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new EmailDomainListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "emd_abc123",
+                    DkimStatus = "not_started",
+                    Domain = "example.com",
+                    Status = "pending",
+                    DnsRecords =
+                    [
+                        new()
+                        {
+                            Name = "name",
+                            Purpose = ItemDnsRecordPurpose.Dkim,
+                            Required = true,
+                            Type = "CNAME",
+                            Value = "value",
+                            Priority = 0,
+                        },
+                    ],
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new EmailDomainListResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "emd_abc123",
+                    DkimStatus = "not_started",
+                    Domain = "example.com",
+                    Status = "pending",
+                    DnsRecords =
+                    [
+                        new()
+                        {
+                            Name = "name",
+                            Purpose = ItemDnsRecordPurpose.Dkim,
+                            Required = true,
+                            Type = "CNAME",
+                            Value = "value",
+                            Priority = 0,
+                        },
+                    ],
+                },
+            ],
+        };
+
+        EmailDomainListResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ItemTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = ItemDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string expectedID = "emd_abc123";
+        string expectedDkimStatus = "not_started";
+        string expectedDomain = "example.com";
+        string expectedStatus = "pending";
+        List<ItemDnsRecord> expectedDnsRecords =
+        [
+            new()
+            {
+                Name = "name",
+                Purpose = ItemDnsRecordPurpose.Dkim,
+                Required = true,
+                Type = "CNAME",
+                Value = "value",
+                Priority = 0,
+            },
+        ];
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedDkimStatus, model.DkimStatus);
+        Assert.Equal(expectedDomain, model.Domain);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.NotNull(model.DnsRecords);
+        Assert.Equal(expectedDnsRecords.Count, model.DnsRecords.Count);
+        for (int i = 0; i < expectedDnsRecords.Count; i++)
+        {
+            Assert.Equal(expectedDnsRecords[i], model.DnsRecords[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = ItemDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Item
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = ItemDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedID = "emd_abc123";
+        string expectedDkimStatus = "not_started";
+        string expectedDomain = "example.com";
+        string expectedStatus = "pending";
+        List<ItemDnsRecord> expectedDnsRecords =
+        [
+            new()
+            {
+                Name = "name",
+                Purpose = ItemDnsRecordPurpose.Dkim,
+                Required = true,
+                Type = "CNAME",
+                Value = "value",
+                Priority = 0,
+            },
+        ];
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedDkimStatus, deserialized.DkimStatus);
+        Assert.Equal(expectedDomain, deserialized.Domain);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.NotNull(deserialized.DnsRecords);
+        Assert.Equal(expectedDnsRecords.Count, deserialized.DnsRecords.Count);
+        for (int i = 0; i < expectedDnsRecords.Count; i++)
+        {
+            Assert.Equal(expectedDnsRecords[i], deserialized.DnsRecords[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Item
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = ItemDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Item
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+        };
+
+        Assert.Null(model.DnsRecords);
+        Assert.False(model.RawData.ContainsKey("dnsRecords"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Item
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new Item
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+
+            // Null should be interpreted as omitted for these properties
+            DnsRecords = null,
+        };
+
+        Assert.Null(model.DnsRecords);
+        Assert.False(model.RawData.ContainsKey("dnsRecords"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Item
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+
+            // Null should be interpreted as omitted for these properties
+            DnsRecords = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Item
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = ItemDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        Item copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ItemDnsRecordTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ItemDnsRecord
+        {
+            Name = "name",
+            Purpose = ItemDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string expectedName = "name";
+        ApiEnum<string, ItemDnsRecordPurpose> expectedPurpose = ItemDnsRecordPurpose.Dkim;
+        bool expectedRequired = true;
+        string expectedType = "CNAME";
+        string expectedValue = "value";
+        long expectedPriority = 0;
+
+        Assert.Equal(expectedName, model.Name);
+        Assert.Equal(expectedPurpose, model.Purpose);
+        Assert.Equal(expectedRequired, model.Required);
+        Assert.Equal(expectedType, model.Type);
+        Assert.Equal(expectedValue, model.Value);
+        Assert.Equal(expectedPriority, model.Priority);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ItemDnsRecord
+        {
+            Name = "name",
+            Purpose = ItemDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ItemDnsRecord>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ItemDnsRecord
+        {
+            Name = "name",
+            Purpose = ItemDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ItemDnsRecord>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedName = "name";
+        ApiEnum<string, ItemDnsRecordPurpose> expectedPurpose = ItemDnsRecordPurpose.Dkim;
+        bool expectedRequired = true;
+        string expectedType = "CNAME";
+        string expectedValue = "value";
+        long expectedPriority = 0;
+
+        Assert.Equal(expectedName, deserialized.Name);
+        Assert.Equal(expectedPurpose, deserialized.Purpose);
+        Assert.Equal(expectedRequired, deserialized.Required);
+        Assert.Equal(expectedType, deserialized.Type);
+        Assert.Equal(expectedValue, deserialized.Value);
+        Assert.Equal(expectedPriority, deserialized.Priority);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ItemDnsRecord
+        {
+            Name = "name",
+            Purpose = ItemDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new ItemDnsRecord
+        {
+            Name = "name",
+            Purpose = ItemDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+        };
+
+        Assert.Null(model.Priority);
+        Assert.False(model.RawData.ContainsKey("priority"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new ItemDnsRecord
+        {
+            Name = "name",
+            Purpose = ItemDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new ItemDnsRecord
+        {
+            Name = "name",
+            Purpose = ItemDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+
+            // Null should be interpreted as omitted for these properties
+            Priority = null,
+        };
+
+        Assert.Null(model.Priority);
+        Assert.False(model.RawData.ContainsKey("priority"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new ItemDnsRecord
+        {
+            Name = "name",
+            Purpose = ItemDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+
+            // Null should be interpreted as omitted for these properties
+            Priority = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ItemDnsRecord
+        {
+            Name = "name",
+            Purpose = ItemDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        ItemDnsRecord copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ItemDnsRecordPurposeTest : TestBase
+{
+    [Theory]
+    [InlineData(ItemDnsRecordPurpose.Dkim)]
+    [InlineData(ItemDnsRecordPurpose.Spf)]
+    [InlineData(ItemDnsRecordPurpose.Dmarc)]
+    [InlineData(ItemDnsRecordPurpose.MailFrom)]
+    public void Validation_Works(ItemDnsRecordPurpose rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, ItemDnsRecordPurpose> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, ItemDnsRecordPurpose>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(ItemDnsRecordPurpose.Dkim)]
+    [InlineData(ItemDnsRecordPurpose.Spf)]
+    [InlineData(ItemDnsRecordPurpose.Dmarc)]
+    [InlineData(ItemDnsRecordPurpose.MailFrom)]
+    public void SerializationRoundtrip_Works(ItemDnsRecordPurpose rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, ItemDnsRecordPurpose> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, ItemDnsRecordPurpose>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, ItemDnsRecordPurpose>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, ItemDnsRecordPurpose>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/EmailDomains/EmailDomainRetrieveParamsTest.cs b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainRetrieveParamsTest.cs
new file mode 100644
index 0000000..7aa8306
--- /dev/null
+++ b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainRetrieveParamsTest.cs
@@ -0,0 +1,39 @@
+using System;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Tests.Models.EmailDomains;
+
+public class EmailDomainRetrieveParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new EmailDomainRetrieveParams { DomainID = "domainId" };
+
+        string expectedDomainID = "domainId";
+
+        Assert.Equal(expectedDomainID, parameters.DomainID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        EmailDomainRetrieveParams parameters = new() { DomainID = "domainId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/email-domains/domainId"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new EmailDomainRetrieveParams { DomainID = "domainId" };
+
+        EmailDomainRetrieveParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/EmailDomains/EmailDomainRetrieveResponseTest.cs b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainRetrieveResponseTest.cs
new file mode 100644
index 0000000..2c50bd6
--- /dev/null
+++ b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainRetrieveResponseTest.cs
@@ -0,0 +1,726 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Tests.Models.EmailDomains;
+
+public class EmailDomainRetrieveResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new EmailDomainRetrieveResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        EmailDomainRetrieveResponseDomain expectedDomain = new()
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        Assert.Equal(expectedDomain, model.Domain);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new EmailDomainRetrieveResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainRetrieveResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new EmailDomainRetrieveResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainRetrieveResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        EmailDomainRetrieveResponseDomain expectedDomain = new()
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        Assert.Equal(expectedDomain, deserialized.Domain);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new EmailDomainRetrieveResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new EmailDomainRetrieveResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        EmailDomainRetrieveResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class EmailDomainRetrieveResponseDomainTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string expectedID = "emd_abc123";
+        string expectedDkimStatus = "not_started";
+        string expectedDomain = "example.com";
+        string expectedStatus = "pending";
+        List<EmailDomainRetrieveResponseDomainDnsRecord> expectedDnsRecords =
+        [
+            new()
+            {
+                Name = "name",
+                Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                Required = true,
+                Type = "CNAME",
+                Value = "value",
+                Priority = 0,
+            },
+        ];
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedDkimStatus, model.DkimStatus);
+        Assert.Equal(expectedDomain, model.Domain);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.NotNull(model.DnsRecords);
+        Assert.Equal(expectedDnsRecords.Count, model.DnsRecords.Count);
+        for (int i = 0; i < expectedDnsRecords.Count; i++)
+        {
+            Assert.Equal(expectedDnsRecords[i], model.DnsRecords[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainRetrieveResponseDomain>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainRetrieveResponseDomain>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "emd_abc123";
+        string expectedDkimStatus = "not_started";
+        string expectedDomain = "example.com";
+        string expectedStatus = "pending";
+        List<EmailDomainRetrieveResponseDomainDnsRecord> expectedDnsRecords =
+        [
+            new()
+            {
+                Name = "name",
+                Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                Required = true,
+                Type = "CNAME",
+                Value = "value",
+                Priority = 0,
+            },
+        ];
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedDkimStatus, deserialized.DkimStatus);
+        Assert.Equal(expectedDomain, deserialized.Domain);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.NotNull(deserialized.DnsRecords);
+        Assert.Equal(expectedDnsRecords.Count, deserialized.DnsRecords.Count);
+        for (int i = 0; i < expectedDnsRecords.Count; i++)
+        {
+            Assert.Equal(expectedDnsRecords[i], deserialized.DnsRecords[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+        };
+
+        Assert.Null(model.DnsRecords);
+        Assert.False(model.RawData.ContainsKey("dnsRecords"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+
+            // Null should be interpreted as omitted for these properties
+            DnsRecords = null,
+        };
+
+        Assert.Null(model.DnsRecords);
+        Assert.False(model.RawData.ContainsKey("dnsRecords"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+
+            // Null should be interpreted as omitted for these properties
+            DnsRecords = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        EmailDomainRetrieveResponseDomain copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class EmailDomainRetrieveResponseDomainDnsRecordTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string expectedName = "name";
+        ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose> expectedPurpose =
+            EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim;
+        bool expectedRequired = true;
+        string expectedType = "CNAME";
+        string expectedValue = "value";
+        long expectedPriority = 0;
+
+        Assert.Equal(expectedName, model.Name);
+        Assert.Equal(expectedPurpose, model.Purpose);
+        Assert.Equal(expectedRequired, model.Required);
+        Assert.Equal(expectedType, model.Type);
+        Assert.Equal(expectedValue, model.Value);
+        Assert.Equal(expectedPriority, model.Priority);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainRetrieveResponseDomainDnsRecord>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainRetrieveResponseDomainDnsRecord>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedName = "name";
+        ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose> expectedPurpose =
+            EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim;
+        bool expectedRequired = true;
+        string expectedType = "CNAME";
+        string expectedValue = "value";
+        long expectedPriority = 0;
+
+        Assert.Equal(expectedName, deserialized.Name);
+        Assert.Equal(expectedPurpose, deserialized.Purpose);
+        Assert.Equal(expectedRequired, deserialized.Required);
+        Assert.Equal(expectedType, deserialized.Type);
+        Assert.Equal(expectedValue, deserialized.Value);
+        Assert.Equal(expectedPriority, deserialized.Priority);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+        };
+
+        Assert.Null(model.Priority);
+        Assert.False(model.RawData.ContainsKey("priority"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+
+            // Null should be interpreted as omitted for these properties
+            Priority = null,
+        };
+
+        Assert.Null(model.Priority);
+        Assert.False(model.RawData.ContainsKey("priority"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+
+            // Null should be interpreted as omitted for these properties
+            Priority = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new EmailDomainRetrieveResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        EmailDomainRetrieveResponseDomainDnsRecord copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class EmailDomainRetrieveResponseDomainDnsRecordPurposeTest : TestBase
+{
+    [Theory]
+    [InlineData(EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim)]
+    [InlineData(EmailDomainRetrieveResponseDomainDnsRecordPurpose.Spf)]
+    [InlineData(EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dmarc)]
+    [InlineData(EmailDomainRetrieveResponseDomainDnsRecordPurpose.MailFrom)]
+    public void Validation_Works(EmailDomainRetrieveResponseDomainDnsRecordPurpose rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim)]
+    [InlineData(EmailDomainRetrieveResponseDomainDnsRecordPurpose.Spf)]
+    [InlineData(EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dmarc)]
+    [InlineData(EmailDomainRetrieveResponseDomainDnsRecordPurpose.MailFrom)]
+    public void SerializationRoundtrip_Works(
+        EmailDomainRetrieveResponseDomainDnsRecordPurpose rawValue
+    )
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/EmailDomains/EmailDomainVerifyParamsTest.cs b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainVerifyParamsTest.cs
new file mode 100644
index 0000000..8ba8cce
--- /dev/null
+++ b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainVerifyParamsTest.cs
@@ -0,0 +1,42 @@
+using System;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Tests.Models.EmailDomains;
+
+public class EmailDomainVerifyParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new EmailDomainVerifyParams { DomainID = "domainId" };
+
+        string expectedDomainID = "domainId";
+
+        Assert.Equal(expectedDomainID, parameters.DomainID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        EmailDomainVerifyParams parameters = new() { DomainID = "domainId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/email-domains/domainId/verify"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new EmailDomainVerifyParams { DomainID = "domainId" };
+
+        EmailDomainVerifyParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/EmailDomains/EmailDomainVerifyResponseTest.cs b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainVerifyResponseTest.cs
new file mode 100644
index 0000000..90d91b9
--- /dev/null
+++ b/src/Zavudev.Tests/Models/EmailDomains/EmailDomainVerifyResponseTest.cs
@@ -0,0 +1,726 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Tests.Models.EmailDomains;
+
+public class EmailDomainVerifyResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new EmailDomainVerifyResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        EmailDomainVerifyResponseDomain expectedDomain = new()
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        Assert.Equal(expectedDomain, model.Domain);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new EmailDomainVerifyResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainVerifyResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new EmailDomainVerifyResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainVerifyResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        EmailDomainVerifyResponseDomain expectedDomain = new()
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        Assert.Equal(expectedDomain, deserialized.Domain);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new EmailDomainVerifyResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new EmailDomainVerifyResponse
+        {
+            Domain = new()
+            {
+                ID = "emd_abc123",
+                DkimStatus = "not_started",
+                Domain = "example.com",
+                Status = "pending",
+                DnsRecords =
+                [
+                    new()
+                    {
+                        Name = "name",
+                        Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                        Required = true,
+                        Type = "CNAME",
+                        Value = "value",
+                        Priority = 0,
+                    },
+                ],
+            },
+        };
+
+        EmailDomainVerifyResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class EmailDomainVerifyResponseDomainTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string expectedID = "emd_abc123";
+        string expectedDkimStatus = "not_started";
+        string expectedDomain = "example.com";
+        string expectedStatus = "pending";
+        List<EmailDomainVerifyResponseDomainDnsRecord> expectedDnsRecords =
+        [
+            new()
+            {
+                Name = "name",
+                Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                Required = true,
+                Type = "CNAME",
+                Value = "value",
+                Priority = 0,
+            },
+        ];
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedDkimStatus, model.DkimStatus);
+        Assert.Equal(expectedDomain, model.Domain);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.NotNull(model.DnsRecords);
+        Assert.Equal(expectedDnsRecords.Count, model.DnsRecords.Count);
+        for (int i = 0; i < expectedDnsRecords.Count; i++)
+        {
+            Assert.Equal(expectedDnsRecords[i], model.DnsRecords[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainVerifyResponseDomain>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainVerifyResponseDomain>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "emd_abc123";
+        string expectedDkimStatus = "not_started";
+        string expectedDomain = "example.com";
+        string expectedStatus = "pending";
+        List<EmailDomainVerifyResponseDomainDnsRecord> expectedDnsRecords =
+        [
+            new()
+            {
+                Name = "name",
+                Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                Required = true,
+                Type = "CNAME",
+                Value = "value",
+                Priority = 0,
+            },
+        ];
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedDkimStatus, deserialized.DkimStatus);
+        Assert.Equal(expectedDomain, deserialized.Domain);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.NotNull(deserialized.DnsRecords);
+        Assert.Equal(expectedDnsRecords.Count, deserialized.DnsRecords.Count);
+        for (int i = 0; i < expectedDnsRecords.Count; i++)
+        {
+            Assert.Equal(expectedDnsRecords[i], deserialized.DnsRecords[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+        };
+
+        Assert.Null(model.DnsRecords);
+        Assert.False(model.RawData.ContainsKey("dnsRecords"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+
+            // Null should be interpreted as omitted for these properties
+            DnsRecords = null,
+        };
+
+        Assert.Null(model.DnsRecords);
+        Assert.False(model.RawData.ContainsKey("dnsRecords"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+
+            // Null should be interpreted as omitted for these properties
+            DnsRecords = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomain
+        {
+            ID = "emd_abc123",
+            DkimStatus = "not_started",
+            Domain = "example.com",
+            Status = "pending",
+            DnsRecords =
+            [
+                new()
+                {
+                    Name = "name",
+                    Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+                    Required = true,
+                    Type = "CNAME",
+                    Value = "value",
+                    Priority = 0,
+                },
+            ],
+        };
+
+        EmailDomainVerifyResponseDomain copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class EmailDomainVerifyResponseDomainDnsRecordTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string expectedName = "name";
+        ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose> expectedPurpose =
+            EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim;
+        bool expectedRequired = true;
+        string expectedType = "CNAME";
+        string expectedValue = "value";
+        long expectedPriority = 0;
+
+        Assert.Equal(expectedName, model.Name);
+        Assert.Equal(expectedPurpose, model.Purpose);
+        Assert.Equal(expectedRequired, model.Required);
+        Assert.Equal(expectedType, model.Type);
+        Assert.Equal(expectedValue, model.Value);
+        Assert.Equal(expectedPriority, model.Priority);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainVerifyResponseDomainDnsRecord>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<EmailDomainVerifyResponseDomainDnsRecord>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedName = "name";
+        ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose> expectedPurpose =
+            EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim;
+        bool expectedRequired = true;
+        string expectedType = "CNAME";
+        string expectedValue = "value";
+        long expectedPriority = 0;
+
+        Assert.Equal(expectedName, deserialized.Name);
+        Assert.Equal(expectedPurpose, deserialized.Purpose);
+        Assert.Equal(expectedRequired, deserialized.Required);
+        Assert.Equal(expectedType, deserialized.Type);
+        Assert.Equal(expectedValue, deserialized.Value);
+        Assert.Equal(expectedPriority, deserialized.Priority);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+        };
+
+        Assert.Null(model.Priority);
+        Assert.False(model.RawData.ContainsKey("priority"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+
+            // Null should be interpreted as omitted for these properties
+            Priority = null,
+        };
+
+        Assert.Null(model.Priority);
+        Assert.False(model.RawData.ContainsKey("priority"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+
+            // Null should be interpreted as omitted for these properties
+            Priority = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new EmailDomainVerifyResponseDomainDnsRecord
+        {
+            Name = "name",
+            Purpose = EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            Required = true,
+            Type = "CNAME",
+            Value = "value",
+            Priority = 0,
+        };
+
+        EmailDomainVerifyResponseDomainDnsRecord copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class EmailDomainVerifyResponseDomainDnsRecordPurposeTest : TestBase
+{
+    [Theory]
+    [InlineData(EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim)]
+    [InlineData(EmailDomainVerifyResponseDomainDnsRecordPurpose.Spf)]
+    [InlineData(EmailDomainVerifyResponseDomainDnsRecordPurpose.Dmarc)]
+    [InlineData(EmailDomainVerifyResponseDomainDnsRecordPurpose.MailFrom)]
+    public void Validation_Works(EmailDomainVerifyResponseDomainDnsRecordPurpose rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim)]
+    [InlineData(EmailDomainVerifyResponseDomainDnsRecordPurpose.Spf)]
+    [InlineData(EmailDomainVerifyResponseDomainDnsRecordPurpose.Dmarc)]
+    [InlineData(EmailDomainVerifyResponseDomainDnsRecordPurpose.MailFrom)]
+    public void SerializationRoundtrip_Works(
+        EmailDomainVerifyResponseDomainDnsRecordPurpose rawValue
+    )
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionCreateParamsTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionCreateParamsTest.cs
index e34773e..8ecbd83 100644
--- a/src/Zavudev.Tests/Models/Functions/FunctionCreateParamsTest.cs
+++ b/src/Zavudev.Tests/Models/Functions/FunctionCreateParamsTest.cs
@@ -18,6 +18,18 @@ public void FieldRoundtrip_Works()
             Slug = "order-bot",
             Dependencies = new Dictionary<string, string>() { { "openai", "^4.20.0" } },
             Description = "Replies to order status questions on WhatsApp.",
+            Entrypoint = "index.ts",
+            Files = new Dictionary<string, string>()
+            {
+                {
+                    "index.ts",
+                    "import { formatOrder } from './lib/orders';\n\nexport default async function handler(event) {\n  return { statusCode: 200, body: formatOrder(event) };\n}\n"
+                },
+                {
+                    "lib/orders.ts",
+                    "export function formatOrder(event) {\n  return JSON.stringify(event);\n}\n"
+                },
+            },
             HttpEnabled = true,
             MemoryMB = MemoryMB.V128,
             Runtime = Runtime.Nodejs24,
@@ -30,6 +42,18 @@ public void FieldRoundtrip_Works()
         string expectedSlug = "order-bot";
         Dictionary<string, string> expectedDependencies = new() { { "openai", "^4.20.0" } };
         string expectedDescription = "Replies to order status questions on WhatsApp.";
+        string expectedEntrypoint = "index.ts";
+        Dictionary<string, string> expectedFiles = new()
+        {
+            {
+                "index.ts",
+                "import { formatOrder } from './lib/orders';\n\nexport default async function handler(event) {\n  return { statusCode: 200, body: formatOrder(event) };\n}\n"
+            },
+            {
+                "lib/orders.ts",
+                "export function formatOrder(event) {\n  return JSON.stringify(event);\n}\n"
+            },
+        };
         bool expectedHttpEnabled = true;
         ApiEnum<long, MemoryMB> expectedMemoryMB = MemoryMB.V128;
         ApiEnum<string, Runtime> expectedRuntime = Runtime.Nodejs24;
@@ -48,6 +72,15 @@ public void FieldRoundtrip_Works()
             Assert.Equal(value, parameters.Dependencies[item.Key]);
         }
         Assert.Equal(expectedDescription, parameters.Description);
+        Assert.Equal(expectedEntrypoint, parameters.Entrypoint);
+        Assert.NotNull(parameters.Files);
+        Assert.Equal(expectedFiles.Count, parameters.Files.Count);
+        foreach (var item in expectedFiles)
+        {
+            Assert.True(parameters.Files.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, parameters.Files[item.Key]);
+        }
         Assert.Equal(expectedHttpEnabled, parameters.HttpEnabled);
         Assert.Equal(expectedMemoryMB, parameters.MemoryMB);
         Assert.Equal(expectedRuntime, parameters.Runtime);
@@ -64,6 +97,10 @@ public void OptionalNonNullableParamsUnsetAreNotSet_Works()
         Assert.False(parameters.RawBodyData.ContainsKey("dependencies"));
         Assert.Null(parameters.Description);
         Assert.False(parameters.RawBodyData.ContainsKey("description"));
+        Assert.Null(parameters.Entrypoint);
+        Assert.False(parameters.RawBodyData.ContainsKey("entrypoint"));
+        Assert.Null(parameters.Files);
+        Assert.False(parameters.RawBodyData.ContainsKey("files"));
         Assert.Null(parameters.HttpEnabled);
         Assert.False(parameters.RawBodyData.ContainsKey("httpEnabled"));
         Assert.Null(parameters.MemoryMB);
@@ -87,6 +124,8 @@ public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
             // Null should be interpreted as omitted for these properties
             Dependencies = null,
             Description = null,
+            Entrypoint = null,
+            Files = null,
             HttpEnabled = null,
             MemoryMB = null,
             Runtime = null,
@@ -98,6 +137,10 @@ public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
         Assert.False(parameters.RawBodyData.ContainsKey("dependencies"));
         Assert.Null(parameters.Description);
         Assert.False(parameters.RawBodyData.ContainsKey("description"));
+        Assert.Null(parameters.Entrypoint);
+        Assert.False(parameters.RawBodyData.ContainsKey("entrypoint"));
+        Assert.Null(parameters.Files);
+        Assert.False(parameters.RawBodyData.ContainsKey("files"));
         Assert.Null(parameters.HttpEnabled);
         Assert.False(parameters.RawBodyData.ContainsKey("httpEnabled"));
         Assert.Null(parameters.MemoryMB);
@@ -129,6 +172,18 @@ public void CopyConstructor_Works()
             Slug = "order-bot",
             Dependencies = new Dictionary<string, string>() { { "openai", "^4.20.0" } },
             Description = "Replies to order status questions on WhatsApp.",
+            Entrypoint = "index.ts",
+            Files = new Dictionary<string, string>()
+            {
+                {
+                    "index.ts",
+                    "import { formatOrder } from './lib/orders';\n\nexport default async function handler(event) {\n  return { statusCode: 200, body: formatOrder(event) };\n}\n"
+                },
+                {
+                    "lib/orders.ts",
+                    "export function formatOrder(event) {\n  return JSON.stringify(event);\n}\n"
+                },
+            },
             HttpEnabled = true,
             MemoryMB = MemoryMB.V128,
             Runtime = Runtime.Nodejs24,
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionDeployParamsTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionDeployParamsTest.cs
index f88734c..6fb595b 100644
--- a/src/Zavudev.Tests/Models/Functions/FunctionDeployParamsTest.cs
+++ b/src/Zavudev.Tests/Models/Functions/FunctionDeployParamsTest.cs
@@ -13,11 +13,35 @@ public void FieldRoundtrip_Works()
         {
             FunctionID = "functionId",
             Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Entrypoint = "index.ts",
+            Files = new Dictionary<string, string>()
+            {
+                {
+                    "index.ts",
+                    "import { formatOrder } from './lib/orders';\n\nexport default async function handler(event) {\n  return { statusCode: 200, body: formatOrder(event) };\n}\n"
+                },
+                {
+                    "lib/orders.ts",
+                    "export function formatOrder(event) {\n  return JSON.stringify(event);\n}\n"
+                },
+            },
             SourceCode = "sourceCode",
         };
 
         string expectedFunctionID = "functionId";
         Dictionary<string, string> expectedDependencies = new() { { "foo", "string" } };
+        string expectedEntrypoint = "index.ts";
+        Dictionary<string, string> expectedFiles = new()
+        {
+            {
+                "index.ts",
+                "import { formatOrder } from './lib/orders';\n\nexport default async function handler(event) {\n  return { statusCode: 200, body: formatOrder(event) };\n}\n"
+            },
+            {
+                "lib/orders.ts",
+                "export function formatOrder(event) {\n  return JSON.stringify(event);\n}\n"
+            },
+        };
         string expectedSourceCode = "sourceCode";
 
         Assert.Equal(expectedFunctionID, parameters.FunctionID);
@@ -29,6 +53,15 @@ public void FieldRoundtrip_Works()
 
             Assert.Equal(value, parameters.Dependencies[item.Key]);
         }
+        Assert.Equal(expectedEntrypoint, parameters.Entrypoint);
+        Assert.NotNull(parameters.Files);
+        Assert.Equal(expectedFiles.Count, parameters.Files.Count);
+        foreach (var item in expectedFiles)
+        {
+            Assert.True(parameters.Files.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, parameters.Files[item.Key]);
+        }
         Assert.Equal(expectedSourceCode, parameters.SourceCode);
     }
 
@@ -39,6 +72,10 @@ public void OptionalNonNullableParamsUnsetAreNotSet_Works()
 
         Assert.Null(parameters.Dependencies);
         Assert.False(parameters.RawBodyData.ContainsKey("dependencies"));
+        Assert.Null(parameters.Entrypoint);
+        Assert.False(parameters.RawBodyData.ContainsKey("entrypoint"));
+        Assert.Null(parameters.Files);
+        Assert.False(parameters.RawBodyData.ContainsKey("files"));
         Assert.Null(parameters.SourceCode);
         Assert.False(parameters.RawBodyData.ContainsKey("sourceCode"));
     }
@@ -52,11 +89,17 @@ public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
 
             // Null should be interpreted as omitted for these properties
             Dependencies = null,
+            Entrypoint = null,
+            Files = null,
             SourceCode = null,
         };
 
         Assert.Null(parameters.Dependencies);
         Assert.False(parameters.RawBodyData.ContainsKey("dependencies"));
+        Assert.Null(parameters.Entrypoint);
+        Assert.False(parameters.RawBodyData.ContainsKey("entrypoint"));
+        Assert.Null(parameters.Files);
+        Assert.False(parameters.RawBodyData.ContainsKey("files"));
         Assert.Null(parameters.SourceCode);
         Assert.False(parameters.RawBodyData.ContainsKey("sourceCode"));
     }
@@ -80,6 +123,18 @@ public void CopyConstructor_Works()
         {
             FunctionID = "functionId",
             Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Entrypoint = "index.ts",
+            Files = new Dictionary<string, string>()
+            {
+                {
+                    "index.ts",
+                    "import { formatOrder } from './lib/orders';\n\nexport default async function handler(event) {\n  return { statusCode: 200, body: formatOrder(event) };\n}\n"
+                },
+                {
+                    "lib/orders.ts",
+                    "export function formatOrder(event) {\n  return JSON.stringify(event);\n}\n"
+                },
+            },
             SourceCode = "sourceCode",
         };
 
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionDeployResponseTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionDeployResponseTest.cs
index bbfef9b..1ad84eb 100644
--- a/src/Zavudev.Tests/Models/Functions/FunctionDeployResponseTest.cs
+++ b/src/Zavudev.Tests/Models/Functions/FunctionDeployResponseTest.cs
@@ -20,6 +20,7 @@ public void FieldRoundtrip_Works()
                 FunctionID = "functionId",
                 Status = DeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -34,6 +35,7 @@ public void FieldRoundtrip_Works()
             FunctionID = "functionId",
             Status = DeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -55,6 +57,7 @@ public void SerializationRoundtrip_Works()
                 FunctionID = "functionId",
                 Status = DeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -83,6 +86,7 @@ public void FieldRoundtripThroughSerialization_Works()
                 FunctionID = "functionId",
                 Status = DeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -104,6 +108,7 @@ public void FieldRoundtripThroughSerialization_Works()
             FunctionID = "functionId",
             Status = DeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -125,6 +130,7 @@ public void Validation_Works()
                 FunctionID = "functionId",
                 Status = DeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -147,6 +153,7 @@ public void CopyConstructor_Works()
                 FunctionID = "functionId",
                 Status = DeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -172,6 +179,7 @@ public void FieldRoundtrip_Works()
             FunctionID = "functionId",
             Status = DeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -183,6 +191,7 @@ public void FieldRoundtrip_Works()
         string expectedFunctionID = "functionId";
         ApiEnum<string, DeploymentStatus> expectedStatus = DeploymentStatus.Pending;
         long expectedVersion = 0;
+        string expectedBuildLogs = "buildLogs";
         long expectedBundleBytes = 0;
         DateTimeOffset expectedDeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
         string expectedErrorMessage = "errorMessage";
@@ -193,6 +202,7 @@ public void FieldRoundtrip_Works()
         Assert.Equal(expectedFunctionID, model.FunctionID);
         Assert.Equal(expectedStatus, model.Status);
         Assert.Equal(expectedVersion, model.Version);
+        Assert.Equal(expectedBuildLogs, model.BuildLogs);
         Assert.Equal(expectedBundleBytes, model.BundleBytes);
         Assert.Equal(expectedDeployedAt, model.DeployedAt);
         Assert.Equal(expectedErrorMessage, model.ErrorMessage);
@@ -209,6 +219,7 @@ public void SerializationRoundtrip_Works()
             FunctionID = "functionId",
             Status = DeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -234,6 +245,7 @@ public void FieldRoundtripThroughSerialization_Works()
             FunctionID = "functionId",
             Status = DeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -252,6 +264,7 @@ public void FieldRoundtripThroughSerialization_Works()
         string expectedFunctionID = "functionId";
         ApiEnum<string, DeploymentStatus> expectedStatus = DeploymentStatus.Pending;
         long expectedVersion = 0;
+        string expectedBuildLogs = "buildLogs";
         long expectedBundleBytes = 0;
         DateTimeOffset expectedDeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
         string expectedErrorMessage = "errorMessage";
@@ -262,6 +275,7 @@ public void FieldRoundtripThroughSerialization_Works()
         Assert.Equal(expectedFunctionID, deserialized.FunctionID);
         Assert.Equal(expectedStatus, deserialized.Status);
         Assert.Equal(expectedVersion, deserialized.Version);
+        Assert.Equal(expectedBuildLogs, deserialized.BuildLogs);
         Assert.Equal(expectedBundleBytes, deserialized.BundleBytes);
         Assert.Equal(expectedDeployedAt, deserialized.DeployedAt);
         Assert.Equal(expectedErrorMessage, deserialized.ErrorMessage);
@@ -278,6 +292,7 @@ public void Validation_Works()
             FunctionID = "functionId",
             Status = DeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -299,6 +314,8 @@ public void OptionalNullablePropertiesUnsetAreNotSet_Works()
             Version = 0,
         };
 
+        Assert.Null(model.BuildLogs);
+        Assert.False(model.RawData.ContainsKey("buildLogs"));
         Assert.Null(model.BundleBytes);
         Assert.False(model.RawData.ContainsKey("bundleBytes"));
         Assert.Null(model.DeployedAt);
@@ -335,12 +352,15 @@ public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
             Status = DeploymentStatus.Pending,
             Version = 0,
 
+            BuildLogs = null,
             BundleBytes = null,
             DeployedAt = null,
             ErrorMessage = null,
             SourceCodeBytes = null,
         };
 
+        Assert.Null(model.BuildLogs);
+        Assert.True(model.RawData.ContainsKey("buildLogs"));
         Assert.Null(model.BundleBytes);
         Assert.True(model.RawData.ContainsKey("bundleBytes"));
         Assert.Null(model.DeployedAt);
@@ -362,6 +382,7 @@ public void OptionalNullablePropertiesSetToNullValidation_Works()
             Status = DeploymentStatus.Pending,
             Version = 0,
 
+            BuildLogs = null,
             BundleBytes = null,
             DeployedAt = null,
             ErrorMessage = null,
@@ -381,6 +402,7 @@ public void CopyConstructor_Works()
             FunctionID = "functionId",
             Status = DeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionGetDeploymentResponseTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionGetDeploymentResponseTest.cs
index c281934..e65354b 100644
--- a/src/Zavudev.Tests/Models/Functions/FunctionGetDeploymentResponseTest.cs
+++ b/src/Zavudev.Tests/Models/Functions/FunctionGetDeploymentResponseTest.cs
@@ -20,6 +20,7 @@ public void FieldRoundtrip_Works()
                 FunctionID = "functionId",
                 Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -34,6 +35,7 @@ public void FieldRoundtrip_Works()
             FunctionID = "functionId",
             Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -55,6 +57,7 @@ public void SerializationRoundtrip_Works()
                 FunctionID = "functionId",
                 Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -83,6 +86,7 @@ public void FieldRoundtripThroughSerialization_Works()
                 FunctionID = "functionId",
                 Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -104,6 +108,7 @@ public void FieldRoundtripThroughSerialization_Works()
             FunctionID = "functionId",
             Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -125,6 +130,7 @@ public void Validation_Works()
                 FunctionID = "functionId",
                 Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -147,6 +153,7 @@ public void CopyConstructor_Works()
                 FunctionID = "functionId",
                 Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
                 Version = 0,
+                BuildLogs = "buildLogs",
                 BundleBytes = 0,
                 DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
                 ErrorMessage = "errorMessage",
@@ -172,6 +179,7 @@ public void FieldRoundtrip_Works()
             FunctionID = "functionId",
             Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -184,6 +192,7 @@ public void FieldRoundtrip_Works()
         ApiEnum<string, FunctionGetDeploymentResponseDeploymentStatus> expectedStatus =
             FunctionGetDeploymentResponseDeploymentStatus.Pending;
         long expectedVersion = 0;
+        string expectedBuildLogs = "buildLogs";
         long expectedBundleBytes = 0;
         DateTimeOffset expectedDeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
         string expectedErrorMessage = "errorMessage";
@@ -194,6 +203,7 @@ public void FieldRoundtrip_Works()
         Assert.Equal(expectedFunctionID, model.FunctionID);
         Assert.Equal(expectedStatus, model.Status);
         Assert.Equal(expectedVersion, model.Version);
+        Assert.Equal(expectedBuildLogs, model.BuildLogs);
         Assert.Equal(expectedBundleBytes, model.BundleBytes);
         Assert.Equal(expectedDeployedAt, model.DeployedAt);
         Assert.Equal(expectedErrorMessage, model.ErrorMessage);
@@ -210,6 +220,7 @@ public void SerializationRoundtrip_Works()
             FunctionID = "functionId",
             Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -235,6 +246,7 @@ public void FieldRoundtripThroughSerialization_Works()
             FunctionID = "functionId",
             Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -254,6 +266,7 @@ public void FieldRoundtripThroughSerialization_Works()
         ApiEnum<string, FunctionGetDeploymentResponseDeploymentStatus> expectedStatus =
             FunctionGetDeploymentResponseDeploymentStatus.Pending;
         long expectedVersion = 0;
+        string expectedBuildLogs = "buildLogs";
         long expectedBundleBytes = 0;
         DateTimeOffset expectedDeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
         string expectedErrorMessage = "errorMessage";
@@ -264,6 +277,7 @@ public void FieldRoundtripThroughSerialization_Works()
         Assert.Equal(expectedFunctionID, deserialized.FunctionID);
         Assert.Equal(expectedStatus, deserialized.Status);
         Assert.Equal(expectedVersion, deserialized.Version);
+        Assert.Equal(expectedBuildLogs, deserialized.BuildLogs);
         Assert.Equal(expectedBundleBytes, deserialized.BundleBytes);
         Assert.Equal(expectedDeployedAt, deserialized.DeployedAt);
         Assert.Equal(expectedErrorMessage, deserialized.ErrorMessage);
@@ -280,6 +294,7 @@ public void Validation_Works()
             FunctionID = "functionId",
             Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
@@ -301,6 +316,8 @@ public void OptionalNullablePropertiesUnsetAreNotSet_Works()
             Version = 0,
         };
 
+        Assert.Null(model.BuildLogs);
+        Assert.False(model.RawData.ContainsKey("buildLogs"));
         Assert.Null(model.BundleBytes);
         Assert.False(model.RawData.ContainsKey("bundleBytes"));
         Assert.Null(model.DeployedAt);
@@ -337,12 +354,15 @@ public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
             Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
             Version = 0,
 
+            BuildLogs = null,
             BundleBytes = null,
             DeployedAt = null,
             ErrorMessage = null,
             SourceCodeBytes = null,
         };
 
+        Assert.Null(model.BuildLogs);
+        Assert.True(model.RawData.ContainsKey("buildLogs"));
         Assert.Null(model.BundleBytes);
         Assert.True(model.RawData.ContainsKey("bundleBytes"));
         Assert.Null(model.DeployedAt);
@@ -364,6 +384,7 @@ public void OptionalNullablePropertiesSetToNullValidation_Works()
             Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
             Version = 0,
 
+            BuildLogs = null,
             BundleBytes = null,
             DeployedAt = null,
             ErrorMessage = null,
@@ -383,6 +404,7 @@ public void CopyConstructor_Works()
             FunctionID = "functionId",
             Status = FunctionGetDeploymentResponseDeploymentStatus.Pending,
             Version = 0,
+            BuildLogs = "buildLogs",
             BundleBytes = 0,
             DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
             ErrorMessage = "errorMessage",
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionListDeploymentsParamsTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionListDeploymentsParamsTest.cs
new file mode 100644
index 0000000..3bc749d
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/FunctionListDeploymentsParamsTest.cs
@@ -0,0 +1,76 @@
+using System;
+using Zavudev.Models.Functions;
+
+namespace Zavudev.Tests.Models.Functions;
+
+public class FunctionListDeploymentsParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new FunctionListDeploymentsParams
+        {
+            FunctionID = "functionId",
+            Limit = 100,
+        };
+
+        string expectedFunctionID = "functionId";
+        long expectedLimit = 100;
+
+        Assert.Equal(expectedFunctionID, parameters.FunctionID);
+        Assert.Equal(expectedLimit, parameters.Limit);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new FunctionListDeploymentsParams { FunctionID = "functionId" };
+
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new FunctionListDeploymentsParams
+        {
+            FunctionID = "functionId",
+
+            // Null should be interpreted as omitted for these properties
+            Limit = null,
+        };
+
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        FunctionListDeploymentsParams parameters = new() { FunctionID = "functionId", Limit = 100 };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/functions/functionId/deployments?limit=100"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new FunctionListDeploymentsParams
+        {
+            FunctionID = "functionId",
+            Limit = 100,
+        };
+
+        FunctionListDeploymentsParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionListDeploymentsResponseTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionListDeploymentsResponseTest.cs
new file mode 100644
index 0000000..b5f4f0b
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/FunctionListDeploymentsResponseTest.cs
@@ -0,0 +1,554 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Functions;
+
+namespace Zavudev.Tests.Models.Functions;
+
+public class FunctionListDeploymentsResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new FunctionListDeploymentsResponse
+        {
+            Deployments =
+            [
+                new()
+                {
+                    ID = "id",
+                    BundleSizeBytes = 0,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ErrorMessage = "errorMessage",
+                    IsActive = true,
+                    Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+                    Version = 0,
+                },
+            ],
+        };
+
+        List<FunctionListDeploymentsResponseDeployment> expectedDeployments =
+        [
+            new()
+            {
+                ID = "id",
+                BundleSizeBytes = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                IsActive = true,
+                Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+                Version = 0,
+            },
+        ];
+
+        Assert.Equal(expectedDeployments.Count, model.Deployments.Count);
+        for (int i = 0; i < expectedDeployments.Count; i++)
+        {
+            Assert.Equal(expectedDeployments[i], model.Deployments[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new FunctionListDeploymentsResponse
+        {
+            Deployments =
+            [
+                new()
+                {
+                    ID = "id",
+                    BundleSizeBytes = 0,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ErrorMessage = "errorMessage",
+                    IsActive = true,
+                    Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+                    Version = 0,
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionListDeploymentsResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new FunctionListDeploymentsResponse
+        {
+            Deployments =
+            [
+                new()
+                {
+                    ID = "id",
+                    BundleSizeBytes = 0,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ErrorMessage = "errorMessage",
+                    IsActive = true,
+                    Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+                    Version = 0,
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionListDeploymentsResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<FunctionListDeploymentsResponseDeployment> expectedDeployments =
+        [
+            new()
+            {
+                ID = "id",
+                BundleSizeBytes = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                IsActive = true,
+                Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+                Version = 0,
+            },
+        ];
+
+        Assert.Equal(expectedDeployments.Count, deserialized.Deployments.Count);
+        for (int i = 0; i < expectedDeployments.Count; i++)
+        {
+            Assert.Equal(expectedDeployments[i], deserialized.Deployments[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new FunctionListDeploymentsResponse
+        {
+            Deployments =
+            [
+                new()
+                {
+                    ID = "id",
+                    BundleSizeBytes = 0,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ErrorMessage = "errorMessage",
+                    IsActive = true,
+                    Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+                    Version = 0,
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new FunctionListDeploymentsResponse
+        {
+            Deployments =
+            [
+                new()
+                {
+                    ID = "id",
+                    BundleSizeBytes = 0,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    ErrorMessage = "errorMessage",
+                    IsActive = true,
+                    Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+                    Version = 0,
+                },
+            ],
+        };
+
+        FunctionListDeploymentsResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class FunctionListDeploymentsResponseDeploymentTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            ID = "id",
+            BundleSizeBytes = 0,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            IsActive = true,
+            Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            Version = 0,
+        };
+
+        string expectedID = "id";
+        long expectedBundleSizeBytes = 0;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedDeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedErrorMessage = "errorMessage";
+        bool expectedIsActive = true;
+        ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus> expectedStatus =
+            FunctionListDeploymentsResponseDeploymentStatus.Pending;
+        long expectedVersion = 0;
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedBundleSizeBytes, model.BundleSizeBytes);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedDeployedAt, model.DeployedAt);
+        Assert.Equal(expectedErrorMessage, model.ErrorMessage);
+        Assert.Equal(expectedIsActive, model.IsActive);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.Equal(expectedVersion, model.Version);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            ID = "id",
+            BundleSizeBytes = 0,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            IsActive = true,
+            Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            Version = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionListDeploymentsResponseDeployment>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            ID = "id",
+            BundleSizeBytes = 0,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            IsActive = true,
+            Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            Version = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionListDeploymentsResponseDeployment>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        long expectedBundleSizeBytes = 0;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedDeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedErrorMessage = "errorMessage";
+        bool expectedIsActive = true;
+        ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus> expectedStatus =
+            FunctionListDeploymentsResponseDeploymentStatus.Pending;
+        long expectedVersion = 0;
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedBundleSizeBytes, deserialized.BundleSizeBytes);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedDeployedAt, deserialized.DeployedAt);
+        Assert.Equal(expectedErrorMessage, deserialized.ErrorMessage);
+        Assert.Equal(expectedIsActive, deserialized.IsActive);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.Equal(expectedVersion, deserialized.Version);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            ID = "id",
+            BundleSizeBytes = 0,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            IsActive = true,
+            Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            Version = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            BundleSizeBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+        };
+
+        Assert.Null(model.ID);
+        Assert.False(model.RawData.ContainsKey("id"));
+        Assert.Null(model.CreatedAt);
+        Assert.False(model.RawData.ContainsKey("createdAt"));
+        Assert.Null(model.IsActive);
+        Assert.False(model.RawData.ContainsKey("isActive"));
+        Assert.Null(model.Status);
+        Assert.False(model.RawData.ContainsKey("status"));
+        Assert.Null(model.Version);
+        Assert.False(model.RawData.ContainsKey("version"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            BundleSizeBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            BundleSizeBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+
+            // Null should be interpreted as omitted for these properties
+            ID = null,
+            CreatedAt = null,
+            IsActive = null,
+            Status = null,
+            Version = null,
+        };
+
+        Assert.Null(model.ID);
+        Assert.False(model.RawData.ContainsKey("id"));
+        Assert.Null(model.CreatedAt);
+        Assert.False(model.RawData.ContainsKey("createdAt"));
+        Assert.Null(model.IsActive);
+        Assert.False(model.RawData.ContainsKey("isActive"));
+        Assert.Null(model.Status);
+        Assert.False(model.RawData.ContainsKey("status"));
+        Assert.Null(model.Version);
+        Assert.False(model.RawData.ContainsKey("version"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            BundleSizeBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+
+            // Null should be interpreted as omitted for these properties
+            ID = null,
+            CreatedAt = null,
+            IsActive = null,
+            Status = null,
+            Version = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            IsActive = true,
+            Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            Version = 0,
+        };
+
+        Assert.Null(model.BundleSizeBytes);
+        Assert.False(model.RawData.ContainsKey("bundleSizeBytes"));
+        Assert.Null(model.DeployedAt);
+        Assert.False(model.RawData.ContainsKey("deployedAt"));
+        Assert.Null(model.ErrorMessage);
+        Assert.False(model.RawData.ContainsKey("errorMessage"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            IsActive = true,
+            Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            Version = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            IsActive = true,
+            Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            Version = 0,
+
+            BundleSizeBytes = null,
+            DeployedAt = null,
+            ErrorMessage = null,
+        };
+
+        Assert.Null(model.BundleSizeBytes);
+        Assert.True(model.RawData.ContainsKey("bundleSizeBytes"));
+        Assert.Null(model.DeployedAt);
+        Assert.True(model.RawData.ContainsKey("deployedAt"));
+        Assert.Null(model.ErrorMessage);
+        Assert.True(model.RawData.ContainsKey("errorMessage"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            IsActive = true,
+            Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            Version = 0,
+
+            BundleSizeBytes = null,
+            DeployedAt = null,
+            ErrorMessage = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new FunctionListDeploymentsResponseDeployment
+        {
+            ID = "id",
+            BundleSizeBytes = 0,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            IsActive = true,
+            Status = FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            Version = 0,
+        };
+
+        FunctionListDeploymentsResponseDeployment copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class FunctionListDeploymentsResponseDeploymentStatusTest : TestBase
+{
+    [Theory]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Pending)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Bundling)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Uploading)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Publishing)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Active)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Failed)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Superseded)]
+    public void Validation_Works(FunctionListDeploymentsResponseDeploymentStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Pending)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Bundling)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Uploading)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Publishing)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Active)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Failed)]
+    [InlineData(FunctionListDeploymentsResponseDeploymentStatus.Superseded)]
+    public void SerializationRoundtrip_Works(
+        FunctionListDeploymentsResponseDeploymentStatus rawValue
+    )
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionListEventTypesParamsTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionListEventTypesParamsTest.cs
new file mode 100644
index 0000000..40190e0
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/FunctionListEventTypesParamsTest.cs
@@ -0,0 +1 @@
+namespace Zavudev.Tests.Models.Functions;
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionListEventTypesResponseTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionListEventTypesResponseTest.cs
new file mode 100644
index 0000000..286a2c6
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/FunctionListEventTypesResponseTest.cs
@@ -0,0 +1,91 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Functions;
+
+namespace Zavudev.Tests.Models.Functions;
+
+public class FunctionListEventTypesResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new FunctionListEventTypesResponse
+        {
+            Events = ["message.inbound", "message.delivered", "cron"],
+        };
+
+        List<string> expectedEvents = ["message.inbound", "message.delivered", "cron"];
+
+        Assert.Equal(expectedEvents.Count, model.Events.Count);
+        for (int i = 0; i < expectedEvents.Count; i++)
+        {
+            Assert.Equal(expectedEvents[i], model.Events[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new FunctionListEventTypesResponse
+        {
+            Events = ["message.inbound", "message.delivered", "cron"],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionListEventTypesResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new FunctionListEventTypesResponse
+        {
+            Events = ["message.inbound", "message.delivered", "cron"],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionListEventTypesResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<string> expectedEvents = ["message.inbound", "message.delivered", "cron"];
+
+        Assert.Equal(expectedEvents.Count, deserialized.Events.Count);
+        for (int i = 0; i < expectedEvents.Count; i++)
+        {
+            Assert.Equal(expectedEvents[i], deserialized.Events[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new FunctionListEventTypesResponse
+        {
+            Events = ["message.inbound", "message.delivered", "cron"],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new FunctionListEventTypesResponse
+        {
+            Events = ["message.inbound", "message.delivered", "cron"],
+        };
+
+        FunctionListEventTypesResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionRollbackDeploymentParamsTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionRollbackDeploymentParamsTest.cs
new file mode 100644
index 0000000..7c844ea
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/FunctionRollbackDeploymentParamsTest.cs
@@ -0,0 +1,56 @@
+using System;
+using Zavudev.Models.Functions;
+
+namespace Zavudev.Tests.Models.Functions;
+
+public class FunctionRollbackDeploymentParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new FunctionRollbackDeploymentParams
+        {
+            FunctionID = "functionId",
+            DeploymentID = "fnd_abc123",
+        };
+
+        string expectedFunctionID = "functionId";
+        string expectedDeploymentID = "fnd_abc123";
+
+        Assert.Equal(expectedFunctionID, parameters.FunctionID);
+        Assert.Equal(expectedDeploymentID, parameters.DeploymentID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        FunctionRollbackDeploymentParams parameters = new()
+        {
+            FunctionID = "functionId",
+            DeploymentID = "fnd_abc123",
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/functions/functionId/rollback"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new FunctionRollbackDeploymentParams
+        {
+            FunctionID = "functionId",
+            DeploymentID = "fnd_abc123",
+        };
+
+        FunctionRollbackDeploymentParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionRollbackDeploymentResponseTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionRollbackDeploymentResponseTest.cs
new file mode 100644
index 0000000..ca2f032
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/FunctionRollbackDeploymentResponseTest.cs
@@ -0,0 +1,712 @@
+using System;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Functions;
+
+namespace Zavudev.Tests.Models.Functions;
+
+public class FunctionRollbackDeploymentResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            PreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}"),
+            RolledBackToVersion = 0,
+        };
+
+        FunctionRollbackDeploymentResponseDeployment expectedDeployment = new()
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+            BuildLogs = "buildLogs",
+            BundleBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            SourceCodeBytes = 0,
+        };
+        JsonElement expectedPreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}");
+        long expectedRolledBackToVersion = 0;
+
+        Assert.Equal(expectedDeployment, model.Deployment);
+        Assert.NotNull(model.PreviousDraft);
+        Assert.True(JsonElement.DeepEquals(expectedPreviousDraft, model.PreviousDraft.Value));
+        Assert.Equal(expectedRolledBackToVersion, model.RolledBackToVersion);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            PreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}"),
+            RolledBackToVersion = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionRollbackDeploymentResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            PreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}"),
+            RolledBackToVersion = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionRollbackDeploymentResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        FunctionRollbackDeploymentResponseDeployment expectedDeployment = new()
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+            BuildLogs = "buildLogs",
+            BundleBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            SourceCodeBytes = 0,
+        };
+        JsonElement expectedPreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}");
+        long expectedRolledBackToVersion = 0;
+
+        Assert.Equal(expectedDeployment, deserialized.Deployment);
+        Assert.NotNull(deserialized.PreviousDraft);
+        Assert.True(
+            JsonElement.DeepEquals(expectedPreviousDraft, deserialized.PreviousDraft.Value)
+        );
+        Assert.Equal(expectedRolledBackToVersion, deserialized.RolledBackToVersion);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            PreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}"),
+            RolledBackToVersion = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            PreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}"),
+        };
+
+        Assert.Null(model.RolledBackToVersion);
+        Assert.False(model.RawData.ContainsKey("rolledBackToVersion"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            PreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            PreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}"),
+
+            // Null should be interpreted as omitted for these properties
+            RolledBackToVersion = null,
+        };
+
+        Assert.Null(model.RolledBackToVersion);
+        Assert.False(model.RawData.ContainsKey("rolledBackToVersion"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            PreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}"),
+
+            // Null should be interpreted as omitted for these properties
+            RolledBackToVersion = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            RolledBackToVersion = 0,
+        };
+
+        Assert.Null(model.PreviousDraft);
+        Assert.False(model.RawData.ContainsKey("previousDraft"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            RolledBackToVersion = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            RolledBackToVersion = 0,
+
+            PreviousDraft = null,
+        };
+
+        Assert.Null(model.PreviousDraft);
+        Assert.True(model.RawData.ContainsKey("previousDraft"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            RolledBackToVersion = 0,
+
+            PreviousDraft = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponse
+        {
+            Deployment = new()
+            {
+                ID = "fnd_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+                Version = 0,
+                BuildLogs = "buildLogs",
+                BundleBytes = 0,
+                DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                ErrorMessage = "errorMessage",
+                SourceCodeBytes = 0,
+            },
+            PreviousDraft = JsonSerializer.Deserialize<JsonElement>("{}"),
+            RolledBackToVersion = 0,
+        };
+
+        FunctionRollbackDeploymentResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class FunctionRollbackDeploymentResponseDeploymentTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponseDeployment
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+            BuildLogs = "buildLogs",
+            BundleBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            SourceCodeBytes = 0,
+        };
+
+        string expectedID = "fnd_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedFunctionID = "functionId";
+        ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus> expectedStatus =
+            FunctionRollbackDeploymentResponseDeploymentStatus.Pending;
+        long expectedVersion = 0;
+        string expectedBuildLogs = "buildLogs";
+        long expectedBundleBytes = 0;
+        DateTimeOffset expectedDeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedErrorMessage = "errorMessage";
+        long expectedSourceCodeBytes = 0;
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedFunctionID, model.FunctionID);
+        Assert.Equal(expectedStatus, model.Status);
+        Assert.Equal(expectedVersion, model.Version);
+        Assert.Equal(expectedBuildLogs, model.BuildLogs);
+        Assert.Equal(expectedBundleBytes, model.BundleBytes);
+        Assert.Equal(expectedDeployedAt, model.DeployedAt);
+        Assert.Equal(expectedErrorMessage, model.ErrorMessage);
+        Assert.Equal(expectedSourceCodeBytes, model.SourceCodeBytes);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponseDeployment
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+            BuildLogs = "buildLogs",
+            BundleBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            SourceCodeBytes = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionRollbackDeploymentResponseDeployment>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponseDeployment
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+            BuildLogs = "buildLogs",
+            BundleBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            SourceCodeBytes = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<FunctionRollbackDeploymentResponseDeployment>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "fnd_abc123";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedFunctionID = "functionId";
+        ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus> expectedStatus =
+            FunctionRollbackDeploymentResponseDeploymentStatus.Pending;
+        long expectedVersion = 0;
+        string expectedBuildLogs = "buildLogs";
+        long expectedBundleBytes = 0;
+        DateTimeOffset expectedDeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedErrorMessage = "errorMessage";
+        long expectedSourceCodeBytes = 0;
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedFunctionID, deserialized.FunctionID);
+        Assert.Equal(expectedStatus, deserialized.Status);
+        Assert.Equal(expectedVersion, deserialized.Version);
+        Assert.Equal(expectedBuildLogs, deserialized.BuildLogs);
+        Assert.Equal(expectedBundleBytes, deserialized.BundleBytes);
+        Assert.Equal(expectedDeployedAt, deserialized.DeployedAt);
+        Assert.Equal(expectedErrorMessage, deserialized.ErrorMessage);
+        Assert.Equal(expectedSourceCodeBytes, deserialized.SourceCodeBytes);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponseDeployment
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+            BuildLogs = "buildLogs",
+            BundleBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            SourceCodeBytes = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponseDeployment
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+        };
+
+        Assert.Null(model.BuildLogs);
+        Assert.False(model.RawData.ContainsKey("buildLogs"));
+        Assert.Null(model.BundleBytes);
+        Assert.False(model.RawData.ContainsKey("bundleBytes"));
+        Assert.Null(model.DeployedAt);
+        Assert.False(model.RawData.ContainsKey("deployedAt"));
+        Assert.Null(model.ErrorMessage);
+        Assert.False(model.RawData.ContainsKey("errorMessage"));
+        Assert.Null(model.SourceCodeBytes);
+        Assert.False(model.RawData.ContainsKey("sourceCodeBytes"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponseDeployment
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponseDeployment
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+
+            BuildLogs = null,
+            BundleBytes = null,
+            DeployedAt = null,
+            ErrorMessage = null,
+            SourceCodeBytes = null,
+        };
+
+        Assert.Null(model.BuildLogs);
+        Assert.True(model.RawData.ContainsKey("buildLogs"));
+        Assert.Null(model.BundleBytes);
+        Assert.True(model.RawData.ContainsKey("bundleBytes"));
+        Assert.Null(model.DeployedAt);
+        Assert.True(model.RawData.ContainsKey("deployedAt"));
+        Assert.Null(model.ErrorMessage);
+        Assert.True(model.RawData.ContainsKey("errorMessage"));
+        Assert.Null(model.SourceCodeBytes);
+        Assert.True(model.RawData.ContainsKey("sourceCodeBytes"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponseDeployment
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+
+            BuildLogs = null,
+            BundleBytes = null,
+            DeployedAt = null,
+            ErrorMessage = null,
+            SourceCodeBytes = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new FunctionRollbackDeploymentResponseDeployment
+        {
+            ID = "fnd_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Status = FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            Version = 0,
+            BuildLogs = "buildLogs",
+            BundleBytes = 0,
+            DeployedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            ErrorMessage = "errorMessage",
+            SourceCodeBytes = 0,
+        };
+
+        FunctionRollbackDeploymentResponseDeployment copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class FunctionRollbackDeploymentResponseDeploymentStatusTest : TestBase
+{
+    [Theory]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Pending)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Bundling)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Uploading)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Publishing)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Active)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Failed)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Superseded)]
+    public void Validation_Works(FunctionRollbackDeploymentResponseDeploymentStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Pending)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Bundling)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Uploading)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Publishing)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Active)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Failed)]
+    [InlineData(FunctionRollbackDeploymentResponseDeploymentStatus.Superseded)]
+    public void SerializationRoundtrip_Works(
+        FunctionRollbackDeploymentResponseDeploymentStatus rawValue
+    )
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/FunctionUpdateParamsTest.cs b/src/Zavudev.Tests/Models/Functions/FunctionUpdateParamsTest.cs
index 2a98f54..a41846c 100644
--- a/src/Zavudev.Tests/Models/Functions/FunctionUpdateParamsTest.cs
+++ b/src/Zavudev.Tests/Models/Functions/FunctionUpdateParamsTest.cs
@@ -13,12 +13,36 @@ public void FieldRoundtrip_Works()
         {
             FunctionID = "functionId",
             Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Entrypoint = "index.ts",
+            Files = new Dictionary<string, string>()
+            {
+                {
+                    "index.ts",
+                    "import { formatOrder } from './lib/orders';\n\nexport default async function handler(event) {\n  return { statusCode: 200, body: formatOrder(event) };\n}\n"
+                },
+                {
+                    "lib/orders.ts",
+                    "export function formatOrder(event) {\n  return JSON.stringify(event);\n}\n"
+                },
+            },
             HttpEnabled = true,
             SourceCode = "sourceCode",
         };
 
         string expectedFunctionID = "functionId";
         Dictionary<string, string> expectedDependencies = new() { { "foo", "string" } };
+        string expectedEntrypoint = "index.ts";
+        Dictionary<string, string> expectedFiles = new()
+        {
+            {
+                "index.ts",
+                "import { formatOrder } from './lib/orders';\n\nexport default async function handler(event) {\n  return { statusCode: 200, body: formatOrder(event) };\n}\n"
+            },
+            {
+                "lib/orders.ts",
+                "export function formatOrder(event) {\n  return JSON.stringify(event);\n}\n"
+            },
+        };
         bool expectedHttpEnabled = true;
         string expectedSourceCode = "sourceCode";
 
@@ -31,6 +55,15 @@ public void FieldRoundtrip_Works()
 
             Assert.Equal(value, parameters.Dependencies[item.Key]);
         }
+        Assert.Equal(expectedEntrypoint, parameters.Entrypoint);
+        Assert.NotNull(parameters.Files);
+        Assert.Equal(expectedFiles.Count, parameters.Files.Count);
+        foreach (var item in expectedFiles)
+        {
+            Assert.True(parameters.Files.TryGetValue(item.Key, out var value));
+
+            Assert.Equal(value, parameters.Files[item.Key]);
+        }
         Assert.Equal(expectedHttpEnabled, parameters.HttpEnabled);
         Assert.Equal(expectedSourceCode, parameters.SourceCode);
     }
@@ -42,6 +75,10 @@ public void OptionalNonNullableParamsUnsetAreNotSet_Works()
 
         Assert.Null(parameters.Dependencies);
         Assert.False(parameters.RawBodyData.ContainsKey("dependencies"));
+        Assert.Null(parameters.Entrypoint);
+        Assert.False(parameters.RawBodyData.ContainsKey("entrypoint"));
+        Assert.Null(parameters.Files);
+        Assert.False(parameters.RawBodyData.ContainsKey("files"));
         Assert.Null(parameters.HttpEnabled);
         Assert.False(parameters.RawBodyData.ContainsKey("httpEnabled"));
         Assert.Null(parameters.SourceCode);
@@ -57,12 +94,18 @@ public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
 
             // Null should be interpreted as omitted for these properties
             Dependencies = null,
+            Entrypoint = null,
+            Files = null,
             HttpEnabled = null,
             SourceCode = null,
         };
 
         Assert.Null(parameters.Dependencies);
         Assert.False(parameters.RawBodyData.ContainsKey("dependencies"));
+        Assert.Null(parameters.Entrypoint);
+        Assert.False(parameters.RawBodyData.ContainsKey("entrypoint"));
+        Assert.Null(parameters.Files);
+        Assert.False(parameters.RawBodyData.ContainsKey("files"));
         Assert.Null(parameters.HttpEnabled);
         Assert.False(parameters.RawBodyData.ContainsKey("httpEnabled"));
         Assert.Null(parameters.SourceCode);
@@ -88,6 +131,18 @@ public void CopyConstructor_Works()
         {
             FunctionID = "functionId",
             Dependencies = new Dictionary<string, string>() { { "foo", "string" } },
+            Entrypoint = "index.ts",
+            Files = new Dictionary<string, string>()
+            {
+                {
+                    "index.ts",
+                    "import { formatOrder } from './lib/orders';\n\nexport default async function handler(event) {\n  return { statusCode: 200, body: formatOrder(event) };\n}\n"
+                },
+                {
+                    "lib/orders.ts",
+                    "export function formatOrder(event) {\n  return JSON.stringify(event);\n}\n"
+                },
+            },
             HttpEnabled = true,
             SourceCode = "sourceCode",
         };
diff --git a/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkDeployNowParamsTest.cs b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkDeployNowParamsTest.cs
new file mode 100644
index 0000000..72b3ea5
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkDeployNowParamsTest.cs
@@ -0,0 +1,42 @@
+using System;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Tests.Models.Functions.GitLink;
+
+public class GitLinkDeployNowParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new GitLinkDeployNowParams { FunctionID = "functionId" };
+
+        string expectedFunctionID = "functionId";
+
+        Assert.Equal(expectedFunctionID, parameters.FunctionID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        GitLinkDeployNowParams parameters = new() { FunctionID = "functionId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/functions/functionId/git-link/deploy"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new GitLinkDeployNowParams { FunctionID = "functionId" };
+
+        GitLinkDeployNowParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkDeployNowResponseTest.cs b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkDeployNowResponseTest.cs
new file mode 100644
index 0000000..781e4f6
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkDeployNowResponseTest.cs
@@ -0,0 +1,67 @@
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Tests.Models.Functions.GitLink;
+
+public class GitLinkDeployNowResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new GitLinkDeployNowResponse { Scheduled = true };
+
+        bool expectedScheduled = true;
+
+        Assert.Equal(expectedScheduled, model.Scheduled);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new GitLinkDeployNowResponse { Scheduled = true };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkDeployNowResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new GitLinkDeployNowResponse { Scheduled = true };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkDeployNowResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        bool expectedScheduled = true;
+
+        Assert.Equal(expectedScheduled, deserialized.Scheduled);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new GitLinkDeployNowResponse { Scheduled = true };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new GitLinkDeployNowResponse { Scheduled = true };
+
+        GitLinkDeployNowResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkLinkParamsTest.cs b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkLinkParamsTest.cs
new file mode 100644
index 0000000..82ec2e1
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkLinkParamsTest.cs
@@ -0,0 +1,114 @@
+using System;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Tests.Models.Functions.GitLink;
+
+public class GitLinkLinkParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new GitLinkLinkParams
+        {
+            FunctionID = "functionId",
+            Owner = "acme",
+            Repo = "order-bot",
+            AutoDeploy = true,
+            Branch = "main",
+            RootDir = "apps/bot",
+        };
+
+        string expectedFunctionID = "functionId";
+        string expectedOwner = "acme";
+        string expectedRepo = "order-bot";
+        bool expectedAutoDeploy = true;
+        string expectedBranch = "main";
+        string expectedRootDir = "apps/bot";
+
+        Assert.Equal(expectedFunctionID, parameters.FunctionID);
+        Assert.Equal(expectedOwner, parameters.Owner);
+        Assert.Equal(expectedRepo, parameters.Repo);
+        Assert.Equal(expectedAutoDeploy, parameters.AutoDeploy);
+        Assert.Equal(expectedBranch, parameters.Branch);
+        Assert.Equal(expectedRootDir, parameters.RootDir);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new GitLinkLinkParams
+        {
+            FunctionID = "functionId",
+            Owner = "acme",
+            Repo = "order-bot",
+        };
+
+        Assert.Null(parameters.AutoDeploy);
+        Assert.False(parameters.RawBodyData.ContainsKey("autoDeploy"));
+        Assert.Null(parameters.Branch);
+        Assert.False(parameters.RawBodyData.ContainsKey("branch"));
+        Assert.Null(parameters.RootDir);
+        Assert.False(parameters.RawBodyData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new GitLinkLinkParams
+        {
+            FunctionID = "functionId",
+            Owner = "acme",
+            Repo = "order-bot",
+
+            // Null should be interpreted as omitted for these properties
+            AutoDeploy = null,
+            Branch = null,
+            RootDir = null,
+        };
+
+        Assert.Null(parameters.AutoDeploy);
+        Assert.False(parameters.RawBodyData.ContainsKey("autoDeploy"));
+        Assert.Null(parameters.Branch);
+        Assert.False(parameters.RawBodyData.ContainsKey("branch"));
+        Assert.Null(parameters.RootDir);
+        Assert.False(parameters.RawBodyData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        GitLinkLinkParams parameters = new()
+        {
+            FunctionID = "functionId",
+            Owner = "acme",
+            Repo = "order-bot",
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/functions/functionId/git-link"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new GitLinkLinkParams
+        {
+            FunctionID = "functionId",
+            Owner = "acme",
+            Repo = "order-bot",
+            AutoDeploy = true,
+            Branch = "main",
+            RootDir = "apps/bot",
+        };
+
+        GitLinkLinkParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkLinkResponseTest.cs b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkLinkResponseTest.cs
new file mode 100644
index 0000000..7d994fc
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkLinkResponseTest.cs
@@ -0,0 +1,858 @@
+using System;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Tests.Models.Functions.GitLink;
+
+public class GitLinkLinkResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new GitLinkLinkResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkLinkResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkLinkResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        GitLinkLinkResponseLink expectedLink = new()
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+        string expectedWebhookUrl = "https://example.com";
+        string expectedWebhookSecret = "ghs_a1b2c3...";
+
+        Assert.Equal(expectedLink, model.Link);
+        Assert.Equal(expectedWebhookUrl, model.WebhookUrl);
+        Assert.Equal(expectedWebhookSecret, model.WebhookSecret);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new GitLinkLinkResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkLinkResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkLinkResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkLinkResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new GitLinkLinkResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkLinkResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkLinkResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkLinkResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        GitLinkLinkResponseLink expectedLink = new()
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+        string expectedWebhookUrl = "https://example.com";
+        string expectedWebhookSecret = "ghs_a1b2c3...";
+
+        Assert.Equal(expectedLink, deserialized.Link);
+        Assert.Equal(expectedWebhookUrl, deserialized.WebhookUrl);
+        Assert.Equal(expectedWebhookSecret, deserialized.WebhookSecret);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new GitLinkLinkResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkLinkResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkLinkResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new GitLinkLinkResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkLinkResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkLinkResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+        };
+
+        Assert.Null(model.WebhookSecret);
+        Assert.False(model.RawData.ContainsKey("webhookSecret"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new GitLinkLinkResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkLinkResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkLinkResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new GitLinkLinkResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkLinkResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkLinkResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+
+            // Null should be interpreted as omitted for these properties
+            WebhookSecret = null,
+        };
+
+        Assert.Null(model.WebhookSecret);
+        Assert.False(model.RawData.ContainsKey("webhookSecret"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new GitLinkLinkResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkLinkResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkLinkResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+
+            // Null should be interpreted as omitted for these properties
+            WebhookSecret = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new GitLinkLinkResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkLinkResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkLinkResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        GitLinkLinkResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class GitLinkLinkResponseLinkTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new GitLinkLinkResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        string expectedID = "id";
+        bool expectedAutoDeploy = true;
+        string expectedBranch = "main";
+        ApiEnum<string, GitLinkLinkResponseLinkConnection> expectedConnection =
+            GitLinkLinkResponseLinkConnection.App;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedFunctionID = "functionId";
+        string expectedOwner = "acme";
+        ApiEnum<string, GitLinkLinkResponseLinkProvider> expectedProvider =
+            GitLinkLinkResponseLinkProvider.GitHub;
+        string expectedRepo = "order-bot";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastCommitMessage = "lastCommitMessage";
+        string expectedLastCommitSha = "lastCommitSha";
+        DateTimeOffset expectedLastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastError = "lastError";
+        ApiEnum<string, GitLinkLinkResponseLinkLastStatus> expectedLastStatus =
+            GitLinkLinkResponseLinkLastStatus.Deploying;
+        string expectedRootDir = "rootDir";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedAutoDeploy, model.AutoDeploy);
+        Assert.Equal(expectedBranch, model.Branch);
+        Assert.Equal(expectedConnection, model.Connection);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedFunctionID, model.FunctionID);
+        Assert.Equal(expectedOwner, model.Owner);
+        Assert.Equal(expectedProvider, model.Provider);
+        Assert.Equal(expectedRepo, model.Repo);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+        Assert.Equal(expectedLastCommitMessage, model.LastCommitMessage);
+        Assert.Equal(expectedLastCommitSha, model.LastCommitSha);
+        Assert.Equal(expectedLastDeployAt, model.LastDeployAt);
+        Assert.Equal(expectedLastError, model.LastError);
+        Assert.Equal(expectedLastStatus, model.LastStatus);
+        Assert.Equal(expectedRootDir, model.RootDir);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new GitLinkLinkResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkLinkResponseLink>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new GitLinkLinkResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkLinkResponseLink>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        bool expectedAutoDeploy = true;
+        string expectedBranch = "main";
+        ApiEnum<string, GitLinkLinkResponseLinkConnection> expectedConnection =
+            GitLinkLinkResponseLinkConnection.App;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedFunctionID = "functionId";
+        string expectedOwner = "acme";
+        ApiEnum<string, GitLinkLinkResponseLinkProvider> expectedProvider =
+            GitLinkLinkResponseLinkProvider.GitHub;
+        string expectedRepo = "order-bot";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastCommitMessage = "lastCommitMessage";
+        string expectedLastCommitSha = "lastCommitSha";
+        DateTimeOffset expectedLastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastError = "lastError";
+        ApiEnum<string, GitLinkLinkResponseLinkLastStatus> expectedLastStatus =
+            GitLinkLinkResponseLinkLastStatus.Deploying;
+        string expectedRootDir = "rootDir";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedAutoDeploy, deserialized.AutoDeploy);
+        Assert.Equal(expectedBranch, deserialized.Branch);
+        Assert.Equal(expectedConnection, deserialized.Connection);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedFunctionID, deserialized.FunctionID);
+        Assert.Equal(expectedOwner, deserialized.Owner);
+        Assert.Equal(expectedProvider, deserialized.Provider);
+        Assert.Equal(expectedRepo, deserialized.Repo);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+        Assert.Equal(expectedLastCommitMessage, deserialized.LastCommitMessage);
+        Assert.Equal(expectedLastCommitSha, deserialized.LastCommitSha);
+        Assert.Equal(expectedLastDeployAt, deserialized.LastDeployAt);
+        Assert.Equal(expectedLastError, deserialized.LastError);
+        Assert.Equal(expectedLastStatus, deserialized.LastStatus);
+        Assert.Equal(expectedRootDir, deserialized.RootDir);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new GitLinkLinkResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new GitLinkLinkResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.LastCommitMessage);
+        Assert.False(model.RawData.ContainsKey("lastCommitMessage"));
+        Assert.Null(model.LastCommitSha);
+        Assert.False(model.RawData.ContainsKey("lastCommitSha"));
+        Assert.Null(model.LastDeployAt);
+        Assert.False(model.RawData.ContainsKey("lastDeployAt"));
+        Assert.Null(model.LastError);
+        Assert.False(model.RawData.ContainsKey("lastError"));
+        Assert.Null(model.LastStatus);
+        Assert.False(model.RawData.ContainsKey("lastStatus"));
+        Assert.Null(model.RootDir);
+        Assert.False(model.RawData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new GitLinkLinkResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new GitLinkLinkResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            LastCommitMessage = null,
+            LastCommitSha = null,
+            LastDeployAt = null,
+            LastError = null,
+            LastStatus = null,
+            RootDir = null,
+        };
+
+        Assert.Null(model.LastCommitMessage);
+        Assert.True(model.RawData.ContainsKey("lastCommitMessage"));
+        Assert.Null(model.LastCommitSha);
+        Assert.True(model.RawData.ContainsKey("lastCommitSha"));
+        Assert.Null(model.LastDeployAt);
+        Assert.True(model.RawData.ContainsKey("lastDeployAt"));
+        Assert.Null(model.LastError);
+        Assert.True(model.RawData.ContainsKey("lastError"));
+        Assert.Null(model.LastStatus);
+        Assert.True(model.RawData.ContainsKey("lastStatus"));
+        Assert.Null(model.RootDir);
+        Assert.True(model.RawData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new GitLinkLinkResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            LastCommitMessage = null,
+            LastCommitSha = null,
+            LastDeployAt = null,
+            LastError = null,
+            LastStatus = null,
+            RootDir = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new GitLinkLinkResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkLinkResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkLinkResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkLinkResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        GitLinkLinkResponseLink copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class GitLinkLinkResponseLinkConnectionTest : TestBase
+{
+    [Theory]
+    [InlineData(GitLinkLinkResponseLinkConnection.App)]
+    [InlineData(GitLinkLinkResponseLinkConnection.Manual)]
+    public void Validation_Works(GitLinkLinkResponseLinkConnection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkLinkResponseLinkConnection> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, GitLinkLinkResponseLinkConnection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(GitLinkLinkResponseLinkConnection.App)]
+    [InlineData(GitLinkLinkResponseLinkConnection.Manual)]
+    public void SerializationRoundtrip_Works(GitLinkLinkResponseLinkConnection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkLinkResponseLinkConnection> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkLinkResponseLinkConnection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, GitLinkLinkResponseLinkConnection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkLinkResponseLinkConnection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class GitLinkLinkResponseLinkProviderTest : TestBase
+{
+    [Theory]
+    [InlineData(GitLinkLinkResponseLinkProvider.GitHub)]
+    public void Validation_Works(GitLinkLinkResponseLinkProvider rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkLinkResponseLinkProvider> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, GitLinkLinkResponseLinkProvider>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(GitLinkLinkResponseLinkProvider.GitHub)]
+    public void SerializationRoundtrip_Works(GitLinkLinkResponseLinkProvider rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkLinkResponseLinkProvider> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkLinkResponseLinkProvider>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, GitLinkLinkResponseLinkProvider>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkLinkResponseLinkProvider>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class GitLinkLinkResponseLinkLastStatusTest : TestBase
+{
+    [Theory]
+    [InlineData(GitLinkLinkResponseLinkLastStatus.Deploying)]
+    [InlineData(GitLinkLinkResponseLinkLastStatus.Deployed)]
+    [InlineData(GitLinkLinkResponseLinkLastStatus.Failed)]
+    public void Validation_Works(GitLinkLinkResponseLinkLastStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkLinkResponseLinkLastStatus> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, GitLinkLinkResponseLinkLastStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(GitLinkLinkResponseLinkLastStatus.Deploying)]
+    [InlineData(GitLinkLinkResponseLinkLastStatus.Deployed)]
+    [InlineData(GitLinkLinkResponseLinkLastStatus.Failed)]
+    public void SerializationRoundtrip_Works(GitLinkLinkResponseLinkLastStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkLinkResponseLinkLastStatus> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkLinkResponseLinkLastStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, GitLinkLinkResponseLinkLastStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkLinkResponseLinkLastStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkRetrieveParamsTest.cs b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkRetrieveParamsTest.cs
new file mode 100644
index 0000000..44f6b87
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkRetrieveParamsTest.cs
@@ -0,0 +1,42 @@
+using System;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Tests.Models.Functions.GitLink;
+
+public class GitLinkRetrieveParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new GitLinkRetrieveParams { FunctionID = "functionId" };
+
+        string expectedFunctionID = "functionId";
+
+        Assert.Equal(expectedFunctionID, parameters.FunctionID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        GitLinkRetrieveParams parameters = new() { FunctionID = "functionId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/functions/functionId/git-link"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new GitLinkRetrieveParams { FunctionID = "functionId" };
+
+        GitLinkRetrieveParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkRetrieveResponseTest.cs b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkRetrieveResponseTest.cs
new file mode 100644
index 0000000..6d39f2a
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkRetrieveResponseTest.cs
@@ -0,0 +1,852 @@
+using System;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Tests.Models.Functions.GitLink;
+
+public class GitLinkRetrieveResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new GitLinkRetrieveResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = Connection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = Provider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = LastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        Link expectedLink = new()
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = LastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+        string expectedWebhookUrl = "https://example.com";
+        string expectedWebhookSecret = "ghs_a1b2c3...";
+
+        Assert.Equal(expectedLink, model.Link);
+        Assert.Equal(expectedWebhookUrl, model.WebhookUrl);
+        Assert.Equal(expectedWebhookSecret, model.WebhookSecret);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new GitLinkRetrieveResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = Connection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = Provider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = LastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkRetrieveResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new GitLinkRetrieveResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = Connection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = Provider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = LastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkRetrieveResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        Link expectedLink = new()
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = LastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+        string expectedWebhookUrl = "https://example.com";
+        string expectedWebhookSecret = "ghs_a1b2c3...";
+
+        Assert.Equal(expectedLink, deserialized.Link);
+        Assert.Equal(expectedWebhookUrl, deserialized.WebhookUrl);
+        Assert.Equal(expectedWebhookSecret, deserialized.WebhookSecret);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new GitLinkRetrieveResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = Connection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = Provider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = LastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new GitLinkRetrieveResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = Connection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = Provider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = LastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+        };
+
+        Assert.Null(model.WebhookSecret);
+        Assert.False(model.RawData.ContainsKey("webhookSecret"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new GitLinkRetrieveResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = Connection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = Provider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = LastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new GitLinkRetrieveResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = Connection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = Provider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = LastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+
+            // Null should be interpreted as omitted for these properties
+            WebhookSecret = null,
+        };
+
+        Assert.Null(model.WebhookSecret);
+        Assert.False(model.RawData.ContainsKey("webhookSecret"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new GitLinkRetrieveResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = Connection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = Provider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = LastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+
+            // Null should be interpreted as omitted for these properties
+            WebhookSecret = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new GitLinkRetrieveResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = Connection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = Provider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = LastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        GitLinkRetrieveResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class LinkTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Link
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = LastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        string expectedID = "id";
+        bool expectedAutoDeploy = true;
+        string expectedBranch = "main";
+        ApiEnum<string, Connection> expectedConnection = Connection.App;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedFunctionID = "functionId";
+        string expectedOwner = "acme";
+        ApiEnum<string, Provider> expectedProvider = Provider.GitHub;
+        string expectedRepo = "order-bot";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastCommitMessage = "lastCommitMessage";
+        string expectedLastCommitSha = "lastCommitSha";
+        DateTimeOffset expectedLastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastError = "lastError";
+        ApiEnum<string, LastStatus> expectedLastStatus = LastStatus.Deploying;
+        string expectedRootDir = "rootDir";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedAutoDeploy, model.AutoDeploy);
+        Assert.Equal(expectedBranch, model.Branch);
+        Assert.Equal(expectedConnection, model.Connection);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedFunctionID, model.FunctionID);
+        Assert.Equal(expectedOwner, model.Owner);
+        Assert.Equal(expectedProvider, model.Provider);
+        Assert.Equal(expectedRepo, model.Repo);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+        Assert.Equal(expectedLastCommitMessage, model.LastCommitMessage);
+        Assert.Equal(expectedLastCommitSha, model.LastCommitSha);
+        Assert.Equal(expectedLastDeployAt, model.LastDeployAt);
+        Assert.Equal(expectedLastError, model.LastError);
+        Assert.Equal(expectedLastStatus, model.LastStatus);
+        Assert.Equal(expectedRootDir, model.RootDir);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Link
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = LastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Link>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Link
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = LastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Link>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        bool expectedAutoDeploy = true;
+        string expectedBranch = "main";
+        ApiEnum<string, Connection> expectedConnection = Connection.App;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedFunctionID = "functionId";
+        string expectedOwner = "acme";
+        ApiEnum<string, Provider> expectedProvider = Provider.GitHub;
+        string expectedRepo = "order-bot";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastCommitMessage = "lastCommitMessage";
+        string expectedLastCommitSha = "lastCommitSha";
+        DateTimeOffset expectedLastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastError = "lastError";
+        ApiEnum<string, LastStatus> expectedLastStatus = LastStatus.Deploying;
+        string expectedRootDir = "rootDir";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedAutoDeploy, deserialized.AutoDeploy);
+        Assert.Equal(expectedBranch, deserialized.Branch);
+        Assert.Equal(expectedConnection, deserialized.Connection);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedFunctionID, deserialized.FunctionID);
+        Assert.Equal(expectedOwner, deserialized.Owner);
+        Assert.Equal(expectedProvider, deserialized.Provider);
+        Assert.Equal(expectedRepo, deserialized.Repo);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+        Assert.Equal(expectedLastCommitMessage, deserialized.LastCommitMessage);
+        Assert.Equal(expectedLastCommitSha, deserialized.LastCommitSha);
+        Assert.Equal(expectedLastDeployAt, deserialized.LastDeployAt);
+        Assert.Equal(expectedLastError, deserialized.LastError);
+        Assert.Equal(expectedLastStatus, deserialized.LastStatus);
+        Assert.Equal(expectedRootDir, deserialized.RootDir);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Link
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = LastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Link
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.LastCommitMessage);
+        Assert.False(model.RawData.ContainsKey("lastCommitMessage"));
+        Assert.Null(model.LastCommitSha);
+        Assert.False(model.RawData.ContainsKey("lastCommitSha"));
+        Assert.Null(model.LastDeployAt);
+        Assert.False(model.RawData.ContainsKey("lastDeployAt"));
+        Assert.Null(model.LastError);
+        Assert.False(model.RawData.ContainsKey("lastError"));
+        Assert.Null(model.LastStatus);
+        Assert.False(model.RawData.ContainsKey("lastStatus"));
+        Assert.Null(model.RootDir);
+        Assert.False(model.RawData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Link
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new Link
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            LastCommitMessage = null,
+            LastCommitSha = null,
+            LastDeployAt = null,
+            LastError = null,
+            LastStatus = null,
+            RootDir = null,
+        };
+
+        Assert.Null(model.LastCommitMessage);
+        Assert.True(model.RawData.ContainsKey("lastCommitMessage"));
+        Assert.Null(model.LastCommitSha);
+        Assert.True(model.RawData.ContainsKey("lastCommitSha"));
+        Assert.Null(model.LastDeployAt);
+        Assert.True(model.RawData.ContainsKey("lastDeployAt"));
+        Assert.Null(model.LastError);
+        Assert.True(model.RawData.ContainsKey("lastError"));
+        Assert.Null(model.LastStatus);
+        Assert.True(model.RawData.ContainsKey("lastStatus"));
+        Assert.Null(model.RootDir);
+        Assert.True(model.RawData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Link
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            LastCommitMessage = null,
+            LastCommitSha = null,
+            LastDeployAt = null,
+            LastError = null,
+            LastStatus = null,
+            RootDir = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Link
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = Connection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = Provider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = LastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        Link copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ConnectionTest : TestBase
+{
+    [Theory]
+    [InlineData(Connection.App)]
+    [InlineData(Connection.Manual)]
+    public void Validation_Works(Connection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Connection> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Connection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Connection.App)]
+    [InlineData(Connection.Manual)]
+    public void SerializationRoundtrip_Works(Connection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Connection> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Connection>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Connection>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Connection>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class ProviderTest : TestBase
+{
+    [Theory]
+    [InlineData(Provider.GitHub)]
+    public void Validation_Works(Provider rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Provider> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Provider>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Provider.GitHub)]
+    public void SerializationRoundtrip_Works(Provider rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Provider> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Provider>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Provider>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Provider>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class LastStatusTest : TestBase
+{
+    [Theory]
+    [InlineData(LastStatus.Deploying)]
+    [InlineData(LastStatus.Deployed)]
+    [InlineData(LastStatus.Failed)]
+    public void Validation_Works(LastStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, LastStatus> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, LastStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(LastStatus.Deploying)]
+    [InlineData(LastStatus.Deployed)]
+    [InlineData(LastStatus.Failed)]
+    public void SerializationRoundtrip_Works(LastStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, LastStatus> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, LastStatus>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, LastStatus>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, LastStatus>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkUnlinkParamsTest.cs b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkUnlinkParamsTest.cs
new file mode 100644
index 0000000..c69a845
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkUnlinkParamsTest.cs
@@ -0,0 +1,42 @@
+using System;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Tests.Models.Functions.GitLink;
+
+public class GitLinkUnlinkParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new GitLinkUnlinkParams { FunctionID = "functionId" };
+
+        string expectedFunctionID = "functionId";
+
+        Assert.Equal(expectedFunctionID, parameters.FunctionID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        GitLinkUnlinkParams parameters = new() { FunctionID = "functionId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/functions/functionId/git-link"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new GitLinkUnlinkParams { FunctionID = "functionId" };
+
+        GitLinkUnlinkParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkUpdateParamsTest.cs b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkUpdateParamsTest.cs
new file mode 100644
index 0000000..3c4d2c8
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkUpdateParamsTest.cs
@@ -0,0 +1,120 @@
+using System;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Tests.Models.Functions.GitLink;
+
+public class GitLinkUpdateParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new GitLinkUpdateParams
+        {
+            FunctionID = "functionId",
+            AutoDeploy = false,
+            Branch = "branch",
+            RootDir = "rootDir",
+        };
+
+        string expectedFunctionID = "functionId";
+        bool expectedAutoDeploy = false;
+        string expectedBranch = "branch";
+        string expectedRootDir = "rootDir";
+
+        Assert.Equal(expectedFunctionID, parameters.FunctionID);
+        Assert.Equal(expectedAutoDeploy, parameters.AutoDeploy);
+        Assert.Equal(expectedBranch, parameters.Branch);
+        Assert.Equal(expectedRootDir, parameters.RootDir);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new GitLinkUpdateParams { FunctionID = "functionId", RootDir = "rootDir" };
+
+        Assert.Null(parameters.AutoDeploy);
+        Assert.False(parameters.RawBodyData.ContainsKey("autoDeploy"));
+        Assert.Null(parameters.Branch);
+        Assert.False(parameters.RawBodyData.ContainsKey("branch"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new GitLinkUpdateParams
+        {
+            FunctionID = "functionId",
+            RootDir = "rootDir",
+
+            // Null should be interpreted as omitted for these properties
+            AutoDeploy = null,
+            Branch = null,
+        };
+
+        Assert.Null(parameters.AutoDeploy);
+        Assert.False(parameters.RawBodyData.ContainsKey("autoDeploy"));
+        Assert.Null(parameters.Branch);
+        Assert.False(parameters.RawBodyData.ContainsKey("branch"));
+    }
+
+    [Fact]
+    public void OptionalNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new GitLinkUpdateParams
+        {
+            FunctionID = "functionId",
+            AutoDeploy = false,
+            Branch = "branch",
+        };
+
+        Assert.Null(parameters.RootDir);
+        Assert.False(parameters.RawBodyData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void OptionalNullableParamsSetToNullAreSetToNull_Works()
+    {
+        var parameters = new GitLinkUpdateParams
+        {
+            FunctionID = "functionId",
+            AutoDeploy = false,
+            Branch = "branch",
+
+            RootDir = null,
+        };
+
+        Assert.Null(parameters.RootDir);
+        Assert.True(parameters.RawBodyData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        GitLinkUpdateParams parameters = new() { FunctionID = "functionId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/functions/functionId/git-link"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new GitLinkUpdateParams
+        {
+            FunctionID = "functionId",
+            AutoDeploy = false,
+            Branch = "branch",
+            RootDir = "rootDir",
+        };
+
+        GitLinkUpdateParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkUpdateResponseTest.cs b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkUpdateResponseTest.cs
new file mode 100644
index 0000000..e71bad2
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/GitLink/GitLinkUpdateResponseTest.cs
@@ -0,0 +1,854 @@
+using System;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Tests.Models.Functions.GitLink;
+
+public class GitLinkUpdateResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new GitLinkUpdateResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkUpdateResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        GitLinkUpdateResponseLink expectedLink = new()
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+        string expectedWebhookUrl = "https://example.com";
+        string expectedWebhookSecret = "ghs_a1b2c3...";
+
+        Assert.Equal(expectedLink, model.Link);
+        Assert.Equal(expectedWebhookUrl, model.WebhookUrl);
+        Assert.Equal(expectedWebhookSecret, model.WebhookSecret);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new GitLinkUpdateResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkUpdateResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkUpdateResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new GitLinkUpdateResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkUpdateResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkUpdateResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        GitLinkUpdateResponseLink expectedLink = new()
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+        string expectedWebhookUrl = "https://example.com";
+        string expectedWebhookSecret = "ghs_a1b2c3...";
+
+        Assert.Equal(expectedLink, deserialized.Link);
+        Assert.Equal(expectedWebhookUrl, deserialized.WebhookUrl);
+        Assert.Equal(expectedWebhookSecret, deserialized.WebhookSecret);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new GitLinkUpdateResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkUpdateResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new GitLinkUpdateResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkUpdateResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+        };
+
+        Assert.Null(model.WebhookSecret);
+        Assert.False(model.RawData.ContainsKey("webhookSecret"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new GitLinkUpdateResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkUpdateResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new GitLinkUpdateResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkUpdateResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+
+            // Null should be interpreted as omitted for these properties
+            WebhookSecret = null,
+        };
+
+        Assert.Null(model.WebhookSecret);
+        Assert.False(model.RawData.ContainsKey("webhookSecret"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new GitLinkUpdateResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkUpdateResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+
+            // Null should be interpreted as omitted for these properties
+            WebhookSecret = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new GitLinkUpdateResponse
+        {
+            Link = new()
+            {
+                ID = "id",
+                AutoDeploy = true,
+                Branch = "main",
+                Connection = GitLinkUpdateResponseLinkConnection.App,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                FunctionID = "functionId",
+                Owner = "acme",
+                Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+                Repo = "order-bot",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastCommitMessage = "lastCommitMessage",
+                LastCommitSha = "lastCommitSha",
+                LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                LastError = "lastError",
+                LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+                RootDir = "rootDir",
+            },
+            WebhookUrl = "https://example.com",
+            WebhookSecret = "ghs_a1b2c3...",
+        };
+
+        GitLinkUpdateResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class GitLinkUpdateResponseLinkTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new GitLinkUpdateResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        string expectedID = "id";
+        bool expectedAutoDeploy = true;
+        string expectedBranch = "main";
+        ApiEnum<string, GitLinkUpdateResponseLinkConnection> expectedConnection =
+            GitLinkUpdateResponseLinkConnection.App;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedFunctionID = "functionId";
+        string expectedOwner = "acme";
+        ApiEnum<string, GitLinkUpdateResponseLinkProvider> expectedProvider =
+            GitLinkUpdateResponseLinkProvider.GitHub;
+        string expectedRepo = "order-bot";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastCommitMessage = "lastCommitMessage";
+        string expectedLastCommitSha = "lastCommitSha";
+        DateTimeOffset expectedLastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastError = "lastError";
+        ApiEnum<string, GitLinkUpdateResponseLinkLastStatus> expectedLastStatus =
+            GitLinkUpdateResponseLinkLastStatus.Deploying;
+        string expectedRootDir = "rootDir";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedAutoDeploy, model.AutoDeploy);
+        Assert.Equal(expectedBranch, model.Branch);
+        Assert.Equal(expectedConnection, model.Connection);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedFunctionID, model.FunctionID);
+        Assert.Equal(expectedOwner, model.Owner);
+        Assert.Equal(expectedProvider, model.Provider);
+        Assert.Equal(expectedRepo, model.Repo);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+        Assert.Equal(expectedLastCommitMessage, model.LastCommitMessage);
+        Assert.Equal(expectedLastCommitSha, model.LastCommitSha);
+        Assert.Equal(expectedLastDeployAt, model.LastDeployAt);
+        Assert.Equal(expectedLastError, model.LastError);
+        Assert.Equal(expectedLastStatus, model.LastStatus);
+        Assert.Equal(expectedRootDir, model.RootDir);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new GitLinkUpdateResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkUpdateResponseLink>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new GitLinkUpdateResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<GitLinkUpdateResponseLink>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        bool expectedAutoDeploy = true;
+        string expectedBranch = "main";
+        ApiEnum<string, GitLinkUpdateResponseLinkConnection> expectedConnection =
+            GitLinkUpdateResponseLinkConnection.App;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedFunctionID = "functionId";
+        string expectedOwner = "acme";
+        ApiEnum<string, GitLinkUpdateResponseLinkProvider> expectedProvider =
+            GitLinkUpdateResponseLinkProvider.GitHub;
+        string expectedRepo = "order-bot";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastCommitMessage = "lastCommitMessage";
+        string expectedLastCommitSha = "lastCommitSha";
+        DateTimeOffset expectedLastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedLastError = "lastError";
+        ApiEnum<string, GitLinkUpdateResponseLinkLastStatus> expectedLastStatus =
+            GitLinkUpdateResponseLinkLastStatus.Deploying;
+        string expectedRootDir = "rootDir";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedAutoDeploy, deserialized.AutoDeploy);
+        Assert.Equal(expectedBranch, deserialized.Branch);
+        Assert.Equal(expectedConnection, deserialized.Connection);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedFunctionID, deserialized.FunctionID);
+        Assert.Equal(expectedOwner, deserialized.Owner);
+        Assert.Equal(expectedProvider, deserialized.Provider);
+        Assert.Equal(expectedRepo, deserialized.Repo);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+        Assert.Equal(expectedLastCommitMessage, deserialized.LastCommitMessage);
+        Assert.Equal(expectedLastCommitSha, deserialized.LastCommitSha);
+        Assert.Equal(expectedLastDeployAt, deserialized.LastDeployAt);
+        Assert.Equal(expectedLastError, deserialized.LastError);
+        Assert.Equal(expectedLastStatus, deserialized.LastStatus);
+        Assert.Equal(expectedRootDir, deserialized.RootDir);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new GitLinkUpdateResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new GitLinkUpdateResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.LastCommitMessage);
+        Assert.False(model.RawData.ContainsKey("lastCommitMessage"));
+        Assert.Null(model.LastCommitSha);
+        Assert.False(model.RawData.ContainsKey("lastCommitSha"));
+        Assert.Null(model.LastDeployAt);
+        Assert.False(model.RawData.ContainsKey("lastDeployAt"));
+        Assert.Null(model.LastError);
+        Assert.False(model.RawData.ContainsKey("lastError"));
+        Assert.Null(model.LastStatus);
+        Assert.False(model.RawData.ContainsKey("lastStatus"));
+        Assert.Null(model.RootDir);
+        Assert.False(model.RawData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new GitLinkUpdateResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new GitLinkUpdateResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            LastCommitMessage = null,
+            LastCommitSha = null,
+            LastDeployAt = null,
+            LastError = null,
+            LastStatus = null,
+            RootDir = null,
+        };
+
+        Assert.Null(model.LastCommitMessage);
+        Assert.True(model.RawData.ContainsKey("lastCommitMessage"));
+        Assert.Null(model.LastCommitSha);
+        Assert.True(model.RawData.ContainsKey("lastCommitSha"));
+        Assert.Null(model.LastDeployAt);
+        Assert.True(model.RawData.ContainsKey("lastDeployAt"));
+        Assert.Null(model.LastError);
+        Assert.True(model.RawData.ContainsKey("lastError"));
+        Assert.Null(model.LastStatus);
+        Assert.True(model.RawData.ContainsKey("lastStatus"));
+        Assert.Null(model.RootDir);
+        Assert.True(model.RawData.ContainsKey("rootDir"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new GitLinkUpdateResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            LastCommitMessage = null,
+            LastCommitSha = null,
+            LastDeployAt = null,
+            LastError = null,
+            LastStatus = null,
+            RootDir = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new GitLinkUpdateResponseLink
+        {
+            ID = "id",
+            AutoDeploy = true,
+            Branch = "main",
+            Connection = GitLinkUpdateResponseLinkConnection.App,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            FunctionID = "functionId",
+            Owner = "acme",
+            Provider = GitLinkUpdateResponseLinkProvider.GitHub,
+            Repo = "order-bot",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastCommitMessage = "lastCommitMessage",
+            LastCommitSha = "lastCommitSha",
+            LastDeployAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            LastError = "lastError",
+            LastStatus = GitLinkUpdateResponseLinkLastStatus.Deploying,
+            RootDir = "rootDir",
+        };
+
+        GitLinkUpdateResponseLink copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class GitLinkUpdateResponseLinkConnectionTest : TestBase
+{
+    [Theory]
+    [InlineData(GitLinkUpdateResponseLinkConnection.App)]
+    [InlineData(GitLinkUpdateResponseLinkConnection.Manual)]
+    public void Validation_Works(GitLinkUpdateResponseLinkConnection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkUpdateResponseLinkConnection> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkConnection>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(GitLinkUpdateResponseLinkConnection.App)]
+    [InlineData(GitLinkUpdateResponseLinkConnection.Manual)]
+    public void SerializationRoundtrip_Works(GitLinkUpdateResponseLinkConnection rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkUpdateResponseLinkConnection> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkConnection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkConnection>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkConnection>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class GitLinkUpdateResponseLinkProviderTest : TestBase
+{
+    [Theory]
+    [InlineData(GitLinkUpdateResponseLinkProvider.GitHub)]
+    public void Validation_Works(GitLinkUpdateResponseLinkProvider rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkUpdateResponseLinkProvider> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, GitLinkUpdateResponseLinkProvider>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(GitLinkUpdateResponseLinkProvider.GitHub)]
+    public void SerializationRoundtrip_Works(GitLinkUpdateResponseLinkProvider rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkUpdateResponseLinkProvider> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkProvider>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, GitLinkUpdateResponseLinkProvider>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkProvider>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class GitLinkUpdateResponseLinkLastStatusTest : TestBase
+{
+    [Theory]
+    [InlineData(GitLinkUpdateResponseLinkLastStatus.Deploying)]
+    [InlineData(GitLinkUpdateResponseLinkLastStatus.Deployed)]
+    [InlineData(GitLinkUpdateResponseLinkLastStatus.Failed)]
+    public void Validation_Works(GitLinkUpdateResponseLinkLastStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkUpdateResponseLinkLastStatus> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkLastStatus>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(GitLinkUpdateResponseLinkLastStatus.Deploying)]
+    [InlineData(GitLinkUpdateResponseLinkLastStatus.Deployed)]
+    [InlineData(GitLinkUpdateResponseLinkLastStatus.Failed)]
+    public void SerializationRoundtrip_Works(GitLinkUpdateResponseLinkLastStatus rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, GitLinkUpdateResponseLinkLastStatus> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkLastStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkLastStatus>
+        >(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<
+            ApiEnum<string, GitLinkUpdateResponseLinkLastStatus>
+        >(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/Triggers/TriggerCreateParamsTest.cs b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerCreateParamsTest.cs
new file mode 100644
index 0000000..f6bfdb6
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerCreateParamsTest.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using Zavudev.Models.Functions.Triggers;
+
+namespace Zavudev.Tests.Models.Functions.Triggers;
+
+public class TriggerCreateParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new TriggerCreateParams
+        {
+            FunctionID = "functionId",
+            EventTypes = ["message.inbound"],
+            SenderIds = [null],
+            Cron = "0 9 * * 1-5",
+        };
+
+        string expectedFunctionID = "functionId";
+        List<string> expectedEventTypes = ["message.inbound"];
+        List<string?> expectedSenderIds = [null];
+        string expectedCron = "0 9 * * 1-5";
+
+        Assert.Equal(expectedFunctionID, parameters.FunctionID);
+        Assert.Equal(expectedEventTypes.Count, parameters.EventTypes.Count);
+        for (int i = 0; i < expectedEventTypes.Count; i++)
+        {
+            Assert.Equal(expectedEventTypes[i], parameters.EventTypes[i]);
+        }
+        Assert.Equal(expectedSenderIds.Count, parameters.SenderIds.Count);
+        for (int i = 0; i < expectedSenderIds.Count; i++)
+        {
+            Assert.Equal(expectedSenderIds[i], parameters.SenderIds[i]);
+        }
+        Assert.Equal(expectedCron, parameters.Cron);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new TriggerCreateParams
+        {
+            FunctionID = "functionId",
+            EventTypes = ["message.inbound"],
+            SenderIds = [null],
+        };
+
+        Assert.Null(parameters.Cron);
+        Assert.False(parameters.RawBodyData.ContainsKey("cron"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new TriggerCreateParams
+        {
+            FunctionID = "functionId",
+            EventTypes = ["message.inbound"],
+            SenderIds = [null],
+
+            // Null should be interpreted as omitted for these properties
+            Cron = null,
+        };
+
+        Assert.Null(parameters.Cron);
+        Assert.False(parameters.RawBodyData.ContainsKey("cron"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        TriggerCreateParams parameters = new()
+        {
+            FunctionID = "functionId",
+            EventTypes = ["message.inbound"],
+            SenderIds = [null],
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/functions/functionId/triggers"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new TriggerCreateParams
+        {
+            FunctionID = "functionId",
+            EventTypes = ["message.inbound"],
+            SenderIds = [null],
+            Cron = "0 9 * * 1-5",
+        };
+
+        TriggerCreateParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/Triggers/TriggerCreateResponseTest.cs b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerCreateResponseTest.cs
new file mode 100644
index 0000000..2a5b622
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerCreateResponseTest.cs
@@ -0,0 +1,458 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Functions.Triggers;
+
+namespace Zavudev.Tests.Models.Functions.Triggers;
+
+public class TriggerCreateResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new TriggerCreateResponse
+        {
+            Added = 0,
+            Skipped = 0,
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        long expectedAdded = 0;
+        long expectedSkipped = 0;
+        List<Trigger> expectedTriggers =
+        [
+            new()
+            {
+                ID = "id",
+                Active = true,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EventType = "eventType",
+                FunctionID = "functionId",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cron = "*/15 * * * *",
+                LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                SenderID = "senderId",
+            },
+        ];
+
+        Assert.Equal(expectedAdded, model.Added);
+        Assert.Equal(expectedSkipped, model.Skipped);
+        Assert.Equal(expectedTriggers.Count, model.Triggers.Count);
+        for (int i = 0; i < expectedTriggers.Count; i++)
+        {
+            Assert.Equal(expectedTriggers[i], model.Triggers[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new TriggerCreateResponse
+        {
+            Added = 0,
+            Skipped = 0,
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TriggerCreateResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new TriggerCreateResponse
+        {
+            Added = 0,
+            Skipped = 0,
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TriggerCreateResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        long expectedAdded = 0;
+        long expectedSkipped = 0;
+        List<Trigger> expectedTriggers =
+        [
+            new()
+            {
+                ID = "id",
+                Active = true,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EventType = "eventType",
+                FunctionID = "functionId",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cron = "*/15 * * * *",
+                LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                SenderID = "senderId",
+            },
+        ];
+
+        Assert.Equal(expectedAdded, deserialized.Added);
+        Assert.Equal(expectedSkipped, deserialized.Skipped);
+        Assert.Equal(expectedTriggers.Count, deserialized.Triggers.Count);
+        for (int i = 0; i < expectedTriggers.Count; i++)
+        {
+            Assert.Equal(expectedTriggers[i], deserialized.Triggers[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new TriggerCreateResponse
+        {
+            Added = 0,
+            Skipped = 0,
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new TriggerCreateResponse
+        {
+            Added = 0,
+            Skipped = 0,
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        TriggerCreateResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class TriggerTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Trigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        string expectedID = "id";
+        bool expectedActive = true;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEventType = "eventType";
+        string expectedFunctionID = "functionId";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedCron = "*/15 * * * *";
+        DateTimeOffset expectedLastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedNextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedSenderID = "senderId";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedActive, model.Active);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedEventType, model.EventType);
+        Assert.Equal(expectedFunctionID, model.FunctionID);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+        Assert.Equal(expectedCron, model.Cron);
+        Assert.Equal(expectedLastRunAt, model.LastRunAt);
+        Assert.Equal(expectedNextRunAt, model.NextRunAt);
+        Assert.Equal(expectedSenderID, model.SenderID);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Trigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Trigger>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Trigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Trigger>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        bool expectedActive = true;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEventType = "eventType";
+        string expectedFunctionID = "functionId";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedCron = "*/15 * * * *";
+        DateTimeOffset expectedLastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedNextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedSenderID = "senderId";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedActive, deserialized.Active);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedEventType, deserialized.EventType);
+        Assert.Equal(expectedFunctionID, deserialized.FunctionID);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+        Assert.Equal(expectedCron, deserialized.Cron);
+        Assert.Equal(expectedLastRunAt, deserialized.LastRunAt);
+        Assert.Equal(expectedNextRunAt, deserialized.NextRunAt);
+        Assert.Equal(expectedSenderID, deserialized.SenderID);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Trigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Trigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.Cron);
+        Assert.False(model.RawData.ContainsKey("cron"));
+        Assert.Null(model.LastRunAt);
+        Assert.False(model.RawData.ContainsKey("lastRunAt"));
+        Assert.Null(model.NextRunAt);
+        Assert.False(model.RawData.ContainsKey("nextRunAt"));
+        Assert.Null(model.SenderID);
+        Assert.False(model.RawData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Trigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new Trigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            Cron = null,
+            LastRunAt = null,
+            NextRunAt = null,
+            SenderID = null,
+        };
+
+        Assert.Null(model.Cron);
+        Assert.True(model.RawData.ContainsKey("cron"));
+        Assert.Null(model.LastRunAt);
+        Assert.True(model.RawData.ContainsKey("lastRunAt"));
+        Assert.Null(model.NextRunAt);
+        Assert.True(model.RawData.ContainsKey("nextRunAt"));
+        Assert.Null(model.SenderID);
+        Assert.True(model.RawData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Trigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            Cron = null,
+            LastRunAt = null,
+            NextRunAt = null,
+            SenderID = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Trigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        Trigger copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/Triggers/TriggerDeleteParamsTest.cs b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerDeleteParamsTest.cs
new file mode 100644
index 0000000..1a4d6c2
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerDeleteParamsTest.cs
@@ -0,0 +1,39 @@
+using System;
+using Zavudev.Models.Functions.Triggers;
+
+namespace Zavudev.Tests.Models.Functions.Triggers;
+
+public class TriggerDeleteParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new TriggerDeleteParams { TriggerID = "triggerId" };
+
+        string expectedTriggerID = "triggerId";
+
+        Assert.Equal(expectedTriggerID, parameters.TriggerID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        TriggerDeleteParams parameters = new() { TriggerID = "triggerId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/functions/triggers/triggerId"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new TriggerDeleteParams { TriggerID = "triggerId" };
+
+        TriggerDeleteParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/Triggers/TriggerListParamsTest.cs b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerListParamsTest.cs
new file mode 100644
index 0000000..7617552
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerListParamsTest.cs
@@ -0,0 +1,42 @@
+using System;
+using Zavudev.Models.Functions.Triggers;
+
+namespace Zavudev.Tests.Models.Functions.Triggers;
+
+public class TriggerListParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new TriggerListParams { FunctionID = "functionId" };
+
+        string expectedFunctionID = "functionId";
+
+        Assert.Equal(expectedFunctionID, parameters.FunctionID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        TriggerListParams parameters = new() { FunctionID = "functionId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/functions/functionId/triggers"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new TriggerListParams { FunctionID = "functionId" };
+
+        TriggerListParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/Triggers/TriggerListResponseTest.cs b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerListResponseTest.cs
new file mode 100644
index 0000000..24801bc
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerListResponseTest.cs
@@ -0,0 +1,443 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Functions.Triggers;
+
+namespace Zavudev.Tests.Models.Functions.Triggers;
+
+public class TriggerListResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new TriggerListResponse
+        {
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        List<TriggerListResponseTrigger> expectedTriggers =
+        [
+            new()
+            {
+                ID = "id",
+                Active = true,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EventType = "eventType",
+                FunctionID = "functionId",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cron = "*/15 * * * *",
+                LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                SenderID = "senderId",
+            },
+        ];
+
+        Assert.Equal(expectedTriggers.Count, model.Triggers.Count);
+        for (int i = 0; i < expectedTriggers.Count; i++)
+        {
+            Assert.Equal(expectedTriggers[i], model.Triggers[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new TriggerListResponse
+        {
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TriggerListResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new TriggerListResponse
+        {
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TriggerListResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<TriggerListResponseTrigger> expectedTriggers =
+        [
+            new()
+            {
+                ID = "id",
+                Active = true,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                EventType = "eventType",
+                FunctionID = "functionId",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Cron = "*/15 * * * *",
+                LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                SenderID = "senderId",
+            },
+        ];
+
+        Assert.Equal(expectedTriggers.Count, deserialized.Triggers.Count);
+        for (int i = 0; i < expectedTriggers.Count; i++)
+        {
+            Assert.Equal(expectedTriggers[i], deserialized.Triggers[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new TriggerListResponse
+        {
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new TriggerListResponse
+        {
+            Triggers =
+            [
+                new()
+                {
+                    ID = "id",
+                    Active = true,
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    EventType = "eventType",
+                    FunctionID = "functionId",
+                    UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Cron = "*/15 * * * *",
+                    LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    SenderID = "senderId",
+                },
+            ],
+        };
+
+        TriggerListResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class TriggerListResponseTriggerTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new TriggerListResponseTrigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        string expectedID = "id";
+        bool expectedActive = true;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEventType = "eventType";
+        string expectedFunctionID = "functionId";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedCron = "*/15 * * * *";
+        DateTimeOffset expectedLastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedNextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedSenderID = "senderId";
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedActive, model.Active);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedEventType, model.EventType);
+        Assert.Equal(expectedFunctionID, model.FunctionID);
+        Assert.Equal(expectedUpdatedAt, model.UpdatedAt);
+        Assert.Equal(expectedCron, model.Cron);
+        Assert.Equal(expectedLastRunAt, model.LastRunAt);
+        Assert.Equal(expectedNextRunAt, model.NextRunAt);
+        Assert.Equal(expectedSenderID, model.SenderID);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new TriggerListResponseTrigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TriggerListResponseTrigger>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new TriggerListResponseTrigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TriggerListResponseTrigger>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        bool expectedActive = true;
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedEventType = "eventType";
+        string expectedFunctionID = "functionId";
+        DateTimeOffset expectedUpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedCron = "*/15 * * * *";
+        DateTimeOffset expectedLastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        DateTimeOffset expectedNextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedSenderID = "senderId";
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedActive, deserialized.Active);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedEventType, deserialized.EventType);
+        Assert.Equal(expectedFunctionID, deserialized.FunctionID);
+        Assert.Equal(expectedUpdatedAt, deserialized.UpdatedAt);
+        Assert.Equal(expectedCron, deserialized.Cron);
+        Assert.Equal(expectedLastRunAt, deserialized.LastRunAt);
+        Assert.Equal(expectedNextRunAt, deserialized.NextRunAt);
+        Assert.Equal(expectedSenderID, deserialized.SenderID);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new TriggerListResponseTrigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new TriggerListResponseTrigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Null(model.Cron);
+        Assert.False(model.RawData.ContainsKey("cron"));
+        Assert.Null(model.LastRunAt);
+        Assert.False(model.RawData.ContainsKey("lastRunAt"));
+        Assert.Null(model.NextRunAt);
+        Assert.False(model.RawData.ContainsKey("nextRunAt"));
+        Assert.Null(model.SenderID);
+        Assert.False(model.RawData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new TriggerListResponseTrigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new TriggerListResponseTrigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            Cron = null,
+            LastRunAt = null,
+            NextRunAt = null,
+            SenderID = null,
+        };
+
+        Assert.Null(model.Cron);
+        Assert.True(model.RawData.ContainsKey("cron"));
+        Assert.Null(model.LastRunAt);
+        Assert.True(model.RawData.ContainsKey("lastRunAt"));
+        Assert.Null(model.NextRunAt);
+        Assert.True(model.RawData.ContainsKey("nextRunAt"));
+        Assert.Null(model.SenderID);
+        Assert.True(model.RawData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new TriggerListResponseTrigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+
+            Cron = null,
+            LastRunAt = null,
+            NextRunAt = null,
+            SenderID = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new TriggerListResponseTrigger
+        {
+            ID = "id",
+            Active = true,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            EventType = "eventType",
+            FunctionID = "functionId",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Cron = "*/15 * * * *",
+            LastRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            NextRunAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            SenderID = "senderId",
+        };
+
+        TriggerListResponseTrigger copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/Triggers/TriggerUpdateParamsTest.cs b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerUpdateParamsTest.cs
new file mode 100644
index 0000000..eb07264
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerUpdateParamsTest.cs
@@ -0,0 +1,41 @@
+using System;
+using Zavudev.Models.Functions.Triggers;
+
+namespace Zavudev.Tests.Models.Functions.Triggers;
+
+public class TriggerUpdateParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new TriggerUpdateParams { TriggerID = "triggerId", Active = true };
+
+        string expectedTriggerID = "triggerId";
+        bool expectedActive = true;
+
+        Assert.Equal(expectedTriggerID, parameters.TriggerID);
+        Assert.Equal(expectedActive, parameters.Active);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        TriggerUpdateParams parameters = new() { TriggerID = "triggerId", Active = true };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/functions/triggers/triggerId"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new TriggerUpdateParams { TriggerID = "triggerId", Active = true };
+
+        TriggerUpdateParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Functions/Triggers/TriggerUpdateResponseTest.cs b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerUpdateResponseTest.cs
new file mode 100644
index 0000000..4d8d32f
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Functions/Triggers/TriggerUpdateResponseTest.cs
@@ -0,0 +1,71 @@
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Functions.Triggers;
+
+namespace Zavudev.Tests.Models.Functions.Triggers;
+
+public class TriggerUpdateResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new TriggerUpdateResponse { Active = true, Ok = true };
+
+        bool expectedActive = true;
+        bool expectedOk = true;
+
+        Assert.Equal(expectedActive, model.Active);
+        Assert.Equal(expectedOk, model.Ok);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new TriggerUpdateResponse { Active = true, Ok = true };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TriggerUpdateResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new TriggerUpdateResponse { Active = true, Ok = true };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TriggerUpdateResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        bool expectedActive = true;
+        bool expectedOk = true;
+
+        Assert.Equal(expectedActive, deserialized.Active);
+        Assert.Equal(expectedOk, deserialized.Ok);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new TriggerUpdateResponse { Active = true, Ok = true };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new TriggerUpdateResponse { Active = true, Ok = true };
+
+        TriggerUpdateResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Introspect/IntrospectValidateEmailParamsTest.cs b/src/Zavudev.Tests/Models/Introspect/IntrospectValidateEmailParamsTest.cs
new file mode 100644
index 0000000..384e80d
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Introspect/IntrospectValidateEmailParamsTest.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using Zavudev.Models.Introspect;
+
+namespace Zavudev.Tests.Models.Introspect;
+
+public class IntrospectValidateEmailParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new IntrospectValidateEmailParams
+        {
+            Email = "maria@example.com",
+            Emails = ["maria@example.com", "info@deaddomain.example"],
+        };
+
+        string expectedEmail = "maria@example.com";
+        List<string> expectedEmails = ["maria@example.com", "info@deaddomain.example"];
+
+        Assert.Equal(expectedEmail, parameters.Email);
+        Assert.NotNull(parameters.Emails);
+        Assert.Equal(expectedEmails.Count, parameters.Emails.Count);
+        for (int i = 0; i < expectedEmails.Count; i++)
+        {
+            Assert.Equal(expectedEmails[i], parameters.Emails[i]);
+        }
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new IntrospectValidateEmailParams { };
+
+        Assert.Null(parameters.Email);
+        Assert.False(parameters.RawBodyData.ContainsKey("email"));
+        Assert.Null(parameters.Emails);
+        Assert.False(parameters.RawBodyData.ContainsKey("emails"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new IntrospectValidateEmailParams
+        {
+            // Null should be interpreted as omitted for these properties
+            Email = null,
+            Emails = null,
+        };
+
+        Assert.Null(parameters.Email);
+        Assert.False(parameters.RawBodyData.ContainsKey("email"));
+        Assert.Null(parameters.Emails);
+        Assert.False(parameters.RawBodyData.ContainsKey("emails"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        IntrospectValidateEmailParams parameters = new();
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/introspect/email"), url));
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new IntrospectValidateEmailParams
+        {
+            Email = "maria@example.com",
+            Emails = ["maria@example.com", "info@deaddomain.example"],
+        };
+
+        IntrospectValidateEmailParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Introspect/IntrospectValidateEmailResponseTest.cs b/src/Zavudev.Tests/Models/Introspect/IntrospectValidateEmailResponseTest.cs
new file mode 100644
index 0000000..e980416
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Introspect/IntrospectValidateEmailResponseTest.cs
@@ -0,0 +1,563 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Introspect;
+
+namespace Zavudev.Tests.Models.Introspect;
+
+public class IntrospectValidateEmailResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new IntrospectValidateEmailResponse
+        {
+            Results =
+            [
+                new()
+                {
+                    Domain = "domain",
+                    Email = "email",
+                    Normalized = "normalized",
+                    Reasons = [Reason.InvalidSyntax],
+                    Verdict = Verdict.Deliverable,
+                },
+            ],
+            Summary = new()
+            {
+                Deliverable = 0,
+                Risky = 0,
+                Total = 0,
+                Undeliverable = 0,
+            },
+        };
+
+        List<Result> expectedResults =
+        [
+            new()
+            {
+                Domain = "domain",
+                Email = "email",
+                Normalized = "normalized",
+                Reasons = [Reason.InvalidSyntax],
+                Verdict = Verdict.Deliverable,
+            },
+        ];
+        Summary expectedSummary = new()
+        {
+            Deliverable = 0,
+            Risky = 0,
+            Total = 0,
+            Undeliverable = 0,
+        };
+
+        Assert.Equal(expectedResults.Count, model.Results.Count);
+        for (int i = 0; i < expectedResults.Count; i++)
+        {
+            Assert.Equal(expectedResults[i], model.Results[i]);
+        }
+        Assert.Equal(expectedSummary, model.Summary);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new IntrospectValidateEmailResponse
+        {
+            Results =
+            [
+                new()
+                {
+                    Domain = "domain",
+                    Email = "email",
+                    Normalized = "normalized",
+                    Reasons = [Reason.InvalidSyntax],
+                    Verdict = Verdict.Deliverable,
+                },
+            ],
+            Summary = new()
+            {
+                Deliverable = 0,
+                Risky = 0,
+                Total = 0,
+                Undeliverable = 0,
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<IntrospectValidateEmailResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new IntrospectValidateEmailResponse
+        {
+            Results =
+            [
+                new()
+                {
+                    Domain = "domain",
+                    Email = "email",
+                    Normalized = "normalized",
+                    Reasons = [Reason.InvalidSyntax],
+                    Verdict = Verdict.Deliverable,
+                },
+            ],
+            Summary = new()
+            {
+                Deliverable = 0,
+                Risky = 0,
+                Total = 0,
+                Undeliverable = 0,
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<IntrospectValidateEmailResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<Result> expectedResults =
+        [
+            new()
+            {
+                Domain = "domain",
+                Email = "email",
+                Normalized = "normalized",
+                Reasons = [Reason.InvalidSyntax],
+                Verdict = Verdict.Deliverable,
+            },
+        ];
+        Summary expectedSummary = new()
+        {
+            Deliverable = 0,
+            Risky = 0,
+            Total = 0,
+            Undeliverable = 0,
+        };
+
+        Assert.Equal(expectedResults.Count, deserialized.Results.Count);
+        for (int i = 0; i < expectedResults.Count; i++)
+        {
+            Assert.Equal(expectedResults[i], deserialized.Results[i]);
+        }
+        Assert.Equal(expectedSummary, deserialized.Summary);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new IntrospectValidateEmailResponse
+        {
+            Results =
+            [
+                new()
+                {
+                    Domain = "domain",
+                    Email = "email",
+                    Normalized = "normalized",
+                    Reasons = [Reason.InvalidSyntax],
+                    Verdict = Verdict.Deliverable,
+                },
+            ],
+            Summary = new()
+            {
+                Deliverable = 0,
+                Risky = 0,
+                Total = 0,
+                Undeliverable = 0,
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new IntrospectValidateEmailResponse
+        {
+            Results =
+            [
+                new()
+                {
+                    Domain = "domain",
+                    Email = "email",
+                    Normalized = "normalized",
+                    Reasons = [Reason.InvalidSyntax],
+                    Verdict = Verdict.Deliverable,
+                },
+            ],
+            Summary = new()
+            {
+                Deliverable = 0,
+                Risky = 0,
+                Total = 0,
+                Undeliverable = 0,
+            },
+        };
+
+        IntrospectValidateEmailResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ResultTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Result
+        {
+            Domain = "domain",
+            Email = "email",
+            Normalized = "normalized",
+            Reasons = [Reason.InvalidSyntax],
+            Verdict = Verdict.Deliverable,
+        };
+
+        string expectedDomain = "domain";
+        string expectedEmail = "email";
+        string expectedNormalized = "normalized";
+        List<ApiEnum<string, Reason>> expectedReasons = [Reason.InvalidSyntax];
+        ApiEnum<string, Verdict> expectedVerdict = Verdict.Deliverable;
+
+        Assert.Equal(expectedDomain, model.Domain);
+        Assert.Equal(expectedEmail, model.Email);
+        Assert.Equal(expectedNormalized, model.Normalized);
+        Assert.Equal(expectedReasons.Count, model.Reasons.Count);
+        for (int i = 0; i < expectedReasons.Count; i++)
+        {
+            Assert.Equal(expectedReasons[i], model.Reasons[i]);
+        }
+        Assert.Equal(expectedVerdict, model.Verdict);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Result
+        {
+            Domain = "domain",
+            Email = "email",
+            Normalized = "normalized",
+            Reasons = [Reason.InvalidSyntax],
+            Verdict = Verdict.Deliverable,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Result>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Result
+        {
+            Domain = "domain",
+            Email = "email",
+            Normalized = "normalized",
+            Reasons = [Reason.InvalidSyntax],
+            Verdict = Verdict.Deliverable,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Result>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedDomain = "domain";
+        string expectedEmail = "email";
+        string expectedNormalized = "normalized";
+        List<ApiEnum<string, Reason>> expectedReasons = [Reason.InvalidSyntax];
+        ApiEnum<string, Verdict> expectedVerdict = Verdict.Deliverable;
+
+        Assert.Equal(expectedDomain, deserialized.Domain);
+        Assert.Equal(expectedEmail, deserialized.Email);
+        Assert.Equal(expectedNormalized, deserialized.Normalized);
+        Assert.Equal(expectedReasons.Count, deserialized.Reasons.Count);
+        for (int i = 0; i < expectedReasons.Count; i++)
+        {
+            Assert.Equal(expectedReasons[i], deserialized.Reasons[i]);
+        }
+        Assert.Equal(expectedVerdict, deserialized.Verdict);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Result
+        {
+            Domain = "domain",
+            Email = "email",
+            Normalized = "normalized",
+            Reasons = [Reason.InvalidSyntax],
+            Verdict = Verdict.Deliverable,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Result
+        {
+            Domain = "domain",
+            Email = "email",
+            Normalized = "normalized",
+            Reasons = [Reason.InvalidSyntax],
+            Verdict = Verdict.Deliverable,
+        };
+
+        Result copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ReasonTest : TestBase
+{
+    [Theory]
+    [InlineData(Reason.InvalidSyntax)]
+    [InlineData(Reason.DomainNotFound)]
+    [InlineData(Reason.DomainNoMx)]
+    [InlineData(Reason.DisposableDomain)]
+    [InlineData(Reason.RoleAddress)]
+    [InlineData(Reason.SuppressedHardBounce)]
+    [InlineData(Reason.SuppressedSoftBounce)]
+    [InlineData(Reason.SuppressedComplaint)]
+    [InlineData(Reason.SuppressedManual)]
+    [InlineData(Reason.SuppressedUnsubscribe)]
+    public void Validation_Works(Reason rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Reason> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Reason>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Reason.InvalidSyntax)]
+    [InlineData(Reason.DomainNotFound)]
+    [InlineData(Reason.DomainNoMx)]
+    [InlineData(Reason.DisposableDomain)]
+    [InlineData(Reason.RoleAddress)]
+    [InlineData(Reason.SuppressedHardBounce)]
+    [InlineData(Reason.SuppressedSoftBounce)]
+    [InlineData(Reason.SuppressedComplaint)]
+    [InlineData(Reason.SuppressedManual)]
+    [InlineData(Reason.SuppressedUnsubscribe)]
+    public void SerializationRoundtrip_Works(Reason rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Reason> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Reason>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Reason>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Reason>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class VerdictTest : TestBase
+{
+    [Theory]
+    [InlineData(Verdict.Deliverable)]
+    [InlineData(Verdict.Risky)]
+    [InlineData(Verdict.Undeliverable)]
+    public void Validation_Works(Verdict rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Verdict> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Verdict>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Verdict.Deliverable)]
+    [InlineData(Verdict.Risky)]
+    [InlineData(Verdict.Undeliverable)]
+    public void SerializationRoundtrip_Works(Verdict rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Verdict> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Verdict>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Verdict>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Verdict>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class SummaryTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Summary
+        {
+            Deliverable = 0,
+            Risky = 0,
+            Total = 0,
+            Undeliverable = 0,
+        };
+
+        long expectedDeliverable = 0;
+        long expectedRisky = 0;
+        long expectedTotal = 0;
+        long expectedUndeliverable = 0;
+
+        Assert.Equal(expectedDeliverable, model.Deliverable);
+        Assert.Equal(expectedRisky, model.Risky);
+        Assert.Equal(expectedTotal, model.Total);
+        Assert.Equal(expectedUndeliverable, model.Undeliverable);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Summary
+        {
+            Deliverable = 0,
+            Risky = 0,
+            Total = 0,
+            Undeliverable = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Summary>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Summary
+        {
+            Deliverable = 0,
+            Risky = 0,
+            Total = 0,
+            Undeliverable = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Summary>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        long expectedDeliverable = 0;
+        long expectedRisky = 0;
+        long expectedTotal = 0;
+        long expectedUndeliverable = 0;
+
+        Assert.Equal(expectedDeliverable, deserialized.Deliverable);
+        Assert.Equal(expectedRisky, deserialized.Risky);
+        Assert.Equal(expectedTotal, deserialized.Total);
+        Assert.Equal(expectedUndeliverable, deserialized.Undeliverable);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Summary
+        {
+            Deliverable = 0,
+            Risky = 0,
+            Total = 0,
+            Undeliverable = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Summary
+        {
+            Deliverable = 0,
+            Risky = 0,
+            Total = 0,
+            Undeliverable = 0,
+        };
+
+        Summary copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Messages/MessageContentTest.cs b/src/Zavudev.Tests/Models/Messages/MessageContentTest.cs
index 64831fb..4199e74 100644
--- a/src/Zavudev.Tests/Models/Messages/MessageContentTest.cs
+++ b/src/Zavudev.Tests/Models/Messages/MessageContentTest.cs
@@ -32,6 +32,19 @@ public void FieldRoundtrip_Works()
             MediaUrl = "https://example.com/image.jpg",
             MimeType = "image/jpeg",
             ReactToMessageID = "reactToMessageId",
+            Referral = new()
+            {
+                Body = "body",
+                CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                Headline = "headline",
+                ImageUrl = "https://example.com",
+                MediaType = MediaType.Image,
+                SourceID = "120210000000000000",
+                SourceType = SourceType.Ad,
+                SourceUrl = "https://example.com",
+                ThumbnailUrl = "https://example.com",
+                VideoUrl = "https://example.com",
+            },
             ReplyToFrom = "replyToFrom",
             ReplyToMessageID = "replyToMessageId",
             ReplyToMessageType = "replyToMessageType",
@@ -85,6 +98,19 @@ public void FieldRoundtrip_Works()
         string expectedMediaUrl = "https://example.com/image.jpg";
         string expectedMimeType = "image/jpeg";
         string expectedReactToMessageID = "reactToMessageId";
+        Referral expectedReferral = new()
+        {
+            Body = "body",
+            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+            Headline = "headline",
+            ImageUrl = "https://example.com",
+            MediaType = MediaType.Image,
+            SourceID = "120210000000000000",
+            SourceType = SourceType.Ad,
+            SourceUrl = "https://example.com",
+            ThumbnailUrl = "https://example.com",
+            VideoUrl = "https://example.com",
+        };
         string expectedReplyToFrom = "replyToFrom";
         string expectedReplyToMessageID = "replyToMessageId";
         string expectedReplyToMessageType = "replyToMessageType";
@@ -150,6 +176,7 @@ public void FieldRoundtrip_Works()
         Assert.Equal(expectedMediaUrl, model.MediaUrl);
         Assert.Equal(expectedMimeType, model.MimeType);
         Assert.Equal(expectedReactToMessageID, model.ReactToMessageID);
+        Assert.Equal(expectedReferral, model.Referral);
         Assert.Equal(expectedReplyToFrom, model.ReplyToFrom);
         Assert.Equal(expectedReplyToMessageID, model.ReplyToMessageID);
         Assert.Equal(expectedReplyToMessageType, model.ReplyToMessageType);
@@ -212,6 +239,19 @@ public void SerializationRoundtrip_Works()
             MediaUrl = "https://example.com/image.jpg",
             MimeType = "image/jpeg",
             ReactToMessageID = "reactToMessageId",
+            Referral = new()
+            {
+                Body = "body",
+                CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                Headline = "headline",
+                ImageUrl = "https://example.com",
+                MediaType = MediaType.Image,
+                SourceID = "120210000000000000",
+                SourceType = SourceType.Ad,
+                SourceUrl = "https://example.com",
+                ThumbnailUrl = "https://example.com",
+                VideoUrl = "https://example.com",
+            },
             ReplyToFrom = "replyToFrom",
             ReplyToMessageID = "replyToMessageId",
             ReplyToMessageType = "replyToMessageType",
@@ -279,6 +319,19 @@ public void FieldRoundtripThroughSerialization_Works()
             MediaUrl = "https://example.com/image.jpg",
             MimeType = "image/jpeg",
             ReactToMessageID = "reactToMessageId",
+            Referral = new()
+            {
+                Body = "body",
+                CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                Headline = "headline",
+                ImageUrl = "https://example.com",
+                MediaType = MediaType.Image,
+                SourceID = "120210000000000000",
+                SourceType = SourceType.Ad,
+                SourceUrl = "https://example.com",
+                ThumbnailUrl = "https://example.com",
+                VideoUrl = "https://example.com",
+            },
             ReplyToFrom = "replyToFrom",
             ReplyToMessageID = "replyToMessageId",
             ReplyToMessageType = "replyToMessageType",
@@ -339,6 +392,19 @@ public void FieldRoundtripThroughSerialization_Works()
         string expectedMediaUrl = "https://example.com/image.jpg";
         string expectedMimeType = "image/jpeg";
         string expectedReactToMessageID = "reactToMessageId";
+        Referral expectedReferral = new()
+        {
+            Body = "body",
+            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+            Headline = "headline",
+            ImageUrl = "https://example.com",
+            MediaType = MediaType.Image,
+            SourceID = "120210000000000000",
+            SourceType = SourceType.Ad,
+            SourceUrl = "https://example.com",
+            ThumbnailUrl = "https://example.com",
+            VideoUrl = "https://example.com",
+        };
         string expectedReplyToFrom = "replyToFrom";
         string expectedReplyToMessageID = "replyToMessageId";
         string expectedReplyToMessageType = "replyToMessageType";
@@ -404,6 +470,7 @@ public void FieldRoundtripThroughSerialization_Works()
         Assert.Equal(expectedMediaUrl, deserialized.MediaUrl);
         Assert.Equal(expectedMimeType, deserialized.MimeType);
         Assert.Equal(expectedReactToMessageID, deserialized.ReactToMessageID);
+        Assert.Equal(expectedReferral, deserialized.Referral);
         Assert.Equal(expectedReplyToFrom, deserialized.ReplyToFrom);
         Assert.Equal(expectedReplyToMessageID, deserialized.ReplyToMessageID);
         Assert.Equal(expectedReplyToMessageType, deserialized.ReplyToMessageType);
@@ -472,6 +539,19 @@ public void Validation_Works()
             MediaUrl = "https://example.com/image.jpg",
             MimeType = "image/jpeg",
             ReactToMessageID = "reactToMessageId",
+            Referral = new()
+            {
+                Body = "body",
+                CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                Headline = "headline",
+                ImageUrl = "https://example.com",
+                MediaType = MediaType.Image,
+                SourceID = "120210000000000000",
+                SourceType = SourceType.Ad,
+                SourceUrl = "https://example.com",
+                ThumbnailUrl = "https://example.com",
+                VideoUrl = "https://example.com",
+            },
             ReplyToFrom = "replyToFrom",
             ReplyToMessageID = "replyToMessageId",
             ReplyToMessageType = "replyToMessageType",
@@ -552,6 +632,8 @@ public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
         Assert.False(model.RawData.ContainsKey("mimeType"));
         Assert.Null(model.ReactToMessageID);
         Assert.False(model.RawData.ContainsKey("reactToMessageId"));
+        Assert.Null(model.Referral);
+        Assert.False(model.RawData.ContainsKey("referral"));
         Assert.Null(model.ReplyToFrom);
         Assert.False(model.RawData.ContainsKey("replyToFrom"));
         Assert.Null(model.ReplyToMessageID);
@@ -607,6 +689,7 @@ public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
             MediaUrl = null,
             MimeType = null,
             ReactToMessageID = null,
+            Referral = null,
             ReplyToFrom = null,
             ReplyToMessageID = null,
             ReplyToMessageType = null,
@@ -657,6 +740,8 @@ public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
         Assert.False(model.RawData.ContainsKey("mimeType"));
         Assert.Null(model.ReactToMessageID);
         Assert.False(model.RawData.ContainsKey("reactToMessageId"));
+        Assert.Null(model.Referral);
+        Assert.False(model.RawData.ContainsKey("referral"));
         Assert.Null(model.ReplyToFrom);
         Assert.False(model.RawData.ContainsKey("replyToFrom"));
         Assert.Null(model.ReplyToMessageID);
@@ -704,6 +789,7 @@ public void OptionalNonNullablePropertiesSetToNullValidation_Works()
             MediaUrl = null,
             MimeType = null,
             ReactToMessageID = null,
+            Referral = null,
             ReplyToFrom = null,
             ReplyToMessageID = null,
             ReplyToMessageType = null,
@@ -743,6 +829,19 @@ public void CopyConstructor_Works()
             MediaUrl = "https://example.com/image.jpg",
             MimeType = "image/jpeg",
             ReactToMessageID = "reactToMessageId",
+            Referral = new()
+            {
+                Body = "body",
+                CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                Headline = "headline",
+                ImageUrl = "https://example.com",
+                MediaType = MediaType.Image,
+                SourceID = "120210000000000000",
+                SourceType = SourceType.Ad,
+                SourceUrl = "https://example.com",
+                ThumbnailUrl = "https://example.com",
+                VideoUrl = "https://example.com",
+            },
             ReplyToFrom = "replyToFrom",
             ReplyToMessageID = "replyToMessageId",
             ReplyToMessageType = "replyToMessageType",
@@ -1026,6 +1125,373 @@ public void InvalidEnumSerializationRoundtrip_Works()
     }
 }
 
+public class ReferralTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Referral
+        {
+            Body = "body",
+            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+            Headline = "headline",
+            ImageUrl = "https://example.com",
+            MediaType = MediaType.Image,
+            SourceID = "120210000000000000",
+            SourceType = SourceType.Ad,
+            SourceUrl = "https://example.com",
+            ThumbnailUrl = "https://example.com",
+            VideoUrl = "https://example.com",
+        };
+
+        string expectedBody = "body";
+        string expectedCtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ";
+        string expectedHeadline = "headline";
+        string expectedImageUrl = "https://example.com";
+        ApiEnum<string, MediaType> expectedMediaType = MediaType.Image;
+        string expectedSourceID = "120210000000000000";
+        ApiEnum<string, SourceType> expectedSourceType = SourceType.Ad;
+        string expectedSourceUrl = "https://example.com";
+        string expectedThumbnailUrl = "https://example.com";
+        string expectedVideoUrl = "https://example.com";
+
+        Assert.Equal(expectedBody, model.Body);
+        Assert.Equal(expectedCtwaClid, model.CtwaClid);
+        Assert.Equal(expectedHeadline, model.Headline);
+        Assert.Equal(expectedImageUrl, model.ImageUrl);
+        Assert.Equal(expectedMediaType, model.MediaType);
+        Assert.Equal(expectedSourceID, model.SourceID);
+        Assert.Equal(expectedSourceType, model.SourceType);
+        Assert.Equal(expectedSourceUrl, model.SourceUrl);
+        Assert.Equal(expectedThumbnailUrl, model.ThumbnailUrl);
+        Assert.Equal(expectedVideoUrl, model.VideoUrl);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Referral
+        {
+            Body = "body",
+            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+            Headline = "headline",
+            ImageUrl = "https://example.com",
+            MediaType = MediaType.Image,
+            SourceID = "120210000000000000",
+            SourceType = SourceType.Ad,
+            SourceUrl = "https://example.com",
+            ThumbnailUrl = "https://example.com",
+            VideoUrl = "https://example.com",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Referral>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Referral
+        {
+            Body = "body",
+            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+            Headline = "headline",
+            ImageUrl = "https://example.com",
+            MediaType = MediaType.Image,
+            SourceID = "120210000000000000",
+            SourceType = SourceType.Ad,
+            SourceUrl = "https://example.com",
+            ThumbnailUrl = "https://example.com",
+            VideoUrl = "https://example.com",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Referral>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedBody = "body";
+        string expectedCtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ";
+        string expectedHeadline = "headline";
+        string expectedImageUrl = "https://example.com";
+        ApiEnum<string, MediaType> expectedMediaType = MediaType.Image;
+        string expectedSourceID = "120210000000000000";
+        ApiEnum<string, SourceType> expectedSourceType = SourceType.Ad;
+        string expectedSourceUrl = "https://example.com";
+        string expectedThumbnailUrl = "https://example.com";
+        string expectedVideoUrl = "https://example.com";
+
+        Assert.Equal(expectedBody, deserialized.Body);
+        Assert.Equal(expectedCtwaClid, deserialized.CtwaClid);
+        Assert.Equal(expectedHeadline, deserialized.Headline);
+        Assert.Equal(expectedImageUrl, deserialized.ImageUrl);
+        Assert.Equal(expectedMediaType, deserialized.MediaType);
+        Assert.Equal(expectedSourceID, deserialized.SourceID);
+        Assert.Equal(expectedSourceType, deserialized.SourceType);
+        Assert.Equal(expectedSourceUrl, deserialized.SourceUrl);
+        Assert.Equal(expectedThumbnailUrl, deserialized.ThumbnailUrl);
+        Assert.Equal(expectedVideoUrl, deserialized.VideoUrl);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Referral
+        {
+            Body = "body",
+            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+            Headline = "headline",
+            ImageUrl = "https://example.com",
+            MediaType = MediaType.Image,
+            SourceID = "120210000000000000",
+            SourceType = SourceType.Ad,
+            SourceUrl = "https://example.com",
+            ThumbnailUrl = "https://example.com",
+            VideoUrl = "https://example.com",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Referral { };
+
+        Assert.Null(model.Body);
+        Assert.False(model.RawData.ContainsKey("body"));
+        Assert.Null(model.CtwaClid);
+        Assert.False(model.RawData.ContainsKey("ctwaClid"));
+        Assert.Null(model.Headline);
+        Assert.False(model.RawData.ContainsKey("headline"));
+        Assert.Null(model.ImageUrl);
+        Assert.False(model.RawData.ContainsKey("imageUrl"));
+        Assert.Null(model.MediaType);
+        Assert.False(model.RawData.ContainsKey("mediaType"));
+        Assert.Null(model.SourceID);
+        Assert.False(model.RawData.ContainsKey("sourceId"));
+        Assert.Null(model.SourceType);
+        Assert.False(model.RawData.ContainsKey("sourceType"));
+        Assert.Null(model.SourceUrl);
+        Assert.False(model.RawData.ContainsKey("sourceUrl"));
+        Assert.Null(model.ThumbnailUrl);
+        Assert.False(model.RawData.ContainsKey("thumbnailUrl"));
+        Assert.Null(model.VideoUrl);
+        Assert.False(model.RawData.ContainsKey("videoUrl"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Referral { };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new Referral
+        {
+            // Null should be interpreted as omitted for these properties
+            Body = null,
+            CtwaClid = null,
+            Headline = null,
+            ImageUrl = null,
+            MediaType = null,
+            SourceID = null,
+            SourceType = null,
+            SourceUrl = null,
+            ThumbnailUrl = null,
+            VideoUrl = null,
+        };
+
+        Assert.Null(model.Body);
+        Assert.False(model.RawData.ContainsKey("body"));
+        Assert.Null(model.CtwaClid);
+        Assert.False(model.RawData.ContainsKey("ctwaClid"));
+        Assert.Null(model.Headline);
+        Assert.False(model.RawData.ContainsKey("headline"));
+        Assert.Null(model.ImageUrl);
+        Assert.False(model.RawData.ContainsKey("imageUrl"));
+        Assert.Null(model.MediaType);
+        Assert.False(model.RawData.ContainsKey("mediaType"));
+        Assert.Null(model.SourceID);
+        Assert.False(model.RawData.ContainsKey("sourceId"));
+        Assert.Null(model.SourceType);
+        Assert.False(model.RawData.ContainsKey("sourceType"));
+        Assert.Null(model.SourceUrl);
+        Assert.False(model.RawData.ContainsKey("sourceUrl"));
+        Assert.Null(model.ThumbnailUrl);
+        Assert.False(model.RawData.ContainsKey("thumbnailUrl"));
+        Assert.Null(model.VideoUrl);
+        Assert.False(model.RawData.ContainsKey("videoUrl"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Referral
+        {
+            // Null should be interpreted as omitted for these properties
+            Body = null,
+            CtwaClid = null,
+            Headline = null,
+            ImageUrl = null,
+            MediaType = null,
+            SourceID = null,
+            SourceType = null,
+            SourceUrl = null,
+            ThumbnailUrl = null,
+            VideoUrl = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Referral
+        {
+            Body = "body",
+            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+            Headline = "headline",
+            ImageUrl = "https://example.com",
+            MediaType = MediaType.Image,
+            SourceID = "120210000000000000",
+            SourceType = SourceType.Ad,
+            SourceUrl = "https://example.com",
+            ThumbnailUrl = "https://example.com",
+            VideoUrl = "https://example.com",
+        };
+
+        Referral copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class MediaTypeTest : TestBase
+{
+    [Theory]
+    [InlineData(MediaType.Image)]
+    [InlineData(MediaType.Video)]
+    public void Validation_Works(MediaType rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, MediaType> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, MediaType>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(MediaType.Image)]
+    [InlineData(MediaType.Video)]
+    public void SerializationRoundtrip_Works(MediaType rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, MediaType> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, MediaType>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, MediaType>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, MediaType>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
+public class SourceTypeTest : TestBase
+{
+    [Theory]
+    [InlineData(SourceType.Ad)]
+    [InlineData(SourceType.Post)]
+    public void Validation_Works(SourceType rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, SourceType> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, SourceType>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(SourceType.Ad)]
+    [InlineData(SourceType.Post)]
+    public void SerializationRoundtrip_Works(SourceType rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, SourceType> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, SourceType>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, SourceType>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, SourceType>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
+
 public class SectionTest : TestBase
 {
     [Fact]
diff --git a/src/Zavudev.Tests/Models/Messages/MessageListAttachmentsParamsTest.cs b/src/Zavudev.Tests/Models/Messages/MessageListAttachmentsParamsTest.cs
new file mode 100644
index 0000000..f65b18b
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Messages/MessageListAttachmentsParamsTest.cs
@@ -0,0 +1,42 @@
+using System;
+using Zavudev.Models.Messages;
+
+namespace Zavudev.Tests.Models.Messages;
+
+public class MessageListAttachmentsParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new MessageListAttachmentsParams { MessageID = "messageId" };
+
+        string expectedMessageID = "messageId";
+
+        Assert.Equal(expectedMessageID, parameters.MessageID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        MessageListAttachmentsParams parameters = new() { MessageID = "messageId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri("https://api.zavu.dev/v1/messages/messageId/attachments"),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new MessageListAttachmentsParams { MessageID = "messageId" };
+
+        MessageListAttachmentsParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Messages/MessageListAttachmentsResponseTest.cs b/src/Zavudev.Tests/Models/Messages/MessageListAttachmentsResponseTest.cs
new file mode 100644
index 0000000..9131042
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Messages/MessageListAttachmentsResponseTest.cs
@@ -0,0 +1,317 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Messages;
+
+namespace Zavudev.Tests.Models.Messages;
+
+public class MessageListAttachmentsResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new MessageListAttachmentsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    ContentID = "logo",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DownloadUrl = "https://example.com",
+                    Filename = "invoice.pdf",
+                    IsInline = true,
+                    MimeType = "application/pdf",
+                    Size = 102400,
+                },
+            ],
+        };
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "jd7x2k3m4n5p6q7r8s9t0",
+                ContentID = "logo",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                DownloadUrl = "https://example.com",
+                Filename = "invoice.pdf",
+                IsInline = true,
+                MimeType = "application/pdf",
+                Size = 102400,
+            },
+        ];
+
+        Assert.Equal(expectedItems.Count, model.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], model.Items[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new MessageListAttachmentsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    ContentID = "logo",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DownloadUrl = "https://example.com",
+                    Filename = "invoice.pdf",
+                    IsInline = true,
+                    MimeType = "application/pdf",
+                    Size = 102400,
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<MessageListAttachmentsResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new MessageListAttachmentsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    ContentID = "logo",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DownloadUrl = "https://example.com",
+                    Filename = "invoice.pdf",
+                    IsInline = true,
+                    MimeType = "application/pdf",
+                    Size = 102400,
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<MessageListAttachmentsResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "jd7x2k3m4n5p6q7r8s9t0",
+                ContentID = "logo",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                DownloadUrl = "https://example.com",
+                Filename = "invoice.pdf",
+                IsInline = true,
+                MimeType = "application/pdf",
+                Size = 102400,
+            },
+        ];
+
+        Assert.Equal(expectedItems.Count, deserialized.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], deserialized.Items[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new MessageListAttachmentsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    ContentID = "logo",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DownloadUrl = "https://example.com",
+                    Filename = "invoice.pdf",
+                    IsInline = true,
+                    MimeType = "application/pdf",
+                    Size = 102400,
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new MessageListAttachmentsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "jd7x2k3m4n5p6q7r8s9t0",
+                    ContentID = "logo",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DownloadUrl = "https://example.com",
+                    Filename = "invoice.pdf",
+                    IsInline = true,
+                    MimeType = "application/pdf",
+                    Size = 102400,
+                },
+            ],
+        };
+
+        MessageListAttachmentsResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ItemTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "jd7x2k3m4n5p6q7r8s9t0",
+            ContentID = "logo",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DownloadUrl = "https://example.com",
+            Filename = "invoice.pdf",
+            IsInline = true,
+            MimeType = "application/pdf",
+            Size = 102400,
+        };
+
+        string expectedID = "jd7x2k3m4n5p6q7r8s9t0";
+        string expectedContentID = "logo";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedDownloadUrl = "https://example.com";
+        string expectedFilename = "invoice.pdf";
+        bool expectedIsInline = true;
+        string expectedMimeType = "application/pdf";
+        long expectedSize = 102400;
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedContentID, model.ContentID);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedDownloadUrl, model.DownloadUrl);
+        Assert.Equal(expectedFilename, model.Filename);
+        Assert.Equal(expectedIsInline, model.IsInline);
+        Assert.Equal(expectedMimeType, model.MimeType);
+        Assert.Equal(expectedSize, model.Size);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "jd7x2k3m4n5p6q7r8s9t0",
+            ContentID = "logo",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DownloadUrl = "https://example.com",
+            Filename = "invoice.pdf",
+            IsInline = true,
+            MimeType = "application/pdf",
+            Size = 102400,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Item
+        {
+            ID = "jd7x2k3m4n5p6q7r8s9t0",
+            ContentID = "logo",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DownloadUrl = "https://example.com",
+            Filename = "invoice.pdf",
+            IsInline = true,
+            MimeType = "application/pdf",
+            Size = 102400,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedID = "jd7x2k3m4n5p6q7r8s9t0";
+        string expectedContentID = "logo";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        string expectedDownloadUrl = "https://example.com";
+        string expectedFilename = "invoice.pdf";
+        bool expectedIsInline = true;
+        string expectedMimeType = "application/pdf";
+        long expectedSize = 102400;
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedContentID, deserialized.ContentID);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedDownloadUrl, deserialized.DownloadUrl);
+        Assert.Equal(expectedFilename, deserialized.Filename);
+        Assert.Equal(expectedIsInline, deserialized.IsInline);
+        Assert.Equal(expectedMimeType, deserialized.MimeType);
+        Assert.Equal(expectedSize, deserialized.Size);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Item
+        {
+            ID = "jd7x2k3m4n5p6q7r8s9t0",
+            ContentID = "logo",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DownloadUrl = "https://example.com",
+            Filename = "invoice.pdf",
+            IsInline = true,
+            MimeType = "application/pdf",
+            Size = 102400,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Item
+        {
+            ID = "jd7x2k3m4n5p6q7r8s9t0",
+            ContentID = "logo",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DownloadUrl = "https://example.com",
+            Filename = "invoice.pdf",
+            IsInline = true,
+            MimeType = "application/pdf",
+            Size = 102400,
+        };
+
+        Item copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Messages/MessageListPageResponseTest.cs b/src/Zavudev.Tests/Models/Messages/MessageListPageResponseTest.cs
index d0f0717..0508105 100644
--- a/src/Zavudev.Tests/Models/Messages/MessageListPageResponseTest.cs
+++ b/src/Zavudev.Tests/Models/Messages/MessageListPageResponseTest.cs
@@ -20,6 +20,7 @@ public void FieldRoundtrip_Works()
                     ID = "jd7x2k3m4n5p6q7r8s9t0",
                     Channel = MessageChannel.Auto,
                     CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Direction.Inbound,
                     MessageType = MessageType.Text,
                     Status = MessageStatus.Queued,
                     To = "+56912345678",
@@ -44,6 +45,19 @@ public void FieldRoundtrip_Works()
                         MediaUrl = "https://example.com/image.jpg",
                         MimeType = "image/jpeg",
                         ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
                         ReplyToFrom = "replyToFrom",
                         ReplyToMessageID = "replyToMessageId",
                         ReplyToMessageType = "replyToMessageType",
@@ -104,6 +118,7 @@ public void FieldRoundtrip_Works()
                 ID = "jd7x2k3m4n5p6q7r8s9t0",
                 Channel = MessageChannel.Auto,
                 CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = Direction.Inbound,
                 MessageType = MessageType.Text,
                 Status = MessageStatus.Queued,
                 To = "+56912345678",
@@ -128,6 +143,19 @@ public void FieldRoundtrip_Works()
                     MediaUrl = "https://example.com/image.jpg",
                     MimeType = "image/jpeg",
                     ReactToMessageID = "reactToMessageId",
+                    Referral = new()
+                    {
+                        Body = "body",
+                        CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                        Headline = "headline",
+                        ImageUrl = "https://example.com",
+                        MediaType = MediaType.Image,
+                        SourceID = "120210000000000000",
+                        SourceType = SourceType.Ad,
+                        SourceUrl = "https://example.com",
+                        ThumbnailUrl = "https://example.com",
+                        VideoUrl = "https://example.com",
+                    },
                     ReplyToFrom = "replyToFrom",
                     ReplyToMessageID = "replyToMessageId",
                     ReplyToMessageType = "replyToMessageType",
@@ -200,6 +228,7 @@ public void SerializationRoundtrip_Works()
                     ID = "jd7x2k3m4n5p6q7r8s9t0",
                     Channel = MessageChannel.Auto,
                     CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Direction.Inbound,
                     MessageType = MessageType.Text,
                     Status = MessageStatus.Queued,
                     To = "+56912345678",
@@ -224,6 +253,19 @@ public void SerializationRoundtrip_Works()
                         MediaUrl = "https://example.com/image.jpg",
                         MimeType = "image/jpeg",
                         ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
                         ReplyToFrom = "replyToFrom",
                         ReplyToMessageID = "replyToMessageId",
                         ReplyToMessageType = "replyToMessageType",
@@ -298,6 +340,7 @@ public void FieldRoundtripThroughSerialization_Works()
                     ID = "jd7x2k3m4n5p6q7r8s9t0",
                     Channel = MessageChannel.Auto,
                     CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Direction.Inbound,
                     MessageType = MessageType.Text,
                     Status = MessageStatus.Queued,
                     To = "+56912345678",
@@ -322,6 +365,19 @@ public void FieldRoundtripThroughSerialization_Works()
                         MediaUrl = "https://example.com/image.jpg",
                         MimeType = "image/jpeg",
                         ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
                         ReplyToFrom = "replyToFrom",
                         ReplyToMessageID = "replyToMessageId",
                         ReplyToMessageType = "replyToMessageType",
@@ -389,6 +445,7 @@ public void FieldRoundtripThroughSerialization_Works()
                 ID = "jd7x2k3m4n5p6q7r8s9t0",
                 Channel = MessageChannel.Auto,
                 CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = Direction.Inbound,
                 MessageType = MessageType.Text,
                 Status = MessageStatus.Queued,
                 To = "+56912345678",
@@ -413,6 +470,19 @@ public void FieldRoundtripThroughSerialization_Works()
                     MediaUrl = "https://example.com/image.jpg",
                     MimeType = "image/jpeg",
                     ReactToMessageID = "reactToMessageId",
+                    Referral = new()
+                    {
+                        Body = "body",
+                        CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                        Headline = "headline",
+                        ImageUrl = "https://example.com",
+                        MediaType = MediaType.Image,
+                        SourceID = "120210000000000000",
+                        SourceType = SourceType.Ad,
+                        SourceUrl = "https://example.com",
+                        ThumbnailUrl = "https://example.com",
+                        VideoUrl = "https://example.com",
+                    },
                     ReplyToFrom = "replyToFrom",
                     ReplyToMessageID = "replyToMessageId",
                     ReplyToMessageType = "replyToMessageType",
@@ -485,6 +555,7 @@ public void Validation_Works()
                     ID = "jd7x2k3m4n5p6q7r8s9t0",
                     Channel = MessageChannel.Auto,
                     CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Direction.Inbound,
                     MessageType = MessageType.Text,
                     Status = MessageStatus.Queued,
                     To = "+56912345678",
@@ -509,6 +580,19 @@ public void Validation_Works()
                         MediaUrl = "https://example.com/image.jpg",
                         MimeType = "image/jpeg",
                         ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
                         ReplyToFrom = "replyToFrom",
                         ReplyToMessageID = "replyToMessageId",
                         ReplyToMessageType = "replyToMessageType",
@@ -577,6 +661,7 @@ public void OptionalNullablePropertiesUnsetAreNotSet_Works()
                     ID = "jd7x2k3m4n5p6q7r8s9t0",
                     Channel = MessageChannel.Auto,
                     CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Direction.Inbound,
                     MessageType = MessageType.Text,
                     Status = MessageStatus.Queued,
                     To = "+56912345678",
@@ -601,6 +686,19 @@ public void OptionalNullablePropertiesUnsetAreNotSet_Works()
                         MediaUrl = "https://example.com/image.jpg",
                         MimeType = "image/jpeg",
                         ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
                         ReplyToFrom = "replyToFrom",
                         ReplyToMessageID = "replyToMessageId",
                         ReplyToMessageType = "replyToMessageType",
@@ -669,6 +767,7 @@ public void OptionalNullablePropertiesUnsetValidation_Works()
                     ID = "jd7x2k3m4n5p6q7r8s9t0",
                     Channel = MessageChannel.Auto,
                     CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Direction.Inbound,
                     MessageType = MessageType.Text,
                     Status = MessageStatus.Queued,
                     To = "+56912345678",
@@ -693,6 +792,19 @@ public void OptionalNullablePropertiesUnsetValidation_Works()
                         MediaUrl = "https://example.com/image.jpg",
                         MimeType = "image/jpeg",
                         ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
                         ReplyToFrom = "replyToFrom",
                         ReplyToMessageID = "replyToMessageId",
                         ReplyToMessageType = "replyToMessageType",
@@ -760,6 +872,7 @@ public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
                     ID = "jd7x2k3m4n5p6q7r8s9t0",
                     Channel = MessageChannel.Auto,
                     CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Direction.Inbound,
                     MessageType = MessageType.Text,
                     Status = MessageStatus.Queued,
                     To = "+56912345678",
@@ -784,6 +897,19 @@ public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
                         MediaUrl = "https://example.com/image.jpg",
                         MimeType = "image/jpeg",
                         ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
                         ReplyToFrom = "replyToFrom",
                         ReplyToMessageID = "replyToMessageId",
                         ReplyToMessageType = "replyToMessageType",
@@ -854,6 +980,7 @@ public void OptionalNullablePropertiesSetToNullValidation_Works()
                     ID = "jd7x2k3m4n5p6q7r8s9t0",
                     Channel = MessageChannel.Auto,
                     CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Direction.Inbound,
                     MessageType = MessageType.Text,
                     Status = MessageStatus.Queued,
                     To = "+56912345678",
@@ -878,6 +1005,19 @@ public void OptionalNullablePropertiesSetToNullValidation_Works()
                         MediaUrl = "https://example.com/image.jpg",
                         MimeType = "image/jpeg",
                         ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
                         ReplyToFrom = "replyToFrom",
                         ReplyToMessageID = "replyToMessageId",
                         ReplyToMessageType = "replyToMessageType",
@@ -947,6 +1087,7 @@ public void CopyConstructor_Works()
                     ID = "jd7x2k3m4n5p6q7r8s9t0",
                     Channel = MessageChannel.Auto,
                     CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    Direction = Direction.Inbound,
                     MessageType = MessageType.Text,
                     Status = MessageStatus.Queued,
                     To = "+56912345678",
@@ -971,6 +1112,19 @@ public void CopyConstructor_Works()
                         MediaUrl = "https://example.com/image.jpg",
                         MimeType = "image/jpeg",
                         ReactToMessageID = "reactToMessageId",
+                        Referral = new()
+                        {
+                            Body = "body",
+                            CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                            Headline = "headline",
+                            ImageUrl = "https://example.com",
+                            MediaType = MediaType.Image,
+                            SourceID = "120210000000000000",
+                            SourceType = SourceType.Ad,
+                            SourceUrl = "https://example.com",
+                            ThumbnailUrl = "https://example.com",
+                            VideoUrl = "https://example.com",
+                        },
                         ReplyToFrom = "replyToFrom",
                         ReplyToMessageID = "replyToMessageId",
                         ReplyToMessageType = "replyToMessageType",
diff --git a/src/Zavudev.Tests/Models/Messages/MessageResponseTest.cs b/src/Zavudev.Tests/Models/Messages/MessageResponseTest.cs
index 20ca0ff..a3f63d1 100644
--- a/src/Zavudev.Tests/Models/Messages/MessageResponseTest.cs
+++ b/src/Zavudev.Tests/Models/Messages/MessageResponseTest.cs
@@ -18,6 +18,7 @@ public void FieldRoundtrip_Works()
                 ID = "jd7x2k3m4n5p6q7r8s9t0",
                 Channel = MessageChannel.Auto,
                 CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = Direction.Inbound,
                 MessageType = MessageType.Text,
                 Status = MessageStatus.Queued,
                 To = "+56912345678",
@@ -42,6 +43,19 @@ public void FieldRoundtrip_Works()
                     MediaUrl = "https://example.com/image.jpg",
                     MimeType = "image/jpeg",
                     ReactToMessageID = "reactToMessageId",
+                    Referral = new()
+                    {
+                        Body = "body",
+                        CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                        Headline = "headline",
+                        ImageUrl = "https://example.com",
+                        MediaType = MediaType.Image,
+                        SourceID = "120210000000000000",
+                        SourceType = SourceType.Ad,
+                        SourceUrl = "https://example.com",
+                        ThumbnailUrl = "https://example.com",
+                        VideoUrl = "https://example.com",
+                    },
                     ReplyToFrom = "replyToFrom",
                     ReplyToMessageID = "replyToMessageId",
                     ReplyToMessageType = "replyToMessageType",
@@ -98,6 +112,7 @@ public void FieldRoundtrip_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -122,6 +137,19 @@ public void FieldRoundtrip_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -185,6 +213,7 @@ public void SerializationRoundtrip_Works()
                 ID = "jd7x2k3m4n5p6q7r8s9t0",
                 Channel = MessageChannel.Auto,
                 CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = Direction.Inbound,
                 MessageType = MessageType.Text,
                 Status = MessageStatus.Queued,
                 To = "+56912345678",
@@ -209,6 +238,19 @@ public void SerializationRoundtrip_Works()
                     MediaUrl = "https://example.com/image.jpg",
                     MimeType = "image/jpeg",
                     ReactToMessageID = "reactToMessageId",
+                    Referral = new()
+                    {
+                        Body = "body",
+                        CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                        Headline = "headline",
+                        ImageUrl = "https://example.com",
+                        MediaType = MediaType.Image,
+                        SourceID = "120210000000000000",
+                        SourceType = SourceType.Ad,
+                        SourceUrl = "https://example.com",
+                        ThumbnailUrl = "https://example.com",
+                        VideoUrl = "https://example.com",
+                    },
                     ReplyToFrom = "replyToFrom",
                     ReplyToMessageID = "replyToMessageId",
                     ReplyToMessageType = "replyToMessageType",
@@ -279,6 +321,7 @@ public void FieldRoundtripThroughSerialization_Works()
                 ID = "jd7x2k3m4n5p6q7r8s9t0",
                 Channel = MessageChannel.Auto,
                 CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = Direction.Inbound,
                 MessageType = MessageType.Text,
                 Status = MessageStatus.Queued,
                 To = "+56912345678",
@@ -303,6 +346,19 @@ public void FieldRoundtripThroughSerialization_Works()
                     MediaUrl = "https://example.com/image.jpg",
                     MimeType = "image/jpeg",
                     ReactToMessageID = "reactToMessageId",
+                    Referral = new()
+                    {
+                        Body = "body",
+                        CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                        Headline = "headline",
+                        ImageUrl = "https://example.com",
+                        MediaType = MediaType.Image,
+                        SourceID = "120210000000000000",
+                        SourceType = SourceType.Ad,
+                        SourceUrl = "https://example.com",
+                        ThumbnailUrl = "https://example.com",
+                        VideoUrl = "https://example.com",
+                    },
                     ReplyToFrom = "replyToFrom",
                     ReplyToMessageID = "replyToMessageId",
                     ReplyToMessageType = "replyToMessageType",
@@ -366,6 +422,7 @@ public void FieldRoundtripThroughSerialization_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -390,6 +447,19 @@ public void FieldRoundtripThroughSerialization_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -453,6 +523,7 @@ public void Validation_Works()
                 ID = "jd7x2k3m4n5p6q7r8s9t0",
                 Channel = MessageChannel.Auto,
                 CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = Direction.Inbound,
                 MessageType = MessageType.Text,
                 Status = MessageStatus.Queued,
                 To = "+56912345678",
@@ -477,6 +548,19 @@ public void Validation_Works()
                     MediaUrl = "https://example.com/image.jpg",
                     MimeType = "image/jpeg",
                     ReactToMessageID = "reactToMessageId",
+                    Referral = new()
+                    {
+                        Body = "body",
+                        CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                        Headline = "headline",
+                        ImageUrl = "https://example.com",
+                        MediaType = MediaType.Image,
+                        SourceID = "120210000000000000",
+                        SourceType = SourceType.Ad,
+                        SourceUrl = "https://example.com",
+                        ThumbnailUrl = "https://example.com",
+                        VideoUrl = "https://example.com",
+                    },
                     ReplyToFrom = "replyToFrom",
                     ReplyToMessageID = "replyToMessageId",
                     ReplyToMessageType = "replyToMessageType",
@@ -541,6 +625,7 @@ public void CopyConstructor_Works()
                 ID = "jd7x2k3m4n5p6q7r8s9t0",
                 Channel = MessageChannel.Auto,
                 CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Direction = Direction.Inbound,
                 MessageType = MessageType.Text,
                 Status = MessageStatus.Queued,
                 To = "+56912345678",
@@ -565,6 +650,19 @@ public void CopyConstructor_Works()
                     MediaUrl = "https://example.com/image.jpg",
                     MimeType = "image/jpeg",
                     ReactToMessageID = "reactToMessageId",
+                    Referral = new()
+                    {
+                        Body = "body",
+                        CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                        Headline = "headline",
+                        ImageUrl = "https://example.com",
+                        MediaType = MediaType.Image,
+                        SourceID = "120210000000000000",
+                        SourceType = SourceType.Ad,
+                        SourceUrl = "https://example.com",
+                        ThumbnailUrl = "https://example.com",
+                        VideoUrl = "https://example.com",
+                    },
                     ReplyToFrom = "replyToFrom",
                     ReplyToMessageID = "replyToMessageId",
                     ReplyToMessageType = "replyToMessageType",
diff --git a/src/Zavudev.Tests/Models/Messages/MessageSendParamsTest.cs b/src/Zavudev.Tests/Models/Messages/MessageSendParamsTest.cs
index 9df6d4d..df913d8 100644
--- a/src/Zavudev.Tests/Models/Messages/MessageSendParamsTest.cs
+++ b/src/Zavudev.Tests/Models/Messages/MessageSendParamsTest.cs
@@ -48,6 +48,19 @@ public void FieldRoundtrip_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -130,6 +143,19 @@ public void FieldRoundtrip_Works()
             MediaUrl = "https://example.com/image.jpg",
             MimeType = "image/jpeg",
             ReactToMessageID = "reactToMessageId",
+            Referral = new()
+            {
+                Body = "body",
+                CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                Headline = "headline",
+                ImageUrl = "https://example.com",
+                MediaType = MediaType.Image,
+                SourceID = "120210000000000000",
+                SourceType = SourceType.Ad,
+                SourceUrl = "https://example.com",
+                ThumbnailUrl = "https://example.com",
+                VideoUrl = "https://example.com",
+            },
             ReplyToFrom = "replyToFrom",
             ReplyToMessageID = "replyToMessageId",
             ReplyToMessageType = "replyToMessageType",
@@ -346,6 +372,19 @@ public void CopyConstructor_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
diff --git a/src/Zavudev.Tests/Models/Messages/MessageTest.cs b/src/Zavudev.Tests/Models/Messages/MessageTest.cs
index b813a6e..7ef3429 100644
--- a/src/Zavudev.Tests/Models/Messages/MessageTest.cs
+++ b/src/Zavudev.Tests/Models/Messages/MessageTest.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using Zavudev.Core;
+using Zavudev.Exceptions;
 using Zavudev.Models.Messages;
 
 namespace Zavudev.Tests.Models.Messages;
@@ -16,6 +17,7 @@ public void FieldRoundtrip_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -40,6 +42,19 @@ public void FieldRoundtrip_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -93,6 +108,7 @@ public void FieldRoundtrip_Works()
         string expectedID = "jd7x2k3m4n5p6q7r8s9t0";
         ApiEnum<string, MessageChannel> expectedChannel = MessageChannel.Auto;
         DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, Direction> expectedDirection = Direction.Inbound;
         ApiEnum<string, MessageType> expectedMessageType = MessageType.Text;
         ApiEnum<string, MessageStatus> expectedStatus = MessageStatus.Queued;
         string expectedTo = "+56912345678";
@@ -117,6 +133,19 @@ public void FieldRoundtrip_Works()
             MediaUrl = "https://example.com/image.jpg",
             MimeType = "image/jpeg",
             ReactToMessageID = "reactToMessageId",
+            Referral = new()
+            {
+                Body = "body",
+                CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                Headline = "headline",
+                ImageUrl = "https://example.com",
+                MediaType = MediaType.Image,
+                SourceID = "120210000000000000",
+                SourceType = SourceType.Ad,
+                SourceUrl = "https://example.com",
+                ThumbnailUrl = "https://example.com",
+                VideoUrl = "https://example.com",
+            },
             ReplyToFrom = "replyToFrom",
             ReplyToMessageID = "replyToMessageId",
             ReplyToMessageType = "replyToMessageType",
@@ -166,6 +195,7 @@ public void FieldRoundtrip_Works()
         Assert.Equal(expectedID, model.ID);
         Assert.Equal(expectedChannel, model.Channel);
         Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedDirection, model.Direction);
         Assert.Equal(expectedMessageType, model.MessageType);
         Assert.Equal(expectedStatus, model.Status);
         Assert.Equal(expectedTo, model.To);
@@ -199,6 +229,7 @@ public void SerializationRoundtrip_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -223,6 +254,19 @@ public void SerializationRoundtrip_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -287,6 +331,7 @@ public void FieldRoundtripThroughSerialization_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -311,6 +356,19 @@ public void FieldRoundtripThroughSerialization_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -371,6 +429,7 @@ public void FieldRoundtripThroughSerialization_Works()
         string expectedID = "jd7x2k3m4n5p6q7r8s9t0";
         ApiEnum<string, MessageChannel> expectedChannel = MessageChannel.Auto;
         DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        ApiEnum<string, Direction> expectedDirection = Direction.Inbound;
         ApiEnum<string, MessageType> expectedMessageType = MessageType.Text;
         ApiEnum<string, MessageStatus> expectedStatus = MessageStatus.Queued;
         string expectedTo = "+56912345678";
@@ -395,6 +454,19 @@ public void FieldRoundtripThroughSerialization_Works()
             MediaUrl = "https://example.com/image.jpg",
             MimeType = "image/jpeg",
             ReactToMessageID = "reactToMessageId",
+            Referral = new()
+            {
+                Body = "body",
+                CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                Headline = "headline",
+                ImageUrl = "https://example.com",
+                MediaType = MediaType.Image,
+                SourceID = "120210000000000000",
+                SourceType = SourceType.Ad,
+                SourceUrl = "https://example.com",
+                ThumbnailUrl = "https://example.com",
+                VideoUrl = "https://example.com",
+            },
             ReplyToFrom = "replyToFrom",
             ReplyToMessageID = "replyToMessageId",
             ReplyToMessageType = "replyToMessageType",
@@ -444,6 +516,7 @@ public void FieldRoundtripThroughSerialization_Works()
         Assert.Equal(expectedID, deserialized.ID);
         Assert.Equal(expectedChannel, deserialized.Channel);
         Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedDirection, deserialized.Direction);
         Assert.Equal(expectedMessageType, deserialized.MessageType);
         Assert.Equal(expectedStatus, deserialized.Status);
         Assert.Equal(expectedTo, deserialized.To);
@@ -477,6 +550,7 @@ public void Validation_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -501,6 +575,19 @@ public void Validation_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -562,6 +649,7 @@ public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -598,6 +686,7 @@ public void OptionalNonNullablePropertiesUnsetValidation_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -619,6 +708,7 @@ public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -665,6 +755,7 @@ public void OptionalNonNullablePropertiesSetToNullValidation_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -696,6 +787,7 @@ public void OptionalNullablePropertiesUnsetAreNotSet_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -720,6 +812,19 @@ public void OptionalNullablePropertiesUnsetAreNotSet_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -785,6 +890,7 @@ public void OptionalNullablePropertiesUnsetValidation_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -809,6 +915,19 @@ public void OptionalNullablePropertiesUnsetValidation_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -865,6 +984,7 @@ public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -889,6 +1009,19 @@ public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -960,6 +1093,7 @@ public void OptionalNullablePropertiesSetToNullValidation_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -984,6 +1118,19 @@ public void OptionalNullablePropertiesSetToNullValidation_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -1046,6 +1193,7 @@ public void CopyConstructor_Works()
             ID = "jd7x2k3m4n5p6q7r8s9t0",
             Channel = MessageChannel.Auto,
             CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Direction = Direction.Inbound,
             MessageType = MessageType.Text,
             Status = MessageStatus.Queued,
             To = "+56912345678",
@@ -1070,6 +1218,19 @@ public void CopyConstructor_Works()
                 MediaUrl = "https://example.com/image.jpg",
                 MimeType = "image/jpeg",
                 ReactToMessageID = "reactToMessageId",
+                Referral = new()
+                {
+                    Body = "body",
+                    CtwaClid = "ARIzZm9vYmFyY3R3YWNsaWQ",
+                    Headline = "headline",
+                    ImageUrl = "https://example.com",
+                    MediaType = MediaType.Image,
+                    SourceID = "120210000000000000",
+                    SourceType = SourceType.Ad,
+                    SourceUrl = "https://example.com",
+                    ThumbnailUrl = "https://example.com",
+                    VideoUrl = "https://example.com",
+                },
                 ReplyToFrom = "replyToFrom",
                 ReplyToMessageID = "replyToMessageId",
                 ReplyToMessageType = "replyToMessageType",
@@ -1125,3 +1286,61 @@ public void CopyConstructor_Works()
         Assert.Equal(model, copied);
     }
 }
+
+public class DirectionTest : TestBase
+{
+    [Theory]
+    [InlineData(Direction.Inbound)]
+    [InlineData(Direction.Outbound)]
+    public void Validation_Works(Direction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Direction> value = rawValue;
+        value.Validate();
+    }
+
+    [Fact]
+    public void InvalidEnumValidationThrows_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+
+        Assert.NotNull(value);
+        Assert.Throws<ZavudevInvalidDataException>(() => value.Validate());
+    }
+
+    [Theory]
+    [InlineData(Direction.Inbound)]
+    [InlineData(Direction.Outbound)]
+    public void SerializationRoundtrip_Works(Direction rawValue)
+    {
+        // force implicit conversion because Theory can't do that for us
+        ApiEnum<string, Direction> value = rawValue;
+
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+
+    [Fact]
+    public void InvalidEnumSerializationRoundtrip_Works()
+    {
+        var value = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            JsonSerializer.SerializeToElement("invalid value"),
+            ModelBase.SerializerOptions
+        );
+        string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ApiEnum<string, Direction>>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(value, deserialized);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/PhoneNumbers/PhoneNumberTypeTest.cs b/src/Zavudev.Tests/Models/PhoneNumbers/PhoneNumberTypeTest.cs
index b112188..237913d 100644
--- a/src/Zavudev.Tests/Models/PhoneNumbers/PhoneNumberTypeTest.cs
+++ b/src/Zavudev.Tests/Models/PhoneNumbers/PhoneNumberTypeTest.cs
@@ -11,6 +11,7 @@ public class PhoneNumberTypeTest : TestBase
     [InlineData(PhoneNumberType.Local)]
     [InlineData(PhoneNumberType.National)]
     [InlineData(PhoneNumberType.TollFree)]
+    [InlineData(PhoneNumberType.Mobile)]
     public void Validation_Works(PhoneNumberType rawValue)
     {
         // force implicit conversion because Theory can't do that for us
@@ -34,6 +35,7 @@ public void InvalidEnumValidationThrows_Works()
     [InlineData(PhoneNumberType.Local)]
     [InlineData(PhoneNumberType.National)]
     [InlineData(PhoneNumberType.TollFree)]
+    [InlineData(PhoneNumberType.Mobile)]
     public void SerializationRoundtrip_Works(PhoneNumberType rawValue)
     {
         // force implicit conversion because Theory can't do that for us
diff --git a/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentParamsTest.cs b/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentParamsTest.cs
new file mode 100644
index 0000000..fc20f43
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentParamsTest.cs
@@ -0,0 +1,63 @@
+using System;
+using Zavudev.Models.Senders.Agent.KnowledgeBases.Documents;
+
+namespace Zavudev.Tests.Models.Senders.Agent.KnowledgeBases.Documents;
+
+public class DocumentRetrieveDocumentParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new DocumentRetrieveDocumentParams
+        {
+            SenderID = "senderId",
+            KBID = "kbId",
+            DocID = "docId",
+        };
+
+        string expectedSenderID = "senderId";
+        string expectedKBID = "kbId";
+        string expectedDocID = "docId";
+
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+        Assert.Equal(expectedKBID, parameters.KBID);
+        Assert.Equal(expectedDocID, parameters.DocID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        DocumentRetrieveDocumentParams parameters = new()
+        {
+            SenderID = "senderId",
+            KBID = "kbId",
+            DocID = "docId",
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri(
+                    "https://api.zavu.dev/v1/senders/senderId/agent/knowledge-bases/kbId/documents/docId"
+                ),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new DocumentRetrieveDocumentParams
+        {
+            SenderID = "senderId",
+            KBID = "kbId",
+            DocID = "docId",
+        };
+
+        DocumentRetrieveDocumentParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentResponseTest.cs b/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentResponseTest.cs
new file mode 100644
index 0000000..d1d355b
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentResponseTest.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Agent.KnowledgeBases;
+using Zavudev.Models.Senders.Agent.KnowledgeBases.Documents;
+
+namespace Zavudev.Tests.Models.Senders.Agent.KnowledgeBases.Documents;
+
+public class DocumentRetrieveDocumentResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new DocumentRetrieveDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        AgentDocument expectedDocument = new()
+        {
+            ID = "id",
+            ChunkCount = 0,
+            ContentLength = 0,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            IsProcessed = true,
+            KnowledgeBaseID = "knowledgeBaseId",
+            Title = "title",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedDocument, model.Document);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new DocumentRetrieveDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<DocumentRetrieveDocumentResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new DocumentRetrieveDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<DocumentRetrieveDocumentResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        AgentDocument expectedDocument = new()
+        {
+            ID = "id",
+            ChunkCount = 0,
+            ContentLength = 0,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            IsProcessed = true,
+            KnowledgeBaseID = "knowledgeBaseId",
+            Title = "title",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedDocument, deserialized.Document);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new DocumentRetrieveDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new DocumentRetrieveDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        DocumentRetrieveDocumentResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentParamsTest.cs b/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentParamsTest.cs
new file mode 100644
index 0000000..5877890
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentParamsTest.cs
@@ -0,0 +1,107 @@
+using System;
+using Zavudev.Models.Senders.Agent.KnowledgeBases.Documents;
+
+namespace Zavudev.Tests.Models.Senders.Agent.KnowledgeBases.Documents;
+
+public class DocumentUpdateDocumentParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new DocumentUpdateDocumentParams
+        {
+            SenderID = "senderId",
+            KBID = "kbId",
+            DocID = "docId",
+            Content = "content",
+            Title = "title",
+        };
+
+        string expectedSenderID = "senderId";
+        string expectedKBID = "kbId";
+        string expectedDocID = "docId";
+        string expectedContent = "content";
+        string expectedTitle = "title";
+
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+        Assert.Equal(expectedKBID, parameters.KBID);
+        Assert.Equal(expectedDocID, parameters.DocID);
+        Assert.Equal(expectedContent, parameters.Content);
+        Assert.Equal(expectedTitle, parameters.Title);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new DocumentUpdateDocumentParams
+        {
+            SenderID = "senderId",
+            KBID = "kbId",
+            DocID = "docId",
+        };
+
+        Assert.Null(parameters.Content);
+        Assert.False(parameters.RawBodyData.ContainsKey("content"));
+        Assert.Null(parameters.Title);
+        Assert.False(parameters.RawBodyData.ContainsKey("title"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new DocumentUpdateDocumentParams
+        {
+            SenderID = "senderId",
+            KBID = "kbId",
+            DocID = "docId",
+
+            // Null should be interpreted as omitted for these properties
+            Content = null,
+            Title = null,
+        };
+
+        Assert.Null(parameters.Content);
+        Assert.False(parameters.RawBodyData.ContainsKey("content"));
+        Assert.Null(parameters.Title);
+        Assert.False(parameters.RawBodyData.ContainsKey("title"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        DocumentUpdateDocumentParams parameters = new()
+        {
+            SenderID = "senderId",
+            KBID = "kbId",
+            DocID = "docId",
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri(
+                    "https://api.zavu.dev/v1/senders/senderId/agent/knowledge-bases/kbId/documents/docId"
+                ),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new DocumentUpdateDocumentParams
+        {
+            SenderID = "senderId",
+            KBID = "kbId",
+            DocID = "docId",
+            Content = "content",
+            Title = "title",
+        };
+
+        DocumentUpdateDocumentParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentResponseTest.cs b/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentResponseTest.cs
new file mode 100644
index 0000000..a910e8e
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentResponseTest.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Agent.KnowledgeBases;
+using Zavudev.Models.Senders.Agent.KnowledgeBases.Documents;
+
+namespace Zavudev.Tests.Models.Senders.Agent.KnowledgeBases.Documents;
+
+public class DocumentUpdateDocumentResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new DocumentUpdateDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        AgentDocument expectedDocument = new()
+        {
+            ID = "id",
+            ChunkCount = 0,
+            ContentLength = 0,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            IsProcessed = true,
+            KnowledgeBaseID = "knowledgeBaseId",
+            Title = "title",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedDocument, model.Document);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new DocumentUpdateDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<DocumentUpdateDocumentResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new DocumentUpdateDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<DocumentUpdateDocumentResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        AgentDocument expectedDocument = new()
+        {
+            ID = "id",
+            ChunkCount = 0,
+            ContentLength = 0,
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            IsProcessed = true,
+            KnowledgeBaseID = "knowledgeBaseId",
+            Title = "title",
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedDocument, deserialized.Document);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new DocumentUpdateDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new DocumentUpdateDocumentResponse
+        {
+            Document = new()
+            {
+                ID = "id",
+                ChunkCount = 0,
+                ContentLength = 0,
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                IsProcessed = true,
+                KnowledgeBaseID = "knowledgeBaseId",
+                Title = "title",
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        DocumentUpdateDocumentResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Senders/Agent/Tools/ToolListTestRunsParamsTest.cs b/src/Zavudev.Tests/Models/Senders/Agent/Tools/ToolListTestRunsParamsTest.cs
new file mode 100644
index 0000000..2b25803
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Agent/Tools/ToolListTestRunsParamsTest.cs
@@ -0,0 +1,88 @@
+using System;
+using Zavudev.Models.Senders.Agent.Tools;
+
+namespace Zavudev.Tests.Models.Senders.Agent.Tools;
+
+public class ToolListTestRunsParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new ToolListTestRunsParams
+        {
+            SenderID = "senderId",
+            ToolID = "toolId",
+            Limit = 100,
+        };
+
+        string expectedSenderID = "senderId";
+        string expectedToolID = "toolId";
+        long expectedLimit = 100;
+
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+        Assert.Equal(expectedToolID, parameters.ToolID);
+        Assert.Equal(expectedLimit, parameters.Limit);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new ToolListTestRunsParams { SenderID = "senderId", ToolID = "toolId" };
+
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new ToolListTestRunsParams
+        {
+            SenderID = "senderId",
+            ToolID = "toolId",
+
+            // Null should be interpreted as omitted for these properties
+            Limit = null,
+        };
+
+        Assert.Null(parameters.Limit);
+        Assert.False(parameters.RawQueryData.ContainsKey("limit"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        ToolListTestRunsParams parameters = new()
+        {
+            SenderID = "senderId",
+            ToolID = "toolId",
+            Limit = 100,
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri(
+                    "https://api.zavu.dev/v1/senders/senderId/agent/tools/toolId/test-runs?limit=100"
+                ),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new ToolListTestRunsParams
+        {
+            SenderID = "senderId",
+            ToolID = "toolId",
+            Limit = 100,
+        };
+
+        ToolListTestRunsParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Senders/Agent/Tools/ToolListTestRunsResponseTest.cs b/src/Zavudev.Tests/Models/Senders/Agent/Tools/ToolListTestRunsResponseTest.cs
new file mode 100644
index 0000000..d34b8e7
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Agent/Tools/ToolListTestRunsResponseTest.cs
@@ -0,0 +1,563 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Agent.Tools;
+
+namespace Zavudev.Tests.Models.Senders.Agent.Tools;
+
+public class ToolListTestRunsResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new ToolListTestRunsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "id",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DurationMs = 0,
+                    Success = true,
+                    ToolID = "toolId",
+                    Error = "error",
+                    Params = new Dictionary<string, JsonElement>()
+                    {
+                        { "foo", JsonSerializer.SerializeToElement("bar") },
+                    },
+                    Response = "response",
+                    StatusCode = 0,
+                },
+            ],
+        };
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "id",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                DurationMs = 0,
+                Success = true,
+                ToolID = "toolId",
+                Error = "error",
+                Params = new Dictionary<string, JsonElement>()
+                {
+                    { "foo", JsonSerializer.SerializeToElement("bar") },
+                },
+                Response = "response",
+                StatusCode = 0,
+            },
+        ];
+
+        Assert.Equal(expectedItems.Count, model.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], model.Items[i]);
+        }
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new ToolListTestRunsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "id",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DurationMs = 0,
+                    Success = true,
+                    ToolID = "toolId",
+                    Error = "error",
+                    Params = new Dictionary<string, JsonElement>()
+                    {
+                        { "foo", JsonSerializer.SerializeToElement("bar") },
+                    },
+                    Response = "response",
+                    StatusCode = 0,
+                },
+            ],
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ToolListTestRunsResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new ToolListTestRunsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "id",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DurationMs = 0,
+                    Success = true,
+                    ToolID = "toolId",
+                    Error = "error",
+                    Params = new Dictionary<string, JsonElement>()
+                    {
+                        { "foo", JsonSerializer.SerializeToElement("bar") },
+                    },
+                    Response = "response",
+                    StatusCode = 0,
+                },
+            ],
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<ToolListTestRunsResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        List<Item> expectedItems =
+        [
+            new()
+            {
+                ID = "id",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                DurationMs = 0,
+                Success = true,
+                ToolID = "toolId",
+                Error = "error",
+                Params = new Dictionary<string, JsonElement>()
+                {
+                    { "foo", JsonSerializer.SerializeToElement("bar") },
+                },
+                Response = "response",
+                StatusCode = 0,
+            },
+        ];
+
+        Assert.Equal(expectedItems.Count, deserialized.Items.Count);
+        for (int i = 0; i < expectedItems.Count; i++)
+        {
+            Assert.Equal(expectedItems[i], deserialized.Items[i]);
+        }
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new ToolListTestRunsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "id",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DurationMs = 0,
+                    Success = true,
+                    ToolID = "toolId",
+                    Error = "error",
+                    Params = new Dictionary<string, JsonElement>()
+                    {
+                        { "foo", JsonSerializer.SerializeToElement("bar") },
+                    },
+                    Response = "response",
+                    StatusCode = 0,
+                },
+            ],
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new ToolListTestRunsResponse
+        {
+            Items =
+            [
+                new()
+                {
+                    ID = "id",
+                    CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                    DurationMs = 0,
+                    Success = true,
+                    ToolID = "toolId",
+                    Error = "error",
+                    Params = new Dictionary<string, JsonElement>()
+                    {
+                        { "foo", JsonSerializer.SerializeToElement("bar") },
+                    },
+                    Response = "response",
+                    StatusCode = 0,
+                },
+            ],
+        };
+
+        ToolListTestRunsResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class ItemTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Error = "error",
+            Params = new Dictionary<string, JsonElement>()
+            {
+                { "foo", JsonSerializer.SerializeToElement("bar") },
+            },
+            Response = "response",
+            StatusCode = 0,
+        };
+
+        string expectedID = "id";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        long expectedDurationMs = 0;
+        bool expectedSuccess = true;
+        string expectedToolID = "toolId";
+        string expectedError = "error";
+        Dictionary<string, JsonElement> expectedParams = new()
+        {
+            { "foo", JsonSerializer.SerializeToElement("bar") },
+        };
+        string expectedResponse = "response";
+        long expectedStatusCode = 0;
+
+        Assert.Equal(expectedID, model.ID);
+        Assert.Equal(expectedCreatedAt, model.CreatedAt);
+        Assert.Equal(expectedDurationMs, model.DurationMs);
+        Assert.Equal(expectedSuccess, model.Success);
+        Assert.Equal(expectedToolID, model.ToolID);
+        Assert.Equal(expectedError, model.Error);
+        Assert.NotNull(model.Params);
+        Assert.Equal(expectedParams.Count, model.Params.Count);
+        foreach (var item in expectedParams)
+        {
+            Assert.True(model.Params.TryGetValue(item.Key, out var value));
+
+            Assert.True(JsonElement.DeepEquals(value, model.Params[item.Key]));
+        }
+        Assert.Equal(expectedResponse, model.Response);
+        Assert.Equal(expectedStatusCode, model.StatusCode);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Error = "error",
+            Params = new Dictionary<string, JsonElement>()
+            {
+                { "foo", JsonSerializer.SerializeToElement("bar") },
+            },
+            Response = "response",
+            StatusCode = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(json, ModelBase.SerializerOptions);
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Error = "error",
+            Params = new Dictionary<string, JsonElement>()
+            {
+                { "foo", JsonSerializer.SerializeToElement("bar") },
+            },
+            Response = "response",
+            StatusCode = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Item>(element, ModelBase.SerializerOptions);
+        Assert.NotNull(deserialized);
+
+        string expectedID = "id";
+        DateTimeOffset expectedCreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z");
+        long expectedDurationMs = 0;
+        bool expectedSuccess = true;
+        string expectedToolID = "toolId";
+        string expectedError = "error";
+        Dictionary<string, JsonElement> expectedParams = new()
+        {
+            { "foo", JsonSerializer.SerializeToElement("bar") },
+        };
+        string expectedResponse = "response";
+        long expectedStatusCode = 0;
+
+        Assert.Equal(expectedID, deserialized.ID);
+        Assert.Equal(expectedCreatedAt, deserialized.CreatedAt);
+        Assert.Equal(expectedDurationMs, deserialized.DurationMs);
+        Assert.Equal(expectedSuccess, deserialized.Success);
+        Assert.Equal(expectedToolID, deserialized.ToolID);
+        Assert.Equal(expectedError, deserialized.Error);
+        Assert.NotNull(deserialized.Params);
+        Assert.Equal(expectedParams.Count, deserialized.Params.Count);
+        foreach (var item in expectedParams)
+        {
+            Assert.True(deserialized.Params.TryGetValue(item.Key, out var value));
+
+            Assert.True(JsonElement.DeepEquals(value, deserialized.Params[item.Key]));
+        }
+        Assert.Equal(expectedResponse, deserialized.Response);
+        Assert.Equal(expectedStatusCode, deserialized.StatusCode);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Error = "error",
+            Params = new Dictionary<string, JsonElement>()
+            {
+                { "foo", JsonSerializer.SerializeToElement("bar") },
+            },
+            Response = "response",
+            StatusCode = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Error = "error",
+            Response = "response",
+            StatusCode = 0,
+        };
+
+        Assert.Null(model.Params);
+        Assert.False(model.RawData.ContainsKey("params"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Error = "error",
+            Response = "response",
+            StatusCode = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Error = "error",
+            Response = "response",
+            StatusCode = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Params = null,
+        };
+
+        Assert.Null(model.Params);
+        Assert.False(model.RawData.ContainsKey("params"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Error = "error",
+            Response = "response",
+            StatusCode = 0,
+
+            // Null should be interpreted as omitted for these properties
+            Params = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Params = new Dictionary<string, JsonElement>()
+            {
+                { "foo", JsonSerializer.SerializeToElement("bar") },
+            },
+        };
+
+        Assert.Null(model.Error);
+        Assert.False(model.RawData.ContainsKey("error"));
+        Assert.Null(model.Response);
+        Assert.False(model.RawData.ContainsKey("response"));
+        Assert.Null(model.StatusCode);
+        Assert.False(model.RawData.ContainsKey("statusCode"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Params = new Dictionary<string, JsonElement>()
+            {
+                { "foo", JsonSerializer.SerializeToElement("bar") },
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullAreSetToNull_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Params = new Dictionary<string, JsonElement>()
+            {
+                { "foo", JsonSerializer.SerializeToElement("bar") },
+            },
+
+            Error = null,
+            Response = null,
+            StatusCode = null,
+        };
+
+        Assert.Null(model.Error);
+        Assert.True(model.RawData.ContainsKey("error"));
+        Assert.Null(model.Response);
+        Assert.True(model.RawData.ContainsKey("response"));
+        Assert.Null(model.StatusCode);
+        Assert.True(model.RawData.ContainsKey("statusCode"));
+    }
+
+    [Fact]
+    public void OptionalNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Params = new Dictionary<string, JsonElement>()
+            {
+                { "foo", JsonSerializer.SerializeToElement("bar") },
+            },
+
+            Error = null,
+            Response = null,
+            StatusCode = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new Item
+        {
+            ID = "id",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            DurationMs = 0,
+            Success = true,
+            ToolID = "toolId",
+            Error = "error",
+            Params = new Dictionary<string, JsonElement>()
+            {
+                { "foo", JsonSerializer.SerializeToElement("bar") },
+            },
+            Response = "response",
+            StatusCode = 0,
+        };
+
+        Item copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Senders/Agent/Tools/Webhook/WebhookRotateSecretParamsTest.cs b/src/Zavudev.Tests/Models/Senders/Agent/Tools/Webhook/WebhookRotateSecretParamsTest.cs
new file mode 100644
index 0000000..5e63ac6
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Agent/Tools/Webhook/WebhookRotateSecretParamsTest.cs
@@ -0,0 +1,46 @@
+using System;
+using Zavudev.Models.Senders.Agent.Tools.Webhook;
+
+namespace Zavudev.Tests.Models.Senders.Agent.Tools.Webhook;
+
+public class WebhookRotateSecretParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new WebhookRotateSecretParams { SenderID = "senderId", ToolID = "toolId" };
+
+        string expectedSenderID = "senderId";
+        string expectedToolID = "toolId";
+
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+        Assert.Equal(expectedToolID, parameters.ToolID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        WebhookRotateSecretParams parameters = new() { SenderID = "senderId", ToolID = "toolId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(
+                new Uri(
+                    "https://api.zavu.dev/v1/senders/senderId/agent/tools/toolId/webhook/secret"
+                ),
+                url
+            )
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new WebhookRotateSecretParams { SenderID = "senderId", ToolID = "toolId" };
+
+        WebhookRotateSecretParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Senders/Telegram/TelegramConnectParamsTest.cs b/src/Zavudev.Tests/Models/Senders/Telegram/TelegramConnectParamsTest.cs
new file mode 100644
index 0000000..19b5a95
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Telegram/TelegramConnectParamsTest.cs
@@ -0,0 +1,41 @@
+using System;
+using Zavudev.Models.Senders.Telegram;
+
+namespace Zavudev.Tests.Models.Senders.Telegram;
+
+public class TelegramConnectParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new TelegramConnectParams { SenderID = "senderId", BotToken = "botToken" };
+
+        string expectedSenderID = "senderId";
+        string expectedBotToken = "botToken";
+
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+        Assert.Equal(expectedBotToken, parameters.BotToken);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        TelegramConnectParams parameters = new() { SenderID = "senderId", BotToken = "botToken" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/senders/senderId/telegram"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new TelegramConnectParams { SenderID = "senderId", BotToken = "botToken" };
+
+        TelegramConnectParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Senders/Telegram/TelegramConnectResponseTest.cs b/src/Zavudev.Tests/Models/Senders/Telegram/TelegramConnectResponseTest.cs
new file mode 100644
index 0000000..aba932a
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Telegram/TelegramConnectResponseTest.cs
@@ -0,0 +1,264 @@
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Telegram;
+
+namespace Zavudev.Tests.Models.Senders.Telegram;
+
+public class TelegramConnectResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new TelegramConnectResponse
+        {
+            Telegram = new()
+            {
+                Connected = true,
+                BotID = "botId",
+                BotUsername = "botUsername",
+            },
+        };
+
+        TelegramConnectResponseTelegram expectedTelegram = new()
+        {
+            Connected = true,
+            BotID = "botId",
+            BotUsername = "botUsername",
+        };
+
+        Assert.Equal(expectedTelegram, model.Telegram);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new TelegramConnectResponse
+        {
+            Telegram = new()
+            {
+                Connected = true,
+                BotID = "botId",
+                BotUsername = "botUsername",
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TelegramConnectResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new TelegramConnectResponse
+        {
+            Telegram = new()
+            {
+                Connected = true,
+                BotID = "botId",
+                BotUsername = "botUsername",
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TelegramConnectResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        TelegramConnectResponseTelegram expectedTelegram = new()
+        {
+            Connected = true,
+            BotID = "botId",
+            BotUsername = "botUsername",
+        };
+
+        Assert.Equal(expectedTelegram, deserialized.Telegram);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new TelegramConnectResponse
+        {
+            Telegram = new()
+            {
+                Connected = true,
+                BotID = "botId",
+                BotUsername = "botUsername",
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new TelegramConnectResponse
+        {
+            Telegram = new()
+            {
+                Connected = true,
+                BotID = "botId",
+                BotUsername = "botUsername",
+            },
+        };
+
+        TelegramConnectResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
+
+public class TelegramConnectResponseTelegramTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new TelegramConnectResponseTelegram
+        {
+            Connected = true,
+            BotID = "botId",
+            BotUsername = "botUsername",
+        };
+
+        bool expectedConnected = true;
+        string expectedBotID = "botId";
+        string expectedBotUsername = "botUsername";
+
+        Assert.Equal(expectedConnected, model.Connected);
+        Assert.Equal(expectedBotID, model.BotID);
+        Assert.Equal(expectedBotUsername, model.BotUsername);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new TelegramConnectResponseTelegram
+        {
+            Connected = true,
+            BotID = "botId",
+            BotUsername = "botUsername",
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TelegramConnectResponseTelegram>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new TelegramConnectResponseTelegram
+        {
+            Connected = true,
+            BotID = "botId",
+            BotUsername = "botUsername",
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TelegramConnectResponseTelegram>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        bool expectedConnected = true;
+        string expectedBotID = "botId";
+        string expectedBotUsername = "botUsername";
+
+        Assert.Equal(expectedConnected, deserialized.Connected);
+        Assert.Equal(expectedBotID, deserialized.BotID);
+        Assert.Equal(expectedBotUsername, deserialized.BotUsername);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new TelegramConnectResponseTelegram
+        {
+            Connected = true,
+            BotID = "botId",
+            BotUsername = "botUsername",
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetAreNotSet_Works()
+    {
+        var model = new TelegramConnectResponseTelegram { Connected = true };
+
+        Assert.Null(model.BotID);
+        Assert.False(model.RawData.ContainsKey("botId"));
+        Assert.Null(model.BotUsername);
+        Assert.False(model.RawData.ContainsKey("botUsername"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesUnsetValidation_Works()
+    {
+        var model = new TelegramConnectResponseTelegram { Connected = true };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullAreNotSet_Works()
+    {
+        var model = new TelegramConnectResponseTelegram
+        {
+            Connected = true,
+
+            // Null should be interpreted as omitted for these properties
+            BotID = null,
+            BotUsername = null,
+        };
+
+        Assert.Null(model.BotID);
+        Assert.False(model.RawData.ContainsKey("botId"));
+        Assert.Null(model.BotUsername);
+        Assert.False(model.RawData.ContainsKey("botUsername"));
+    }
+
+    [Fact]
+    public void OptionalNonNullablePropertiesSetToNullValidation_Works()
+    {
+        var model = new TelegramConnectResponseTelegram
+        {
+            Connected = true,
+
+            // Null should be interpreted as omitted for these properties
+            BotID = null,
+            BotUsername = null,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new TelegramConnectResponseTelegram
+        {
+            Connected = true,
+            BotID = "botId",
+            BotUsername = "botUsername",
+        };
+
+        TelegramConnectResponseTelegram copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Senders/Telegram/TelegramDisconnectParamsTest.cs b/src/Zavudev.Tests/Models/Senders/Telegram/TelegramDisconnectParamsTest.cs
new file mode 100644
index 0000000..76e3e6e
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Senders/Telegram/TelegramDisconnectParamsTest.cs
@@ -0,0 +1,39 @@
+using System;
+using Zavudev.Models.Senders.Telegram;
+
+namespace Zavudev.Tests.Models.Senders.Telegram;
+
+public class TelegramDisconnectParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new TelegramDisconnectParams { SenderID = "senderId" };
+
+        string expectedSenderID = "senderId";
+
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        TelegramDisconnectParams parameters = new() { SenderID = "senderId" };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/senders/senderId/telegram"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new TelegramDisconnectParams { SenderID = "senderId" };
+
+        TelegramDisconnectParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Templates/TemplateSyncParamsTest.cs b/src/Zavudev.Tests/Models/Templates/TemplateSyncParamsTest.cs
new file mode 100644
index 0000000..aac06bc
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Templates/TemplateSyncParamsTest.cs
@@ -0,0 +1,59 @@
+using System;
+using Zavudev.Models.Templates;
+
+namespace Zavudev.Tests.Models.Templates;
+
+public class TemplateSyncParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new TemplateSyncParams { SenderID = "sender_12345" };
+
+        string expectedSenderID = "sender_12345";
+
+        Assert.Equal(expectedSenderID, parameters.SenderID);
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsUnsetAreNotSet_Works()
+    {
+        var parameters = new TemplateSyncParams { };
+
+        Assert.Null(parameters.SenderID);
+        Assert.False(parameters.RawBodyData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void OptionalNonNullableParamsSetToNullAreNotSet_Works()
+    {
+        var parameters = new TemplateSyncParams
+        {
+            // Null should be interpreted as omitted for these properties
+            SenderID = null,
+        };
+
+        Assert.Null(parameters.SenderID);
+        Assert.False(parameters.RawBodyData.ContainsKey("senderId"));
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        TemplateSyncParams parameters = new();
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/templates/sync"), url));
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new TemplateSyncParams { SenderID = "sender_12345" };
+
+        TemplateSyncParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Templates/TemplateSyncResponseTest.cs b/src/Zavudev.Tests/Models/Templates/TemplateSyncResponseTest.cs
new file mode 100644
index 0000000..19aa746
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Templates/TemplateSyncResponseTest.cs
@@ -0,0 +1,136 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Templates;
+
+namespace Zavudev.Tests.Models.Templates;
+
+public class TemplateSyncResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new TemplateSyncResponse
+        {
+            AccountsSynced = 0,
+            Errors = ["string"],
+            Imported = 0,
+            Linked = 0,
+            Skipped = 0,
+            Updated = 0,
+        };
+
+        long expectedAccountsSynced = 0;
+        List<string> expectedErrors = ["string"];
+        long expectedImported = 0;
+        long expectedLinked = 0;
+        long expectedSkipped = 0;
+        long expectedUpdated = 0;
+
+        Assert.Equal(expectedAccountsSynced, model.AccountsSynced);
+        Assert.Equal(expectedErrors.Count, model.Errors.Count);
+        for (int i = 0; i < expectedErrors.Count; i++)
+        {
+            Assert.Equal(expectedErrors[i], model.Errors[i]);
+        }
+        Assert.Equal(expectedImported, model.Imported);
+        Assert.Equal(expectedLinked, model.Linked);
+        Assert.Equal(expectedSkipped, model.Skipped);
+        Assert.Equal(expectedUpdated, model.Updated);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new TemplateSyncResponse
+        {
+            AccountsSynced = 0,
+            Errors = ["string"],
+            Imported = 0,
+            Linked = 0,
+            Skipped = 0,
+            Updated = 0,
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TemplateSyncResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new TemplateSyncResponse
+        {
+            AccountsSynced = 0,
+            Errors = ["string"],
+            Imported = 0,
+            Linked = 0,
+            Skipped = 0,
+            Updated = 0,
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<TemplateSyncResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        long expectedAccountsSynced = 0;
+        List<string> expectedErrors = ["string"];
+        long expectedImported = 0;
+        long expectedLinked = 0;
+        long expectedSkipped = 0;
+        long expectedUpdated = 0;
+
+        Assert.Equal(expectedAccountsSynced, deserialized.AccountsSynced);
+        Assert.Equal(expectedErrors.Count, deserialized.Errors.Count);
+        for (int i = 0; i < expectedErrors.Count; i++)
+        {
+            Assert.Equal(expectedErrors[i], deserialized.Errors[i]);
+        }
+        Assert.Equal(expectedImported, deserialized.Imported);
+        Assert.Equal(expectedLinked, deserialized.Linked);
+        Assert.Equal(expectedSkipped, deserialized.Skipped);
+        Assert.Equal(expectedUpdated, deserialized.Updated);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new TemplateSyncResponse
+        {
+            AccountsSynced = 0,
+            Errors = ["string"],
+            Imported = 0,
+            Linked = 0,
+            Skipped = 0,
+            Updated = 0,
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new TemplateSyncResponse
+        {
+            AccountsSynced = 0,
+            Errors = ["string"],
+            Imported = 0,
+            Linked = 0,
+            Skipped = 0,
+            Updated = 0,
+        };
+
+        TemplateSyncResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Urls/UrlEscalateParamsTest.cs b/src/Zavudev.Tests/Models/Urls/UrlEscalateParamsTest.cs
new file mode 100644
index 0000000..2b4ea2b
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Urls/UrlEscalateParamsTest.cs
@@ -0,0 +1,53 @@
+using System;
+using Zavudev.Models.Urls;
+
+namespace Zavudev.Tests.Models.Urls;
+
+public class UrlEscalateParamsTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var parameters = new UrlEscalateParams
+        {
+            UrlID = "urlId",
+            Reason = "This is our official landing page and was rejected in error.",
+        };
+
+        string expectedUrlID = "urlId";
+        string expectedReason = "This is our official landing page and was rejected in error.";
+
+        Assert.Equal(expectedUrlID, parameters.UrlID);
+        Assert.Equal(expectedReason, parameters.Reason);
+    }
+
+    [Fact]
+    public void Url_Works()
+    {
+        UrlEscalateParams parameters = new()
+        {
+            UrlID = "urlId",
+            Reason = "This is our official landing page and was rejected in error.",
+        };
+
+        var url = parameters.Url(new() { ApiKey = "My API Key" });
+
+        Assert.True(
+            TestBase.UrisEqual(new Uri("https://api.zavu.dev/v1/urls/urlId/escalate"), url)
+        );
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var parameters = new UrlEscalateParams
+        {
+            UrlID = "urlId",
+            Reason = "This is our official landing page and was rejected in error.",
+        };
+
+        UrlEscalateParams copied = new(parameters);
+
+        Assert.Equal(parameters, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Models/Urls/UrlEscalateResponseTest.cs b/src/Zavudev.Tests/Models/Urls/UrlEscalateResponseTest.cs
new file mode 100644
index 0000000..a7789d9
--- /dev/null
+++ b/src/Zavudev.Tests/Models/Urls/UrlEscalateResponseTest.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Text.Json;
+using Zavudev.Core;
+using Zavudev.Models.Urls;
+
+namespace Zavudev.Tests.Models.Urls;
+
+public class UrlEscalateResponseTest : TestBase
+{
+    [Fact]
+    public void FieldRoundtrip_Works()
+    {
+        var model = new UrlEscalateResponse
+        {
+            Message = "message",
+            Url = new()
+            {
+                ID = "url_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Domain = "example.com",
+                Status = VerifiedUrlStatus.Pending,
+                Url = "https://example.com/page",
+                ApprovalType = ApprovalType.Manual,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string expectedMessage = "message";
+        VerifiedUrl expectedUrl = new()
+        {
+            ID = "url_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Domain = "example.com",
+            Status = VerifiedUrlStatus.Pending,
+            Url = "https://example.com/page",
+            ApprovalType = ApprovalType.Manual,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedMessage, model.Message);
+        Assert.Equal(expectedUrl, model.Url);
+    }
+
+    [Fact]
+    public void SerializationRoundtrip_Works()
+    {
+        var model = new UrlEscalateResponse
+        {
+            Message = "message",
+            Url = new()
+            {
+                ID = "url_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Domain = "example.com",
+                Status = VerifiedUrlStatus.Pending,
+                Url = "https://example.com/page",
+                ApprovalType = ApprovalType.Manual,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string json = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<UrlEscalateResponse>(
+            json,
+            ModelBase.SerializerOptions
+        );
+
+        Assert.Equal(model, deserialized);
+    }
+
+    [Fact]
+    public void FieldRoundtripThroughSerialization_Works()
+    {
+        var model = new UrlEscalateResponse
+        {
+            Message = "message",
+            Url = new()
+            {
+                ID = "url_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Domain = "example.com",
+                Status = VerifiedUrlStatus.Pending,
+                Url = "https://example.com/page",
+                ApprovalType = ApprovalType.Manual,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        string element = JsonSerializer.Serialize(model, ModelBase.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<UrlEscalateResponse>(
+            element,
+            ModelBase.SerializerOptions
+        );
+        Assert.NotNull(deserialized);
+
+        string expectedMessage = "message";
+        VerifiedUrl expectedUrl = new()
+        {
+            ID = "url_abc123",
+            CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            Domain = "example.com",
+            Status = VerifiedUrlStatus.Pending,
+            Url = "https://example.com/page",
+            ApprovalType = ApprovalType.Manual,
+            UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+        };
+
+        Assert.Equal(expectedMessage, deserialized.Message);
+        Assert.Equal(expectedUrl, deserialized.Url);
+    }
+
+    [Fact]
+    public void Validation_Works()
+    {
+        var model = new UrlEscalateResponse
+        {
+            Message = "message",
+            Url = new()
+            {
+                ID = "url_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Domain = "example.com",
+                Status = VerifiedUrlStatus.Pending,
+                Url = "https://example.com/page",
+                ApprovalType = ApprovalType.Manual,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        model.Validate();
+    }
+
+    [Fact]
+    public void CopyConstructor_Works()
+    {
+        var model = new UrlEscalateResponse
+        {
+            Message = "message",
+            Url = new()
+            {
+                ID = "url_abc123",
+                CreatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+                Domain = "example.com",
+                Status = VerifiedUrlStatus.Pending,
+                Url = "https://example.com/page",
+                ApprovalType = ApprovalType.Manual,
+                UpdatedAt = DateTimeOffset.Parse("2019-12-27T18:11:19.117Z"),
+            },
+        };
+
+        UrlEscalateResponse copied = new(model);
+
+        Assert.Equal(model, copied);
+    }
+}
diff --git a/src/Zavudev.Tests/Services/AgentServiceTest.cs b/src/Zavudev.Tests/Services/AgentServiceTest.cs
new file mode 100644
index 0000000..6f05158
--- /dev/null
+++ b/src/Zavudev.Tests/Services/AgentServiceTest.cs
@@ -0,0 +1,79 @@
+using System.Threading.Tasks;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Tests.Services;
+
+public class AgentServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Create_Works()
+    {
+        var agent = await this.client.Agents.Create(
+            new()
+            {
+                Model = "model",
+                Name = "name",
+                Provider = AgentProvider.OpenAI,
+                SystemPrompt = "systemPrompt",
+            },
+            TestContext.Current.CancellationToken
+        );
+        agent.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Retrieve_Works()
+    {
+        var agent = await this.client.Agents.Retrieve(
+            "agentId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        agent.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Update_Works()
+    {
+        var agent = await this.client.Agents.Update(
+            "agentId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        agent.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task List_Works()
+    {
+        var page = await this.client.Agents.List(new(), TestContext.Current.CancellationToken);
+        page.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Delete_Works()
+    {
+        await this.client.Agents.Delete("agentId", new(), TestContext.Current.CancellationToken);
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task ListVoices_Works()
+    {
+        var response = await this.client.Agents.ListVoices(
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Test_Works()
+    {
+        var response = await this.client.Agents.Test(
+            "agentId",
+            new() { Message = "Where is order ORD-12345?" },
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+}
diff --git a/src/Zavudev.Tests/Services/AgentTemplateServiceTest.cs b/src/Zavudev.Tests/Services/AgentTemplateServiceTest.cs
new file mode 100644
index 0000000..b1a2f01
--- /dev/null
+++ b/src/Zavudev.Tests/Services/AgentTemplateServiceTest.cs
@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+
+namespace Zavudev.Tests.Services;
+
+public class AgentTemplateServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Retrieve_Works()
+    {
+        var agentTemplate = await this.client.AgentTemplates.Retrieve(
+            "fermi",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        agentTemplate.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task List_Works()
+    {
+        var agentTemplates = await this.client.AgentTemplates.List(
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        agentTemplates.Validate();
+    }
+}
diff --git a/src/Zavudev.Tests/Services/Agents/SenderServiceTest.cs b/src/Zavudev.Tests/Services/Agents/SenderServiceTest.cs
new file mode 100644
index 0000000..2ce8ebf
--- /dev/null
+++ b/src/Zavudev.Tests/Services/Agents/SenderServiceTest.cs
@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+
+namespace Zavudev.Tests.Services.Agents;
+
+public class SenderServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Connect_Works()
+    {
+        var response = await this.client.Agents.Senders.Connect(
+            "agentId",
+            new() { SenderID = "senderId" },
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Disconnect_Works()
+    {
+        await this.client.Agents.Senders.Disconnect(
+            "senderId",
+            new() { AgentID = "agentId" },
+            TestContext.Current.CancellationToken
+        );
+    }
+}
diff --git a/src/Zavudev.Tests/Services/CallServiceTest.cs b/src/Zavudev.Tests/Services/CallServiceTest.cs
new file mode 100644
index 0000000..1abf9b6
--- /dev/null
+++ b/src/Zavudev.Tests/Services/CallServiceTest.cs
@@ -0,0 +1,45 @@
+using System.Threading.Tasks;
+
+namespace Zavudev.Tests.Services;
+
+public class CallServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Create_Works()
+    {
+        var call = await this.client.Calls.Create(
+            new() { To = "+56912345678" },
+            TestContext.Current.CancellationToken
+        );
+        call.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Retrieve_Works()
+    {
+        var call = await this.client.Calls.Retrieve(
+            "callId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        call.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task List_Works()
+    {
+        var page = await this.client.Calls.List(new(), TestContext.Current.CancellationToken);
+        page.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Hangup_Works()
+    {
+        var response = await this.client.Calls.Hangup(
+            "callId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+}
diff --git a/src/Zavudev.Tests/Services/ContactServiceTest.cs b/src/Zavudev.Tests/Services/ContactServiceTest.cs
index 661dd1c..4d9f99c 100644
--- a/src/Zavudev.Tests/Services/ContactServiceTest.cs
+++ b/src/Zavudev.Tests/Services/ContactServiceTest.cs
@@ -67,16 +67,6 @@ await this.client.Contacts.Delete(
         );
     }
 
-    [Fact(Skip = "Mock server tests are disabled")]
-    public async Task DismissMergeSuggestion_Works()
-    {
-        await this.client.Contacts.DismissMergeSuggestion(
-            "contactId",
-            new(),
-            TestContext.Current.CancellationToken
-        );
-    }
-
     [Fact(Skip = "Mock server tests are disabled")]
     public async Task Merge_Works()
     {
diff --git a/src/Zavudev.Tests/Services/ConversationServiceTest.cs b/src/Zavudev.Tests/Services/ConversationServiceTest.cs
new file mode 100644
index 0000000..5389e31
--- /dev/null
+++ b/src/Zavudev.Tests/Services/ConversationServiceTest.cs
@@ -0,0 +1,49 @@
+using System.Threading.Tasks;
+
+namespace Zavudev.Tests.Services;
+
+public class ConversationServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Retrieve_Works()
+    {
+        var conversation = await this.client.Conversations.Retrieve(
+            "conversationId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        conversation.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task List_Works()
+    {
+        var page = await this.client.Conversations.List(
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        page.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task ListMessages_Works()
+    {
+        var page = await this.client.Conversations.ListMessages(
+            "conversationId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        page.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task MarkAsRead_Works()
+    {
+        var response = await this.client.Conversations.MarkAsRead(
+            "conversationId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+}
diff --git a/src/Zavudev.Tests/Services/EmailDomainServiceTest.cs b/src/Zavudev.Tests/Services/EmailDomainServiceTest.cs
new file mode 100644
index 0000000..6a3f79c
--- /dev/null
+++ b/src/Zavudev.Tests/Services/EmailDomainServiceTest.cs
@@ -0,0 +1,58 @@
+using System.Threading.Tasks;
+
+namespace Zavudev.Tests.Services;
+
+public class EmailDomainServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Create_Works()
+    {
+        var emailDomain = await this.client.EmailDomains.Create(
+            new() { Domain = "example.com" },
+            TestContext.Current.CancellationToken
+        );
+        emailDomain.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Retrieve_Works()
+    {
+        var emailDomain = await this.client.EmailDomains.Retrieve(
+            "domainId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        emailDomain.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task List_Works()
+    {
+        var emailDomains = await this.client.EmailDomains.List(
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        emailDomains.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Delete_Works()
+    {
+        await this.client.EmailDomains.Delete(
+            "domainId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Verify_Works()
+    {
+        var response = await this.client.EmailDomains.Verify(
+            "domainId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+}
diff --git a/src/Zavudev.Tests/Services/FunctionServiceTest.cs b/src/Zavudev.Tests/Services/FunctionServiceTest.cs
index de3acb0..d1bd0cb 100644
--- a/src/Zavudev.Tests/Services/FunctionServiceTest.cs
+++ b/src/Zavudev.Tests/Services/FunctionServiceTest.cs
@@ -69,6 +69,38 @@ public async Task GetDeployment_Works()
         response.Validate();
     }
 
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task ListDeployments_Works()
+    {
+        var response = await this.client.Functions.ListDeployments(
+            "functionId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task ListEventTypes_Works()
+    {
+        var response = await this.client.Functions.ListEventTypes(
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task RollbackDeployment_Works()
+    {
+        var response = await this.client.Functions.RollbackDeployment(
+            "functionId",
+            new() { DeploymentID = "fnd_abc123" },
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
     [Fact(Skip = "Mock server tests are disabled")]
     public async Task TailLogs_Works()
     {
diff --git a/src/Zavudev.Tests/Services/Functions/GitLinkServiceTest.cs b/src/Zavudev.Tests/Services/Functions/GitLinkServiceTest.cs
new file mode 100644
index 0000000..b9516a6
--- /dev/null
+++ b/src/Zavudev.Tests/Services/Functions/GitLinkServiceTest.cs
@@ -0,0 +1,60 @@
+using System.Threading.Tasks;
+
+namespace Zavudev.Tests.Services.Functions;
+
+public class GitLinkServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Retrieve_Works()
+    {
+        var gitLink = await this.client.Functions.GitLink.Retrieve(
+            "functionId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        gitLink.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Update_Works()
+    {
+        var gitLink = await this.client.Functions.GitLink.Update(
+            "functionId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        gitLink.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task DeployNow_Works()
+    {
+        var response = await this.client.Functions.GitLink.DeployNow(
+            "functionId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Link_Works()
+    {
+        var response = await this.client.Functions.GitLink.Link(
+            "functionId",
+            new() { Owner = "acme", Repo = "order-bot" },
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Unlink_Works()
+    {
+        await this.client.Functions.GitLink.Unlink(
+            "functionId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+    }
+}
diff --git a/src/Zavudev.Tests/Services/Functions/TriggerServiceTest.cs b/src/Zavudev.Tests/Services/Functions/TriggerServiceTest.cs
new file mode 100644
index 0000000..f9bfb47
--- /dev/null
+++ b/src/Zavudev.Tests/Services/Functions/TriggerServiceTest.cs
@@ -0,0 +1,49 @@
+using System.Threading.Tasks;
+
+namespace Zavudev.Tests.Services.Functions;
+
+public class TriggerServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Create_Works()
+    {
+        var trigger = await this.client.Functions.Triggers.Create(
+            "functionId",
+            new() { EventTypes = ["message.inbound"], SenderIds = [null] },
+            TestContext.Current.CancellationToken
+        );
+        trigger.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Update_Works()
+    {
+        var trigger = await this.client.Functions.Triggers.Update(
+            "triggerId",
+            new() { Active = true },
+            TestContext.Current.CancellationToken
+        );
+        trigger.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task List_Works()
+    {
+        var triggers = await this.client.Functions.Triggers.List(
+            "functionId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        triggers.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Delete_Works()
+    {
+        await this.client.Functions.Triggers.Delete(
+            "triggerId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+    }
+}
diff --git a/src/Zavudev.Tests/Services/IntrospectServiceTest.cs b/src/Zavudev.Tests/Services/IntrospectServiceTest.cs
index 3c85de4..d3b3417 100644
--- a/src/Zavudev.Tests/Services/IntrospectServiceTest.cs
+++ b/src/Zavudev.Tests/Services/IntrospectServiceTest.cs
@@ -4,6 +4,16 @@ namespace Zavudev.Tests.Services;
 
 public class IntrospectServiceTest : TestBase
 {
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task ValidateEmail_Works()
+    {
+        var response = await this.client.Introspect.ValidateEmail(
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
     [Fact(Skip = "Mock server tests are disabled")]
     public async Task ValidatePhone_Works()
     {
diff --git a/src/Zavudev.Tests/Services/MessageServiceTest.cs b/src/Zavudev.Tests/Services/MessageServiceTest.cs
index 5c21ec8..ef3e417 100644
--- a/src/Zavudev.Tests/Services/MessageServiceTest.cs
+++ b/src/Zavudev.Tests/Services/MessageServiceTest.cs
@@ -22,6 +22,17 @@ public async Task List_Works()
         page.Validate();
     }
 
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task ListAttachments_Works()
+    {
+        var response = await this.client.Messages.ListAttachments(
+            "messageId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
     [Fact(Skip = "Mock server tests are disabled")]
     public async Task React_Works()
     {
diff --git a/src/Zavudev.Tests/Services/Senders/Agent/KnowledgeBases/DocumentServiceTest.cs b/src/Zavudev.Tests/Services/Senders/Agent/KnowledgeBases/DocumentServiceTest.cs
index 0f35910..7a015e2 100644
--- a/src/Zavudev.Tests/Services/Senders/Agent/KnowledgeBases/DocumentServiceTest.cs
+++ b/src/Zavudev.Tests/Services/Senders/Agent/KnowledgeBases/DocumentServiceTest.cs
@@ -40,4 +40,26 @@ await this.client.Senders.Agent.KnowledgeBases.Documents.Delete(
             TestContext.Current.CancellationToken
         );
     }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task RetrieveDocument_Works()
+    {
+        var response = await this.client.Senders.Agent.KnowledgeBases.Documents.RetrieveDocument(
+            "docId",
+            new() { SenderID = "senderId", KBID = "kbId" },
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task UpdateDocument_Works()
+    {
+        var response = await this.client.Senders.Agent.KnowledgeBases.Documents.UpdateDocument(
+            "docId",
+            new() { SenderID = "senderId", KBID = "kbId" },
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
 }
diff --git a/src/Zavudev.Tests/Services/Senders/Agent/ToolServiceTest.cs b/src/Zavudev.Tests/Services/Senders/Agent/ToolServiceTest.cs
index ec3a5ea..41ae2e5 100644
--- a/src/Zavudev.Tests/Services/Senders/Agent/ToolServiceTest.cs
+++ b/src/Zavudev.Tests/Services/Senders/Agent/ToolServiceTest.cs
@@ -78,6 +78,17 @@ await this.client.Senders.Agent.Tools.Delete(
         );
     }
 
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task ListTestRuns_Works()
+    {
+        var response = await this.client.Senders.Agent.Tools.ListTestRuns(
+            "toolId",
+            new() { SenderID = "senderId" },
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
     [Fact(Skip = "Mock server tests are disabled")]
     public async Task Test_Works()
     {
diff --git a/src/Zavudev.Tests/Services/Senders/Agent/Tools/WebhookServiceTest.cs b/src/Zavudev.Tests/Services/Senders/Agent/Tools/WebhookServiceTest.cs
new file mode 100644
index 0000000..25c377e
--- /dev/null
+++ b/src/Zavudev.Tests/Services/Senders/Agent/Tools/WebhookServiceTest.cs
@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+
+namespace Zavudev.Tests.Services.Senders.Agent.Tools;
+
+public class WebhookServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task RotateSecret_Works()
+    {
+        var webhookSecretResponse = await this.client.Senders.Agent.Tools.Webhook.RotateSecret(
+            "toolId",
+            new() { SenderID = "senderId" },
+            TestContext.Current.CancellationToken
+        );
+        webhookSecretResponse.Validate();
+    }
+}
diff --git a/src/Zavudev.Tests/Services/Senders/TelegramServiceTest.cs b/src/Zavudev.Tests/Services/Senders/TelegramServiceTest.cs
new file mode 100644
index 0000000..76205d2
--- /dev/null
+++ b/src/Zavudev.Tests/Services/Senders/TelegramServiceTest.cs
@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+
+namespace Zavudev.Tests.Services.Senders;
+
+public class TelegramServiceTest : TestBase
+{
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Connect_Works()
+    {
+        var response = await this.client.Senders.Telegram.Connect(
+            "senderId",
+            new() { BotToken = "botToken" },
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Disconnect_Works()
+    {
+        await this.client.Senders.Telegram.Disconnect(
+            "senderId",
+            new(),
+            TestContext.Current.CancellationToken
+        );
+    }
+}
diff --git a/src/Zavudev.Tests/Services/TemplateServiceTest.cs b/src/Zavudev.Tests/Services/TemplateServiceTest.cs
index 0e8635b..a443445 100644
--- a/src/Zavudev.Tests/Services/TemplateServiceTest.cs
+++ b/src/Zavudev.Tests/Services/TemplateServiceTest.cs
@@ -58,4 +58,14 @@ public async Task Submit_Works()
         );
         template.Validate();
     }
+
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Sync_Works()
+    {
+        var response = await this.client.Templates.Sync(
+            new(),
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
 }
diff --git a/src/Zavudev.Tests/Services/UrlServiceTest.cs b/src/Zavudev.Tests/Services/UrlServiceTest.cs
index a299bf7..934fbd7 100644
--- a/src/Zavudev.Tests/Services/UrlServiceTest.cs
+++ b/src/Zavudev.Tests/Services/UrlServiceTest.cs
@@ -4,6 +4,17 @@ namespace Zavudev.Tests.Services;
 
 public class UrlServiceTest : TestBase
 {
+    [Fact(Skip = "Mock server tests are disabled")]
+    public async Task Escalate_Works()
+    {
+        var response = await this.client.Urls.Escalate(
+            "urlId",
+            new() { Reason = "This is our official landing page and was rejected in error." },
+            TestContext.Current.CancellationToken
+        );
+        response.Validate();
+    }
+
     [Fact(Skip = "Mock server tests are disabled")]
     public async Task ListVerified_Works()
     {
diff --git a/src/Zavudev/Core/ModelBase.cs b/src/Zavudev/Core/ModelBase.cs
index 9e50614..40d3e4f 100644
--- a/src/Zavudev/Core/ModelBase.cs
+++ b/src/Zavudev/Core/ModelBase.cs
@@ -1,7 +1,10 @@
 using System.Text.Json;
 using Zavudev.Exceptions;
 using Zavudev.Models.Addresses;
+using Zavudev.Models.AgentTemplates;
 using Zavudev.Models.Broadcasts;
+using Zavudev.Models.EmailDomains;
+using Zavudev.Models.Functions.GitLink;
 using Zavudev.Models.Introspect;
 using Zavudev.Models.Messages;
 using Zavudev.Models.PhoneNumbers;
@@ -9,10 +12,13 @@
 using Zavudev.Models.Senders.Agent;
 using Zavudev.Models.Senders.Agent.Flows;
 using Zavudev.Models.SubAccounts.ApiKeys;
+using Agents = Zavudev.Models.Agents;
 using Brands = Zavudev.Models.Number10dlc.Brands;
+using Calls = Zavudev.Models.Calls;
 using Campaigns = Zavudev.Models.Number10dlc.Campaigns;
 using Channels = Zavudev.Models.Contacts.Channels;
 using Contacts = Zavudev.Models.Contacts;
+using Conversations = Zavudev.Models.Conversations;
 using Functions = Zavudev.Models.Functions;
 using Invitations = Zavudev.Models.Invitations;
 using PhoneNumbers = Zavudev.Models.Number10dlc.Campaigns.PhoneNumbers;
@@ -43,7 +49,10 @@ protected ModelBase(ModelBase modelBase)
         {
             new FrozenDictionaryConverterFactory(),
             new ApiEnumConverter<string, MessageChannel>(),
+            new ApiEnumConverter<string, Direction>(),
             new ApiEnumConverter<string, CtaHeaderType>(),
+            new ApiEnumConverter<string, MediaType>(),
+            new ApiEnumConverter<string, SourceType>(),
             new ApiEnumConverter<string, MessageStatus>(),
             new ApiEnumConverter<string, MessageType>(),
             new ApiEnumConverter<string, Channel>(),
@@ -83,6 +92,8 @@ protected ModelBase(ModelBase modelBase)
             new ApiEnumConverter<string, BroadcastMessageType>(),
             new ApiEnumConverter<string, BroadcastStatus>(),
             new ApiEnumConverter<string, LineType>(),
+            new ApiEnumConverter<string, Reason>(),
+            new ApiEnumConverter<string, Verdict>(),
             new ApiEnumConverter<string, PhoneNumberStatus>(),
             new ApiEnumConverter<string, PhoneNumberType>(),
             new ApiEnumConverter<string, RequirementFieldType>(),
@@ -120,8 +131,58 @@ protected ModelBase(ModelBase modelBase)
                 string,
                 Functions::FunctionGetDeploymentResponseDeploymentStatus
             >(),
+            new ApiEnumConverter<
+                string,
+                Functions::FunctionListDeploymentsResponseDeploymentStatus
+            >(),
+            new ApiEnumConverter<
+                string,
+                Functions::FunctionRollbackDeploymentResponseDeploymentStatus
+            >(),
             new ApiEnumConverter<long, Functions::MemoryMB>(),
             new ApiEnumConverter<string, Functions::Runtime>(),
+            new ApiEnumConverter<string, Connection>(),
+            new ApiEnumConverter<string, Provider>(),
+            new ApiEnumConverter<string, LastStatus>(),
+            new ApiEnumConverter<string, GitLinkUpdateResponseLinkConnection>(),
+            new ApiEnumConverter<string, GitLinkUpdateResponseLinkProvider>(),
+            new ApiEnumConverter<string, GitLinkUpdateResponseLinkLastStatus>(),
+            new ApiEnumConverter<string, GitLinkLinkResponseLinkConnection>(),
+            new ApiEnumConverter<string, GitLinkLinkResponseLinkProvider>(),
+            new ApiEnumConverter<string, GitLinkLinkResponseLinkLastStatus>(),
+            new ApiEnumConverter<string, Conversations::Direction>(),
+            new ApiEnumConverter<
+                string,
+                Conversations::ConversationListResponseLastMessageDirection
+            >(),
+            new ApiEnumConverter<
+                string,
+                Conversations::ConversationMarkAsReadResponseConversationLastMessageDirection
+            >(),
+            new ApiEnumConverter<string, Conversations::Channel>(),
+            new ApiEnumConverter<string, Calls::CallDirection>(),
+            new ApiEnumConverter<string, Calls::CallStatus>(),
+            new ApiEnumConverter<string, Calls::Role>(),
+            new ApiEnumConverter<string, Calls::CallRetrieveResponseCallDirection>(),
+            new ApiEnumConverter<string, Calls::CallRetrieveResponseCallStatus>(),
+            new ApiEnumConverter<string, Calls::CallRetrieveResponseCallTranscriptRole>(),
+            new ApiEnumConverter<string, Calls::CallListResponseDirection>(),
+            new ApiEnumConverter<string, Calls::CallListResponseStatus>(),
+            new ApiEnumConverter<string, Calls::CallListResponseTranscriptRole>(),
+            new ApiEnumConverter<string, Calls::CallHangupResponseCallDirection>(),
+            new ApiEnumConverter<string, Calls::CallHangupResponseCallStatus>(),
+            new ApiEnumConverter<string, Calls::CallHangupResponseCallTranscriptRole>(),
+            new ApiEnumConverter<string, Calls::Direction>(),
+            new ApiEnumConverter<string, Calls::Status>(),
+            new ApiEnumConverter<string, Category>(),
+            new ApiEnumConverter<string, ItemCategory>(),
+            new ApiEnumConverter<string, Purpose>(),
+            new ApiEnumConverter<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose>(),
+            new ApiEnumConverter<string, ItemDnsRecordPurpose>(),
+            new ApiEnumConverter<string, EmailDomainVerifyResponseDomainDnsRecordPurpose>(),
+            new ApiEnumConverter<string, Agents::VoicemailAction>(),
+            new ApiEnumConverter<string, Agents::AgentUpdateParamsVoiceVoicemailAction>(),
+            new ApiEnumConverter<string, Agents::Role>(),
         },
     };
 
diff --git a/src/Zavudev/IZavudevClient.cs b/src/Zavudev/IZavudevClient.cs
index d2cfb30..90c4022 100644
--- a/src/Zavudev/IZavudevClient.cs
+++ b/src/Zavudev/IZavudevClient.cs
@@ -82,6 +82,16 @@ public interface IZavudevClient : IDisposable
     IMeService Me { get; }
 
     IFunctionService Functions { get; }
+
+    IConversationService Conversations { get; }
+
+    ICallService Calls { get; }
+
+    IAgentTemplateService AgentTemplates { get; }
+
+    IEmailDomainService EmailDomains { get; }
+
+    IAgentService Agents { get; }
 }
 
 /// <summary>
@@ -145,6 +155,16 @@ public interface IZavudevClientWithRawResponse : IDisposable
 
     IFunctionServiceWithRawResponse Functions { get; }
 
+    IConversationServiceWithRawResponse Conversations { get; }
+
+    ICallServiceWithRawResponse Calls { get; }
+
+    IAgentTemplateServiceWithRawResponse AgentTemplates { get; }
+
+    IEmailDomainServiceWithRawResponse EmailDomains { get; }
+
+    IAgentServiceWithRawResponse Agents { get; }
+
     /// <summary>
     /// Sends a request to the Zavudev REST API.
     /// </summary>
diff --git a/src/Zavudev/Models/AgentTemplates/AgentTemplateListParams.cs b/src/Zavudev/Models/AgentTemplates/AgentTemplateListParams.cs
new file mode 100644
index 0000000..631861a
--- /dev/null
+++ b/src/Zavudev/Models/AgentTemplates/AgentTemplateListParams.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.AgentTemplates;
+
+/// <summary>
+/// List the factory agents available to scaffold with `npx zavudev agents pull`.
+/// Each entry is a ready-made voice or text agent (system prompt, skills, and —
+/// for voice agents — a co-located voice config).
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class AgentTemplateListParams : ParamsBase
+{
+    public AgentTemplateListParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentTemplateListParams(AgentTemplateListParams agentTemplateListParams)
+        : base(agentTemplateListParams) { }
+#pragma warning restore CS8618
+
+    public AgentTemplateListParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentTemplateListParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static AgentTemplateListParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(AgentTemplateListParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/agent-templates")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/AgentTemplates/AgentTemplateListResponse.cs b/src/Zavudev/Models/AgentTemplates/AgentTemplateListResponse.cs
new file mode 100644
index 0000000..fbf4a8f
--- /dev/null
+++ b/src/Zavudev/Models/AgentTemplates/AgentTemplateListResponse.cs
@@ -0,0 +1,251 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.AgentTemplates;
+
+[JsonConverter(
+    typeof(JsonModelConverter<AgentTemplateListResponse, AgentTemplateListResponseFromRaw>)
+)]
+public sealed record class AgentTemplateListResponse : JsonModel
+{
+    public required IReadOnlyList<Item> Items
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<Item>>("items");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<Item>>(
+                "items",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Items)
+        {
+            item.Validate();
+        }
+    }
+
+    public AgentTemplateListResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentTemplateListResponse(AgentTemplateListResponse agentTemplateListResponse)
+        : base(agentTemplateListResponse) { }
+#pragma warning restore CS8618
+
+    public AgentTemplateListResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentTemplateListResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="AgentTemplateListResponseFromRaw.FromRawUnchecked"/>
+    public static AgentTemplateListResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public AgentTemplateListResponse(IReadOnlyList<Item> items)
+        : this()
+    {
+        this.Items = items;
+    }
+}
+
+class AgentTemplateListResponseFromRaw : IFromRawJson<AgentTemplateListResponse>
+{
+    /// <inheritdoc/>
+    public AgentTemplateListResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => AgentTemplateListResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Compact catalog entry for a factory agent.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Item, ItemFromRaw>))]
+public sealed record class Item : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required ApiEnum<string, ItemCategory> Category
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, ItemCategory>>("category");
+        }
+        init { this._rawData.Set("category", value); }
+    }
+
+    public required string Name
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("name");
+        }
+        init { this._rawData.Set("name", value); }
+    }
+
+    public required string Summary
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("summary");
+        }
+        init { this._rawData.Set("summary", value); }
+    }
+
+    public required long ToolCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("toolCount");
+        }
+        init { this._rawData.Set("toolCount", value); }
+    }
+
+    /// <summary>
+    /// Whether this agent answers phone calls.
+    /// </summary>
+    public required bool Voice
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("voice");
+        }
+        init { this._rawData.Set("voice", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        this.Category.Validate();
+        _ = this.Name;
+        _ = this.Summary;
+        _ = this.ToolCount;
+        _ = this.Voice;
+    }
+
+    public Item() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Item(Item item)
+        : base(item) { }
+#pragma warning restore CS8618
+
+    public Item(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Item(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ItemFromRaw.FromRawUnchecked"/>
+    public static Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ItemFromRaw : IFromRawJson<Item>
+{
+    /// <inheritdoc/>
+    public Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Item.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(ItemCategoryConverter))]
+public enum ItemCategory
+{
+    Sales,
+    Support,
+    FrontDesk,
+    Ops,
+}
+
+sealed class ItemCategoryConverter : JsonConverter<ItemCategory>
+{
+    public override ItemCategory Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "sales" => ItemCategory.Sales,
+            "support" => ItemCategory.Support,
+            "frontDesk" => ItemCategory.FrontDesk,
+            "ops" => ItemCategory.Ops,
+            _ => (ItemCategory)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        ItemCategory value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                ItemCategory.Sales => "sales",
+                ItemCategory.Support => "support",
+                ItemCategory.FrontDesk => "frontDesk",
+                ItemCategory.Ops => "ops",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/AgentTemplates/AgentTemplateRetrieveParams.cs b/src/Zavudev/Models/AgentTemplates/AgentTemplateRetrieveParams.cs
new file mode 100644
index 0000000..619016f
--- /dev/null
+++ b/src/Zavudev/Models/AgentTemplates/AgentTemplateRetrieveParams.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.AgentTemplates;
+
+/// <summary>
+/// Fetch a single factory agent fully rendered: the function files to scaffold (an
+/// `index.ts` that declares the agent with `defineAgent` and its skills with `defineTool`)
+/// plus the secrets it needs. This is what `npx zavudev agents pull &lt;id&gt;`
+/// writes to disk before `npx zavudev deploy`.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class AgentTemplateRetrieveParams : ParamsBase
+{
+    public string? TemplateID { get; init; }
+
+    public AgentTemplateRetrieveParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentTemplateRetrieveParams(AgentTemplateRetrieveParams agentTemplateRetrieveParams)
+        : base(agentTemplateRetrieveParams)
+    {
+        this.TemplateID = agentTemplateRetrieveParams.TemplateID;
+    }
+#pragma warning restore CS8618
+
+    public AgentTemplateRetrieveParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentTemplateRetrieveParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string templateID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.TemplateID = templateID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static AgentTemplateRetrieveParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string templateID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            templateID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["TemplateID"] = JsonSerializer.SerializeToElement(this.TemplateID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(AgentTemplateRetrieveParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.TemplateID?.Equals(other.TemplateID) ?? other.TemplateID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/agent-templates/{0}", this.TemplateID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/AgentTemplates/AgentTemplateRetrieveResponse.cs b/src/Zavudev/Models/AgentTemplates/AgentTemplateRetrieveResponse.cs
new file mode 100644
index 0000000..49eb0ae
--- /dev/null
+++ b/src/Zavudev/Models/AgentTemplates/AgentTemplateRetrieveResponse.cs
@@ -0,0 +1,439 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.AgentTemplates;
+
+[JsonConverter(
+    typeof(JsonModelConverter<AgentTemplateRetrieveResponse, AgentTemplateRetrieveResponseFromRaw>)
+)]
+public sealed record class AgentTemplateRetrieveResponse : JsonModel
+{
+    /// <summary>
+    /// A fully rendered factory agent: the function files to scaffold plus the secrets
+    /// it needs. Returned by GET /v1/agent-templates/{templateId} and consumed by
+    /// `npx zavudev agents pull`.
+    /// </summary>
+    public required Template Template
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<Template>("template");
+        }
+        init { this._rawData.Set("template", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Template.Validate();
+    }
+
+    public AgentTemplateRetrieveResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentTemplateRetrieveResponse(
+        AgentTemplateRetrieveResponse agentTemplateRetrieveResponse
+    )
+        : base(agentTemplateRetrieveResponse) { }
+#pragma warning restore CS8618
+
+    public AgentTemplateRetrieveResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentTemplateRetrieveResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="AgentTemplateRetrieveResponseFromRaw.FromRawUnchecked"/>
+    public static AgentTemplateRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public AgentTemplateRetrieveResponse(Template template)
+        : this()
+    {
+        this.Template = template;
+    }
+}
+
+class AgentTemplateRetrieveResponseFromRaw : IFromRawJson<AgentTemplateRetrieveResponse>
+{
+    /// <inheritdoc/>
+    public AgentTemplateRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => AgentTemplateRetrieveResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// A fully rendered factory agent: the function files to scaffold plus the secrets
+/// it needs. Returned by GET /v1/agent-templates/{templateId} and consumed by `npx
+/// zavudev agents pull`.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Template, TemplateFromRaw>))]
+public sealed record class Template : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required ApiEnum<string, Category> Category
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, Category>>("category");
+        }
+        init { this._rawData.Set("category", value); }
+    }
+
+    public required string DefaultSlug
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("defaultSlug");
+        }
+        init { this._rawData.Set("defaultSlug", value); }
+    }
+
+    /// <summary>
+    /// npm dependencies for the scaffolded function.
+    /// </summary>
+    public required IReadOnlyDictionary<string, string> Dependencies
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<FrozenDictionary<string, string>>("dependencies");
+        }
+        init
+        {
+            this._rawData.Set<FrozenDictionary<string, string>>(
+                "dependencies",
+                FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    public required IReadOnlyList<File> Files
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<File>>("files");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<File>>(
+                "files",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public required string Name
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("name");
+        }
+        init { this._rawData.Set("name", value); }
+    }
+
+    public required IReadOnlyList<RequiredSecret> RequiredSecrets
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<RequiredSecret>>(
+                "requiredSecrets"
+            );
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<RequiredSecret>>(
+                "requiredSecrets",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public required string Summary
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("summary");
+        }
+        init { this._rawData.Set("summary", value); }
+    }
+
+    public required bool Voice
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("voice");
+        }
+        init { this._rawData.Set("voice", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        this.Category.Validate();
+        _ = this.DefaultSlug;
+        _ = this.Dependencies;
+        foreach (var item in this.Files)
+        {
+            item.Validate();
+        }
+        _ = this.Name;
+        foreach (var item in this.RequiredSecrets)
+        {
+            item.Validate();
+        }
+        _ = this.Summary;
+        _ = this.Voice;
+    }
+
+    public Template() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Template(Template template)
+        : base(template) { }
+#pragma warning restore CS8618
+
+    public Template(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Template(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TemplateFromRaw.FromRawUnchecked"/>
+    public static Template FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class TemplateFromRaw : IFromRawJson<Template>
+{
+    /// <inheritdoc/>
+    public Template FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Template.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(CategoryConverter))]
+public enum Category
+{
+    Sales,
+    Support,
+    FrontDesk,
+    Ops,
+}
+
+sealed class CategoryConverter : JsonConverter<Category>
+{
+    public override Category Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "sales" => Category.Sales,
+            "support" => Category.Support,
+            "frontDesk" => Category.FrontDesk,
+            "ops" => Category.Ops,
+            _ => (Category)(-1),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, Category value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Category.Sales => "sales",
+                Category.Support => "support",
+                Category.FrontDesk => "frontDesk",
+                Category.Ops => "ops",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+[JsonConverter(typeof(JsonModelConverter<File, FileFromRaw>))]
+public sealed record class File : JsonModel
+{
+    /// <summary>
+    /// File contents to write verbatim.
+    /// </summary>
+    public required string Content
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("content");
+        }
+        init { this._rawData.Set("content", value); }
+    }
+
+    public required string Path
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("path");
+        }
+        init { this._rawData.Set("path", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Content;
+        _ = this.Path;
+    }
+
+    public File() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public File(File file)
+        : base(file) { }
+#pragma warning restore CS8618
+
+    public File(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    File(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="FileFromRaw.FromRawUnchecked"/>
+    public static File FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class FileFromRaw : IFromRawJson<File>
+{
+    /// <inheritdoc/>
+    public File FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        File.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<RequiredSecret, RequiredSecretFromRaw>))]
+public sealed record class RequiredSecret : JsonModel
+{
+    public required string Hint
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("hint");
+        }
+        init { this._rawData.Set("hint", value); }
+    }
+
+    public required string Key
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("key");
+        }
+        init { this._rawData.Set("key", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Hint;
+        _ = this.Key;
+    }
+
+    public RequiredSecret() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public RequiredSecret(RequiredSecret requiredSecret)
+        : base(requiredSecret) { }
+#pragma warning restore CS8618
+
+    public RequiredSecret(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    RequiredSecret(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="RequiredSecretFromRaw.FromRawUnchecked"/>
+    public static RequiredSecret FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class RequiredSecretFromRaw : IFromRawJson<RequiredSecret>
+{
+    /// <inheritdoc/>
+    public RequiredSecret FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        RequiredSecret.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Agents/AgentCreateParams.cs b/src/Zavudev/Models/Agents/AgentCreateParams.cs
new file mode 100644
index 0000000..52af2b7
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentCreateParams.cs
@@ -0,0 +1,819 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Agent = Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Models.Agents;
+
+/// <summary>
+/// Create an agent without a sender. It is created disabled; connect a sender and
+/// enable it when you are ready for it to answer.
+///
+/// <para>**Sub-resources.** An agent's tools, flows and knowledge bases are reachable
+/// at `/v1/agents/{agentId}/tools`, `/v1/agents/{agentId}/flows` and `/v1/agents/{agentId}/knowledge-bases`,
+/// mirroring the sender-scoped routes documented under `/v1/senders/{senderId}/agent/...`
+/// exactly. Use the agent-scoped form while the agent has no sender: the sender-scoped
+/// one cannot address it.</para>
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class AgentCreateParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public required string Model
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("model");
+        }
+        init { this._rawBodyData.Set("model", value); }
+    }
+
+    public required string Name
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("name");
+        }
+        init { this._rawBodyData.Set("name", value); }
+    }
+
+    /// <summary>
+    /// LLM provider for the AI agent.
+    /// </summary>
+    public required ApiEnum<string, Agent::AgentProvider> Provider
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<ApiEnum<string, Agent::AgentProvider>>(
+                "provider"
+            );
+        }
+        init { this._rawBodyData.Set("provider", value); }
+    }
+
+    public required string SystemPrompt
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("systemPrompt");
+        }
+        init { this._rawBodyData.Set("systemPrompt", value); }
+    }
+
+    public long? ContextWindowMessages
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<long>("contextWindowMessages");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("contextWindowMessages", value);
+        }
+    }
+
+    public bool? IncludeContactMetadata
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<bool>("includeContactMetadata");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("includeContactMetadata", value);
+        }
+    }
+
+    public long? MaxTokens
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<long>("maxTokens");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("maxTokens", value);
+        }
+    }
+
+    public double? Temperature
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<double>("temperature");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("temperature", value);
+        }
+    }
+
+    public IReadOnlyList<string>? TriggerOnChannels
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<ImmutableArray<string>>("triggerOnChannels");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<ImmutableArray<string>?>(
+                "triggerOnChannels",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public IReadOnlyList<string>? TriggerOnMessageTypes
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<ImmutableArray<string>>(
+                "triggerOnMessageTypes"
+            );
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<ImmutableArray<string>?>(
+                "triggerOnMessageTypes",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Voice Agent configuration on a sender's AI agent. Controls how the agent
+    /// behaves on inbound and outbound phone calls through Zavu's managed voice pipeline
+    /// (speech recognition, the agent's LLM, and speech synthesis, with real-time
+    /// interruption handling). Requires the Voice Agents feature to be enabled for
+    /// your team.
+    /// </summary>
+    public Voice? Voice
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<Voice>("voice");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("voice", value);
+        }
+    }
+
+    public AgentCreateParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentCreateParams(AgentCreateParams agentCreateParams)
+        : base(agentCreateParams)
+    {
+        this._rawBodyData = new(agentCreateParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public AgentCreateParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentCreateParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static AgentCreateParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(AgentCreateParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/agents")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
+
+/// <summary>
+/// Voice Agent configuration on a sender's AI agent. Controls how the agent behaves
+/// on inbound and outbound phone calls through Zavu's managed voice pipeline (speech
+/// recognition, the agent's LLM, and speech synthesis, with real-time interruption
+/// handling). Requires the Voice Agents feature to be enabled for your team.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Voice, VoiceFromRaw>))]
+public sealed record class Voice : JsonModel
+{
+    /// <summary>
+    /// Whether the agent handles voice calls. When false, the sender's number is
+    /// not answered by the voice agent and outbound calls are rejected.
+    /// </summary>
+    public required bool Enabled
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("enabled");
+        }
+        init { this._rawData.Set("enabled", value); }
+    }
+
+    /// <summary>
+    /// Opening line the agent speaks when the call connects. If omitted, the agent
+    /// waits for the caller to speak first.
+    /// </summary>
+    public string? Greeting
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("greeting");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("greeting", value);
+        }
+    }
+
+    /// <summary>
+    /// Greeting per language, keyed by language code. Used when the caller's language
+    /// differs from the one `greeting` is written in.
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Greetings
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<FrozenDictionary<string, string>>("greetings");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<FrozenDictionary<string, string>?>(
+                "greetings",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Whether the caller can interrupt the agent while it is speaking (barge-in).
+    /// When true, the agent stops talking as soon as the caller starts.
+    /// </summary>
+    public bool? Interruptible
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<bool>("interruptible");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("interruptible", value);
+        }
+    }
+
+    /// <summary>
+    /// BCP-47 language code used for both speech recognition and speech synthesis
+    /// (e.g. `en`, `es`, `pt-BR`). Auto-detected from the recipient when omitted.
+    /// </summary>
+    public string? Language
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("language");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("language", value);
+        }
+    }
+
+    /// <summary>
+    /// Hard limit on call length in minutes. The call ends automatically when reached.
+    /// </summary>
+    public long? MaxCallDurationMinutes
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("maxCallDurationMinutes");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("maxCallDurationMinutes", value);
+        }
+    }
+
+    /// <summary>
+    /// How long the agent waits during silence before ending the call.
+    /// </summary>
+    public long? MaxIdleSeconds
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("maxIdleSeconds");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("maxIdleSeconds", value);
+        }
+    }
+
+    /// <summary>
+    /// Model that runs the conversation, co-located in the voice network for lowest
+    /// latency. Independent of the model used for text messaging. Derived from the
+    /// agent's text model when omitted.
+    /// </summary>
+    public string? Model
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("model");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("model", value);
+        }
+    }
+
+    /// <summary>
+    /// Whether the call audio is recorded.
+    /// </summary>
+    public bool? RecordCalls
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<bool>("recordCalls");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("recordCalls", value);
+        }
+    }
+
+    /// <summary>
+    /// Speech-recognition model. Uses the default when omitted.
+    /// </summary>
+    public string? SttModel
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("sttModel");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("sttModel", value);
+        }
+    }
+
+    /// <summary>
+    /// Speech-recognition provider. Uses the default when omitted.
+    /// </summary>
+    public string? SttProvider
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("sttProvider");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("sttProvider", value);
+        }
+    }
+
+    /// <summary>
+    /// E.164 phone number the agent can transfer the call to. When set, the agent
+    /// is given a transfer tool it can use to hand the call to a human.
+    /// </summary>
+    public string? TransferPhoneNumber
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("transferPhoneNumber");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("transferPhoneNumber", value);
+        }
+    }
+
+    /// <summary>
+    /// Speech-synthesis provider. Uses the default when omitted.
+    /// </summary>
+    public string? TtsProvider
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("ttsProvider");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("ttsProvider", value);
+        }
+    }
+
+    /// <summary>
+    /// Identifier of the synthesized voice that speaks. Choose from the voices available
+    /// in the dashboard. Uses a neutral default when omitted.
+    /// </summary>
+    public string? TtsVoiceID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("ttsVoiceId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("ttsVoiceId", value);
+        }
+    }
+
+    /// <summary>
+    /// What the agent does when an answering machine or voicemail is detected on
+    /// an outbound call.
+    /// </summary>
+    public ApiEnum<string, VoicemailAction>? VoicemailAction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<ApiEnum<string, VoicemailAction>>(
+                "voicemailAction"
+            );
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("voicemailAction", value);
+        }
+    }
+
+    /// <summary>
+    /// Message spoken when `voicemailAction` is `leave_message`. Falls back to `greeting`
+    /// when omitted.
+    /// </summary>
+    public string? VoicemailMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("voicemailMessage");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("voicemailMessage", value);
+        }
+    }
+
+    /// <summary>
+    /// Speech rate. 1.0 is natural. Only honoured by voices that support rate control;
+    /// ignored by the others.
+    /// </summary>
+    public double? VoiceSpeed
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<double>("voiceSpeed");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("voiceSpeed", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Enabled;
+        _ = this.Greeting;
+        _ = this.Greetings;
+        _ = this.Interruptible;
+        _ = this.Language;
+        _ = this.MaxCallDurationMinutes;
+        _ = this.MaxIdleSeconds;
+        _ = this.Model;
+        _ = this.RecordCalls;
+        _ = this.SttModel;
+        _ = this.SttProvider;
+        _ = this.TransferPhoneNumber;
+        _ = this.TtsProvider;
+        _ = this.TtsVoiceID;
+        this.VoicemailAction?.Validate();
+        _ = this.VoicemailMessage;
+        _ = this.VoiceSpeed;
+    }
+
+    public Voice() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Voice(Voice voice)
+        : base(voice) { }
+#pragma warning restore CS8618
+
+    public Voice(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Voice(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="VoiceFromRaw.FromRawUnchecked"/>
+    public static Voice FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public Voice(bool enabled)
+        : this()
+    {
+        this.Enabled = enabled;
+    }
+}
+
+class VoiceFromRaw : IFromRawJson<Voice>
+{
+    /// <inheritdoc/>
+    public Voice FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Voice.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// What the agent does when an answering machine or voicemail is detected on an
+/// outbound call.
+/// </summary>
+[JsonConverter(typeof(VoicemailActionConverter))]
+public enum VoicemailAction
+{
+    Hangup,
+    LeaveMessage,
+}
+
+sealed class VoicemailActionConverter : JsonConverter<VoicemailAction>
+{
+    public override VoicemailAction Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "hangup" => VoicemailAction.Hangup,
+            "leave_message" => VoicemailAction.LeaveMessage,
+            _ => (VoicemailAction)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        VoicemailAction value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                VoicemailAction.Hangup => "hangup",
+                VoicemailAction.LeaveMessage => "leave_message",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Agents/AgentCreateResponse.cs b/src/Zavudev/Models/Agents/AgentCreateResponse.cs
new file mode 100644
index 0000000..b07e4e1
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentCreateResponse.cs
@@ -0,0 +1,75 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Models.Agents;
+
+[JsonConverter(typeof(JsonModelConverter<AgentCreateResponse, AgentCreateResponseFromRaw>))]
+public sealed record class AgentCreateResponse : JsonModel
+{
+    /// <summary>
+    /// AI Agent configuration for a sender.
+    /// </summary>
+    public required AgentAgent Agent
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<AgentAgent>("agent");
+        }
+        init { this._rawData.Set("agent", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Agent.Validate();
+    }
+
+    public AgentCreateResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentCreateResponse(AgentCreateResponse agentCreateResponse)
+        : base(agentCreateResponse) { }
+#pragma warning restore CS8618
+
+    public AgentCreateResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentCreateResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="AgentCreateResponseFromRaw.FromRawUnchecked"/>
+    public static AgentCreateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public AgentCreateResponse(AgentAgent agent)
+        : this()
+    {
+        this.Agent = agent;
+    }
+}
+
+class AgentCreateResponseFromRaw : IFromRawJson<AgentCreateResponse>
+{
+    /// <inheritdoc/>
+    public AgentCreateResponse FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        AgentCreateResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Agents/AgentDeleteParams.cs b/src/Zavudev/Models/Agents/AgentDeleteParams.cs
new file mode 100644
index 0000000..4a7170a
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentDeleteParams.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Agents;
+
+/// <summary>
+/// Delete an agent
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class AgentDeleteParams : ParamsBase
+{
+    public string? AgentID { get; init; }
+
+    public AgentDeleteParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentDeleteParams(AgentDeleteParams agentDeleteParams)
+        : base(agentDeleteParams)
+    {
+        this.AgentID = agentDeleteParams.AgentID;
+    }
+#pragma warning restore CS8618
+
+    public AgentDeleteParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentDeleteParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string agentID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.AgentID = agentID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static AgentDeleteParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string agentID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            agentID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["AgentID"] = JsonSerializer.SerializeToElement(this.AgentID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(AgentDeleteParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.AgentID?.Equals(other.AgentID) ?? other.AgentID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/') + string.Format("/v1/agents/{0}", this.AgentID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Agents/AgentListPage.cs b/src/Zavudev/Models/Agents/AgentListPage.cs
new file mode 100644
index 0000000..9041695
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentListPage.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Senders.Agent;
+using Zavudev.Services;
+
+namespace Zavudev.Models.Agents;
+
+/// <summary>
+/// A single page from the paginated endpoint that <see cref="IAgentService.List(AgentListParams, CancellationToken)"/> queries.
+/// </summary>
+public sealed class AgentListPage(
+    IAgentServiceWithRawResponse service,
+    AgentListParams parameters,
+    AgentListPageResponse response
+) : IPage<AgentAgent>
+{
+    /// <inheritdoc/>
+    public IReadOnlyList<AgentAgent> Items
+    {
+        get { return response.Items; }
+    }
+
+    /// <inheritdoc/>
+    public bool HasNext()
+    {
+        try
+        {
+            return this.Items.Count > 0 && response.NextCursor != null;
+        }
+        catch (ZavudevInvalidDataException)
+        {
+            // If accessing the response data to determine if there's a next page failed, then just
+            // assume there's no next page.
+            return false;
+        }
+    }
+
+    /// <inheritdoc/>
+    async Task<IPage<AgentAgent>> IPage<AgentAgent>.Next(CancellationToken cancellationToken) =>
+        await this.Next(cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc cref="IPage{T}.Next"/>
+    public async Task<AgentListPage> Next(CancellationToken cancellationToken = default)
+    {
+        var nextCursor =
+            response.NextCursor ?? throw new InvalidOperationException("Cannot request next page");
+        using var nextResponse = await service
+            .List(parameters with { Cursor = nextCursor }, cancellationToken)
+            .ConfigureAwait(false);
+        return await nextResponse.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public void Validate()
+    {
+        response.Validate();
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(JsonSerializer.SerializeToElement(this.Items)),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public override bool Equals(object? obj)
+    {
+        if (obj is not AgentListPage other)
+        {
+            return false;
+        }
+
+        return Enumerable.SequenceEqual(this.Items, other.Items);
+    }
+
+    public override int GetHashCode() => 0;
+}
diff --git a/src/Zavudev/Models/Agents/AgentListPageResponse.cs b/src/Zavudev/Models/Agents/AgentListPageResponse.cs
new file mode 100644
index 0000000..a287793
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentListPageResponse.cs
@@ -0,0 +1,94 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Models.Agents;
+
+[JsonConverter(typeof(JsonModelConverter<AgentListPageResponse, AgentListPageResponseFromRaw>))]
+public sealed record class AgentListPageResponse : JsonModel
+{
+    public required IReadOnlyList<AgentAgent> Items
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<AgentAgent>>("items");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<AgentAgent>>(
+                "items",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public string? NextCursor
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("nextCursor");
+        }
+        init { this._rawData.Set("nextCursor", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Items)
+        {
+            item.Validate();
+        }
+        _ = this.NextCursor;
+    }
+
+    public AgentListPageResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentListPageResponse(AgentListPageResponse agentListPageResponse)
+        : base(agentListPageResponse) { }
+#pragma warning restore CS8618
+
+    public AgentListPageResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentListPageResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="AgentListPageResponseFromRaw.FromRawUnchecked"/>
+    public static AgentListPageResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public AgentListPageResponse(IReadOnlyList<AgentAgent> items)
+        : this()
+    {
+        this.Items = items;
+    }
+}
+
+class AgentListPageResponseFromRaw : IFromRawJson<AgentListPageResponse>
+{
+    /// <inheritdoc/>
+    public AgentListPageResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => AgentListPageResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Agents/AgentListParams.cs b/src/Zavudev/Models/Agents/AgentListParams.cs
new file mode 100644
index 0000000..911ec22
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentListParams.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Agents;
+
+/// <summary>
+/// Every agent in the project, newest first — including agents that are not connected
+/// to any sender yet, which the sender-scoped routes cannot reach. Each item carries
+/// `senderIds`, the senders the agent answers on.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class AgentListParams : ParamsBase
+{
+    public string? Cursor
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<string>("cursor");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("cursor", value);
+        }
+    }
+
+    public long? Limit
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableStruct<long>("limit");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("limit", value);
+        }
+    }
+
+    public AgentListParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentListParams(AgentListParams agentListParams)
+        : base(agentListParams) { }
+#pragma warning restore CS8618
+
+    public AgentListParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentListParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static AgentListParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(AgentListParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/agents")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Agents/AgentListVoicesParams.cs b/src/Zavudev/Models/Agents/AgentListVoicesParams.cs
new file mode 100644
index 0000000..60b18f2
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentListVoicesParams.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Agents;
+
+/// <summary>
+/// The voices an agent can speak with, for `voice.ttsVoiceId`. Filter by `language`
+/// to get the ones that speak it; a voice can still be used with `language: auto`,
+/// where the agent follows the caller and keeps the chosen voice.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class AgentListVoicesParams : ParamsBase
+{
+    /// <summary>
+    /// BCP-47 tag (`en`, `es`, `pt-BR`). Omit, or pass `auto`, for every voice.
+    /// </summary>
+    public string? Language
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<string>("language");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("language", value);
+        }
+    }
+
+    public AgentListVoicesParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentListVoicesParams(AgentListVoicesParams agentListVoicesParams)
+        : base(agentListVoicesParams) { }
+#pragma warning restore CS8618
+
+    public AgentListVoicesParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentListVoicesParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static AgentListVoicesParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(AgentListVoicesParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/agents/voices")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Agents/AgentListVoicesResponse.cs b/src/Zavudev/Models/Agents/AgentListVoicesResponse.cs
new file mode 100644
index 0000000..745ebc5
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentListVoicesResponse.cs
@@ -0,0 +1,196 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Agents;
+
+[JsonConverter(typeof(JsonModelConverter<AgentListVoicesResponse, AgentListVoicesResponseFromRaw>))]
+public sealed record class AgentListVoicesResponse : JsonModel
+{
+    public required IReadOnlyList<Item> Items
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<Item>>("items");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<Item>>(
+                "items",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Languages an agent can be pinned to. `auto` follows the caller.
+    /// </summary>
+    public required IReadOnlyList<string> Languages
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<string>>("languages");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<string>>(
+                "languages",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Voices in the catalog, before filtering.
+    /// </summary>
+    public long? Total
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("total");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("total", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Items)
+        {
+            item.Validate();
+        }
+        _ = this.Languages;
+        _ = this.Total;
+    }
+
+    public AgentListVoicesResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentListVoicesResponse(AgentListVoicesResponse agentListVoicesResponse)
+        : base(agentListVoicesResponse) { }
+#pragma warning restore CS8618
+
+    public AgentListVoicesResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentListVoicesResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="AgentListVoicesResponseFromRaw.FromRawUnchecked"/>
+    public static AgentListVoicesResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class AgentListVoicesResponseFromRaw : IFromRawJson<AgentListVoicesResponse>
+{
+    /// <inheritdoc/>
+    public AgentListVoicesResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => AgentListVoicesResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<Item, ItemFromRaw>))]
+public sealed record class Item : JsonModel
+{
+    /// <summary>
+    /// Value for `voice.ttsVoiceId`.
+    /// </summary>
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required string Language
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("language");
+        }
+        init { this._rawData.Set("language", value); }
+    }
+
+    public required string Name
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("name");
+        }
+        init { this._rawData.Set("name", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.Language;
+        _ = this.Name;
+    }
+
+    public Item() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Item(Item item)
+        : base(item) { }
+#pragma warning restore CS8618
+
+    public Item(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Item(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ItemFromRaw.FromRawUnchecked"/>
+    public static Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ItemFromRaw : IFromRawJson<Item>
+{
+    /// <inheritdoc/>
+    public Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Item.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Agents/AgentRetrieveParams.cs b/src/Zavudev/Models/Agents/AgentRetrieveParams.cs
new file mode 100644
index 0000000..0fb44e2
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentRetrieveParams.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Agents;
+
+/// <summary>
+/// Get an agent
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class AgentRetrieveParams : ParamsBase
+{
+    public string? AgentID { get; init; }
+
+    public AgentRetrieveParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentRetrieveParams(AgentRetrieveParams agentRetrieveParams)
+        : base(agentRetrieveParams)
+    {
+        this.AgentID = agentRetrieveParams.AgentID;
+    }
+#pragma warning restore CS8618
+
+    public AgentRetrieveParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentRetrieveParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string agentID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.AgentID = agentID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static AgentRetrieveParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string agentID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            agentID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["AgentID"] = JsonSerializer.SerializeToElement(this.AgentID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(AgentRetrieveParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.AgentID?.Equals(other.AgentID) ?? other.AgentID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/') + string.Format("/v1/agents/{0}", this.AgentID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Agents/AgentRetrieveResponse.cs b/src/Zavudev/Models/Agents/AgentRetrieveResponse.cs
new file mode 100644
index 0000000..b3fbf22
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentRetrieveResponse.cs
@@ -0,0 +1,76 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Models.Agents;
+
+[JsonConverter(typeof(JsonModelConverter<AgentRetrieveResponse, AgentRetrieveResponseFromRaw>))]
+public sealed record class AgentRetrieveResponse : JsonModel
+{
+    /// <summary>
+    /// AI Agent configuration for a sender.
+    /// </summary>
+    public required AgentAgent Agent
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<AgentAgent>("agent");
+        }
+        init { this._rawData.Set("agent", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Agent.Validate();
+    }
+
+    public AgentRetrieveResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentRetrieveResponse(AgentRetrieveResponse agentRetrieveResponse)
+        : base(agentRetrieveResponse) { }
+#pragma warning restore CS8618
+
+    public AgentRetrieveResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentRetrieveResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="AgentRetrieveResponseFromRaw.FromRawUnchecked"/>
+    public static AgentRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public AgentRetrieveResponse(AgentAgent agent)
+        : this()
+    {
+        this.Agent = agent;
+    }
+}
+
+class AgentRetrieveResponseFromRaw : IFromRawJson<AgentRetrieveResponse>
+{
+    /// <inheritdoc/>
+    public AgentRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => AgentRetrieveResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Agents/AgentTestParams.cs b/src/Zavudev/Models/Agents/AgentTestParams.cs
new file mode 100644
index 0000000..ee16a3e
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentTestParams.cs
@@ -0,0 +1,349 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Agents;
+
+/// <summary>
+/// Run the agent's prompt, model and knowledge base against a message and return
+/// the reply instead of delivering it. Writes nothing and charges nothing, so it
+/// is safe to call repeatedly while iterating on a prompt.
+///
+/// <para>Note that a dry run never **executes** tools — running them would cause
+/// real side effects. Live conversations on every channel do call them. When the
+/// agent has enabled tools, that gap is reported in `warnings` rather than silently
+/// producing an answer that looks like a tool call happened.</para>
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class AgentTestParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? AgentID { get; init; }
+
+    /// <summary>
+    /// What to say to the agent.
+    /// </summary>
+    public required string Message
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("message");
+        }
+        init { this._rawBodyData.Set("message", value); }
+    }
+
+    /// <summary>
+    /// Run the tools the agent calls instead of reporting the choice and stopping.
+    ///
+    /// <para>Off by default because a tool handler talks to the outside world: a
+    /// rehearsal that charges a card is not a rehearsal. Turn it on to exercise the
+    /// loop that actually matters — the model picks a tool, the handler answers,
+    /// the model replies with the result — without sending a message to anyone.
+    /// What ran comes back in `executedToolCalls`.</para>
+    /// </summary>
+    public bool? ExecuteTools
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<bool>("executeTools");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("executeTools", value);
+        }
+    }
+
+    /// <summary>
+    /// Prior turns, oldest first, to exercise multi-turn behaviour without persisting
+    /// a thread. Trimmed to the agent's context window.
+    /// </summary>
+    public IReadOnlyList<History>? History
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<ImmutableArray<History>>("history");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<ImmutableArray<History>?>(
+                "history",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Set false to skip retrieval and isolate prompt behaviour from the knowledge base.
+    /// </summary>
+    public bool? UseKnowledgeBase
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<bool>("useKnowledgeBase");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("useKnowledgeBase", value);
+        }
+    }
+
+    public AgentTestParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentTestParams(AgentTestParams agentTestParams)
+        : base(agentTestParams)
+    {
+        this.AgentID = agentTestParams.AgentID;
+
+        this._rawBodyData = new(agentTestParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public AgentTestParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentTestParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string agentID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.AgentID = agentID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static AgentTestParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string agentID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            agentID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["AgentID"] = JsonSerializer.SerializeToElement(this.AgentID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(AgentTestParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.AgentID?.Equals(other.AgentID) ?? other.AgentID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/agents/{0}/test", this.AgentID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
+
+[JsonConverter(typeof(JsonModelConverter<History, HistoryFromRaw>))]
+public sealed record class History : JsonModel
+{
+    public required string Content
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("content");
+        }
+        init { this._rawData.Set("content", value); }
+    }
+
+    public required ApiEnum<string, Role> Role
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, Role>>("role");
+        }
+        init { this._rawData.Set("role", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Content;
+        this.Role.Validate();
+    }
+
+    public History() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public History(History history)
+        : base(history) { }
+#pragma warning restore CS8618
+
+    public History(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    History(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="HistoryFromRaw.FromRawUnchecked"/>
+    public static History FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class HistoryFromRaw : IFromRawJson<History>
+{
+    /// <inheritdoc/>
+    public History FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        History.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(RoleConverter))]
+public enum Role
+{
+    User,
+    Assistant,
+}
+
+sealed class RoleConverter : JsonConverter<Role>
+{
+    public override Role Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "user" => Role.User,
+            "assistant" => Role.Assistant,
+            _ => (Role)(-1),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, Role value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Role.User => "user",
+                Role.Assistant => "assistant",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Agents/AgentTestResponse.cs b/src/Zavudev/Models/Agents/AgentTestResponse.cs
new file mode 100644
index 0000000..a083ae7
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentTestResponse.cs
@@ -0,0 +1,277 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Agents;
+
+[JsonConverter(typeof(JsonModelConverter<AgentTestResponse, AgentTestResponseFromRaw>))]
+public sealed record class AgentTestResponse : JsonModel
+{
+    public required string? Error
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("error");
+        }
+        init { this._rawData.Set("error", value); }
+    }
+
+    public required long InputTokens
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("inputTokens");
+        }
+        init { this._rawData.Set("inputTokens", value); }
+    }
+
+    /// <summary>
+    /// Knowledge-base chunks retrieved for this message. Zero means the answer was
+    /// not grounded in your documents.
+    /// </summary>
+    public required long KnowledgeChunksUsed
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("knowledgeChunksUsed");
+        }
+        init { this._rawData.Set("knowledgeChunksUsed", value); }
+    }
+
+    public required long LatencyMs
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("latencyMs");
+        }
+        init { this._rawData.Set("latencyMs", value); }
+    }
+
+    public required long OutputTokens
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("outputTokens");
+        }
+        init { this._rawData.Set("outputTokens", value); }
+    }
+
+    public required bool Success
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("success");
+        }
+        init { this._rawData.Set("success", value); }
+    }
+
+    /// <summary>
+    /// What the agent would reply.
+    /// </summary>
+    public required string? Text
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("text");
+        }
+        init { this._rawData.Set("text", value); }
+    }
+
+    /// <summary>
+    /// Things that are true of this agent but that a dry run cannot prove. Surfaced
+    /// so a passing dry run is never mistaken for proof that the agent works live.
+    ///
+    /// <para>- The agent being disabled. - Enabled tools that were **not offered
+    /// to the model** here — the model never saw them, so a reply that looks like
+    /// a lookup was invented. Live conversations on every channel do offer them;
+    /// running them here would cause real side effects. - An agent whose sender has
+    /// none of the channels it triggers on, which answers every dry run and no real
+    /// message. - Contact metadata that exists on a real conversation but not here.</para>
+    /// </summary>
+    public required IReadOnlyList<string> Warnings
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<string>>("warnings");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<string>>(
+                "warnings",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Tools that actually ran, in order, when the request set `executeTools`. Empty
+    /// on a normal dry run, where nothing is executed. An entry with `ok: false`
+    /// means the agent saw an error and answered around it, which is what a customer
+    /// would have received.
+    /// </summary>
+    public IReadOnlyList<ExecutedToolCall>? ExecutedToolCalls
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<ImmutableArray<ExecutedToolCall>>(
+                "executedToolCalls"
+            );
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<ImmutableArray<ExecutedToolCall>?>(
+                "executedToolCalls",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Error;
+        _ = this.InputTokens;
+        _ = this.KnowledgeChunksUsed;
+        _ = this.LatencyMs;
+        _ = this.OutputTokens;
+        _ = this.Success;
+        _ = this.Text;
+        _ = this.Warnings;
+        foreach (var item in this.ExecutedToolCalls ?? [])
+        {
+            item.Validate();
+        }
+    }
+
+    public AgentTestResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentTestResponse(AgentTestResponse agentTestResponse)
+        : base(agentTestResponse) { }
+#pragma warning restore CS8618
+
+    public AgentTestResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentTestResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="AgentTestResponseFromRaw.FromRawUnchecked"/>
+    public static AgentTestResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class AgentTestResponseFromRaw : IFromRawJson<AgentTestResponse>
+{
+    /// <inheritdoc/>
+    public AgentTestResponse FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        AgentTestResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<ExecutedToolCall, ExecutedToolCallFromRaw>))]
+public sealed record class ExecutedToolCall : JsonModel
+{
+    public required string Name
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("name");
+        }
+        init { this._rawData.Set("name", value); }
+    }
+
+    public required bool Ok
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("ok");
+        }
+        init { this._rawData.Set("ok", value); }
+    }
+
+    public string? Error
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("error");
+        }
+        init { this._rawData.Set("error", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Name;
+        _ = this.Ok;
+        _ = this.Error;
+    }
+
+    public ExecutedToolCall() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ExecutedToolCall(ExecutedToolCall executedToolCall)
+        : base(executedToolCall) { }
+#pragma warning restore CS8618
+
+    public ExecutedToolCall(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ExecutedToolCall(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ExecutedToolCallFromRaw.FromRawUnchecked"/>
+    public static ExecutedToolCall FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ExecutedToolCallFromRaw : IFromRawJson<ExecutedToolCall>
+{
+    /// <inheritdoc/>
+    public ExecutedToolCall FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        ExecutedToolCall.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Agents/AgentUpdateParams.cs b/src/Zavudev/Models/Agents/AgentUpdateParams.cs
new file mode 100644
index 0000000..cb9a91d
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentUpdateParams.cs
@@ -0,0 +1,876 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Agent = Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Models.Agents;
+
+/// <summary>
+/// Update an agent
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class AgentUpdateParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? AgentID { get; init; }
+
+    public string? ApiKey
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("apiKey");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("apiKey", value);
+        }
+    }
+
+    public long? ContextWindowMessages
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<long>("contextWindowMessages");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("contextWindowMessages", value);
+        }
+    }
+
+    public bool? Enabled
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<bool>("enabled");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("enabled", value);
+        }
+    }
+
+    public bool? IncludeContactMetadata
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<bool>("includeContactMetadata");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("includeContactMetadata", value);
+        }
+    }
+
+    public long? MaxTokens
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<long>("maxTokens");
+        }
+        init { this._rawBodyData.Set("maxTokens", value); }
+    }
+
+    public string? Model
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("model");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("model", value);
+        }
+    }
+
+    public string? Name
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("name");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("name", value);
+        }
+    }
+
+    /// <summary>
+    /// LLM provider for the AI agent.
+    /// </summary>
+    public ApiEnum<string, Agent::AgentProvider>? Provider
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<ApiEnum<string, Agent::AgentProvider>>(
+                "provider"
+            );
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("provider", value);
+        }
+    }
+
+    public string? SystemPrompt
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("systemPrompt");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("systemPrompt", value);
+        }
+    }
+
+    public double? Temperature
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<double>("temperature");
+        }
+        init { this._rawBodyData.Set("temperature", value); }
+    }
+
+    public IReadOnlyList<string>? TriggerOnChannels
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<ImmutableArray<string>>("triggerOnChannels");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<ImmutableArray<string>?>(
+                "triggerOnChannels",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public IReadOnlyList<string>? TriggerOnMessageTypes
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<ImmutableArray<string>>(
+                "triggerOnMessageTypes"
+            );
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<ImmutableArray<string>?>(
+                "triggerOnMessageTypes",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Voice Agent configuration. Patch this object to enable voice, change the greeting,
+    /// or adjust call limits. Requires the Voice Agents feature to be enabled for
+    /// your team.
+    /// </summary>
+    public AgentUpdateParamsVoice? Voice
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<AgentUpdateParamsVoice>("voice");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("voice", value);
+        }
+    }
+
+    public AgentUpdateParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentUpdateParams(AgentUpdateParams agentUpdateParams)
+        : base(agentUpdateParams)
+    {
+        this.AgentID = agentUpdateParams.AgentID;
+
+        this._rawBodyData = new(agentUpdateParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public AgentUpdateParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentUpdateParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string agentID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.AgentID = agentID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static AgentUpdateParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string agentID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            agentID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["AgentID"] = JsonSerializer.SerializeToElement(this.AgentID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(AgentUpdateParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.AgentID?.Equals(other.AgentID) ?? other.AgentID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/') + string.Format("/v1/agents/{0}", this.AgentID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
+
+/// <summary>
+/// Voice Agent configuration. Patch this object to enable voice, change the greeting,
+/// or adjust call limits. Requires the Voice Agents feature to be enabled for your team.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<AgentUpdateParamsVoice, AgentUpdateParamsVoiceFromRaw>))]
+public sealed record class AgentUpdateParamsVoice : JsonModel
+{
+    /// <summary>
+    /// Whether the agent handles voice calls. When false, the sender's number is
+    /// not answered by the voice agent and outbound calls are rejected.
+    /// </summary>
+    public required bool Enabled
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("enabled");
+        }
+        init { this._rawData.Set("enabled", value); }
+    }
+
+    /// <summary>
+    /// Opening line the agent speaks when the call connects. If omitted, the agent
+    /// waits for the caller to speak first.
+    /// </summary>
+    public string? Greeting
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("greeting");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("greeting", value);
+        }
+    }
+
+    /// <summary>
+    /// Greeting per language, keyed by language code. Used when the caller's language
+    /// differs from the one `greeting` is written in.
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Greetings
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<FrozenDictionary<string, string>>("greetings");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<FrozenDictionary<string, string>?>(
+                "greetings",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Whether the caller can interrupt the agent while it is speaking (barge-in).
+    /// When true, the agent stops talking as soon as the caller starts.
+    /// </summary>
+    public bool? Interruptible
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<bool>("interruptible");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("interruptible", value);
+        }
+    }
+
+    /// <summary>
+    /// BCP-47 language code used for both speech recognition and speech synthesis
+    /// (e.g. `en`, `es`, `pt-BR`). Auto-detected from the recipient when omitted.
+    /// </summary>
+    public string? Language
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("language");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("language", value);
+        }
+    }
+
+    /// <summary>
+    /// Hard limit on call length in minutes. The call ends automatically when reached.
+    /// </summary>
+    public long? MaxCallDurationMinutes
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("maxCallDurationMinutes");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("maxCallDurationMinutes", value);
+        }
+    }
+
+    /// <summary>
+    /// How long the agent waits during silence before ending the call.
+    /// </summary>
+    public long? MaxIdleSeconds
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("maxIdleSeconds");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("maxIdleSeconds", value);
+        }
+    }
+
+    /// <summary>
+    /// Model that runs the conversation, co-located in the voice network for lowest
+    /// latency. Independent of the model used for text messaging. Derived from the
+    /// agent's text model when omitted.
+    /// </summary>
+    public string? Model
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("model");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("model", value);
+        }
+    }
+
+    /// <summary>
+    /// Whether the call audio is recorded.
+    /// </summary>
+    public bool? RecordCalls
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<bool>("recordCalls");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("recordCalls", value);
+        }
+    }
+
+    /// <summary>
+    /// Speech-recognition model. Uses the default when omitted.
+    /// </summary>
+    public string? SttModel
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("sttModel");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("sttModel", value);
+        }
+    }
+
+    /// <summary>
+    /// Speech-recognition provider. Uses the default when omitted.
+    /// </summary>
+    public string? SttProvider
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("sttProvider");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("sttProvider", value);
+        }
+    }
+
+    /// <summary>
+    /// E.164 phone number the agent can transfer the call to. When set, the agent
+    /// is given a transfer tool it can use to hand the call to a human.
+    /// </summary>
+    public string? TransferPhoneNumber
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("transferPhoneNumber");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("transferPhoneNumber", value);
+        }
+    }
+
+    /// <summary>
+    /// Speech-synthesis provider. Uses the default when omitted.
+    /// </summary>
+    public string? TtsProvider
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("ttsProvider");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("ttsProvider", value);
+        }
+    }
+
+    /// <summary>
+    /// Identifier of the synthesized voice that speaks. Choose from the voices available
+    /// in the dashboard. Uses a neutral default when omitted.
+    /// </summary>
+    public string? TtsVoiceID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("ttsVoiceId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("ttsVoiceId", value);
+        }
+    }
+
+    /// <summary>
+    /// What the agent does when an answering machine or voicemail is detected on
+    /// an outbound call.
+    /// </summary>
+    public ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction>? VoicemailAction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<
+                ApiEnum<string, AgentUpdateParamsVoiceVoicemailAction>
+            >("voicemailAction");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("voicemailAction", value);
+        }
+    }
+
+    /// <summary>
+    /// Message spoken when `voicemailAction` is `leave_message`. Falls back to `greeting`
+    /// when omitted.
+    /// </summary>
+    public string? VoicemailMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("voicemailMessage");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("voicemailMessage", value);
+        }
+    }
+
+    /// <summary>
+    /// Speech rate. 1.0 is natural. Only honoured by voices that support rate control;
+    /// ignored by the others.
+    /// </summary>
+    public double? VoiceSpeed
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<double>("voiceSpeed");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("voiceSpeed", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Enabled;
+        _ = this.Greeting;
+        _ = this.Greetings;
+        _ = this.Interruptible;
+        _ = this.Language;
+        _ = this.MaxCallDurationMinutes;
+        _ = this.MaxIdleSeconds;
+        _ = this.Model;
+        _ = this.RecordCalls;
+        _ = this.SttModel;
+        _ = this.SttProvider;
+        _ = this.TransferPhoneNumber;
+        _ = this.TtsProvider;
+        _ = this.TtsVoiceID;
+        this.VoicemailAction?.Validate();
+        _ = this.VoicemailMessage;
+        _ = this.VoiceSpeed;
+    }
+
+    public AgentUpdateParamsVoice() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentUpdateParamsVoice(AgentUpdateParamsVoice agentUpdateParamsVoice)
+        : base(agentUpdateParamsVoice) { }
+#pragma warning restore CS8618
+
+    public AgentUpdateParamsVoice(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentUpdateParamsVoice(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="AgentUpdateParamsVoiceFromRaw.FromRawUnchecked"/>
+    public static AgentUpdateParamsVoice FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public AgentUpdateParamsVoice(bool enabled)
+        : this()
+    {
+        this.Enabled = enabled;
+    }
+}
+
+class AgentUpdateParamsVoiceFromRaw : IFromRawJson<AgentUpdateParamsVoice>
+{
+    /// <inheritdoc/>
+    public AgentUpdateParamsVoice FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => AgentUpdateParamsVoice.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// What the agent does when an answering machine or voicemail is detected on an
+/// outbound call.
+/// </summary>
+[JsonConverter(typeof(AgentUpdateParamsVoiceVoicemailActionConverter))]
+public enum AgentUpdateParamsVoiceVoicemailAction
+{
+    Hangup,
+    LeaveMessage,
+}
+
+sealed class AgentUpdateParamsVoiceVoicemailActionConverter
+    : JsonConverter<AgentUpdateParamsVoiceVoicemailAction>
+{
+    public override AgentUpdateParamsVoiceVoicemailAction Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "hangup" => AgentUpdateParamsVoiceVoicemailAction.Hangup,
+            "leave_message" => AgentUpdateParamsVoiceVoicemailAction.LeaveMessage,
+            _ => (AgentUpdateParamsVoiceVoicemailAction)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        AgentUpdateParamsVoiceVoicemailAction value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                AgentUpdateParamsVoiceVoicemailAction.Hangup => "hangup",
+                AgentUpdateParamsVoiceVoicemailAction.LeaveMessage => "leave_message",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Agents/AgentUpdateResponse.cs b/src/Zavudev/Models/Agents/AgentUpdateResponse.cs
new file mode 100644
index 0000000..2ac0ec0
--- /dev/null
+++ b/src/Zavudev/Models/Agents/AgentUpdateResponse.cs
@@ -0,0 +1,75 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Models.Agents;
+
+[JsonConverter(typeof(JsonModelConverter<AgentUpdateResponse, AgentUpdateResponseFromRaw>))]
+public sealed record class AgentUpdateResponse : JsonModel
+{
+    /// <summary>
+    /// AI Agent configuration for a sender.
+    /// </summary>
+    public required AgentAgent Agent
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<AgentAgent>("agent");
+        }
+        init { this._rawData.Set("agent", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Agent.Validate();
+    }
+
+    public AgentUpdateResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public AgentUpdateResponse(AgentUpdateResponse agentUpdateResponse)
+        : base(agentUpdateResponse) { }
+#pragma warning restore CS8618
+
+    public AgentUpdateResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    AgentUpdateResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="AgentUpdateResponseFromRaw.FromRawUnchecked"/>
+    public static AgentUpdateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public AgentUpdateResponse(AgentAgent agent)
+        : this()
+    {
+        this.Agent = agent;
+    }
+}
+
+class AgentUpdateResponseFromRaw : IFromRawJson<AgentUpdateResponse>
+{
+    /// <inheritdoc/>
+    public AgentUpdateResponse FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        AgentUpdateResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Agents/Senders/SenderConnectParams.cs b/src/Zavudev/Models/Agents/Senders/SenderConnectParams.cs
new file mode 100644
index 0000000..f7642fc
--- /dev/null
+++ b/src/Zavudev/Models/Agents/Senders/SenderConnectParams.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Agents.Senders;
+
+/// <summary>
+/// Make the agent answer on this sender. An agent can serve several senders; a sender
+/// answers with at most one agent, so connecting one that is already in use returns
+/// `400` naming the agent that holds it.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class SenderConnectParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? AgentID { get; init; }
+
+    /// <summary>
+    /// Sender to connect.
+    /// </summary>
+    public required string SenderID
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("senderId");
+        }
+        init { this._rawBodyData.Set("senderId", value); }
+    }
+
+    public SenderConnectParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public SenderConnectParams(SenderConnectParams senderConnectParams)
+        : base(senderConnectParams)
+    {
+        this.AgentID = senderConnectParams.AgentID;
+
+        this._rawBodyData = new(senderConnectParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public SenderConnectParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    SenderConnectParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string agentID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.AgentID = agentID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static SenderConnectParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string agentID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            agentID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["AgentID"] = JsonSerializer.SerializeToElement(this.AgentID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(SenderConnectParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.AgentID?.Equals(other.AgentID) ?? other.AgentID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/agents/{0}/senders", this.AgentID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Agents/Senders/SenderConnectResponse.cs b/src/Zavudev/Models/Agents/Senders/SenderConnectResponse.cs
new file mode 100644
index 0000000..9156c3e
--- /dev/null
+++ b/src/Zavudev/Models/Agents/Senders/SenderConnectResponse.cs
@@ -0,0 +1,76 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Agent;
+
+namespace Zavudev.Models.Agents.Senders;
+
+[JsonConverter(typeof(JsonModelConverter<SenderConnectResponse, SenderConnectResponseFromRaw>))]
+public sealed record class SenderConnectResponse : JsonModel
+{
+    /// <summary>
+    /// AI Agent configuration for a sender.
+    /// </summary>
+    public required AgentAgent Agent
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<AgentAgent>("agent");
+        }
+        init { this._rawData.Set("agent", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Agent.Validate();
+    }
+
+    public SenderConnectResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public SenderConnectResponse(SenderConnectResponse senderConnectResponse)
+        : base(senderConnectResponse) { }
+#pragma warning restore CS8618
+
+    public SenderConnectResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    SenderConnectResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="SenderConnectResponseFromRaw.FromRawUnchecked"/>
+    public static SenderConnectResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public SenderConnectResponse(AgentAgent agent)
+        : this()
+    {
+        this.Agent = agent;
+    }
+}
+
+class SenderConnectResponseFromRaw : IFromRawJson<SenderConnectResponse>
+{
+    /// <inheritdoc/>
+    public SenderConnectResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => SenderConnectResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Agents/Senders/SenderDisconnectParams.cs b/src/Zavudev/Models/Agents/Senders/SenderDisconnectParams.cs
new file mode 100644
index 0000000..2ebb7de
--- /dev/null
+++ b/src/Zavudev/Models/Agents/Senders/SenderDisconnectParams.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Agents.Senders;
+
+/// <summary>
+/// Stop the agent answering on this sender. The agent's primary sender is part of
+/// the agent itself and cannot be disconnected here.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class SenderDisconnectParams : ParamsBase
+{
+    public required string AgentID { get; init; }
+
+    public string? SenderID { get; init; }
+
+    public SenderDisconnectParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public SenderDisconnectParams(SenderDisconnectParams senderDisconnectParams)
+        : base(senderDisconnectParams)
+    {
+        this.AgentID = senderDisconnectParams.AgentID;
+        this.SenderID = senderDisconnectParams.SenderID;
+    }
+#pragma warning restore CS8618
+
+    public SenderDisconnectParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    SenderDisconnectParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string agentID,
+        string senderID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.AgentID = agentID;
+        this.SenderID = senderID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static SenderDisconnectParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string agentID,
+        string senderID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            agentID,
+            senderID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["AgentID"] = JsonSerializer.SerializeToElement(this.AgentID),
+                    ["SenderID"] = JsonSerializer.SerializeToElement(this.SenderID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(SenderDisconnectParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this.AgentID.Equals(other.AgentID)
+            && (this.SenderID?.Equals(other.SenderID) ?? other.SenderID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/agents/{0}/senders/{1}", this.AgentID, this.SenderID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Broadcasts/BroadcastSendParams.cs b/src/Zavudev/Models/Broadcasts/BroadcastSendParams.cs
index 7a01695..d36ffc5 100644
--- a/src/Zavudev/Models/Broadcasts/BroadcastSendParams.cs
+++ b/src/Zavudev/Models/Broadcasts/BroadcastSendParams.cs
@@ -12,11 +12,21 @@ namespace Zavudev.Models.Broadcasts;
 /// <summary>
 /// Start sending the broadcast immediately or schedule for later.
 ///
-/// <para>**Verification is required to send, and there are two of them.** The team
-/// must have completed both identity verification (KYC) and business verification
-/// (KYB); passing one is not enough. Drafts can be created, edited and kept without
-/// either. Every send path — dashboard, API and CLI alike — enforces both, returning
-/// `403` with code `kyc_required` or `kyb_required` for whichever is outstanding.</para>
+/// <para>**The account must be past the unverified level to send, except on WhatsApp.**
+/// An account that has verified nothing is refused with `403` and code `kyc_required`
+/// on every channel other than `whatsapp`. Any one of these lifts it: identity verification
+/// (KYC), a saved payment method, a settled deposit, or a paid plan. Business verification
+/// (KYB) is not required to broadcast; it gates 10DLC registration only. A `whatsapp`
+/// broadcast is exempt: it can only be built on a template, and Meta vets the business
+/// and the content when it approves that template, so an unapproved template is
+/// refused instead. `smart` is not exempt, since it can route a contact to SMS or
+/// email. Drafts can be created, edited and kept without any check. Every send path
+/// (dashboard, API and CLI) enforces the same rule.</para>
+///
+/// <para>**Daily ceilings apply per recipient.** Each message a broadcast sends
+/// counts against the channel's daily ceiling (see `POST /v1/messages`). Once the
+/// ceiling is reached, the remaining recipients are marked `failed` with `errorCode`
+/// `DAILY_LIMIT_EXCEEDED`; they are not retried the next day.</para>
 ///
 /// <para>**Review depends on the channel, and cannot be bypassed.** A draft is submitted
 /// to automated content review here; it does not go straight out. A WhatsApp broadcast
diff --git a/src/Zavudev/Models/Calls/CallCreateParams.cs b/src/Zavudev/Models/Calls/CallCreateParams.cs
new file mode 100644
index 0000000..41288c9
--- /dev/null
+++ b/src/Zavudev/Models/Calls/CallCreateParams.cs
@@ -0,0 +1,282 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Calls;
+
+/// <summary>
+/// Place an outbound voice call answered by the voice agent configured on the sender.
+/// Zavu dials the recipient and runs the conversation through its managed voice
+/// pipeline (speech recognition, the agent's LLM, and speech synthesis, with real-time
+/// interruption handling).
+///
+/// <para>**Requirements:** - The Voice Agents feature must be enabled for your team
+/// (otherwise `403`). - An account that has verified nothing may only call the phone
+/// numbers the project has verified (`403` with code `destination_not_verified`,
+/// and `details.verifiedNumbers` lists them), and at most 5 calls a day (`429` with
+/// code `daily_limit_exceeded`). A number is verified from the dashboard's Sandbox
+/// screen by sending the pre-filled WhatsApp message from that phone; the same verification
+/// covers SMS and calls. Verify your identity, add a payment method, settle a deposit
+/// or subscribe to call any destination. That raises the ceiling to 50 calls a day
+/// on Free; paid plans have no daily call ceiling. Full reference: https://docs.zavu.dev/concepts/sending-limits
+/// - The sender's agent must have `voice.enabled` set to `true`. - Not available
+/// with test-mode API keys.</para>
+///
+/// <para>**Billing:** Voice calls are billed per minute of connected time plus telephony,
+/// deducted from your prepaid balance. A short-duration estimate is reserved when
+/// the call is placed; you are charged for the actual duration when the call ends.</para>
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class CallCreateParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    /// <summary>
+    /// Recipient phone number in E.164 format.
+    /// </summary>
+    public required string To
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("to");
+        }
+        init { this._rawBodyData.Set("to", value); }
+    }
+
+    /// <summary>
+    /// Overrides the agent's configured greeting for this call only.
+    /// </summary>
+    public string? Greeting
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("greeting");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("greeting", value);
+        }
+    }
+
+    /// <summary>
+    /// Language the agent speaks on this call only, as a BCP-47 tag (`en`, `es`,
+    /// `es-ES`, `pt-BR`), or `auto` to detect the caller's language and follow it.
+    /// Overrides the agent's configured language for speech recognition, the agent's
+    /// replies, and the synthesized voice. If the agent uses a custom voice you supplied,
+    /// that voice is kept and only the language changes. When omitted, the agent's
+    /// configured language is used.
+    /// </summary>
+    public string? Language
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("language");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("language", value);
+        }
+    }
+
+    /// <summary>
+    /// Overrides the agent's maximum call duration for this call only.
+    /// </summary>
+    public long? MaxDurationMinutes
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<long>("maxDurationMinutes");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("maxDurationMinutes", value);
+        }
+    }
+
+    /// <summary>
+    /// Arbitrary metadata to associate with the call. Returned on the call object
+    /// and included in voice webhooks.
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Metadata
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<FrozenDictionary<string, string>>("metadata");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<FrozenDictionary<string, string>?>(
+                "metadata",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Sender profile that places the call. Uses the project's default sender if
+    /// omitted. The sender's agent must have voice enabled.
+    /// </summary>
+    public string? SenderID
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("senderId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("senderId", value);
+        }
+    }
+
+    public CallCreateParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallCreateParams(CallCreateParams callCreateParams)
+        : base(callCreateParams)
+    {
+        this._rawBodyData = new(callCreateParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public CallCreateParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallCreateParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static CallCreateParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(CallCreateParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/calls")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Calls/CallCreateResponse.cs b/src/Zavudev/Models/Calls/CallCreateResponse.cs
new file mode 100644
index 0000000..150b398
--- /dev/null
+++ b/src/Zavudev/Models/Calls/CallCreateResponse.cs
@@ -0,0 +1,639 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Calls;
+
+[JsonConverter(typeof(JsonModelConverter<CallCreateResponse, CallCreateResponseFromRaw>))]
+public sealed record class CallCreateResponse : JsonModel
+{
+    public required Call Call
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<Call>("call");
+        }
+        init { this._rawData.Set("call", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Call.Validate();
+    }
+
+    public CallCreateResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallCreateResponse(CallCreateResponse callCreateResponse)
+        : base(callCreateResponse) { }
+#pragma warning restore CS8618
+
+    public CallCreateResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallCreateResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallCreateResponseFromRaw.FromRawUnchecked"/>
+    public static CallCreateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public CallCreateResponse(Call call)
+        : this()
+    {
+        this.Call = call;
+    }
+}
+
+class CallCreateResponseFromRaw : IFromRawJson<CallCreateResponse>
+{
+    /// <inheritdoc/>
+    public CallCreateResponse FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        CallCreateResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<Call, CallFromRaw>))]
+public sealed record class Call : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+    /// </summary>
+    public required ApiEnum<string, CallDirection> Direction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, CallDirection>>("direction");
+        }
+        init { this._rawData.Set("direction", value); }
+    }
+
+    /// <summary>
+    /// Caller phone number in E.164 format. Your sender's number for outbound calls;
+    /// the caller's number for inbound calls.
+    /// </summary>
+    public required string From
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("from");
+        }
+        init { this._rawData.Set("from", value); }
+    }
+
+    /// <summary>
+    /// Lifecycle status of a voice call. - `queued`: outbound call created, not
+    /// yet dialing. - `ringing`: dialing (outbound) or received and ringing (inbound).
+    /// - `in_progress`: answered, the agent is connected. - `completed`: ended after
+    /// a conversation. - `failed`: could not be completed. - `busy`: the line was
+    /// busy. - `no_answer`: rang but was not answered. - `canceled`: canceled before
+    /// it was answered.
+    /// </summary>
+    public required ApiEnum<string, CallStatus> Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, CallStatus>>("status");
+        }
+        init { this._rawData.Set("status", value); }
+    }
+
+    /// <summary>
+    /// Callee phone number in E.164 format.
+    /// </summary>
+    public required string To
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("to");
+        }
+        init { this._rawData.Set("to", value); }
+    }
+
+    /// <summary>
+    /// When the call was answered.
+    /// </summary>
+    public DateTimeOffset? AnsweredAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("answeredAt");
+        }
+        init { this._rawData.Set("answeredAt", value); }
+    }
+
+    /// <summary>
+    /// Total cost of the call in USD, combining the managed voice pipeline per-minute
+    /// charge and telephony. Available once the call has ended.
+    /// </summary>
+    public double? Cost
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<double>("cost");
+        }
+        init { this._rawData.Set("cost", value); }
+    }
+
+    /// <summary>
+    /// Billable talk time in seconds, measured from answer to hangup.
+    /// </summary>
+    public long? DurationSeconds
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("durationSeconds");
+        }
+        init { this._rawData.Set("durationSeconds", value); }
+    }
+
+    /// <summary>
+    /// When the call ended.
+    /// </summary>
+    public DateTimeOffset? EndedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("endedAt");
+        }
+        init { this._rawData.Set("endedAt", value); }
+    }
+
+    /// <summary>
+    /// Why the call ended (e.g. `agent_ended`, `max_duration`, `transfer`, `hangup`).
+    /// Present once the call is no longer active.
+    /// </summary>
+    public string? EndReason
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("endReason");
+        }
+        init { this._rawData.Set("endReason", value); }
+    }
+
+    /// <summary>
+    /// Arbitrary metadata you attached when creating the call.
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Metadata
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<FrozenDictionary<string, string>>("metadata");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<FrozenDictionary<string, string>?>(
+                "metadata",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Ordered transcript of the call. Included when retrieving a single call; omitted
+    /// from list responses.
+    /// </summary>
+    public IReadOnlyList<Transcript>? Transcript
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<ImmutableArray<Transcript>>("transcript");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<ImmutableArray<Transcript>?>(
+                "transcript",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Number of conversation turns exchanged during the call.
+    /// </summary>
+    public long? TurnCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("turnCount");
+        }
+        init { this._rawData.Set("turnCount", value); }
+    }
+
+    public DateTimeOffset? UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("updatedAt");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("updatedAt", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.CreatedAt;
+        this.Direction.Validate();
+        _ = this.From;
+        this.Status.Validate();
+        _ = this.To;
+        _ = this.AnsweredAt;
+        _ = this.Cost;
+        _ = this.DurationSeconds;
+        _ = this.EndedAt;
+        _ = this.EndReason;
+        _ = this.Metadata;
+        foreach (var item in this.Transcript ?? [])
+        {
+            item.Validate();
+        }
+        _ = this.TurnCount;
+        _ = this.UpdatedAt;
+    }
+
+    public Call() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Call(Call call)
+        : base(call) { }
+#pragma warning restore CS8618
+
+    public Call(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Call(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallFromRaw.FromRawUnchecked"/>
+    public static Call FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class CallFromRaw : IFromRawJson<Call>
+{
+    /// <inheritdoc/>
+    public Call FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Call.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+/// </summary>
+[JsonConverter(typeof(CallDirectionConverter))]
+public enum CallDirection
+{
+    Inbound,
+    Outbound,
+}
+
+sealed class CallDirectionConverter : JsonConverter<CallDirection>
+{
+    public override CallDirection Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "inbound" => CallDirection.Inbound,
+            "outbound" => CallDirection.Outbound,
+            _ => (CallDirection)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallDirection value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallDirection.Inbound => "inbound",
+                CallDirection.Outbound => "outbound",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Lifecycle status of a voice call. - `queued`: outbound call created, not yet dialing.
+/// - `ringing`: dialing (outbound) or received and ringing (inbound). - `in_progress`:
+/// answered, the agent is connected. - `completed`: ended after a conversation.
+/// - `failed`: could not be completed. - `busy`: the line was busy. - `no_answer`:
+/// rang but was not answered. - `canceled`: canceled before it was answered.
+/// </summary>
+[JsonConverter(typeof(CallStatusConverter))]
+public enum CallStatus
+{
+    Queued,
+    Ringing,
+    InProgress,
+    Completed,
+    Failed,
+    Busy,
+    NoAnswer,
+    Canceled,
+}
+
+sealed class CallStatusConverter : JsonConverter<CallStatus>
+{
+    public override CallStatus Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "queued" => CallStatus.Queued,
+            "ringing" => CallStatus.Ringing,
+            "in_progress" => CallStatus.InProgress,
+            "completed" => CallStatus.Completed,
+            "failed" => CallStatus.Failed,
+            "busy" => CallStatus.Busy,
+            "no_answer" => CallStatus.NoAnswer,
+            "canceled" => CallStatus.Canceled,
+            _ => (CallStatus)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallStatus value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallStatus.Queued => "queued",
+                CallStatus.Ringing => "ringing",
+                CallStatus.InProgress => "in_progress",
+                CallStatus.Completed => "completed",
+                CallStatus.Failed => "failed",
+                CallStatus.Busy => "busy",
+                CallStatus.NoAnswer => "no_answer",
+                CallStatus.Canceled => "canceled",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// A single turn in a voice call transcript.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Transcript, TranscriptFromRaw>))]
+public sealed record class Transcript : JsonModel
+{
+    /// <summary>
+    /// Who produced the turn. `tool` records a tool call the agent made during the conversation.
+    /// </summary>
+    public required ApiEnum<string, Role> Role
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, Role>>("role");
+        }
+        init { this._rawData.Set("role", value); }
+    }
+
+    /// <summary>
+    /// Ordinal position of the turn within the call, starting at 0.
+    /// </summary>
+    public required long Seq
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("seq");
+        }
+        init { this._rawData.Set("seq", value); }
+    }
+
+    /// <summary>
+    /// Transcribed speech for `user` and `assistant` turns, or a JSON summary of
+    /// the tool call for `tool` turns.
+    /// </summary>
+    public required string Text
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("text");
+        }
+        init { this._rawData.Set("text", value); }
+    }
+
+    /// <summary>
+    /// When the turn ended.
+    /// </summary>
+    public DateTimeOffset? EndedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("endedAt");
+        }
+        init { this._rawData.Set("endedAt", value); }
+    }
+
+    /// <summary>
+    /// When the turn started.
+    /// </summary>
+    public DateTimeOffset? StartedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("startedAt");
+        }
+        init { this._rawData.Set("startedAt", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Role.Validate();
+        _ = this.Seq;
+        _ = this.Text;
+        _ = this.EndedAt;
+        _ = this.StartedAt;
+    }
+
+    public Transcript() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Transcript(Transcript transcript)
+        : base(transcript) { }
+#pragma warning restore CS8618
+
+    public Transcript(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Transcript(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TranscriptFromRaw.FromRawUnchecked"/>
+    public static Transcript FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class TranscriptFromRaw : IFromRawJson<Transcript>
+{
+    /// <inheritdoc/>
+    public Transcript FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Transcript.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Who produced the turn. `tool` records a tool call the agent made during the conversation.
+/// </summary>
+[JsonConverter(typeof(RoleConverter))]
+public enum Role
+{
+    User,
+    Assistant,
+    Tool,
+}
+
+sealed class RoleConverter : JsonConverter<Role>
+{
+    public override Role Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "user" => Role.User,
+            "assistant" => Role.Assistant,
+            "tool" => Role.Tool,
+            _ => (Role)(-1),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, Role value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Role.User => "user",
+                Role.Assistant => "assistant",
+                Role.Tool => "tool",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Contacts/ContactDismissMergeSuggestionParams.cs b/src/Zavudev/Models/Calls/CallHangupParams.cs
similarity index 70%
rename from src/Zavudev/Models/Contacts/ContactDismissMergeSuggestionParams.cs
rename to src/Zavudev/Models/Calls/CallHangupParams.cs
index 6dc65a1..87c2ed5 100644
--- a/src/Zavudev/Models/Contacts/ContactDismissMergeSuggestionParams.cs
+++ b/src/Zavudev/Models/Calls/CallHangupParams.cs
@@ -6,33 +6,32 @@
 using System.Text.Json;
 using Zavudev.Core;
 
-namespace Zavudev.Models.Contacts;
+namespace Zavudev.Models.Calls;
 
 /// <summary>
-/// Dismiss the merge suggestion for a contact.
+/// End an active voice call. The call must still be ringing or in progress. Not available
+/// with test-mode API keys.
 ///
 /// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
 /// breaking changes in non-major versions. We may add new methods in the future that
 /// cause existing derived classes to break.</para>
 /// </summary>
-public record class ContactDismissMergeSuggestionParams : ParamsBase
+public record class CallHangupParams : ParamsBase
 {
-    public string? ContactID { get; init; }
+    public string? CallID { get; init; }
 
-    public ContactDismissMergeSuggestionParams() { }
+    public CallHangupParams() { }
 
 #pragma warning disable CS8618
     [SetsRequiredMembers]
-    public ContactDismissMergeSuggestionParams(
-        ContactDismissMergeSuggestionParams contactDismissMergeSuggestionParams
-    )
-        : base(contactDismissMergeSuggestionParams)
+    public CallHangupParams(CallHangupParams callHangupParams)
+        : base(callHangupParams)
     {
-        this.ContactID = contactDismissMergeSuggestionParams.ContactID;
+        this.CallID = callHangupParams.CallID;
     }
 #pragma warning restore CS8618
 
-    public ContactDismissMergeSuggestionParams(
+    public CallHangupParams(
         IReadOnlyDictionary<string, JsonElement> rawHeaderData,
         IReadOnlyDictionary<string, JsonElement> rawQueryData
     )
@@ -43,29 +42,29 @@ IReadOnlyDictionary<string, JsonElement> rawQueryData
 
 #pragma warning disable CS8618
     [SetsRequiredMembers]
-    ContactDismissMergeSuggestionParams(
+    CallHangupParams(
         FrozenDictionary<string, JsonElement> rawHeaderData,
         FrozenDictionary<string, JsonElement> rawQueryData,
-        string contactID
+        string callID
     )
     {
         this._rawHeaderData = new(rawHeaderData);
         this._rawQueryData = new(rawQueryData);
-        this.ContactID = contactID;
+        this.CallID = callID;
     }
 #pragma warning restore CS8618
 
     /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
-    public static ContactDismissMergeSuggestionParams FromRawUnchecked(
+    public static CallHangupParams FromRawUnchecked(
         IReadOnlyDictionary<string, JsonElement> rawHeaderData,
         IReadOnlyDictionary<string, JsonElement> rawQueryData,
-        string contactID
+        string callID
     )
     {
         return new(
             FrozenDictionary.ToFrozenDictionary(rawHeaderData),
             FrozenDictionary.ToFrozenDictionary(rawQueryData),
-            contactID
+            callID
         );
     }
 
@@ -74,7 +73,7 @@ public override string ToString() =>
             FriendlyJsonPrinter.PrintValue(
                 new Dictionary<string, JsonElement>()
                 {
-                    ["ContactID"] = JsonSerializer.SerializeToElement(this.ContactID),
+                    ["CallID"] = JsonSerializer.SerializeToElement(this.CallID),
                     ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
                         JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
                     ),
@@ -86,13 +85,13 @@ public override string ToString() =>
             ModelBase.ToStringSerializerOptions
         );
 
-    public virtual bool Equals(ContactDismissMergeSuggestionParams? other)
+    public virtual bool Equals(CallHangupParams? other)
     {
         if (other == null)
         {
             return false;
         }
-        return (this.ContactID?.Equals(other.ContactID) ?? other.ContactID == null)
+        return (this.CallID?.Equals(other.CallID) ?? other.CallID == null)
             && this._rawHeaderData.Equals(other._rawHeaderData)
             && this._rawQueryData.Equals(other._rawQueryData);
     }
@@ -101,7 +100,7 @@ public override Uri Url(ClientOptions options)
     {
         return new UriBuilder(
             options.BaseUrl.ToString().TrimEnd('/')
-                + string.Format("/v1/contacts/{0}/merge-suggestion", this.ContactID)
+                + string.Format("/v1/calls/{0}/hangup", this.CallID)
         )
         {
             Query = this.QueryString(options),
diff --git a/src/Zavudev/Models/Calls/CallHangupResponse.cs b/src/Zavudev/Models/Calls/CallHangupResponse.cs
new file mode 100644
index 0000000..72e2943
--- /dev/null
+++ b/src/Zavudev/Models/Calls/CallHangupResponse.cs
@@ -0,0 +1,666 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Calls;
+
+[JsonConverter(typeof(JsonModelConverter<CallHangupResponse, CallHangupResponseFromRaw>))]
+public sealed record class CallHangupResponse : JsonModel
+{
+    public required CallHangupResponseCall Call
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<CallHangupResponseCall>("call");
+        }
+        init { this._rawData.Set("call", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Call.Validate();
+    }
+
+    public CallHangupResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallHangupResponse(CallHangupResponse callHangupResponse)
+        : base(callHangupResponse) { }
+#pragma warning restore CS8618
+
+    public CallHangupResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallHangupResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallHangupResponseFromRaw.FromRawUnchecked"/>
+    public static CallHangupResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public CallHangupResponse(CallHangupResponseCall call)
+        : this()
+    {
+        this.Call = call;
+    }
+}
+
+class CallHangupResponseFromRaw : IFromRawJson<CallHangupResponse>
+{
+    /// <inheritdoc/>
+    public CallHangupResponse FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        CallHangupResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<CallHangupResponseCall, CallHangupResponseCallFromRaw>))]
+public sealed record class CallHangupResponseCall : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+    /// </summary>
+    public required ApiEnum<string, CallHangupResponseCallDirection> Direction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, CallHangupResponseCallDirection>>(
+                "direction"
+            );
+        }
+        init { this._rawData.Set("direction", value); }
+    }
+
+    /// <summary>
+    /// Caller phone number in E.164 format. Your sender's number for outbound calls;
+    /// the caller's number for inbound calls.
+    /// </summary>
+    public required string From
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("from");
+        }
+        init { this._rawData.Set("from", value); }
+    }
+
+    /// <summary>
+    /// Lifecycle status of a voice call. - `queued`: outbound call created, not
+    /// yet dialing. - `ringing`: dialing (outbound) or received and ringing (inbound).
+    /// - `in_progress`: answered, the agent is connected. - `completed`: ended after
+    /// a conversation. - `failed`: could not be completed. - `busy`: the line was
+    /// busy. - `no_answer`: rang but was not answered. - `canceled`: canceled before
+    /// it was answered.
+    /// </summary>
+    public required ApiEnum<string, CallHangupResponseCallStatus> Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, CallHangupResponseCallStatus>>(
+                "status"
+            );
+        }
+        init { this._rawData.Set("status", value); }
+    }
+
+    /// <summary>
+    /// Callee phone number in E.164 format.
+    /// </summary>
+    public required string To
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("to");
+        }
+        init { this._rawData.Set("to", value); }
+    }
+
+    /// <summary>
+    /// When the call was answered.
+    /// </summary>
+    public DateTimeOffset? AnsweredAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("answeredAt");
+        }
+        init { this._rawData.Set("answeredAt", value); }
+    }
+
+    /// <summary>
+    /// Total cost of the call in USD, combining the managed voice pipeline per-minute
+    /// charge and telephony. Available once the call has ended.
+    /// </summary>
+    public double? Cost
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<double>("cost");
+        }
+        init { this._rawData.Set("cost", value); }
+    }
+
+    /// <summary>
+    /// Billable talk time in seconds, measured from answer to hangup.
+    /// </summary>
+    public long? DurationSeconds
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("durationSeconds");
+        }
+        init { this._rawData.Set("durationSeconds", value); }
+    }
+
+    /// <summary>
+    /// When the call ended.
+    /// </summary>
+    public DateTimeOffset? EndedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("endedAt");
+        }
+        init { this._rawData.Set("endedAt", value); }
+    }
+
+    /// <summary>
+    /// Why the call ended (e.g. `agent_ended`, `max_duration`, `transfer`, `hangup`).
+    /// Present once the call is no longer active.
+    /// </summary>
+    public string? EndReason
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("endReason");
+        }
+        init { this._rawData.Set("endReason", value); }
+    }
+
+    /// <summary>
+    /// Arbitrary metadata you attached when creating the call.
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Metadata
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<FrozenDictionary<string, string>>("metadata");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<FrozenDictionary<string, string>?>(
+                "metadata",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Ordered transcript of the call. Included when retrieving a single call; omitted
+    /// from list responses.
+    /// </summary>
+    public IReadOnlyList<CallHangupResponseCallTranscript>? Transcript
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<
+                ImmutableArray<CallHangupResponseCallTranscript>
+            >("transcript");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<ImmutableArray<CallHangupResponseCallTranscript>?>(
+                "transcript",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Number of conversation turns exchanged during the call.
+    /// </summary>
+    public long? TurnCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("turnCount");
+        }
+        init { this._rawData.Set("turnCount", value); }
+    }
+
+    public DateTimeOffset? UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("updatedAt");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("updatedAt", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.CreatedAt;
+        this.Direction.Validate();
+        _ = this.From;
+        this.Status.Validate();
+        _ = this.To;
+        _ = this.AnsweredAt;
+        _ = this.Cost;
+        _ = this.DurationSeconds;
+        _ = this.EndedAt;
+        _ = this.EndReason;
+        _ = this.Metadata;
+        foreach (var item in this.Transcript ?? [])
+        {
+            item.Validate();
+        }
+        _ = this.TurnCount;
+        _ = this.UpdatedAt;
+    }
+
+    public CallHangupResponseCall() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallHangupResponseCall(CallHangupResponseCall callHangupResponseCall)
+        : base(callHangupResponseCall) { }
+#pragma warning restore CS8618
+
+    public CallHangupResponseCall(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallHangupResponseCall(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallHangupResponseCallFromRaw.FromRawUnchecked"/>
+    public static CallHangupResponseCall FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class CallHangupResponseCallFromRaw : IFromRawJson<CallHangupResponseCall>
+{
+    /// <inheritdoc/>
+    public CallHangupResponseCall FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => CallHangupResponseCall.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+/// </summary>
+[JsonConverter(typeof(CallHangupResponseCallDirectionConverter))]
+public enum CallHangupResponseCallDirection
+{
+    Inbound,
+    Outbound,
+}
+
+sealed class CallHangupResponseCallDirectionConverter
+    : JsonConverter<CallHangupResponseCallDirection>
+{
+    public override CallHangupResponseCallDirection Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "inbound" => CallHangupResponseCallDirection.Inbound,
+            "outbound" => CallHangupResponseCallDirection.Outbound,
+            _ => (CallHangupResponseCallDirection)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallHangupResponseCallDirection value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallHangupResponseCallDirection.Inbound => "inbound",
+                CallHangupResponseCallDirection.Outbound => "outbound",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Lifecycle status of a voice call. - `queued`: outbound call created, not yet dialing.
+/// - `ringing`: dialing (outbound) or received and ringing (inbound). - `in_progress`:
+/// answered, the agent is connected. - `completed`: ended after a conversation.
+/// - `failed`: could not be completed. - `busy`: the line was busy. - `no_answer`:
+/// rang but was not answered. - `canceled`: canceled before it was answered.
+/// </summary>
+[JsonConverter(typeof(CallHangupResponseCallStatusConverter))]
+public enum CallHangupResponseCallStatus
+{
+    Queued,
+    Ringing,
+    InProgress,
+    Completed,
+    Failed,
+    Busy,
+    NoAnswer,
+    Canceled,
+}
+
+sealed class CallHangupResponseCallStatusConverter : JsonConverter<CallHangupResponseCallStatus>
+{
+    public override CallHangupResponseCallStatus Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "queued" => CallHangupResponseCallStatus.Queued,
+            "ringing" => CallHangupResponseCallStatus.Ringing,
+            "in_progress" => CallHangupResponseCallStatus.InProgress,
+            "completed" => CallHangupResponseCallStatus.Completed,
+            "failed" => CallHangupResponseCallStatus.Failed,
+            "busy" => CallHangupResponseCallStatus.Busy,
+            "no_answer" => CallHangupResponseCallStatus.NoAnswer,
+            "canceled" => CallHangupResponseCallStatus.Canceled,
+            _ => (CallHangupResponseCallStatus)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallHangupResponseCallStatus value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallHangupResponseCallStatus.Queued => "queued",
+                CallHangupResponseCallStatus.Ringing => "ringing",
+                CallHangupResponseCallStatus.InProgress => "in_progress",
+                CallHangupResponseCallStatus.Completed => "completed",
+                CallHangupResponseCallStatus.Failed => "failed",
+                CallHangupResponseCallStatus.Busy => "busy",
+                CallHangupResponseCallStatus.NoAnswer => "no_answer",
+                CallHangupResponseCallStatus.Canceled => "canceled",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// A single turn in a voice call transcript.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<
+        CallHangupResponseCallTranscript,
+        CallHangupResponseCallTranscriptFromRaw
+    >)
+)]
+public sealed record class CallHangupResponseCallTranscript : JsonModel
+{
+    /// <summary>
+    /// Who produced the turn. `tool` records a tool call the agent made during the conversation.
+    /// </summary>
+    public required ApiEnum<string, CallHangupResponseCallTranscriptRole> Role
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, CallHangupResponseCallTranscriptRole>
+            >("role");
+        }
+        init { this._rawData.Set("role", value); }
+    }
+
+    /// <summary>
+    /// Ordinal position of the turn within the call, starting at 0.
+    /// </summary>
+    public required long Seq
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("seq");
+        }
+        init { this._rawData.Set("seq", value); }
+    }
+
+    /// <summary>
+    /// Transcribed speech for `user` and `assistant` turns, or a JSON summary of
+    /// the tool call for `tool` turns.
+    /// </summary>
+    public required string Text
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("text");
+        }
+        init { this._rawData.Set("text", value); }
+    }
+
+    /// <summary>
+    /// When the turn ended.
+    /// </summary>
+    public DateTimeOffset? EndedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("endedAt");
+        }
+        init { this._rawData.Set("endedAt", value); }
+    }
+
+    /// <summary>
+    /// When the turn started.
+    /// </summary>
+    public DateTimeOffset? StartedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("startedAt");
+        }
+        init { this._rawData.Set("startedAt", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Role.Validate();
+        _ = this.Seq;
+        _ = this.Text;
+        _ = this.EndedAt;
+        _ = this.StartedAt;
+    }
+
+    public CallHangupResponseCallTranscript() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallHangupResponseCallTranscript(
+        CallHangupResponseCallTranscript callHangupResponseCallTranscript
+    )
+        : base(callHangupResponseCallTranscript) { }
+#pragma warning restore CS8618
+
+    public CallHangupResponseCallTranscript(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallHangupResponseCallTranscript(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallHangupResponseCallTranscriptFromRaw.FromRawUnchecked"/>
+    public static CallHangupResponseCallTranscript FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class CallHangupResponseCallTranscriptFromRaw : IFromRawJson<CallHangupResponseCallTranscript>
+{
+    /// <inheritdoc/>
+    public CallHangupResponseCallTranscript FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => CallHangupResponseCallTranscript.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Who produced the turn. `tool` records a tool call the agent made during the conversation.
+/// </summary>
+[JsonConverter(typeof(CallHangupResponseCallTranscriptRoleConverter))]
+public enum CallHangupResponseCallTranscriptRole
+{
+    User,
+    Assistant,
+    Tool,
+}
+
+sealed class CallHangupResponseCallTranscriptRoleConverter
+    : JsonConverter<CallHangupResponseCallTranscriptRole>
+{
+    public override CallHangupResponseCallTranscriptRole Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "user" => CallHangupResponseCallTranscriptRole.User,
+            "assistant" => CallHangupResponseCallTranscriptRole.Assistant,
+            "tool" => CallHangupResponseCallTranscriptRole.Tool,
+            _ => (CallHangupResponseCallTranscriptRole)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallHangupResponseCallTranscriptRole value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallHangupResponseCallTranscriptRole.User => "user",
+                CallHangupResponseCallTranscriptRole.Assistant => "assistant",
+                CallHangupResponseCallTranscriptRole.Tool => "tool",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Calls/CallListPage.cs b/src/Zavudev/Models/Calls/CallListPage.cs
new file mode 100644
index 0000000..a28353a
--- /dev/null
+++ b/src/Zavudev/Models/Calls/CallListPage.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Services;
+
+namespace Zavudev.Models.Calls;
+
+/// <summary>
+/// A single page from the paginated endpoint that <see cref="ICallService.List(CallListParams, CancellationToken)"/> queries.
+/// </summary>
+public sealed class CallListPage(
+    ICallServiceWithRawResponse service,
+    CallListParams parameters,
+    CallListPageResponse response
+) : IPage<CallListResponse>
+{
+    /// <inheritdoc/>
+    public IReadOnlyList<CallListResponse> Items
+    {
+        get { return response.Items; }
+    }
+
+    /// <inheritdoc/>
+    public bool HasNext()
+    {
+        try
+        {
+            return this.Items.Count > 0 && response.NextCursor != null;
+        }
+        catch (ZavudevInvalidDataException)
+        {
+            // If accessing the response data to determine if there's a next page failed, then just
+            // assume there's no next page.
+            return false;
+        }
+    }
+
+    /// <inheritdoc/>
+    async Task<IPage<CallListResponse>> IPage<CallListResponse>.Next(
+        CancellationToken cancellationToken
+    ) => await this.Next(cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc cref="IPage{T}.Next"/>
+    public async Task<CallListPage> Next(CancellationToken cancellationToken = default)
+    {
+        var nextCursor =
+            response.NextCursor ?? throw new InvalidOperationException("Cannot request next page");
+        using var nextResponse = await service
+            .List(parameters with { Cursor = nextCursor }, cancellationToken)
+            .ConfigureAwait(false);
+        return await nextResponse.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public void Validate()
+    {
+        response.Validate();
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(JsonSerializer.SerializeToElement(this.Items)),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public override bool Equals(object? obj)
+    {
+        if (obj is not CallListPage other)
+        {
+            return false;
+        }
+
+        return Enumerable.SequenceEqual(this.Items, other.Items);
+    }
+
+    public override int GetHashCode() => 0;
+}
diff --git a/src/Zavudev/Models/Calls/CallListPageResponse.cs b/src/Zavudev/Models/Calls/CallListPageResponse.cs
new file mode 100644
index 0000000..d7a198b
--- /dev/null
+++ b/src/Zavudev/Models/Calls/CallListPageResponse.cs
@@ -0,0 +1,93 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Calls;
+
+[JsonConverter(typeof(JsonModelConverter<CallListPageResponse, CallListPageResponseFromRaw>))]
+public sealed record class CallListPageResponse : JsonModel
+{
+    public required IReadOnlyList<CallListResponse> Items
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<CallListResponse>>("items");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<CallListResponse>>(
+                "items",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public string? NextCursor
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("nextCursor");
+        }
+        init { this._rawData.Set("nextCursor", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Items)
+        {
+            item.Validate();
+        }
+        _ = this.NextCursor;
+    }
+
+    public CallListPageResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallListPageResponse(CallListPageResponse callListPageResponse)
+        : base(callListPageResponse) { }
+#pragma warning restore CS8618
+
+    public CallListPageResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallListPageResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallListPageResponseFromRaw.FromRawUnchecked"/>
+    public static CallListPageResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public CallListPageResponse(IReadOnlyList<CallListResponse> items)
+        : this()
+    {
+        this.Items = items;
+    }
+}
+
+class CallListPageResponseFromRaw : IFromRawJson<CallListPageResponse>
+{
+    /// <inheritdoc/>
+    public CallListPageResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => CallListPageResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Calls/CallListParams.cs b/src/Zavudev/Models/Calls/CallListParams.cs
new file mode 100644
index 0000000..22d87aa
--- /dev/null
+++ b/src/Zavudev/Models/Calls/CallListParams.cs
@@ -0,0 +1,306 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Calls;
+
+/// <summary>
+/// List voice calls for this project, most recent first. Transcripts are omitted
+/// from the list; fetch a single call to get its transcript.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class CallListParams : ParamsBase
+{
+    public string? Cursor
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<string>("cursor");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("cursor", value);
+        }
+    }
+
+    /// <summary>
+    /// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+    /// </summary>
+    public ApiEnum<string, Direction>? Direction
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<ApiEnum<string, Direction>>("direction");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("direction", value);
+        }
+    }
+
+    public long? Limit
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableStruct<long>("limit");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("limit", value);
+        }
+    }
+
+    /// <summary>
+    /// Lifecycle status of a voice call. - `queued`: outbound call created, not
+    /// yet dialing. - `ringing`: dialing (outbound) or received and ringing (inbound).
+    /// - `in_progress`: answered, the agent is connected. - `completed`: ended after
+    /// a conversation. - `failed`: could not be completed. - `busy`: the line was
+    /// busy. - `no_answer`: rang but was not answered. - `canceled`: canceled before
+    /// it was answered.
+    /// </summary>
+    public ApiEnum<string, Status>? Status
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<ApiEnum<string, Status>>("status");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("status", value);
+        }
+    }
+
+    public CallListParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallListParams(CallListParams callListParams)
+        : base(callListParams) { }
+#pragma warning restore CS8618
+
+    public CallListParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallListParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static CallListParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(CallListParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/calls")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
+
+/// <summary>
+/// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+/// </summary>
+[JsonConverter(typeof(DirectionConverter))]
+public enum Direction
+{
+    Inbound,
+    Outbound,
+}
+
+sealed class DirectionConverter : JsonConverter<Direction>
+{
+    public override Direction Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "inbound" => Direction.Inbound,
+            "outbound" => Direction.Outbound,
+            _ => (Direction)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        Direction value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Direction.Inbound => "inbound",
+                Direction.Outbound => "outbound",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Lifecycle status of a voice call. - `queued`: outbound call created, not yet dialing.
+/// - `ringing`: dialing (outbound) or received and ringing (inbound). - `in_progress`:
+/// answered, the agent is connected. - `completed`: ended after a conversation.
+/// - `failed`: could not be completed. - `busy`: the line was busy. - `no_answer`:
+/// rang but was not answered. - `canceled`: canceled before it was answered.
+/// </summary>
+[JsonConverter(typeof(StatusConverter))]
+public enum Status
+{
+    Queued,
+    Ringing,
+    InProgress,
+    Completed,
+    Failed,
+    Busy,
+    NoAnswer,
+    Canceled,
+}
+
+sealed class StatusConverter : JsonConverter<Status>
+{
+    public override Status Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "queued" => Status.Queued,
+            "ringing" => Status.Ringing,
+            "in_progress" => Status.InProgress,
+            "completed" => Status.Completed,
+            "failed" => Status.Failed,
+            "busy" => Status.Busy,
+            "no_answer" => Status.NoAnswer,
+            "canceled" => Status.Canceled,
+            _ => (Status)(-1),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, Status value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Status.Queued => "queued",
+                Status.Ringing => "ringing",
+                Status.InProgress => "in_progress",
+                Status.Completed => "completed",
+                Status.Failed => "failed",
+                Status.Busy => "busy",
+                Status.NoAnswer => "no_answer",
+                Status.Canceled => "canceled",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Calls/CallListResponse.cs b/src/Zavudev/Models/Calls/CallListResponse.cs
new file mode 100644
index 0000000..4893b10
--- /dev/null
+++ b/src/Zavudev/Models/Calls/CallListResponse.cs
@@ -0,0 +1,593 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Calls;
+
+[JsonConverter(typeof(JsonModelConverter<CallListResponse, CallListResponseFromRaw>))]
+public sealed record class CallListResponse : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+    /// </summary>
+    public required ApiEnum<string, CallListResponseDirection> Direction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, CallListResponseDirection>>(
+                "direction"
+            );
+        }
+        init { this._rawData.Set("direction", value); }
+    }
+
+    /// <summary>
+    /// Caller phone number in E.164 format. Your sender's number for outbound calls;
+    /// the caller's number for inbound calls.
+    /// </summary>
+    public required string From
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("from");
+        }
+        init { this._rawData.Set("from", value); }
+    }
+
+    /// <summary>
+    /// Lifecycle status of a voice call. - `queued`: outbound call created, not
+    /// yet dialing. - `ringing`: dialing (outbound) or received and ringing (inbound).
+    /// - `in_progress`: answered, the agent is connected. - `completed`: ended after
+    /// a conversation. - `failed`: could not be completed. - `busy`: the line was
+    /// busy. - `no_answer`: rang but was not answered. - `canceled`: canceled before
+    /// it was answered.
+    /// </summary>
+    public required ApiEnum<string, CallListResponseStatus> Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, CallListResponseStatus>>("status");
+        }
+        init { this._rawData.Set("status", value); }
+    }
+
+    /// <summary>
+    /// Callee phone number in E.164 format.
+    /// </summary>
+    public required string To
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("to");
+        }
+        init { this._rawData.Set("to", value); }
+    }
+
+    /// <summary>
+    /// When the call was answered.
+    /// </summary>
+    public DateTimeOffset? AnsweredAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("answeredAt");
+        }
+        init { this._rawData.Set("answeredAt", value); }
+    }
+
+    /// <summary>
+    /// Total cost of the call in USD, combining the managed voice pipeline per-minute
+    /// charge and telephony. Available once the call has ended.
+    /// </summary>
+    public double? Cost
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<double>("cost");
+        }
+        init { this._rawData.Set("cost", value); }
+    }
+
+    /// <summary>
+    /// Billable talk time in seconds, measured from answer to hangup.
+    /// </summary>
+    public long? DurationSeconds
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("durationSeconds");
+        }
+        init { this._rawData.Set("durationSeconds", value); }
+    }
+
+    /// <summary>
+    /// When the call ended.
+    /// </summary>
+    public DateTimeOffset? EndedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("endedAt");
+        }
+        init { this._rawData.Set("endedAt", value); }
+    }
+
+    /// <summary>
+    /// Why the call ended (e.g. `agent_ended`, `max_duration`, `transfer`, `hangup`).
+    /// Present once the call is no longer active.
+    /// </summary>
+    public string? EndReason
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("endReason");
+        }
+        init { this._rawData.Set("endReason", value); }
+    }
+
+    /// <summary>
+    /// Arbitrary metadata you attached when creating the call.
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Metadata
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<FrozenDictionary<string, string>>("metadata");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<FrozenDictionary<string, string>?>(
+                "metadata",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Ordered transcript of the call. Included when retrieving a single call; omitted
+    /// from list responses.
+    /// </summary>
+    public IReadOnlyList<CallListResponseTranscript>? Transcript
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<ImmutableArray<CallListResponseTranscript>>(
+                "transcript"
+            );
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<ImmutableArray<CallListResponseTranscript>?>(
+                "transcript",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Number of conversation turns exchanged during the call.
+    /// </summary>
+    public long? TurnCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("turnCount");
+        }
+        init { this._rawData.Set("turnCount", value); }
+    }
+
+    public DateTimeOffset? UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("updatedAt");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("updatedAt", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.CreatedAt;
+        this.Direction.Validate();
+        _ = this.From;
+        this.Status.Validate();
+        _ = this.To;
+        _ = this.AnsweredAt;
+        _ = this.Cost;
+        _ = this.DurationSeconds;
+        _ = this.EndedAt;
+        _ = this.EndReason;
+        _ = this.Metadata;
+        foreach (var item in this.Transcript ?? [])
+        {
+            item.Validate();
+        }
+        _ = this.TurnCount;
+        _ = this.UpdatedAt;
+    }
+
+    public CallListResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallListResponse(CallListResponse callListResponse)
+        : base(callListResponse) { }
+#pragma warning restore CS8618
+
+    public CallListResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallListResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallListResponseFromRaw.FromRawUnchecked"/>
+    public static CallListResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class CallListResponseFromRaw : IFromRawJson<CallListResponse>
+{
+    /// <inheritdoc/>
+    public CallListResponse FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        CallListResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+/// </summary>
+[JsonConverter(typeof(CallListResponseDirectionConverter))]
+public enum CallListResponseDirection
+{
+    Inbound,
+    Outbound,
+}
+
+sealed class CallListResponseDirectionConverter : JsonConverter<CallListResponseDirection>
+{
+    public override CallListResponseDirection Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "inbound" => CallListResponseDirection.Inbound,
+            "outbound" => CallListResponseDirection.Outbound,
+            _ => (CallListResponseDirection)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallListResponseDirection value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallListResponseDirection.Inbound => "inbound",
+                CallListResponseDirection.Outbound => "outbound",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Lifecycle status of a voice call. - `queued`: outbound call created, not yet dialing.
+/// - `ringing`: dialing (outbound) or received and ringing (inbound). - `in_progress`:
+/// answered, the agent is connected. - `completed`: ended after a conversation.
+/// - `failed`: could not be completed. - `busy`: the line was busy. - `no_answer`:
+/// rang but was not answered. - `canceled`: canceled before it was answered.
+/// </summary>
+[JsonConverter(typeof(CallListResponseStatusConverter))]
+public enum CallListResponseStatus
+{
+    Queued,
+    Ringing,
+    InProgress,
+    Completed,
+    Failed,
+    Busy,
+    NoAnswer,
+    Canceled,
+}
+
+sealed class CallListResponseStatusConverter : JsonConverter<CallListResponseStatus>
+{
+    public override CallListResponseStatus Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "queued" => CallListResponseStatus.Queued,
+            "ringing" => CallListResponseStatus.Ringing,
+            "in_progress" => CallListResponseStatus.InProgress,
+            "completed" => CallListResponseStatus.Completed,
+            "failed" => CallListResponseStatus.Failed,
+            "busy" => CallListResponseStatus.Busy,
+            "no_answer" => CallListResponseStatus.NoAnswer,
+            "canceled" => CallListResponseStatus.Canceled,
+            _ => (CallListResponseStatus)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallListResponseStatus value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallListResponseStatus.Queued => "queued",
+                CallListResponseStatus.Ringing => "ringing",
+                CallListResponseStatus.InProgress => "in_progress",
+                CallListResponseStatus.Completed => "completed",
+                CallListResponseStatus.Failed => "failed",
+                CallListResponseStatus.Busy => "busy",
+                CallListResponseStatus.NoAnswer => "no_answer",
+                CallListResponseStatus.Canceled => "canceled",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// A single turn in a voice call transcript.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<CallListResponseTranscript, CallListResponseTranscriptFromRaw>)
+)]
+public sealed record class CallListResponseTranscript : JsonModel
+{
+    /// <summary>
+    /// Who produced the turn. `tool` records a tool call the agent made during the conversation.
+    /// </summary>
+    public required ApiEnum<string, CallListResponseTranscriptRole> Role
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, CallListResponseTranscriptRole>>(
+                "role"
+            );
+        }
+        init { this._rawData.Set("role", value); }
+    }
+
+    /// <summary>
+    /// Ordinal position of the turn within the call, starting at 0.
+    /// </summary>
+    public required long Seq
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("seq");
+        }
+        init { this._rawData.Set("seq", value); }
+    }
+
+    /// <summary>
+    /// Transcribed speech for `user` and `assistant` turns, or a JSON summary of
+    /// the tool call for `tool` turns.
+    /// </summary>
+    public required string Text
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("text");
+        }
+        init { this._rawData.Set("text", value); }
+    }
+
+    /// <summary>
+    /// When the turn ended.
+    /// </summary>
+    public DateTimeOffset? EndedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("endedAt");
+        }
+        init { this._rawData.Set("endedAt", value); }
+    }
+
+    /// <summary>
+    /// When the turn started.
+    /// </summary>
+    public DateTimeOffset? StartedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("startedAt");
+        }
+        init { this._rawData.Set("startedAt", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Role.Validate();
+        _ = this.Seq;
+        _ = this.Text;
+        _ = this.EndedAt;
+        _ = this.StartedAt;
+    }
+
+    public CallListResponseTranscript() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallListResponseTranscript(CallListResponseTranscript callListResponseTranscript)
+        : base(callListResponseTranscript) { }
+#pragma warning restore CS8618
+
+    public CallListResponseTranscript(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallListResponseTranscript(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallListResponseTranscriptFromRaw.FromRawUnchecked"/>
+    public static CallListResponseTranscript FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class CallListResponseTranscriptFromRaw : IFromRawJson<CallListResponseTranscript>
+{
+    /// <inheritdoc/>
+    public CallListResponseTranscript FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => CallListResponseTranscript.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Who produced the turn. `tool` records a tool call the agent made during the conversation.
+/// </summary>
+[JsonConverter(typeof(CallListResponseTranscriptRoleConverter))]
+public enum CallListResponseTranscriptRole
+{
+    User,
+    Assistant,
+    Tool,
+}
+
+sealed class CallListResponseTranscriptRoleConverter : JsonConverter<CallListResponseTranscriptRole>
+{
+    public override CallListResponseTranscriptRole Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "user" => CallListResponseTranscriptRole.User,
+            "assistant" => CallListResponseTranscriptRole.Assistant,
+            "tool" => CallListResponseTranscriptRole.Tool,
+            _ => (CallListResponseTranscriptRole)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallListResponseTranscriptRole value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallListResponseTranscriptRole.User => "user",
+                CallListResponseTranscriptRole.Assistant => "assistant",
+                CallListResponseTranscriptRole.Tool => "tool",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Calls/CallRetrieveParams.cs b/src/Zavudev/Models/Calls/CallRetrieveParams.cs
new file mode 100644
index 0000000..ae170ec
--- /dev/null
+++ b/src/Zavudev/Models/Calls/CallRetrieveParams.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Calls;
+
+/// <summary>
+/// Retrieve a single voice call, including its full transcript once the conversation
+/// has produced turns.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class CallRetrieveParams : ParamsBase
+{
+    public string? CallID { get; init; }
+
+    public CallRetrieveParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallRetrieveParams(CallRetrieveParams callRetrieveParams)
+        : base(callRetrieveParams)
+    {
+        this.CallID = callRetrieveParams.CallID;
+    }
+#pragma warning restore CS8618
+
+    public CallRetrieveParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallRetrieveParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string callID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.CallID = callID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static CallRetrieveParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string callID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            callID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["CallID"] = JsonSerializer.SerializeToElement(this.CallID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(CallRetrieveParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.CallID?.Equals(other.CallID) ?? other.CallID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/') + string.Format("/v1/calls/{0}", this.CallID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Calls/CallRetrieveResponse.cs b/src/Zavudev/Models/Calls/CallRetrieveResponse.cs
new file mode 100644
index 0000000..9cc95d4
--- /dev/null
+++ b/src/Zavudev/Models/Calls/CallRetrieveResponse.cs
@@ -0,0 +1,669 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Calls;
+
+[JsonConverter(typeof(JsonModelConverter<CallRetrieveResponse, CallRetrieveResponseFromRaw>))]
+public sealed record class CallRetrieveResponse : JsonModel
+{
+    public required CallRetrieveResponseCall Call
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<CallRetrieveResponseCall>("call");
+        }
+        init { this._rawData.Set("call", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Call.Validate();
+    }
+
+    public CallRetrieveResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallRetrieveResponse(CallRetrieveResponse callRetrieveResponse)
+        : base(callRetrieveResponse) { }
+#pragma warning restore CS8618
+
+    public CallRetrieveResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallRetrieveResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallRetrieveResponseFromRaw.FromRawUnchecked"/>
+    public static CallRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public CallRetrieveResponse(CallRetrieveResponseCall call)
+        : this()
+    {
+        this.Call = call;
+    }
+}
+
+class CallRetrieveResponseFromRaw : IFromRawJson<CallRetrieveResponse>
+{
+    /// <inheritdoc/>
+    public CallRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => CallRetrieveResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(
+    typeof(JsonModelConverter<CallRetrieveResponseCall, CallRetrieveResponseCallFromRaw>)
+)]
+public sealed record class CallRetrieveResponseCall : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+    /// </summary>
+    public required ApiEnum<string, CallRetrieveResponseCallDirection> Direction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, CallRetrieveResponseCallDirection>
+            >("direction");
+        }
+        init { this._rawData.Set("direction", value); }
+    }
+
+    /// <summary>
+    /// Caller phone number in E.164 format. Your sender's number for outbound calls;
+    /// the caller's number for inbound calls.
+    /// </summary>
+    public required string From
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("from");
+        }
+        init { this._rawData.Set("from", value); }
+    }
+
+    /// <summary>
+    /// Lifecycle status of a voice call. - `queued`: outbound call created, not
+    /// yet dialing. - `ringing`: dialing (outbound) or received and ringing (inbound).
+    /// - `in_progress`: answered, the agent is connected. - `completed`: ended after
+    /// a conversation. - `failed`: could not be completed. - `busy`: the line was
+    /// busy. - `no_answer`: rang but was not answered. - `canceled`: canceled before
+    /// it was answered.
+    /// </summary>
+    public required ApiEnum<string, CallRetrieveResponseCallStatus> Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, CallRetrieveResponseCallStatus>>(
+                "status"
+            );
+        }
+        init { this._rawData.Set("status", value); }
+    }
+
+    /// <summary>
+    /// Callee phone number in E.164 format.
+    /// </summary>
+    public required string To
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("to");
+        }
+        init { this._rawData.Set("to", value); }
+    }
+
+    /// <summary>
+    /// When the call was answered.
+    /// </summary>
+    public DateTimeOffset? AnsweredAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("answeredAt");
+        }
+        init { this._rawData.Set("answeredAt", value); }
+    }
+
+    /// <summary>
+    /// Total cost of the call in USD, combining the managed voice pipeline per-minute
+    /// charge and telephony. Available once the call has ended.
+    /// </summary>
+    public double? Cost
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<double>("cost");
+        }
+        init { this._rawData.Set("cost", value); }
+    }
+
+    /// <summary>
+    /// Billable talk time in seconds, measured from answer to hangup.
+    /// </summary>
+    public long? DurationSeconds
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("durationSeconds");
+        }
+        init { this._rawData.Set("durationSeconds", value); }
+    }
+
+    /// <summary>
+    /// When the call ended.
+    /// </summary>
+    public DateTimeOffset? EndedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("endedAt");
+        }
+        init { this._rawData.Set("endedAt", value); }
+    }
+
+    /// <summary>
+    /// Why the call ended (e.g. `agent_ended`, `max_duration`, `transfer`, `hangup`).
+    /// Present once the call is no longer active.
+    /// </summary>
+    public string? EndReason
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("endReason");
+        }
+        init { this._rawData.Set("endReason", value); }
+    }
+
+    /// <summary>
+    /// Arbitrary metadata you attached when creating the call.
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Metadata
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<FrozenDictionary<string, string>>("metadata");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<FrozenDictionary<string, string>?>(
+                "metadata",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Ordered transcript of the call. Included when retrieving a single call; omitted
+    /// from list responses.
+    /// </summary>
+    public IReadOnlyList<CallRetrieveResponseCallTranscript>? Transcript
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<
+                ImmutableArray<CallRetrieveResponseCallTranscript>
+            >("transcript");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<ImmutableArray<CallRetrieveResponseCallTranscript>?>(
+                "transcript",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Number of conversation turns exchanged during the call.
+    /// </summary>
+    public long? TurnCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("turnCount");
+        }
+        init { this._rawData.Set("turnCount", value); }
+    }
+
+    public DateTimeOffset? UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("updatedAt");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("updatedAt", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.CreatedAt;
+        this.Direction.Validate();
+        _ = this.From;
+        this.Status.Validate();
+        _ = this.To;
+        _ = this.AnsweredAt;
+        _ = this.Cost;
+        _ = this.DurationSeconds;
+        _ = this.EndedAt;
+        _ = this.EndReason;
+        _ = this.Metadata;
+        foreach (var item in this.Transcript ?? [])
+        {
+            item.Validate();
+        }
+        _ = this.TurnCount;
+        _ = this.UpdatedAt;
+    }
+
+    public CallRetrieveResponseCall() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallRetrieveResponseCall(CallRetrieveResponseCall callRetrieveResponseCall)
+        : base(callRetrieveResponseCall) { }
+#pragma warning restore CS8618
+
+    public CallRetrieveResponseCall(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallRetrieveResponseCall(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallRetrieveResponseCallFromRaw.FromRawUnchecked"/>
+    public static CallRetrieveResponseCall FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class CallRetrieveResponseCallFromRaw : IFromRawJson<CallRetrieveResponseCall>
+{
+    /// <inheritdoc/>
+    public CallRetrieveResponseCall FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => CallRetrieveResponseCall.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Whether the call was placed by Zavu (outbound) or received from a caller (inbound).
+/// </summary>
+[JsonConverter(typeof(CallRetrieveResponseCallDirectionConverter))]
+public enum CallRetrieveResponseCallDirection
+{
+    Inbound,
+    Outbound,
+}
+
+sealed class CallRetrieveResponseCallDirectionConverter
+    : JsonConverter<CallRetrieveResponseCallDirection>
+{
+    public override CallRetrieveResponseCallDirection Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "inbound" => CallRetrieveResponseCallDirection.Inbound,
+            "outbound" => CallRetrieveResponseCallDirection.Outbound,
+            _ => (CallRetrieveResponseCallDirection)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallRetrieveResponseCallDirection value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallRetrieveResponseCallDirection.Inbound => "inbound",
+                CallRetrieveResponseCallDirection.Outbound => "outbound",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Lifecycle status of a voice call. - `queued`: outbound call created, not yet dialing.
+/// - `ringing`: dialing (outbound) or received and ringing (inbound). - `in_progress`:
+/// answered, the agent is connected. - `completed`: ended after a conversation.
+/// - `failed`: could not be completed. - `busy`: the line was busy. - `no_answer`:
+/// rang but was not answered. - `canceled`: canceled before it was answered.
+/// </summary>
+[JsonConverter(typeof(CallRetrieveResponseCallStatusConverter))]
+public enum CallRetrieveResponseCallStatus
+{
+    Queued,
+    Ringing,
+    InProgress,
+    Completed,
+    Failed,
+    Busy,
+    NoAnswer,
+    Canceled,
+}
+
+sealed class CallRetrieveResponseCallStatusConverter : JsonConverter<CallRetrieveResponseCallStatus>
+{
+    public override CallRetrieveResponseCallStatus Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "queued" => CallRetrieveResponseCallStatus.Queued,
+            "ringing" => CallRetrieveResponseCallStatus.Ringing,
+            "in_progress" => CallRetrieveResponseCallStatus.InProgress,
+            "completed" => CallRetrieveResponseCallStatus.Completed,
+            "failed" => CallRetrieveResponseCallStatus.Failed,
+            "busy" => CallRetrieveResponseCallStatus.Busy,
+            "no_answer" => CallRetrieveResponseCallStatus.NoAnswer,
+            "canceled" => CallRetrieveResponseCallStatus.Canceled,
+            _ => (CallRetrieveResponseCallStatus)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallRetrieveResponseCallStatus value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallRetrieveResponseCallStatus.Queued => "queued",
+                CallRetrieveResponseCallStatus.Ringing => "ringing",
+                CallRetrieveResponseCallStatus.InProgress => "in_progress",
+                CallRetrieveResponseCallStatus.Completed => "completed",
+                CallRetrieveResponseCallStatus.Failed => "failed",
+                CallRetrieveResponseCallStatus.Busy => "busy",
+                CallRetrieveResponseCallStatus.NoAnswer => "no_answer",
+                CallRetrieveResponseCallStatus.Canceled => "canceled",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// A single turn in a voice call transcript.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<
+        CallRetrieveResponseCallTranscript,
+        CallRetrieveResponseCallTranscriptFromRaw
+    >)
+)]
+public sealed record class CallRetrieveResponseCallTranscript : JsonModel
+{
+    /// <summary>
+    /// Who produced the turn. `tool` records a tool call the agent made during the conversation.
+    /// </summary>
+    public required ApiEnum<string, CallRetrieveResponseCallTranscriptRole> Role
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, CallRetrieveResponseCallTranscriptRole>
+            >("role");
+        }
+        init { this._rawData.Set("role", value); }
+    }
+
+    /// <summary>
+    /// Ordinal position of the turn within the call, starting at 0.
+    /// </summary>
+    public required long Seq
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("seq");
+        }
+        init { this._rawData.Set("seq", value); }
+    }
+
+    /// <summary>
+    /// Transcribed speech for `user` and `assistant` turns, or a JSON summary of
+    /// the tool call for `tool` turns.
+    /// </summary>
+    public required string Text
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("text");
+        }
+        init { this._rawData.Set("text", value); }
+    }
+
+    /// <summary>
+    /// When the turn ended.
+    /// </summary>
+    public DateTimeOffset? EndedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("endedAt");
+        }
+        init { this._rawData.Set("endedAt", value); }
+    }
+
+    /// <summary>
+    /// When the turn started.
+    /// </summary>
+    public DateTimeOffset? StartedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("startedAt");
+        }
+        init { this._rawData.Set("startedAt", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Role.Validate();
+        _ = this.Seq;
+        _ = this.Text;
+        _ = this.EndedAt;
+        _ = this.StartedAt;
+    }
+
+    public CallRetrieveResponseCallTranscript() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public CallRetrieveResponseCallTranscript(
+        CallRetrieveResponseCallTranscript callRetrieveResponseCallTranscript
+    )
+        : base(callRetrieveResponseCallTranscript) { }
+#pragma warning restore CS8618
+
+    public CallRetrieveResponseCallTranscript(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    CallRetrieveResponseCallTranscript(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="CallRetrieveResponseCallTranscriptFromRaw.FromRawUnchecked"/>
+    public static CallRetrieveResponseCallTranscript FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class CallRetrieveResponseCallTranscriptFromRaw : IFromRawJson<CallRetrieveResponseCallTranscript>
+{
+    /// <inheritdoc/>
+    public CallRetrieveResponseCallTranscript FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => CallRetrieveResponseCallTranscript.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Who produced the turn. `tool` records a tool call the agent made during the conversation.
+/// </summary>
+[JsonConverter(typeof(CallRetrieveResponseCallTranscriptRoleConverter))]
+public enum CallRetrieveResponseCallTranscriptRole
+{
+    User,
+    Assistant,
+    Tool,
+}
+
+sealed class CallRetrieveResponseCallTranscriptRoleConverter
+    : JsonConverter<CallRetrieveResponseCallTranscriptRole>
+{
+    public override CallRetrieveResponseCallTranscriptRole Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "user" => CallRetrieveResponseCallTranscriptRole.User,
+            "assistant" => CallRetrieveResponseCallTranscriptRole.Assistant,
+            "tool" => CallRetrieveResponseCallTranscriptRole.Tool,
+            _ => (CallRetrieveResponseCallTranscriptRole)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        CallRetrieveResponseCallTranscriptRole value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                CallRetrieveResponseCallTranscriptRole.User => "user",
+                CallRetrieveResponseCallTranscriptRole.Assistant => "assistant",
+                CallRetrieveResponseCallTranscriptRole.Tool => "tool",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Contacts/Contact.cs b/src/Zavudev/Models/Contacts/Contact.cs
index b4cfe2e..0789a5f 100644
--- a/src/Zavudev/Models/Contacts/Contact.cs
+++ b/src/Zavudev/Models/Contacts/Contact.cs
@@ -243,27 +243,6 @@ public string? ProfileName
         init { this._rawData.Set("profileName", value); }
     }
 
-    /// <summary>
-    /// ID of a contact suggested for merging.
-    /// </summary>
-    public string? SuggestedMergeWith
-    {
-        get
-        {
-            this._rawData.Freeze();
-            return this._rawData.GetNullableClass<string>("suggestedMergeWith");
-        }
-        init
-        {
-            if (value == null)
-            {
-                return;
-            }
-
-            this._rawData.Set("suggestedMergeWith", value);
-        }
-    }
-
     public DateTimeOffset? UpdatedAt
     {
         get
@@ -301,7 +280,6 @@ public override void Validate()
         _ = this.PrimaryEmail;
         _ = this.PrimaryPhone;
         _ = this.ProfileName;
-        _ = this.SuggestedMergeWith;
         _ = this.UpdatedAt;
     }
 
diff --git a/src/Zavudev/Models/Contacts/ContactListParams.cs b/src/Zavudev/Models/Contacts/ContactListParams.cs
index f2ec168..96f9809 100644
--- a/src/Zavudev/Models/Contacts/ContactListParams.cs
+++ b/src/Zavudev/Models/Contacts/ContactListParams.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Frozen;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Http;
 using System.Text.Json;
@@ -17,6 +18,9 @@ namespace Zavudev.Models.Contacts;
 /// </summary>
 public record class ContactListParams : ParamsBase
 {
+    /// <summary>
+    /// Opaque cursor from a previous response's `nextCursor`. Do not construct it.
+    /// </summary>
     public string? Cursor
     {
         get
@@ -53,6 +57,9 @@ public long? Limit
         }
     }
 
+    /// <summary>
+    /// Exact match on the contact's primary phone number, in E.164.
+    /// </summary>
     public string? PhoneNumber
     {
         get
@@ -71,6 +78,65 @@ public string? PhoneNumber
         }
     }
 
+    /// <summary>
+    /// Free-text match over the contact's name (`displayName` and the WhatsApp profile
+    /// name), phone numbers and email addresses. Case- and accent-insensitive. A
+    /// phone number matches on a trailing fragment too, so `5551234` finds `+14155551234`.
+    ///
+    /// <para>Contacts created automatically from an inbound message have no `displayName`
+    /// — they are matched by their identifier until you set one with `PATCH /v1/contacts/{contactId}`.</para>
+    ///
+    /// <para>Results come back in relevance order rather than newest-first. `cursor`
+    /// is opaque in both modes; pass back exactly what the previous response returned,
+    /// and start a new pagination run when the search term changes.</para>
+    /// </summary>
+    public string? Search
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<string>("search");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("search", value);
+        }
+    }
+
+    /// <summary>
+    /// Tag name. Repeatable: `?tag=vip&amp;tag=chile` returns contacts carrying **every**
+    /// tag given, not any of them — the same rule the dashboard filter applies.
+    ///
+    /// <para>Tags are matched by name, case-insensitively. An unknown tag returns
+    /// 400 rather than being ignored, because a typo that silently matched every
+    /// contact would be a worse answer than an error.</para>
+    /// </summary>
+    public IReadOnlyList<string>? Tag
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableStruct<ImmutableArray<string>>("tag");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set<ImmutableArray<string>?>(
+                "tag",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
     public ContactListParams() { }
 
 #pragma warning disable CS8618
diff --git a/src/Zavudev/Models/Contacts/ContactUpdateParams.cs b/src/Zavudev/Models/Contacts/ContactUpdateParams.cs
index 1e810ff..5a67765 100644
--- a/src/Zavudev/Models/Contacts/ContactUpdateParams.cs
+++ b/src/Zavudev/Models/Contacts/ContactUpdateParams.cs
@@ -43,6 +43,21 @@ public ApiEnum<string, DefaultChannel>? DefaultChannel
         init { this._rawBodyData.Set("defaultChannel", value); }
     }
 
+    /// <summary>
+    /// Human-readable name for this contact. Set to null to clear it and fall back
+    /// to the contact's identifier. Contacts created automatically from an inbound
+    /// message have no display name until you set one.
+    /// </summary>
+    public string? DisplayName
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("displayName");
+        }
+        init { this._rawBodyData.Set("displayName", value); }
+    }
+
     public IReadOnlyDictionary<string, string>? Metadata
     {
         get
diff --git a/src/Zavudev/Models/Conversations/ConversationListMessagesPage.cs b/src/Zavudev/Models/Conversations/ConversationListMessagesPage.cs
new file mode 100644
index 0000000..cf54328
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationListMessagesPage.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Messages;
+using Zavudev.Services;
+
+namespace Zavudev.Models.Conversations;
+
+/// <summary>
+/// A single page from the paginated endpoint that <see cref="IConversationService.ListMessages(ConversationListMessagesParams, CancellationToken)"/> queries.
+/// </summary>
+public sealed class ConversationListMessagesPage(
+    IConversationServiceWithRawResponse service,
+    ConversationListMessagesParams parameters,
+    ConversationListMessagesPageResponse response
+) : IPage<Message>
+{
+    /// <inheritdoc/>
+    public IReadOnlyList<Message> Items
+    {
+        get { return response.Items; }
+    }
+
+    /// <inheritdoc/>
+    public bool HasNext()
+    {
+        try
+        {
+            return this.Items.Count > 0 && response.NextCursor != null;
+        }
+        catch (ZavudevInvalidDataException)
+        {
+            // If accessing the response data to determine if there's a next page failed, then just
+            // assume there's no next page.
+            return false;
+        }
+    }
+
+    /// <inheritdoc/>
+    async Task<IPage<Message>> IPage<Message>.Next(CancellationToken cancellationToken) =>
+        await this.Next(cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc cref="IPage{T}.Next"/>
+    public async Task<ConversationListMessagesPage> Next(
+        CancellationToken cancellationToken = default
+    )
+    {
+        var nextCursor =
+            response.NextCursor ?? throw new InvalidOperationException("Cannot request next page");
+        using var nextResponse = await service
+            .ListMessages(parameters with { Cursor = nextCursor }, cancellationToken)
+            .ConfigureAwait(false);
+        return await nextResponse.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public void Validate()
+    {
+        response.Validate();
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(JsonSerializer.SerializeToElement(this.Items)),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public override bool Equals(object? obj)
+    {
+        if (obj is not ConversationListMessagesPage other)
+        {
+            return false;
+        }
+
+        return Enumerable.SequenceEqual(this.Items, other.Items);
+    }
+
+    public override int GetHashCode() => 0;
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationListMessagesPageResponse.cs b/src/Zavudev/Models/Conversations/ConversationListMessagesPageResponse.cs
new file mode 100644
index 0000000..1d4ff63
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationListMessagesPageResponse.cs
@@ -0,0 +1,102 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Models.Messages;
+
+namespace Zavudev.Models.Conversations;
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        ConversationListMessagesPageResponse,
+        ConversationListMessagesPageResponseFromRaw
+    >)
+)]
+public sealed record class ConversationListMessagesPageResponse : JsonModel
+{
+    public required IReadOnlyList<Message> Items
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<Message>>("items");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<Message>>(
+                "items",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public string? NextCursor
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("nextCursor");
+        }
+        init { this._rawData.Set("nextCursor", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Items)
+        {
+            item.Validate();
+        }
+        _ = this.NextCursor;
+    }
+
+    public ConversationListMessagesPageResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationListMessagesPageResponse(
+        ConversationListMessagesPageResponse conversationListMessagesPageResponse
+    )
+        : base(conversationListMessagesPageResponse) { }
+#pragma warning restore CS8618
+
+    public ConversationListMessagesPageResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationListMessagesPageResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationListMessagesPageResponseFromRaw.FromRawUnchecked"/>
+    public static ConversationListMessagesPageResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public ConversationListMessagesPageResponse(IReadOnlyList<Message> items)
+        : this()
+    {
+        this.Items = items;
+    }
+}
+
+class ConversationListMessagesPageResponseFromRaw
+    : IFromRawJson<ConversationListMessagesPageResponse>
+{
+    /// <inheritdoc/>
+    public ConversationListMessagesPageResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationListMessagesPageResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationListMessagesParams.cs b/src/Zavudev/Models/Conversations/ConversationListMessagesParams.cs
new file mode 100644
index 0000000..9c8ab0f
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationListMessagesParams.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Conversations;
+
+/// <summary>
+/// Messages in this thread, newest first, across every channel it has carried. Reply
+/// with `POST /v1/messages`, passing the conversation's `senderId` as the `Zavu-Sender`
+/// header so the answer leaves from the number the contact already knows.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class ConversationListMessagesParams : ParamsBase
+{
+    public string? ConversationID { get; init; }
+
+    /// <summary>
+    /// Opaque cursor from a previous response's `nextCursor`.
+    /// </summary>
+    public string? Cursor
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<string>("cursor");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("cursor", value);
+        }
+    }
+
+    public long? Limit
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableStruct<long>("limit");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("limit", value);
+        }
+    }
+
+    public ConversationListMessagesParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationListMessagesParams(
+        ConversationListMessagesParams conversationListMessagesParams
+    )
+        : base(conversationListMessagesParams)
+    {
+        this.ConversationID = conversationListMessagesParams.ConversationID;
+    }
+#pragma warning restore CS8618
+
+    public ConversationListMessagesParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationListMessagesParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string conversationID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.ConversationID = conversationID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static ConversationListMessagesParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string conversationID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            conversationID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["ConversationID"] = JsonSerializer.SerializeToElement(this.ConversationID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(ConversationListMessagesParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.ConversationID?.Equals(other.ConversationID) ?? other.ConversationID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/conversations/{0}/messages", this.ConversationID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationListPage.cs b/src/Zavudev/Models/Conversations/ConversationListPage.cs
new file mode 100644
index 0000000..4130aa2
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationListPage.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Services;
+
+namespace Zavudev.Models.Conversations;
+
+/// <summary>
+/// A single page from the paginated endpoint that <see cref="IConversationService.List(ConversationListParams, CancellationToken)"/> queries.
+/// </summary>
+public sealed class ConversationListPage(
+    IConversationServiceWithRawResponse service,
+    ConversationListParams parameters,
+    ConversationListPageResponse response
+) : IPage<ConversationListResponse>
+{
+    /// <inheritdoc/>
+    public IReadOnlyList<ConversationListResponse> Items
+    {
+        get { return response.Items; }
+    }
+
+    /// <inheritdoc/>
+    public bool HasNext()
+    {
+        try
+        {
+            return this.Items.Count > 0 && response.NextCursor != null;
+        }
+        catch (ZavudevInvalidDataException)
+        {
+            // If accessing the response data to determine if there's a next page failed, then just
+            // assume there's no next page.
+            return false;
+        }
+    }
+
+    /// <inheritdoc/>
+    async Task<IPage<ConversationListResponse>> IPage<ConversationListResponse>.Next(
+        CancellationToken cancellationToken
+    ) => await this.Next(cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc cref="IPage{T}.Next"/>
+    public async Task<ConversationListPage> Next(CancellationToken cancellationToken = default)
+    {
+        var nextCursor =
+            response.NextCursor ?? throw new InvalidOperationException("Cannot request next page");
+        using var nextResponse = await service
+            .List(parameters with { Cursor = nextCursor }, cancellationToken)
+            .ConfigureAwait(false);
+        return await nextResponse.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public void Validate()
+    {
+        response.Validate();
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(JsonSerializer.SerializeToElement(this.Items)),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public override bool Equals(object? obj)
+    {
+        if (obj is not ConversationListPage other)
+        {
+            return false;
+        }
+
+        return Enumerable.SequenceEqual(this.Items, other.Items);
+    }
+
+    public override int GetHashCode() => 0;
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationListPageResponse.cs b/src/Zavudev/Models/Conversations/ConversationListPageResponse.cs
new file mode 100644
index 0000000..ec07676
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationListPageResponse.cs
@@ -0,0 +1,97 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Conversations;
+
+[JsonConverter(
+    typeof(JsonModelConverter<ConversationListPageResponse, ConversationListPageResponseFromRaw>)
+)]
+public sealed record class ConversationListPageResponse : JsonModel
+{
+    public required IReadOnlyList<ConversationListResponse> Items
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<ConversationListResponse>>(
+                "items"
+            );
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<ConversationListResponse>>(
+                "items",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public string? NextCursor
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("nextCursor");
+        }
+        init { this._rawData.Set("nextCursor", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Items)
+        {
+            item.Validate();
+        }
+        _ = this.NextCursor;
+    }
+
+    public ConversationListPageResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationListPageResponse(ConversationListPageResponse conversationListPageResponse)
+        : base(conversationListPageResponse) { }
+#pragma warning restore CS8618
+
+    public ConversationListPageResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationListPageResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationListPageResponseFromRaw.FromRawUnchecked"/>
+    public static ConversationListPageResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public ConversationListPageResponse(IReadOnlyList<ConversationListResponse> items)
+        : this()
+    {
+        this.Items = items;
+    }
+}
+
+class ConversationListPageResponseFromRaw : IFromRawJson<ConversationListPageResponse>
+{
+    /// <inheritdoc/>
+    public ConversationListPageResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationListPageResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationListParams.cs b/src/Zavudev/Models/Conversations/ConversationListParams.cs
new file mode 100644
index 0000000..cb969d8
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationListParams.cs
@@ -0,0 +1,291 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Conversations;
+
+/// <summary>
+/// List inbox threads, most recently active first. A conversation groups every message
+/// with one contact across channels, which is what you need to build an inbox: `GET
+/// /v1/messages` returns a flat log with no thread to hang it on.
+///
+/// <para>Use `senderId` to scope the list to a single number, and `channel` to keep
+/// only threads that have carried that channel.</para>
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class ConversationListParams : ParamsBase
+{
+    /// <summary>
+    /// Keep only threads that have carried this channel.
+    /// </summary>
+    public ApiEnum<string, Channel>? Channel
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<ApiEnum<string, Channel>>("channel");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("channel", value);
+        }
+    }
+
+    /// <summary>
+    /// Opaque cursor from a previous response's `nextCursor`. Do not construct it.
+    /// </summary>
+    public string? Cursor
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<string>("cursor");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("cursor", value);
+        }
+    }
+
+    public long? Limit
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableStruct<long>("limit");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("limit", value);
+        }
+    }
+
+    /// <summary>
+    /// Search threads by identity: phone number (any format — `+1 (555) 123-4567`
+    /// and `15551234567` both match), email address (full or local part), WhatsApp
+    /// group subject, WhatsApp username, or BSUID. Matching is by whole word, with
+    /// prefix matching on the last term, so `mar` finds `maria@example.com` and
+    /// `+1555` finds `+15551234567`; a fragment from the middle or end of a number
+    /// (`4567`) does not match.
+    ///
+    /// <para>It does **not** search message bodies — only who the thread is with.</para>
+    ///
+    /// <para>Results come back ranked by relevance rather than by recency, so the
+    /// usual "most recently active first" ordering does not apply while `q` is set.
+    /// `senderId` and `channel` still narrow the results, and `cursor` paginates
+    /// them as usual. An empty or whitespace-only `q` returns no items rather than
+    /// the full list.</para>
+    /// </summary>
+    public string? Search
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<string>("search");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("search", value);
+        }
+    }
+
+    /// <summary>
+    /// Keep only threads last handled by this sender.
+    /// </summary>
+    public string? SenderID
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableClass<string>("senderId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("senderId", value);
+        }
+    }
+
+    public ConversationListParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationListParams(ConversationListParams conversationListParams)
+        : base(conversationListParams) { }
+#pragma warning restore CS8618
+
+    public ConversationListParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationListParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static ConversationListParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(ConversationListParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/conversations")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
+
+/// <summary>
+/// Keep only threads that have carried this channel.
+/// </summary>
+[JsonConverter(typeof(ChannelConverter))]
+public enum Channel
+{
+    Sms,
+    SmsOneway,
+    Whatsapp,
+    Email,
+    Telegram,
+    Instagram,
+    Messenger,
+    Voice,
+}
+
+sealed class ChannelConverter : JsonConverter<Channel>
+{
+    public override Channel Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "sms" => Channel.Sms,
+            "sms_oneway" => Channel.SmsOneway,
+            "whatsapp" => Channel.Whatsapp,
+            "email" => Channel.Email,
+            "telegram" => Channel.Telegram,
+            "instagram" => Channel.Instagram,
+            "messenger" => Channel.Messenger,
+            "voice" => Channel.Voice,
+            _ => (Channel)(-1),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, Channel value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Channel.Sms => "sms",
+                Channel.SmsOneway => "sms_oneway",
+                Channel.Whatsapp => "whatsapp",
+                Channel.Email => "email",
+                Channel.Telegram => "telegram",
+                Channel.Instagram => "instagram",
+                Channel.Messenger => "messenger",
+                Channel.Voice => "voice",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationListResponse.cs b/src/Zavudev/Models/Conversations/ConversationListResponse.cs
new file mode 100644
index 0000000..37dccad
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationListResponse.cs
@@ -0,0 +1,658 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Messages;
+
+namespace Zavudev.Models.Conversations;
+
+/// <summary>
+/// An inbox thread with one contact. A conversation groups every message exchanged
+/// with that contact across channels, so a contact who writes on WhatsApp and later
+/// by email stays in one thread.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<ConversationListResponse, ConversationListResponseFromRaw>)
+)]
+public sealed record class ConversationListResponse : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    /// <summary>
+    /// Every channel this thread has carried messages on.
+    /// </summary>
+    public required IReadOnlyList<string> Channels
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<string>>("channels");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<string>>(
+                "channels",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// The key this thread is filed under: a phone number in E.164, a WhatsApp business-scoped
+    /// user ID (BSUID), a numeric chat ID (Telegram/Instagram/Messenger), or a group
+    /// JID. It is not always a phone number, so do not parse it as one.
+    /// </summary>
+    public required string ContactIdentifier
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("contactIdentifier");
+        }
+        init { this._rawData.Set("contactIdentifier", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Denormalized preview of the most recent message, so a thread list needs no
+    /// extra fetch.
+    /// </summary>
+    public required ConversationListResponseLastMessage LastMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ConversationListResponseLastMessage>(
+                "lastMessage"
+            );
+        }
+        init { this._rawData.Set("lastMessage", value); }
+    }
+
+    public required long MessageCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("messageCount");
+        }
+        init { this._rawData.Set("messageCount", value); }
+    }
+
+    /// <summary>
+    /// Inbound messages not yet marked read. Reset with POST /v1/conversations/{conversationId}/read.
+    /// </summary>
+    public required long UnreadCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("unreadCount");
+        }
+        init { this._rawData.Set("unreadCount", value); }
+    }
+
+    public required DateTimeOffset UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("updatedAt");
+        }
+        init { this._rawData.Set("updatedAt", value); }
+    }
+
+    /// <summary>
+    /// ID of the contact this thread belongs to. Absent on group threads and on
+    /// threads whose contact has not been resolved yet.
+    /// </summary>
+    public string? ContactID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("contactId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("contactId", value);
+        }
+    }
+
+    /// <summary>
+    /// Email address of the thread, when the contact was reached by email.
+    /// </summary>
+    public string? Email
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("email");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("email", value);
+        }
+    }
+
+    /// <summary>
+    /// Present when the thread is a group chat rather than a one-to-one conversation.
+    /// </summary>
+    public ConversationListResponseGroup? Group
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<ConversationListResponseGroup>("group");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("group", value);
+        }
+    }
+
+    /// <summary>
+    /// Sender that last handled this thread. Use it as the `Zavu-Sender` header
+    /// when replying so the answer leaves from the same number the contact knows.
+    /// </summary>
+    public string? SenderID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("senderId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("senderId", value);
+        }
+    }
+
+    /// <summary>
+    /// WhatsApp identity, present when the contact adopted a username.
+    /// </summary>
+    public ConversationListResponseWhatsapp? Whatsapp
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<ConversationListResponseWhatsapp>("whatsapp");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("whatsapp", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.Channels;
+        _ = this.ContactIdentifier;
+        _ = this.CreatedAt;
+        this.LastMessage.Validate();
+        _ = this.MessageCount;
+        _ = this.UnreadCount;
+        _ = this.UpdatedAt;
+        _ = this.ContactID;
+        _ = this.Email;
+        this.Group?.Validate();
+        _ = this.SenderID;
+        this.Whatsapp?.Validate();
+    }
+
+    public ConversationListResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationListResponse(ConversationListResponse conversationListResponse)
+        : base(conversationListResponse) { }
+#pragma warning restore CS8618
+
+    public ConversationListResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationListResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationListResponseFromRaw.FromRawUnchecked"/>
+    public static ConversationListResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ConversationListResponseFromRaw : IFromRawJson<ConversationListResponse>
+{
+    /// <inheritdoc/>
+    public ConversationListResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationListResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Denormalized preview of the most recent message, so a thread list needs no extra fetch.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<
+        ConversationListResponseLastMessage,
+        ConversationListResponseLastMessageFromRaw
+    >)
+)]
+public sealed record class ConversationListResponseLastMessage : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required DateTimeOffset At
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("at");
+        }
+        init { this._rawData.Set("at", value); }
+    }
+
+    /// <summary>
+    /// Delivery channel. Use 'auto' for intelligent routing.
+    /// </summary>
+    public required ApiEnum<string, MessageChannel> Channel
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, MessageChannel>>("channel");
+        }
+        init { this._rawData.Set("channel", value); }
+    }
+
+    public required ApiEnum<string, ConversationListResponseLastMessageDirection> Direction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, ConversationListResponseLastMessageDirection>
+            >("direction");
+        }
+        init { this._rawData.Set("direction", value); }
+    }
+
+    /// <summary>
+    /// Text or caption. Empty when the last message carried no text (e.g. media).
+    /// </summary>
+    public required string Text
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("text");
+        }
+        init { this._rawData.Set("text", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.At;
+        this.Channel.Validate();
+        this.Direction.Validate();
+        _ = this.Text;
+    }
+
+    public ConversationListResponseLastMessage() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationListResponseLastMessage(
+        ConversationListResponseLastMessage conversationListResponseLastMessage
+    )
+        : base(conversationListResponseLastMessage) { }
+#pragma warning restore CS8618
+
+    public ConversationListResponseLastMessage(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationListResponseLastMessage(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationListResponseLastMessageFromRaw.FromRawUnchecked"/>
+    public static ConversationListResponseLastMessage FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ConversationListResponseLastMessageFromRaw : IFromRawJson<ConversationListResponseLastMessage>
+{
+    /// <inheritdoc/>
+    public ConversationListResponseLastMessage FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationListResponseLastMessage.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(ConversationListResponseLastMessageDirectionConverter))]
+public enum ConversationListResponseLastMessageDirection
+{
+    Inbound,
+    Outbound,
+}
+
+sealed class ConversationListResponseLastMessageDirectionConverter
+    : JsonConverter<ConversationListResponseLastMessageDirection>
+{
+    public override ConversationListResponseLastMessageDirection Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "inbound" => ConversationListResponseLastMessageDirection.Inbound,
+            "outbound" => ConversationListResponseLastMessageDirection.Outbound,
+            _ => (ConversationListResponseLastMessageDirection)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        ConversationListResponseLastMessageDirection value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                ConversationListResponseLastMessageDirection.Inbound => "inbound",
+                ConversationListResponseLastMessageDirection.Outbound => "outbound",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Present when the thread is a group chat rather than a one-to-one conversation.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<ConversationListResponseGroup, ConversationListResponseGroupFromRaw>)
+)]
+public sealed record class ConversationListResponseGroup : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public long? ParticipantCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("participantCount");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("participantCount", value);
+        }
+    }
+
+    public string? Subject
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("subject");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("subject", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.ParticipantCount;
+        _ = this.Subject;
+    }
+
+    public ConversationListResponseGroup() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationListResponseGroup(
+        ConversationListResponseGroup conversationListResponseGroup
+    )
+        : base(conversationListResponseGroup) { }
+#pragma warning restore CS8618
+
+    public ConversationListResponseGroup(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationListResponseGroup(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationListResponseGroupFromRaw.FromRawUnchecked"/>
+    public static ConversationListResponseGroup FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public ConversationListResponseGroup(string id)
+        : this()
+    {
+        this.ID = id;
+    }
+}
+
+class ConversationListResponseGroupFromRaw : IFromRawJson<ConversationListResponseGroup>
+{
+    /// <inheritdoc/>
+    public ConversationListResponseGroup FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationListResponseGroup.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// WhatsApp identity, present when the contact adopted a username.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<
+        ConversationListResponseWhatsapp,
+        ConversationListResponseWhatsappFromRaw
+    >)
+)]
+public sealed record class ConversationListResponseWhatsapp : JsonModel
+{
+    /// <summary>
+    /// Business-scoped user ID. Can be used as `to` when sending.
+    /// </summary>
+    public string? Bsuid
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("bsuid");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("bsuid", value);
+        }
+    }
+
+    public string? Username
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("username");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("username", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Bsuid;
+        _ = this.Username;
+    }
+
+    public ConversationListResponseWhatsapp() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationListResponseWhatsapp(
+        ConversationListResponseWhatsapp conversationListResponseWhatsapp
+    )
+        : base(conversationListResponseWhatsapp) { }
+#pragma warning restore CS8618
+
+    public ConversationListResponseWhatsapp(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationListResponseWhatsapp(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationListResponseWhatsappFromRaw.FromRawUnchecked"/>
+    public static ConversationListResponseWhatsapp FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ConversationListResponseWhatsappFromRaw : IFromRawJson<ConversationListResponseWhatsapp>
+{
+    /// <inheritdoc/>
+    public ConversationListResponseWhatsapp FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationListResponseWhatsapp.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationMarkAsReadParams.cs b/src/Zavudev/Models/Conversations/ConversationMarkAsReadParams.cs
new file mode 100644
index 0000000..409c0c2
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationMarkAsReadParams.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Conversations;
+
+/// <summary>
+/// Reset the thread's `unreadCount` to zero. Marks the thread read in your own inbox
+/// only: it does not send a read receipt to the contact.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class ConversationMarkAsReadParams : ParamsBase
+{
+    public string? ConversationID { get; init; }
+
+    public ConversationMarkAsReadParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationMarkAsReadParams(ConversationMarkAsReadParams conversationMarkAsReadParams)
+        : base(conversationMarkAsReadParams)
+    {
+        this.ConversationID = conversationMarkAsReadParams.ConversationID;
+    }
+#pragma warning restore CS8618
+
+    public ConversationMarkAsReadParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationMarkAsReadParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string conversationID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.ConversationID = conversationID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static ConversationMarkAsReadParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string conversationID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            conversationID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["ConversationID"] = JsonSerializer.SerializeToElement(this.ConversationID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(ConversationMarkAsReadParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.ConversationID?.Equals(other.ConversationID) ?? other.ConversationID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/conversations/{0}/read", this.ConversationID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationMarkAsReadResponse.cs b/src/Zavudev/Models/Conversations/ConversationMarkAsReadResponse.cs
new file mode 100644
index 0000000..35978ef
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationMarkAsReadResponse.cs
@@ -0,0 +1,768 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Messages;
+
+namespace Zavudev.Models.Conversations;
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        ConversationMarkAsReadResponse,
+        ConversationMarkAsReadResponseFromRaw
+    >)
+)]
+public sealed record class ConversationMarkAsReadResponse : JsonModel
+{
+    /// <summary>
+    /// An inbox thread with one contact. A conversation groups every message exchanged
+    /// with that contact across channels, so a contact who writes on WhatsApp and
+    /// later by email stays in one thread.
+    /// </summary>
+    public required ConversationMarkAsReadResponseConversation Conversation
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ConversationMarkAsReadResponseConversation>(
+                "conversation"
+            );
+        }
+        init { this._rawData.Set("conversation", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Conversation.Validate();
+    }
+
+    public ConversationMarkAsReadResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationMarkAsReadResponse(
+        ConversationMarkAsReadResponse conversationMarkAsReadResponse
+    )
+        : base(conversationMarkAsReadResponse) { }
+#pragma warning restore CS8618
+
+    public ConversationMarkAsReadResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationMarkAsReadResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationMarkAsReadResponseFromRaw.FromRawUnchecked"/>
+    public static ConversationMarkAsReadResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public ConversationMarkAsReadResponse(ConversationMarkAsReadResponseConversation conversation)
+        : this()
+    {
+        this.Conversation = conversation;
+    }
+}
+
+class ConversationMarkAsReadResponseFromRaw : IFromRawJson<ConversationMarkAsReadResponse>
+{
+    /// <inheritdoc/>
+    public ConversationMarkAsReadResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationMarkAsReadResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// An inbox thread with one contact. A conversation groups every message exchanged
+/// with that contact across channels, so a contact who writes on WhatsApp and later
+/// by email stays in one thread.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<
+        ConversationMarkAsReadResponseConversation,
+        ConversationMarkAsReadResponseConversationFromRaw
+    >)
+)]
+public sealed record class ConversationMarkAsReadResponseConversation : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    /// <summary>
+    /// Every channel this thread has carried messages on.
+    /// </summary>
+    public required IReadOnlyList<string> Channels
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<string>>("channels");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<string>>(
+                "channels",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// The key this thread is filed under: a phone number in E.164, a WhatsApp business-scoped
+    /// user ID (BSUID), a numeric chat ID (Telegram/Instagram/Messenger), or a group
+    /// JID. It is not always a phone number, so do not parse it as one.
+    /// </summary>
+    public required string ContactIdentifier
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("contactIdentifier");
+        }
+        init { this._rawData.Set("contactIdentifier", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Denormalized preview of the most recent message, so a thread list needs no
+    /// extra fetch.
+    /// </summary>
+    public required ConversationMarkAsReadResponseConversationLastMessage LastMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ConversationMarkAsReadResponseConversationLastMessage>(
+                "lastMessage"
+            );
+        }
+        init { this._rawData.Set("lastMessage", value); }
+    }
+
+    public required long MessageCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("messageCount");
+        }
+        init { this._rawData.Set("messageCount", value); }
+    }
+
+    /// <summary>
+    /// Inbound messages not yet marked read. Reset with POST /v1/conversations/{conversationId}/read.
+    /// </summary>
+    public required long UnreadCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("unreadCount");
+        }
+        init { this._rawData.Set("unreadCount", value); }
+    }
+
+    public required DateTimeOffset UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("updatedAt");
+        }
+        init { this._rawData.Set("updatedAt", value); }
+    }
+
+    /// <summary>
+    /// ID of the contact this thread belongs to. Absent on group threads and on
+    /// threads whose contact has not been resolved yet.
+    /// </summary>
+    public string? ContactID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("contactId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("contactId", value);
+        }
+    }
+
+    /// <summary>
+    /// Email address of the thread, when the contact was reached by email.
+    /// </summary>
+    public string? Email
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("email");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("email", value);
+        }
+    }
+
+    /// <summary>
+    /// Present when the thread is a group chat rather than a one-to-one conversation.
+    /// </summary>
+    public ConversationMarkAsReadResponseConversationGroup? Group
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<ConversationMarkAsReadResponseConversationGroup>(
+                "group"
+            );
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("group", value);
+        }
+    }
+
+    /// <summary>
+    /// Sender that last handled this thread. Use it as the `Zavu-Sender` header
+    /// when replying so the answer leaves from the same number the contact knows.
+    /// </summary>
+    public string? SenderID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("senderId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("senderId", value);
+        }
+    }
+
+    /// <summary>
+    /// WhatsApp identity, present when the contact adopted a username.
+    /// </summary>
+    public ConversationMarkAsReadResponseConversationWhatsapp? Whatsapp
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<ConversationMarkAsReadResponseConversationWhatsapp>(
+                "whatsapp"
+            );
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("whatsapp", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.Channels;
+        _ = this.ContactIdentifier;
+        _ = this.CreatedAt;
+        this.LastMessage.Validate();
+        _ = this.MessageCount;
+        _ = this.UnreadCount;
+        _ = this.UpdatedAt;
+        _ = this.ContactID;
+        _ = this.Email;
+        this.Group?.Validate();
+        _ = this.SenderID;
+        this.Whatsapp?.Validate();
+    }
+
+    public ConversationMarkAsReadResponseConversation() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationMarkAsReadResponseConversation(
+        ConversationMarkAsReadResponseConversation conversationMarkAsReadResponseConversation
+    )
+        : base(conversationMarkAsReadResponseConversation) { }
+#pragma warning restore CS8618
+
+    public ConversationMarkAsReadResponseConversation(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationMarkAsReadResponseConversation(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationMarkAsReadResponseConversationFromRaw.FromRawUnchecked"/>
+    public static ConversationMarkAsReadResponseConversation FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ConversationMarkAsReadResponseConversationFromRaw
+    : IFromRawJson<ConversationMarkAsReadResponseConversation>
+{
+    /// <inheritdoc/>
+    public ConversationMarkAsReadResponseConversation FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationMarkAsReadResponseConversation.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Denormalized preview of the most recent message, so a thread list needs no extra fetch.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<
+        ConversationMarkAsReadResponseConversationLastMessage,
+        ConversationMarkAsReadResponseConversationLastMessageFromRaw
+    >)
+)]
+public sealed record class ConversationMarkAsReadResponseConversationLastMessage : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required DateTimeOffset At
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("at");
+        }
+        init { this._rawData.Set("at", value); }
+    }
+
+    /// <summary>
+    /// Delivery channel. Use 'auto' for intelligent routing.
+    /// </summary>
+    public required ApiEnum<string, MessageChannel> Channel
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, MessageChannel>>("channel");
+        }
+        init { this._rawData.Set("channel", value); }
+    }
+
+    public required ApiEnum<
+        string,
+        ConversationMarkAsReadResponseConversationLastMessageDirection
+    > Direction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, ConversationMarkAsReadResponseConversationLastMessageDirection>
+            >("direction");
+        }
+        init { this._rawData.Set("direction", value); }
+    }
+
+    /// <summary>
+    /// Text or caption. Empty when the last message carried no text (e.g. media).
+    /// </summary>
+    public required string Text
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("text");
+        }
+        init { this._rawData.Set("text", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.At;
+        this.Channel.Validate();
+        this.Direction.Validate();
+        _ = this.Text;
+    }
+
+    public ConversationMarkAsReadResponseConversationLastMessage() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationMarkAsReadResponseConversationLastMessage(
+        ConversationMarkAsReadResponseConversationLastMessage conversationMarkAsReadResponseConversationLastMessage
+    )
+        : base(conversationMarkAsReadResponseConversationLastMessage) { }
+#pragma warning restore CS8618
+
+    public ConversationMarkAsReadResponseConversationLastMessage(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationMarkAsReadResponseConversationLastMessage(
+        FrozenDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationMarkAsReadResponseConversationLastMessageFromRaw.FromRawUnchecked"/>
+    public static ConversationMarkAsReadResponseConversationLastMessage FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ConversationMarkAsReadResponseConversationLastMessageFromRaw
+    : IFromRawJson<ConversationMarkAsReadResponseConversationLastMessage>
+{
+    /// <inheritdoc/>
+    public ConversationMarkAsReadResponseConversationLastMessage FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationMarkAsReadResponseConversationLastMessage.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(ConversationMarkAsReadResponseConversationLastMessageDirectionConverter))]
+public enum ConversationMarkAsReadResponseConversationLastMessageDirection
+{
+    Inbound,
+    Outbound,
+}
+
+sealed class ConversationMarkAsReadResponseConversationLastMessageDirectionConverter
+    : JsonConverter<ConversationMarkAsReadResponseConversationLastMessageDirection>
+{
+    public override ConversationMarkAsReadResponseConversationLastMessageDirection Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "inbound" => ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound,
+            "outbound" => ConversationMarkAsReadResponseConversationLastMessageDirection.Outbound,
+            _ => (ConversationMarkAsReadResponseConversationLastMessageDirection)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        ConversationMarkAsReadResponseConversationLastMessageDirection value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                ConversationMarkAsReadResponseConversationLastMessageDirection.Inbound => "inbound",
+                ConversationMarkAsReadResponseConversationLastMessageDirection.Outbound =>
+                    "outbound",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Present when the thread is a group chat rather than a one-to-one conversation.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<
+        ConversationMarkAsReadResponseConversationGroup,
+        ConversationMarkAsReadResponseConversationGroupFromRaw
+    >)
+)]
+public sealed record class ConversationMarkAsReadResponseConversationGroup : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public long? ParticipantCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("participantCount");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("participantCount", value);
+        }
+    }
+
+    public string? Subject
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("subject");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("subject", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.ParticipantCount;
+        _ = this.Subject;
+    }
+
+    public ConversationMarkAsReadResponseConversationGroup() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationMarkAsReadResponseConversationGroup(
+        ConversationMarkAsReadResponseConversationGroup conversationMarkAsReadResponseConversationGroup
+    )
+        : base(conversationMarkAsReadResponseConversationGroup) { }
+#pragma warning restore CS8618
+
+    public ConversationMarkAsReadResponseConversationGroup(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationMarkAsReadResponseConversationGroup(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationMarkAsReadResponseConversationGroupFromRaw.FromRawUnchecked"/>
+    public static ConversationMarkAsReadResponseConversationGroup FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public ConversationMarkAsReadResponseConversationGroup(string id)
+        : this()
+    {
+        this.ID = id;
+    }
+}
+
+class ConversationMarkAsReadResponseConversationGroupFromRaw
+    : IFromRawJson<ConversationMarkAsReadResponseConversationGroup>
+{
+    /// <inheritdoc/>
+    public ConversationMarkAsReadResponseConversationGroup FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationMarkAsReadResponseConversationGroup.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// WhatsApp identity, present when the contact adopted a username.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<
+        ConversationMarkAsReadResponseConversationWhatsapp,
+        ConversationMarkAsReadResponseConversationWhatsappFromRaw
+    >)
+)]
+public sealed record class ConversationMarkAsReadResponseConversationWhatsapp : JsonModel
+{
+    /// <summary>
+    /// Business-scoped user ID. Can be used as `to` when sending.
+    /// </summary>
+    public string? Bsuid
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("bsuid");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("bsuid", value);
+        }
+    }
+
+    public string? Username
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("username");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("username", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Bsuid;
+        _ = this.Username;
+    }
+
+    public ConversationMarkAsReadResponseConversationWhatsapp() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationMarkAsReadResponseConversationWhatsapp(
+        ConversationMarkAsReadResponseConversationWhatsapp conversationMarkAsReadResponseConversationWhatsapp
+    )
+        : base(conversationMarkAsReadResponseConversationWhatsapp) { }
+#pragma warning restore CS8618
+
+    public ConversationMarkAsReadResponseConversationWhatsapp(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationMarkAsReadResponseConversationWhatsapp(
+        FrozenDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationMarkAsReadResponseConversationWhatsappFromRaw.FromRawUnchecked"/>
+    public static ConversationMarkAsReadResponseConversationWhatsapp FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ConversationMarkAsReadResponseConversationWhatsappFromRaw
+    : IFromRawJson<ConversationMarkAsReadResponseConversationWhatsapp>
+{
+    /// <inheritdoc/>
+    public ConversationMarkAsReadResponseConversationWhatsapp FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationMarkAsReadResponseConversationWhatsapp.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationRetrieveParams.cs b/src/Zavudev/Models/Conversations/ConversationRetrieveParams.cs
new file mode 100644
index 0000000..10fa360
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationRetrieveParams.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Conversations;
+
+/// <summary>
+/// Get conversation
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class ConversationRetrieveParams : ParamsBase
+{
+    public string? ConversationID { get; init; }
+
+    public ConversationRetrieveParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationRetrieveParams(ConversationRetrieveParams conversationRetrieveParams)
+        : base(conversationRetrieveParams)
+    {
+        this.ConversationID = conversationRetrieveParams.ConversationID;
+    }
+#pragma warning restore CS8618
+
+    public ConversationRetrieveParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationRetrieveParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string conversationID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.ConversationID = conversationID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static ConversationRetrieveParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string conversationID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            conversationID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["ConversationID"] = JsonSerializer.SerializeToElement(this.ConversationID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(ConversationRetrieveParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.ConversationID?.Equals(other.ConversationID) ?? other.ConversationID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/conversations/{0}", this.ConversationID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Conversations/ConversationRetrieveResponse.cs b/src/Zavudev/Models/Conversations/ConversationRetrieveResponse.cs
new file mode 100644
index 0000000..12e7ccc
--- /dev/null
+++ b/src/Zavudev/Models/Conversations/ConversationRetrieveResponse.cs
@@ -0,0 +1,694 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Messages;
+
+namespace Zavudev.Models.Conversations;
+
+[JsonConverter(
+    typeof(JsonModelConverter<ConversationRetrieveResponse, ConversationRetrieveResponseFromRaw>)
+)]
+public sealed record class ConversationRetrieveResponse : JsonModel
+{
+    /// <summary>
+    /// An inbox thread with one contact. A conversation groups every message exchanged
+    /// with that contact across channels, so a contact who writes on WhatsApp and
+    /// later by email stays in one thread.
+    /// </summary>
+    public required Conversation Conversation
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<Conversation>("conversation");
+        }
+        init { this._rawData.Set("conversation", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Conversation.Validate();
+    }
+
+    public ConversationRetrieveResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ConversationRetrieveResponse(ConversationRetrieveResponse conversationRetrieveResponse)
+        : base(conversationRetrieveResponse) { }
+#pragma warning restore CS8618
+
+    public ConversationRetrieveResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ConversationRetrieveResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationRetrieveResponseFromRaw.FromRawUnchecked"/>
+    public static ConversationRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public ConversationRetrieveResponse(Conversation conversation)
+        : this()
+    {
+        this.Conversation = conversation;
+    }
+}
+
+class ConversationRetrieveResponseFromRaw : IFromRawJson<ConversationRetrieveResponse>
+{
+    /// <inheritdoc/>
+    public ConversationRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ConversationRetrieveResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// An inbox thread with one contact. A conversation groups every message exchanged
+/// with that contact across channels, so a contact who writes on WhatsApp and later
+/// by email stays in one thread.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Conversation, ConversationFromRaw>))]
+public sealed record class Conversation : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    /// <summary>
+    /// Every channel this thread has carried messages on.
+    /// </summary>
+    public required IReadOnlyList<string> Channels
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<string>>("channels");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<string>>(
+                "channels",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// The key this thread is filed under: a phone number in E.164, a WhatsApp business-scoped
+    /// user ID (BSUID), a numeric chat ID (Telegram/Instagram/Messenger), or a group
+    /// JID. It is not always a phone number, so do not parse it as one.
+    /// </summary>
+    public required string ContactIdentifier
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("contactIdentifier");
+        }
+        init { this._rawData.Set("contactIdentifier", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Denormalized preview of the most recent message, so a thread list needs no
+    /// extra fetch.
+    /// </summary>
+    public required LastMessage LastMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<LastMessage>("lastMessage");
+        }
+        init { this._rawData.Set("lastMessage", value); }
+    }
+
+    public required long MessageCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("messageCount");
+        }
+        init { this._rawData.Set("messageCount", value); }
+    }
+
+    /// <summary>
+    /// Inbound messages not yet marked read. Reset with POST /v1/conversations/{conversationId}/read.
+    /// </summary>
+    public required long UnreadCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("unreadCount");
+        }
+        init { this._rawData.Set("unreadCount", value); }
+    }
+
+    public required DateTimeOffset UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("updatedAt");
+        }
+        init { this._rawData.Set("updatedAt", value); }
+    }
+
+    /// <summary>
+    /// ID of the contact this thread belongs to. Absent on group threads and on
+    /// threads whose contact has not been resolved yet.
+    /// </summary>
+    public string? ContactID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("contactId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("contactId", value);
+        }
+    }
+
+    /// <summary>
+    /// Email address of the thread, when the contact was reached by email.
+    /// </summary>
+    public string? Email
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("email");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("email", value);
+        }
+    }
+
+    /// <summary>
+    /// Present when the thread is a group chat rather than a one-to-one conversation.
+    /// </summary>
+    public Group? Group
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<Group>("group");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("group", value);
+        }
+    }
+
+    /// <summary>
+    /// Sender that last handled this thread. Use it as the `Zavu-Sender` header
+    /// when replying so the answer leaves from the same number the contact knows.
+    /// </summary>
+    public string? SenderID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("senderId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("senderId", value);
+        }
+    }
+
+    /// <summary>
+    /// WhatsApp identity, present when the contact adopted a username.
+    /// </summary>
+    public Whatsapp? Whatsapp
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<Whatsapp>("whatsapp");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("whatsapp", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.Channels;
+        _ = this.ContactIdentifier;
+        _ = this.CreatedAt;
+        this.LastMessage.Validate();
+        _ = this.MessageCount;
+        _ = this.UnreadCount;
+        _ = this.UpdatedAt;
+        _ = this.ContactID;
+        _ = this.Email;
+        this.Group?.Validate();
+        _ = this.SenderID;
+        this.Whatsapp?.Validate();
+    }
+
+    public Conversation() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Conversation(Conversation conversation)
+        : base(conversation) { }
+#pragma warning restore CS8618
+
+    public Conversation(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Conversation(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ConversationFromRaw.FromRawUnchecked"/>
+    public static Conversation FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ConversationFromRaw : IFromRawJson<Conversation>
+{
+    /// <inheritdoc/>
+    public Conversation FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Conversation.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Denormalized preview of the most recent message, so a thread list needs no extra fetch.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<LastMessage, LastMessageFromRaw>))]
+public sealed record class LastMessage : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required DateTimeOffset At
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("at");
+        }
+        init { this._rawData.Set("at", value); }
+    }
+
+    /// <summary>
+    /// Delivery channel. Use 'auto' for intelligent routing.
+    /// </summary>
+    public required ApiEnum<string, MessageChannel> Channel
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, MessageChannel>>("channel");
+        }
+        init { this._rawData.Set("channel", value); }
+    }
+
+    public required ApiEnum<string, global::Zavudev.Models.Conversations.Direction> Direction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, global::Zavudev.Models.Conversations.Direction>
+            >("direction");
+        }
+        init { this._rawData.Set("direction", value); }
+    }
+
+    /// <summary>
+    /// Text or caption. Empty when the last message carried no text (e.g. media).
+    /// </summary>
+    public required string Text
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("text");
+        }
+        init { this._rawData.Set("text", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.At;
+        this.Channel.Validate();
+        this.Direction.Validate();
+        _ = this.Text;
+    }
+
+    public LastMessage() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public LastMessage(LastMessage lastMessage)
+        : base(lastMessage) { }
+#pragma warning restore CS8618
+
+    public LastMessage(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    LastMessage(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="LastMessageFromRaw.FromRawUnchecked"/>
+    public static LastMessage FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class LastMessageFromRaw : IFromRawJson<LastMessage>
+{
+    /// <inheritdoc/>
+    public LastMessage FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        LastMessage.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(global::Zavudev.Models.Conversations.DirectionConverter))]
+public enum Direction
+{
+    Inbound,
+    Outbound,
+}
+
+sealed class DirectionConverter : JsonConverter<global::Zavudev.Models.Conversations.Direction>
+{
+    public override global::Zavudev.Models.Conversations.Direction Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "inbound" => global::Zavudev.Models.Conversations.Direction.Inbound,
+            "outbound" => global::Zavudev.Models.Conversations.Direction.Outbound,
+            _ => (global::Zavudev.Models.Conversations.Direction)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        global::Zavudev.Models.Conversations.Direction value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                global::Zavudev.Models.Conversations.Direction.Inbound => "inbound",
+                global::Zavudev.Models.Conversations.Direction.Outbound => "outbound",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Present when the thread is a group chat rather than a one-to-one conversation.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Group, GroupFromRaw>))]
+public sealed record class Group : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public long? ParticipantCount
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("participantCount");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("participantCount", value);
+        }
+    }
+
+    public string? Subject
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("subject");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("subject", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.ParticipantCount;
+        _ = this.Subject;
+    }
+
+    public Group() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Group(Group group)
+        : base(group) { }
+#pragma warning restore CS8618
+
+    public Group(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Group(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="GroupFromRaw.FromRawUnchecked"/>
+    public static Group FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public Group(string id)
+        : this()
+    {
+        this.ID = id;
+    }
+}
+
+class GroupFromRaw : IFromRawJson<Group>
+{
+    /// <inheritdoc/>
+    public Group FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Group.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// WhatsApp identity, present when the contact adopted a username.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Whatsapp, WhatsappFromRaw>))]
+public sealed record class Whatsapp : JsonModel
+{
+    /// <summary>
+    /// Business-scoped user ID. Can be used as `to` when sending.
+    /// </summary>
+    public string? Bsuid
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("bsuid");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("bsuid", value);
+        }
+    }
+
+    public string? Username
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("username");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("username", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Bsuid;
+        _ = this.Username;
+    }
+
+    public Whatsapp() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Whatsapp(Whatsapp whatsapp)
+        : base(whatsapp) { }
+#pragma warning restore CS8618
+
+    public Whatsapp(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Whatsapp(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="WhatsappFromRaw.FromRawUnchecked"/>
+    public static Whatsapp FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class WhatsappFromRaw : IFromRawJson<Whatsapp>
+{
+    /// <inheritdoc/>
+    public Whatsapp FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Whatsapp.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/EmailDomains/EmailDomainCreateParams.cs b/src/Zavudev/Models/EmailDomains/EmailDomainCreateParams.cs
new file mode 100644
index 0000000..d6d848c
--- /dev/null
+++ b/src/Zavudev/Models/EmailDomains/EmailDomainCreateParams.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.EmailDomains;
+
+/// <summary>
+/// Add a domain to send email from. Returns the DNS records to publish (DKIM CNAMEs
+/// are required; SPF, DMARC, and MAIL FROM are recommended). Publish them at your
+/// DNS provider, then verify.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class EmailDomainCreateParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    /// <summary>
+    /// Bare domain, e.g. example.com.
+    /// </summary>
+    public required string Domain
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("domain");
+        }
+        init { this._rawBodyData.Set("domain", value); }
+    }
+
+    public EmailDomainCreateParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainCreateParams(EmailDomainCreateParams emailDomainCreateParams)
+        : base(emailDomainCreateParams)
+    {
+        this._rawBodyData = new(emailDomainCreateParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public EmailDomainCreateParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainCreateParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static EmailDomainCreateParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(EmailDomainCreateParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/email-domains")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/EmailDomains/EmailDomainCreateResponse.cs b/src/Zavudev/Models/EmailDomains/EmailDomainCreateResponse.cs
new file mode 100644
index 0000000..4357e8c
--- /dev/null
+++ b/src/Zavudev/Models/EmailDomains/EmailDomainCreateResponse.cs
@@ -0,0 +1,379 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.EmailDomains;
+
+[JsonConverter(
+    typeof(JsonModelConverter<EmailDomainCreateResponse, EmailDomainCreateResponseFromRaw>)
+)]
+public sealed record class EmailDomainCreateResponse : JsonModel
+{
+    public required Domain Domain
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<Domain>("domain");
+        }
+        init { this._rawData.Set("domain", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Domain.Validate();
+    }
+
+    public EmailDomainCreateResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainCreateResponse(EmailDomainCreateResponse emailDomainCreateResponse)
+        : base(emailDomainCreateResponse) { }
+#pragma warning restore CS8618
+
+    public EmailDomainCreateResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainCreateResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="EmailDomainCreateResponseFromRaw.FromRawUnchecked"/>
+    public static EmailDomainCreateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public EmailDomainCreateResponse(Domain domain)
+        : this()
+    {
+        this.Domain = domain;
+    }
+}
+
+class EmailDomainCreateResponseFromRaw : IFromRawJson<EmailDomainCreateResponse>
+{
+    /// <inheritdoc/>
+    public EmailDomainCreateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => EmailDomainCreateResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<Domain, DomainFromRaw>))]
+public sealed record class Domain : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required string DkimStatus
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("dkimStatus");
+        }
+        init { this._rawData.Set("dkimStatus", value); }
+    }
+
+    public required string DomainValue
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("domain");
+        }
+        init { this._rawData.Set("domain", value); }
+    }
+
+    /// <summary>
+    /// Overall verification status.
+    /// </summary>
+    public required string Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("status");
+        }
+        init { this._rawData.Set("status", value); }
+    }
+
+    /// <summary>
+    /// DNS records to publish. Present when fetching a single domain or after adding one.
+    /// </summary>
+    public IReadOnlyList<DnsRecord>? DnsRecords
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<ImmutableArray<DnsRecord>>("dnsRecords");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<ImmutableArray<DnsRecord>?>(
+                "dnsRecords",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.DkimStatus;
+        _ = this.DomainValue;
+        _ = this.Status;
+        foreach (var item in this.DnsRecords ?? [])
+        {
+            item.Validate();
+        }
+    }
+
+    public Domain() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Domain(Domain domain)
+        : base(domain) { }
+#pragma warning restore CS8618
+
+    public Domain(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Domain(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="DomainFromRaw.FromRawUnchecked"/>
+    public static Domain FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class DomainFromRaw : IFromRawJson<Domain>
+{
+    /// <inheritdoc/>
+    public Domain FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Domain.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<DnsRecord, DnsRecordFromRaw>))]
+public sealed record class DnsRecord : JsonModel
+{
+    /// <summary>
+    /// Record host/name to create.
+    /// </summary>
+    public required string Name
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("name");
+        }
+        init { this._rawData.Set("name", value); }
+    }
+
+    /// <summary>
+    /// What the record is for.
+    /// </summary>
+    public required ApiEnum<string, Purpose> Purpose
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, Purpose>>("purpose");
+        }
+        init { this._rawData.Set("purpose", value); }
+    }
+
+    /// <summary>
+    /// Whether the record is required to verify + send (DKIM) or recommended for deliverability.
+    /// </summary>
+    public required bool Required
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("required");
+        }
+        init { this._rawData.Set("required", value); }
+    }
+
+    /// <summary>
+    /// DNS record type.
+    /// </summary>
+    public required string Type
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("type");
+        }
+        init { this._rawData.Set("type", value); }
+    }
+
+    /// <summary>
+    /// Record value.
+    /// </summary>
+    public required string Value
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("value");
+        }
+        init { this._rawData.Set("value", value); }
+    }
+
+    /// <summary>
+    /// Priority (MX records only).
+    /// </summary>
+    public long? Priority
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("priority");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("priority", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Name;
+        this.Purpose.Validate();
+        _ = this.Required;
+        _ = this.Type;
+        _ = this.Value;
+        _ = this.Priority;
+    }
+
+    public DnsRecord() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public DnsRecord(DnsRecord dnsRecord)
+        : base(dnsRecord) { }
+#pragma warning restore CS8618
+
+    public DnsRecord(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    DnsRecord(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="DnsRecordFromRaw.FromRawUnchecked"/>
+    public static DnsRecord FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class DnsRecordFromRaw : IFromRawJson<DnsRecord>
+{
+    /// <inheritdoc/>
+    public DnsRecord FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        DnsRecord.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// What the record is for.
+/// </summary>
+[JsonConverter(typeof(PurposeConverter))]
+public enum Purpose
+{
+    Dkim,
+    Spf,
+    Dmarc,
+    MailFrom,
+}
+
+sealed class PurposeConverter : JsonConverter<Purpose>
+{
+    public override Purpose Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "dkim" => Purpose.Dkim,
+            "spf" => Purpose.Spf,
+            "dmarc" => Purpose.Dmarc,
+            "mail_from" => Purpose.MailFrom,
+            _ => (Purpose)(-1),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, Purpose value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Purpose.Dkim => "dkim",
+                Purpose.Spf => "spf",
+                Purpose.Dmarc => "dmarc",
+                Purpose.MailFrom => "mail_from",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/EmailDomains/EmailDomainDeleteParams.cs b/src/Zavudev/Models/EmailDomains/EmailDomainDeleteParams.cs
new file mode 100644
index 0000000..ced98a4
--- /dev/null
+++ b/src/Zavudev/Models/EmailDomains/EmailDomainDeleteParams.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.EmailDomains;
+
+/// <summary>
+/// Remove an email domain
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class EmailDomainDeleteParams : ParamsBase
+{
+    public string? DomainID { get; init; }
+
+    public EmailDomainDeleteParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainDeleteParams(EmailDomainDeleteParams emailDomainDeleteParams)
+        : base(emailDomainDeleteParams)
+    {
+        this.DomainID = emailDomainDeleteParams.DomainID;
+    }
+#pragma warning restore CS8618
+
+    public EmailDomainDeleteParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainDeleteParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string domainID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.DomainID = domainID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static EmailDomainDeleteParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string domainID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            domainID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["DomainID"] = JsonSerializer.SerializeToElement(this.DomainID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(EmailDomainDeleteParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.DomainID?.Equals(other.DomainID) ?? other.DomainID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/email-domains/{0}", this.DomainID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/EmailDomains/EmailDomainListParams.cs b/src/Zavudev/Models/EmailDomains/EmailDomainListParams.cs
new file mode 100644
index 0000000..8aa0a7c
--- /dev/null
+++ b/src/Zavudev/Models/EmailDomains/EmailDomainListParams.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.EmailDomains;
+
+/// <summary>
+/// List email domains
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class EmailDomainListParams : ParamsBase
+{
+    public EmailDomainListParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainListParams(EmailDomainListParams emailDomainListParams)
+        : base(emailDomainListParams) { }
+#pragma warning restore CS8618
+
+    public EmailDomainListParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainListParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static EmailDomainListParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(EmailDomainListParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/email-domains")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/EmailDomains/EmailDomainListResponse.cs b/src/Zavudev/Models/EmailDomains/EmailDomainListResponse.cs
new file mode 100644
index 0000000..aa6e837
--- /dev/null
+++ b/src/Zavudev/Models/EmailDomains/EmailDomainListResponse.cs
@@ -0,0 +1,390 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.EmailDomains;
+
+[JsonConverter(typeof(JsonModelConverter<EmailDomainListResponse, EmailDomainListResponseFromRaw>))]
+public sealed record class EmailDomainListResponse : JsonModel
+{
+    public required IReadOnlyList<Item> Items
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<Item>>("items");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<Item>>(
+                "items",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Items)
+        {
+            item.Validate();
+        }
+    }
+
+    public EmailDomainListResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainListResponse(EmailDomainListResponse emailDomainListResponse)
+        : base(emailDomainListResponse) { }
+#pragma warning restore CS8618
+
+    public EmailDomainListResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainListResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="EmailDomainListResponseFromRaw.FromRawUnchecked"/>
+    public static EmailDomainListResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public EmailDomainListResponse(IReadOnlyList<Item> items)
+        : this()
+    {
+        this.Items = items;
+    }
+}
+
+class EmailDomainListResponseFromRaw : IFromRawJson<EmailDomainListResponse>
+{
+    /// <inheritdoc/>
+    public EmailDomainListResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => EmailDomainListResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<Item, ItemFromRaw>))]
+public sealed record class Item : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required string DkimStatus
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("dkimStatus");
+        }
+        init { this._rawData.Set("dkimStatus", value); }
+    }
+
+    public required string Domain
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("domain");
+        }
+        init { this._rawData.Set("domain", value); }
+    }
+
+    /// <summary>
+    /// Overall verification status.
+    /// </summary>
+    public required string Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("status");
+        }
+        init { this._rawData.Set("status", value); }
+    }
+
+    /// <summary>
+    /// DNS records to publish. Present when fetching a single domain or after adding one.
+    /// </summary>
+    public IReadOnlyList<ItemDnsRecord>? DnsRecords
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<ImmutableArray<ItemDnsRecord>>("dnsRecords");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<ImmutableArray<ItemDnsRecord>?>(
+                "dnsRecords",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.DkimStatus;
+        _ = this.Domain;
+        _ = this.Status;
+        foreach (var item in this.DnsRecords ?? [])
+        {
+            item.Validate();
+        }
+    }
+
+    public Item() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Item(Item item)
+        : base(item) { }
+#pragma warning restore CS8618
+
+    public Item(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Item(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ItemFromRaw.FromRawUnchecked"/>
+    public static Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ItemFromRaw : IFromRawJson<Item>
+{
+    /// <inheritdoc/>
+    public Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Item.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<ItemDnsRecord, ItemDnsRecordFromRaw>))]
+public sealed record class ItemDnsRecord : JsonModel
+{
+    /// <summary>
+    /// Record host/name to create.
+    /// </summary>
+    public required string Name
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("name");
+        }
+        init { this._rawData.Set("name", value); }
+    }
+
+    /// <summary>
+    /// What the record is for.
+    /// </summary>
+    public required ApiEnum<string, ItemDnsRecordPurpose> Purpose
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, ItemDnsRecordPurpose>>("purpose");
+        }
+        init { this._rawData.Set("purpose", value); }
+    }
+
+    /// <summary>
+    /// Whether the record is required to verify + send (DKIM) or recommended for deliverability.
+    /// </summary>
+    public required bool Required
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("required");
+        }
+        init { this._rawData.Set("required", value); }
+    }
+
+    /// <summary>
+    /// DNS record type.
+    /// </summary>
+    public required string Type
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("type");
+        }
+        init { this._rawData.Set("type", value); }
+    }
+
+    /// <summary>
+    /// Record value.
+    /// </summary>
+    public required string Value
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("value");
+        }
+        init { this._rawData.Set("value", value); }
+    }
+
+    /// <summary>
+    /// Priority (MX records only).
+    /// </summary>
+    public long? Priority
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("priority");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("priority", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Name;
+        this.Purpose.Validate();
+        _ = this.Required;
+        _ = this.Type;
+        _ = this.Value;
+        _ = this.Priority;
+    }
+
+    public ItemDnsRecord() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ItemDnsRecord(ItemDnsRecord itemDnsRecord)
+        : base(itemDnsRecord) { }
+#pragma warning restore CS8618
+
+    public ItemDnsRecord(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ItemDnsRecord(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ItemDnsRecordFromRaw.FromRawUnchecked"/>
+    public static ItemDnsRecord FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ItemDnsRecordFromRaw : IFromRawJson<ItemDnsRecord>
+{
+    /// <inheritdoc/>
+    public ItemDnsRecord FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        ItemDnsRecord.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// What the record is for.
+/// </summary>
+[JsonConverter(typeof(ItemDnsRecordPurposeConverter))]
+public enum ItemDnsRecordPurpose
+{
+    Dkim,
+    Spf,
+    Dmarc,
+    MailFrom,
+}
+
+sealed class ItemDnsRecordPurposeConverter : JsonConverter<ItemDnsRecordPurpose>
+{
+    public override ItemDnsRecordPurpose Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "dkim" => ItemDnsRecordPurpose.Dkim,
+            "spf" => ItemDnsRecordPurpose.Spf,
+            "dmarc" => ItemDnsRecordPurpose.Dmarc,
+            "mail_from" => ItemDnsRecordPurpose.MailFrom,
+            _ => (ItemDnsRecordPurpose)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        ItemDnsRecordPurpose value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                ItemDnsRecordPurpose.Dkim => "dkim",
+                ItemDnsRecordPurpose.Spf => "spf",
+                ItemDnsRecordPurpose.Dmarc => "dmarc",
+                ItemDnsRecordPurpose.MailFrom => "mail_from",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/EmailDomains/EmailDomainRetrieveParams.cs b/src/Zavudev/Models/EmailDomains/EmailDomainRetrieveParams.cs
new file mode 100644
index 0000000..a8907d8
--- /dev/null
+++ b/src/Zavudev/Models/EmailDomains/EmailDomainRetrieveParams.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.EmailDomains;
+
+/// <summary>
+/// Fetch a domain with its DNS records and current status.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class EmailDomainRetrieveParams : ParamsBase
+{
+    public string? DomainID { get; init; }
+
+    public EmailDomainRetrieveParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainRetrieveParams(EmailDomainRetrieveParams emailDomainRetrieveParams)
+        : base(emailDomainRetrieveParams)
+    {
+        this.DomainID = emailDomainRetrieveParams.DomainID;
+    }
+#pragma warning restore CS8618
+
+    public EmailDomainRetrieveParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainRetrieveParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string domainID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.DomainID = domainID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static EmailDomainRetrieveParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string domainID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            domainID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["DomainID"] = JsonSerializer.SerializeToElement(this.DomainID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(EmailDomainRetrieveParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.DomainID?.Equals(other.DomainID) ?? other.DomainID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/email-domains/{0}", this.DomainID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/EmailDomains/EmailDomainRetrieveResponse.cs b/src/Zavudev/Models/EmailDomains/EmailDomainRetrieveResponse.cs
new file mode 100644
index 0000000..c2d9bf4
--- /dev/null
+++ b/src/Zavudev/Models/EmailDomains/EmailDomainRetrieveResponse.cs
@@ -0,0 +1,411 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.EmailDomains;
+
+[JsonConverter(
+    typeof(JsonModelConverter<EmailDomainRetrieveResponse, EmailDomainRetrieveResponseFromRaw>)
+)]
+public sealed record class EmailDomainRetrieveResponse : JsonModel
+{
+    public required EmailDomainRetrieveResponseDomain Domain
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<EmailDomainRetrieveResponseDomain>("domain");
+        }
+        init { this._rawData.Set("domain", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Domain.Validate();
+    }
+
+    public EmailDomainRetrieveResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainRetrieveResponse(EmailDomainRetrieveResponse emailDomainRetrieveResponse)
+        : base(emailDomainRetrieveResponse) { }
+#pragma warning restore CS8618
+
+    public EmailDomainRetrieveResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainRetrieveResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="EmailDomainRetrieveResponseFromRaw.FromRawUnchecked"/>
+    public static EmailDomainRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public EmailDomainRetrieveResponse(EmailDomainRetrieveResponseDomain domain)
+        : this()
+    {
+        this.Domain = domain;
+    }
+}
+
+class EmailDomainRetrieveResponseFromRaw : IFromRawJson<EmailDomainRetrieveResponse>
+{
+    /// <inheritdoc/>
+    public EmailDomainRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => EmailDomainRetrieveResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        EmailDomainRetrieveResponseDomain,
+        EmailDomainRetrieveResponseDomainFromRaw
+    >)
+)]
+public sealed record class EmailDomainRetrieveResponseDomain : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required string DkimStatus
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("dkimStatus");
+        }
+        init { this._rawData.Set("dkimStatus", value); }
+    }
+
+    public required string Domain
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("domain");
+        }
+        init { this._rawData.Set("domain", value); }
+    }
+
+    /// <summary>
+    /// Overall verification status.
+    /// </summary>
+    public required string Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("status");
+        }
+        init { this._rawData.Set("status", value); }
+    }
+
+    /// <summary>
+    /// DNS records to publish. Present when fetching a single domain or after adding one.
+    /// </summary>
+    public IReadOnlyList<EmailDomainRetrieveResponseDomainDnsRecord>? DnsRecords
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<
+                ImmutableArray<EmailDomainRetrieveResponseDomainDnsRecord>
+            >("dnsRecords");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<ImmutableArray<EmailDomainRetrieveResponseDomainDnsRecord>?>(
+                "dnsRecords",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.DkimStatus;
+        _ = this.Domain;
+        _ = this.Status;
+        foreach (var item in this.DnsRecords ?? [])
+        {
+            item.Validate();
+        }
+    }
+
+    public EmailDomainRetrieveResponseDomain() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainRetrieveResponseDomain(
+        EmailDomainRetrieveResponseDomain emailDomainRetrieveResponseDomain
+    )
+        : base(emailDomainRetrieveResponseDomain) { }
+#pragma warning restore CS8618
+
+    public EmailDomainRetrieveResponseDomain(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainRetrieveResponseDomain(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="EmailDomainRetrieveResponseDomainFromRaw.FromRawUnchecked"/>
+    public static EmailDomainRetrieveResponseDomain FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class EmailDomainRetrieveResponseDomainFromRaw : IFromRawJson<EmailDomainRetrieveResponseDomain>
+{
+    /// <inheritdoc/>
+    public EmailDomainRetrieveResponseDomain FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => EmailDomainRetrieveResponseDomain.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        EmailDomainRetrieveResponseDomainDnsRecord,
+        EmailDomainRetrieveResponseDomainDnsRecordFromRaw
+    >)
+)]
+public sealed record class EmailDomainRetrieveResponseDomainDnsRecord : JsonModel
+{
+    /// <summary>
+    /// Record host/name to create.
+    /// </summary>
+    public required string Name
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("name");
+        }
+        init { this._rawData.Set("name", value); }
+    }
+
+    /// <summary>
+    /// What the record is for.
+    /// </summary>
+    public required ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose> Purpose
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, EmailDomainRetrieveResponseDomainDnsRecordPurpose>
+            >("purpose");
+        }
+        init { this._rawData.Set("purpose", value); }
+    }
+
+    /// <summary>
+    /// Whether the record is required to verify + send (DKIM) or recommended for deliverability.
+    /// </summary>
+    public required bool Required
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("required");
+        }
+        init { this._rawData.Set("required", value); }
+    }
+
+    /// <summary>
+    /// DNS record type.
+    /// </summary>
+    public required string Type
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("type");
+        }
+        init { this._rawData.Set("type", value); }
+    }
+
+    /// <summary>
+    /// Record value.
+    /// </summary>
+    public required string Value
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("value");
+        }
+        init { this._rawData.Set("value", value); }
+    }
+
+    /// <summary>
+    /// Priority (MX records only).
+    /// </summary>
+    public long? Priority
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("priority");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("priority", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Name;
+        this.Purpose.Validate();
+        _ = this.Required;
+        _ = this.Type;
+        _ = this.Value;
+        _ = this.Priority;
+    }
+
+    public EmailDomainRetrieveResponseDomainDnsRecord() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainRetrieveResponseDomainDnsRecord(
+        EmailDomainRetrieveResponseDomainDnsRecord emailDomainRetrieveResponseDomainDnsRecord
+    )
+        : base(emailDomainRetrieveResponseDomainDnsRecord) { }
+#pragma warning restore CS8618
+
+    public EmailDomainRetrieveResponseDomainDnsRecord(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainRetrieveResponseDomainDnsRecord(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="EmailDomainRetrieveResponseDomainDnsRecordFromRaw.FromRawUnchecked"/>
+    public static EmailDomainRetrieveResponseDomainDnsRecord FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class EmailDomainRetrieveResponseDomainDnsRecordFromRaw
+    : IFromRawJson<EmailDomainRetrieveResponseDomainDnsRecord>
+{
+    /// <inheritdoc/>
+    public EmailDomainRetrieveResponseDomainDnsRecord FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => EmailDomainRetrieveResponseDomainDnsRecord.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// What the record is for.
+/// </summary>
+[JsonConverter(typeof(EmailDomainRetrieveResponseDomainDnsRecordPurposeConverter))]
+public enum EmailDomainRetrieveResponseDomainDnsRecordPurpose
+{
+    Dkim,
+    Spf,
+    Dmarc,
+    MailFrom,
+}
+
+sealed class EmailDomainRetrieveResponseDomainDnsRecordPurposeConverter
+    : JsonConverter<EmailDomainRetrieveResponseDomainDnsRecordPurpose>
+{
+    public override EmailDomainRetrieveResponseDomainDnsRecordPurpose Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "dkim" => EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim,
+            "spf" => EmailDomainRetrieveResponseDomainDnsRecordPurpose.Spf,
+            "dmarc" => EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dmarc,
+            "mail_from" => EmailDomainRetrieveResponseDomainDnsRecordPurpose.MailFrom,
+            _ => (EmailDomainRetrieveResponseDomainDnsRecordPurpose)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        EmailDomainRetrieveResponseDomainDnsRecordPurpose value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dkim => "dkim",
+                EmailDomainRetrieveResponseDomainDnsRecordPurpose.Spf => "spf",
+                EmailDomainRetrieveResponseDomainDnsRecordPurpose.Dmarc => "dmarc",
+                EmailDomainRetrieveResponseDomainDnsRecordPurpose.MailFrom => "mail_from",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/EmailDomains/EmailDomainVerifyParams.cs b/src/Zavudev/Models/EmailDomains/EmailDomainVerifyParams.cs
new file mode 100644
index 0000000..e899560
--- /dev/null
+++ b/src/Zavudev/Models/EmailDomains/EmailDomainVerifyParams.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.EmailDomains;
+
+/// <summary>
+/// Re-check the domain's published DNS records and refresh its status.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class EmailDomainVerifyParams : ParamsBase
+{
+    public string? DomainID { get; init; }
+
+    public EmailDomainVerifyParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainVerifyParams(EmailDomainVerifyParams emailDomainVerifyParams)
+        : base(emailDomainVerifyParams)
+    {
+        this.DomainID = emailDomainVerifyParams.DomainID;
+    }
+#pragma warning restore CS8618
+
+    public EmailDomainVerifyParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainVerifyParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string domainID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.DomainID = domainID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static EmailDomainVerifyParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string domainID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            domainID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["DomainID"] = JsonSerializer.SerializeToElement(this.DomainID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(EmailDomainVerifyParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.DomainID?.Equals(other.DomainID) ?? other.DomainID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/email-domains/{0}/verify", this.DomainID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/EmailDomains/EmailDomainVerifyResponse.cs b/src/Zavudev/Models/EmailDomains/EmailDomainVerifyResponse.cs
new file mode 100644
index 0000000..24f5949
--- /dev/null
+++ b/src/Zavudev/Models/EmailDomains/EmailDomainVerifyResponse.cs
@@ -0,0 +1,411 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.EmailDomains;
+
+[JsonConverter(
+    typeof(JsonModelConverter<EmailDomainVerifyResponse, EmailDomainVerifyResponseFromRaw>)
+)]
+public sealed record class EmailDomainVerifyResponse : JsonModel
+{
+    public required EmailDomainVerifyResponseDomain Domain
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<EmailDomainVerifyResponseDomain>("domain");
+        }
+        init { this._rawData.Set("domain", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Domain.Validate();
+    }
+
+    public EmailDomainVerifyResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainVerifyResponse(EmailDomainVerifyResponse emailDomainVerifyResponse)
+        : base(emailDomainVerifyResponse) { }
+#pragma warning restore CS8618
+
+    public EmailDomainVerifyResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainVerifyResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="EmailDomainVerifyResponseFromRaw.FromRawUnchecked"/>
+    public static EmailDomainVerifyResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public EmailDomainVerifyResponse(EmailDomainVerifyResponseDomain domain)
+        : this()
+    {
+        this.Domain = domain;
+    }
+}
+
+class EmailDomainVerifyResponseFromRaw : IFromRawJson<EmailDomainVerifyResponse>
+{
+    /// <inheritdoc/>
+    public EmailDomainVerifyResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => EmailDomainVerifyResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        EmailDomainVerifyResponseDomain,
+        EmailDomainVerifyResponseDomainFromRaw
+    >)
+)]
+public sealed record class EmailDomainVerifyResponseDomain : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required string DkimStatus
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("dkimStatus");
+        }
+        init { this._rawData.Set("dkimStatus", value); }
+    }
+
+    public required string Domain
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("domain");
+        }
+        init { this._rawData.Set("domain", value); }
+    }
+
+    /// <summary>
+    /// Overall verification status.
+    /// </summary>
+    public required string Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("status");
+        }
+        init { this._rawData.Set("status", value); }
+    }
+
+    /// <summary>
+    /// DNS records to publish. Present when fetching a single domain or after adding one.
+    /// </summary>
+    public IReadOnlyList<EmailDomainVerifyResponseDomainDnsRecord>? DnsRecords
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<
+                ImmutableArray<EmailDomainVerifyResponseDomainDnsRecord>
+            >("dnsRecords");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<ImmutableArray<EmailDomainVerifyResponseDomainDnsRecord>?>(
+                "dnsRecords",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.DkimStatus;
+        _ = this.Domain;
+        _ = this.Status;
+        foreach (var item in this.DnsRecords ?? [])
+        {
+            item.Validate();
+        }
+    }
+
+    public EmailDomainVerifyResponseDomain() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainVerifyResponseDomain(
+        EmailDomainVerifyResponseDomain emailDomainVerifyResponseDomain
+    )
+        : base(emailDomainVerifyResponseDomain) { }
+#pragma warning restore CS8618
+
+    public EmailDomainVerifyResponseDomain(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainVerifyResponseDomain(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="EmailDomainVerifyResponseDomainFromRaw.FromRawUnchecked"/>
+    public static EmailDomainVerifyResponseDomain FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class EmailDomainVerifyResponseDomainFromRaw : IFromRawJson<EmailDomainVerifyResponseDomain>
+{
+    /// <inheritdoc/>
+    public EmailDomainVerifyResponseDomain FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => EmailDomainVerifyResponseDomain.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        EmailDomainVerifyResponseDomainDnsRecord,
+        EmailDomainVerifyResponseDomainDnsRecordFromRaw
+    >)
+)]
+public sealed record class EmailDomainVerifyResponseDomainDnsRecord : JsonModel
+{
+    /// <summary>
+    /// Record host/name to create.
+    /// </summary>
+    public required string Name
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("name");
+        }
+        init { this._rawData.Set("name", value); }
+    }
+
+    /// <summary>
+    /// What the record is for.
+    /// </summary>
+    public required ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose> Purpose
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, EmailDomainVerifyResponseDomainDnsRecordPurpose>
+            >("purpose");
+        }
+        init { this._rawData.Set("purpose", value); }
+    }
+
+    /// <summary>
+    /// Whether the record is required to verify + send (DKIM) or recommended for deliverability.
+    /// </summary>
+    public required bool Required
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("required");
+        }
+        init { this._rawData.Set("required", value); }
+    }
+
+    /// <summary>
+    /// DNS record type.
+    /// </summary>
+    public required string Type
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("type");
+        }
+        init { this._rawData.Set("type", value); }
+    }
+
+    /// <summary>
+    /// Record value.
+    /// </summary>
+    public required string Value
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("value");
+        }
+        init { this._rawData.Set("value", value); }
+    }
+
+    /// <summary>
+    /// Priority (MX records only).
+    /// </summary>
+    public long? Priority
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("priority");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("priority", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Name;
+        this.Purpose.Validate();
+        _ = this.Required;
+        _ = this.Type;
+        _ = this.Value;
+        _ = this.Priority;
+    }
+
+    public EmailDomainVerifyResponseDomainDnsRecord() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public EmailDomainVerifyResponseDomainDnsRecord(
+        EmailDomainVerifyResponseDomainDnsRecord emailDomainVerifyResponseDomainDnsRecord
+    )
+        : base(emailDomainVerifyResponseDomainDnsRecord) { }
+#pragma warning restore CS8618
+
+    public EmailDomainVerifyResponseDomainDnsRecord(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    EmailDomainVerifyResponseDomainDnsRecord(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="EmailDomainVerifyResponseDomainDnsRecordFromRaw.FromRawUnchecked"/>
+    public static EmailDomainVerifyResponseDomainDnsRecord FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class EmailDomainVerifyResponseDomainDnsRecordFromRaw
+    : IFromRawJson<EmailDomainVerifyResponseDomainDnsRecord>
+{
+    /// <inheritdoc/>
+    public EmailDomainVerifyResponseDomainDnsRecord FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => EmailDomainVerifyResponseDomainDnsRecord.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// What the record is for.
+/// </summary>
+[JsonConverter(typeof(EmailDomainVerifyResponseDomainDnsRecordPurposeConverter))]
+public enum EmailDomainVerifyResponseDomainDnsRecordPurpose
+{
+    Dkim,
+    Spf,
+    Dmarc,
+    MailFrom,
+}
+
+sealed class EmailDomainVerifyResponseDomainDnsRecordPurposeConverter
+    : JsonConverter<EmailDomainVerifyResponseDomainDnsRecordPurpose>
+{
+    public override EmailDomainVerifyResponseDomainDnsRecordPurpose Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "dkim" => EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim,
+            "spf" => EmailDomainVerifyResponseDomainDnsRecordPurpose.Spf,
+            "dmarc" => EmailDomainVerifyResponseDomainDnsRecordPurpose.Dmarc,
+            "mail_from" => EmailDomainVerifyResponseDomainDnsRecordPurpose.MailFrom,
+            _ => (EmailDomainVerifyResponseDomainDnsRecordPurpose)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        EmailDomainVerifyResponseDomainDnsRecordPurpose value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                EmailDomainVerifyResponseDomainDnsRecordPurpose.Dkim => "dkim",
+                EmailDomainVerifyResponseDomainDnsRecordPurpose.Spf => "spf",
+                EmailDomainVerifyResponseDomainDnsRecordPurpose.Dmarc => "dmarc",
+                EmailDomainVerifyResponseDomainDnsRecordPurpose.MailFrom => "mail_from",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Functions/FunctionCreateParams.cs b/src/Zavudev/Models/Functions/FunctionCreateParams.cs
index 22d6cdf..4ee277c 100644
--- a/src/Zavudev/Models/Functions/FunctionCreateParams.cs
+++ b/src/Zavudev/Models/Functions/FunctionCreateParams.cs
@@ -98,6 +98,58 @@ public string? Description
         }
     }
 
+    /// <summary>
+    /// Which file in `files` is the entry point. Defaults to `index.ts`.
+    /// </summary>
+    public string? Entrypoint
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("entrypoint");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("entrypoint", value);
+        }
+    }
+
+    /// <summary>
+    /// The project's source files, keyed by path relative to the project root (e.g.
+    /// `index.ts`, `lib/orders.ts`). Imports between them are resolved when the
+    /// function is built, so a function can be split across as many files as it needs.
+    ///
+    /// <para>Paths must be relative and use forward slashes; `..`, `node_modules/`
+    /// and `package.json` are rejected. npm packages are not uploaded here — declare
+    /// them under `dependencies` and Zavu installs them. Limits: 200 files and 900,000
+    /// bytes for the whole tree.</para>
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Files
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<FrozenDictionary<string, string>>("files");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<FrozenDictionary<string, string>?>(
+                "files",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
     /// <summary>
     /// Whether to expose a public HTTPS URL for this function.
     /// </summary>
@@ -159,7 +211,9 @@ public ApiEnum<string, Runtime>? Runtime
     }
 
     /// <summary>
-    /// TypeScript source code for the function entry point (max ~900KB).
+    /// Shortcut for a single-file function: exactly equivalent to sending `files`
+    /// with one entry named after `entrypoint` (`index.ts` by default). Fully supported
+    /// — use whichever fits. If both are sent, `files` wins.
     /// </summary>
     public string? SourceCode
     {
diff --git a/src/Zavudev/Models/Functions/FunctionDeployParams.cs b/src/Zavudev/Models/Functions/FunctionDeployParams.cs
index 750128e..15f281e 100644
--- a/src/Zavudev/Models/Functions/FunctionDeployParams.cs
+++ b/src/Zavudev/Models/Functions/FunctionDeployParams.cs
@@ -56,7 +56,61 @@ public IReadOnlyDictionary<string, string>? Dependencies
     }
 
     /// <summary>
-    /// New source code to publish (replaces the draft).
+    /// Which file in `files` is the entry point. Defaults to `index.ts`.
+    /// </summary>
+    public string? Entrypoint
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("entrypoint");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("entrypoint", value);
+        }
+    }
+
+    /// <summary>
+    /// The project's source files, keyed by path relative to the project root (e.g.
+    /// `index.ts`, `lib/orders.ts`). Imports between them are resolved when the
+    /// function is built, so a function can be split across as many files as it needs.
+    ///
+    /// <para>Paths must be relative and use forward slashes; `..`, `node_modules/`
+    /// and `package.json` are rejected. npm packages are not uploaded here — declare
+    /// them under `dependencies` and Zavu installs them. Limits: 200 files and 900,000
+    /// bytes for the whole tree.</para>
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Files
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<FrozenDictionary<string, string>>("files");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<FrozenDictionary<string, string>?>(
+                "files",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Shortcut for a single-file function: exactly equivalent to sending `files`
+    /// with one entry named after `entrypoint` (`index.ts` by default). Fully supported
+    /// — use whichever fits. If both are sent, `files` wins.
     /// </summary>
     public string? SourceCode
     {
diff --git a/src/Zavudev/Models/Functions/FunctionDeployResponse.cs b/src/Zavudev/Models/Functions/FunctionDeployResponse.cs
index ea91a4d..43fa04e 100644
--- a/src/Zavudev/Models/Functions/FunctionDeployResponse.cs
+++ b/src/Zavudev/Models/Functions/FunctionDeployResponse.cs
@@ -132,6 +132,26 @@ public required long Version
         init { this._rawData.Set("version", value); }
     }
 
+    /// <summary>
+    /// What the build printed: dependency installation, the bundler's output, and
+    /// the compiler's message when it failed. Returned when fetching a single deployment,
+    /// omitted from the list. Read this first when a deploy fails — `errorMessage`
+    /// is often the outer wrapper's summary, and the line that names the broken
+    /// import or the syntax error is here.
+    /// </summary>
+    public string? BuildLogs
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("buildLogs");
+        }
+        init { this._rawData.Set("buildLogs", value); }
+    }
+
+    /// <summary>
+    /// Size of the built bundle in bytes. Null until the build finishes.
+    /// </summary>
     public long? BundleBytes
     {
         get
@@ -165,6 +185,9 @@ public string? ErrorMessage
         init { this._rawData.Set("errorMessage", value); }
     }
 
+    /// <summary>
+    /// Total size of the deployed source tree in bytes.
+    /// </summary>
     public long? SourceCodeBytes
     {
         get
@@ -183,6 +206,7 @@ public override void Validate()
         _ = this.FunctionID;
         this.Status.Validate();
         _ = this.Version;
+        _ = this.BuildLogs;
         _ = this.BundleBytes;
         _ = this.DeployedAt;
         _ = this.ErrorMessage;
diff --git a/src/Zavudev/Models/Functions/FunctionGetDeploymentResponse.cs b/src/Zavudev/Models/Functions/FunctionGetDeploymentResponse.cs
index 46b47f5..c30503c 100644
--- a/src/Zavudev/Models/Functions/FunctionGetDeploymentResponse.cs
+++ b/src/Zavudev/Models/Functions/FunctionGetDeploymentResponse.cs
@@ -145,6 +145,26 @@ public required long Version
         init { this._rawData.Set("version", value); }
     }
 
+    /// <summary>
+    /// What the build printed: dependency installation, the bundler's output, and
+    /// the compiler's message when it failed. Returned when fetching a single deployment,
+    /// omitted from the list. Read this first when a deploy fails — `errorMessage`
+    /// is often the outer wrapper's summary, and the line that names the broken
+    /// import or the syntax error is here.
+    /// </summary>
+    public string? BuildLogs
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("buildLogs");
+        }
+        init { this._rawData.Set("buildLogs", value); }
+    }
+
+    /// <summary>
+    /// Size of the built bundle in bytes. Null until the build finishes.
+    /// </summary>
     public long? BundleBytes
     {
         get
@@ -178,6 +198,9 @@ public string? ErrorMessage
         init { this._rawData.Set("errorMessage", value); }
     }
 
+    /// <summary>
+    /// Total size of the deployed source tree in bytes.
+    /// </summary>
     public long? SourceCodeBytes
     {
         get
@@ -196,6 +219,7 @@ public override void Validate()
         _ = this.FunctionID;
         this.Status.Validate();
         _ = this.Version;
+        _ = this.BuildLogs;
         _ = this.BundleBytes;
         _ = this.DeployedAt;
         _ = this.ErrorMessage;
diff --git a/src/Zavudev/Models/Functions/FunctionListDeploymentsParams.cs b/src/Zavudev/Models/Functions/FunctionListDeploymentsParams.cs
new file mode 100644
index 0000000..8161179
--- /dev/null
+++ b/src/Zavudev/Models/Functions/FunctionListDeploymentsParams.cs
@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions;
+
+/// <summary>
+/// List a function's deployment history, newest first. Source code is omitted; fetch
+/// a single deployment via GET /v1/functions/deployments/{deploymentId} for full details.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class FunctionListDeploymentsParams : ParamsBase
+{
+    public string? FunctionID { get; init; }
+
+    public long? Limit
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableStruct<long>("limit");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("limit", value);
+        }
+    }
+
+    public FunctionListDeploymentsParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public FunctionListDeploymentsParams(
+        FunctionListDeploymentsParams functionListDeploymentsParams
+    )
+        : base(functionListDeploymentsParams)
+    {
+        this.FunctionID = functionListDeploymentsParams.FunctionID;
+    }
+#pragma warning restore CS8618
+
+    public FunctionListDeploymentsParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    FunctionListDeploymentsParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.FunctionID = functionID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static FunctionListDeploymentsParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            functionID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["FunctionID"] = JsonSerializer.SerializeToElement(this.FunctionID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(FunctionListDeploymentsParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.FunctionID?.Equals(other.FunctionID) ?? other.FunctionID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/{0}/deployments", this.FunctionID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/FunctionListDeploymentsResponse.cs b/src/Zavudev/Models/Functions/FunctionListDeploymentsResponse.cs
new file mode 100644
index 0000000..c1b8504
--- /dev/null
+++ b/src/Zavudev/Models/Functions/FunctionListDeploymentsResponse.cs
@@ -0,0 +1,347 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Functions;
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        FunctionListDeploymentsResponse,
+        FunctionListDeploymentsResponseFromRaw
+    >)
+)]
+public sealed record class FunctionListDeploymentsResponse : JsonModel
+{
+    public required IReadOnlyList<FunctionListDeploymentsResponseDeployment> Deployments
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<
+                ImmutableArray<FunctionListDeploymentsResponseDeployment>
+            >("deployments");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<FunctionListDeploymentsResponseDeployment>>(
+                "deployments",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Deployments)
+        {
+            item.Validate();
+        }
+    }
+
+    public FunctionListDeploymentsResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public FunctionListDeploymentsResponse(
+        FunctionListDeploymentsResponse functionListDeploymentsResponse
+    )
+        : base(functionListDeploymentsResponse) { }
+#pragma warning restore CS8618
+
+    public FunctionListDeploymentsResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    FunctionListDeploymentsResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="FunctionListDeploymentsResponseFromRaw.FromRawUnchecked"/>
+    public static FunctionListDeploymentsResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public FunctionListDeploymentsResponse(
+        IReadOnlyList<FunctionListDeploymentsResponseDeployment> deployments
+    )
+        : this()
+    {
+        this.Deployments = deployments;
+    }
+}
+
+class FunctionListDeploymentsResponseFromRaw : IFromRawJson<FunctionListDeploymentsResponse>
+{
+    /// <inheritdoc/>
+    public FunctionListDeploymentsResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => FunctionListDeploymentsResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        FunctionListDeploymentsResponseDeployment,
+        FunctionListDeploymentsResponseDeploymentFromRaw
+    >)
+)]
+public sealed record class FunctionListDeploymentsResponseDeployment : JsonModel
+{
+    public string? ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("id");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("id", value);
+        }
+    }
+
+    public long? BundleSizeBytes
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("bundleSizeBytes");
+        }
+        init { this._rawData.Set("bundleSizeBytes", value); }
+    }
+
+    public DateTimeOffset? CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("createdAt");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("createdAt", value);
+        }
+    }
+
+    public DateTimeOffset? DeployedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("deployedAt");
+        }
+        init { this._rawData.Set("deployedAt", value); }
+    }
+
+    public string? ErrorMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("errorMessage");
+        }
+        init { this._rawData.Set("errorMessage", value); }
+    }
+
+    public bool? IsActive
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<bool>("isActive");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("isActive", value);
+        }
+    }
+
+    /// <summary>
+    /// Stage of a function deployment.
+    /// </summary>
+    public ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus>? Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<
+                ApiEnum<string, FunctionListDeploymentsResponseDeploymentStatus>
+            >("status");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("status", value);
+        }
+    }
+
+    public long? Version
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("version");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("version", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.BundleSizeBytes;
+        _ = this.CreatedAt;
+        _ = this.DeployedAt;
+        _ = this.ErrorMessage;
+        _ = this.IsActive;
+        this.Status?.Validate();
+        _ = this.Version;
+    }
+
+    public FunctionListDeploymentsResponseDeployment() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public FunctionListDeploymentsResponseDeployment(
+        FunctionListDeploymentsResponseDeployment functionListDeploymentsResponseDeployment
+    )
+        : base(functionListDeploymentsResponseDeployment) { }
+#pragma warning restore CS8618
+
+    public FunctionListDeploymentsResponseDeployment(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    FunctionListDeploymentsResponseDeployment(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="FunctionListDeploymentsResponseDeploymentFromRaw.FromRawUnchecked"/>
+    public static FunctionListDeploymentsResponseDeployment FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class FunctionListDeploymentsResponseDeploymentFromRaw
+    : IFromRawJson<FunctionListDeploymentsResponseDeployment>
+{
+    /// <inheritdoc/>
+    public FunctionListDeploymentsResponseDeployment FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => FunctionListDeploymentsResponseDeployment.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Stage of a function deployment.
+/// </summary>
+[JsonConverter(typeof(FunctionListDeploymentsResponseDeploymentStatusConverter))]
+public enum FunctionListDeploymentsResponseDeploymentStatus
+{
+    Pending,
+    Bundling,
+    Uploading,
+    Publishing,
+    Active,
+    Failed,
+    Superseded,
+}
+
+sealed class FunctionListDeploymentsResponseDeploymentStatusConverter
+    : JsonConverter<FunctionListDeploymentsResponseDeploymentStatus>
+{
+    public override FunctionListDeploymentsResponseDeploymentStatus Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "pending" => FunctionListDeploymentsResponseDeploymentStatus.Pending,
+            "bundling" => FunctionListDeploymentsResponseDeploymentStatus.Bundling,
+            "uploading" => FunctionListDeploymentsResponseDeploymentStatus.Uploading,
+            "publishing" => FunctionListDeploymentsResponseDeploymentStatus.Publishing,
+            "active" => FunctionListDeploymentsResponseDeploymentStatus.Active,
+            "failed" => FunctionListDeploymentsResponseDeploymentStatus.Failed,
+            "superseded" => FunctionListDeploymentsResponseDeploymentStatus.Superseded,
+            _ => (FunctionListDeploymentsResponseDeploymentStatus)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        FunctionListDeploymentsResponseDeploymentStatus value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                FunctionListDeploymentsResponseDeploymentStatus.Pending => "pending",
+                FunctionListDeploymentsResponseDeploymentStatus.Bundling => "bundling",
+                FunctionListDeploymentsResponseDeploymentStatus.Uploading => "uploading",
+                FunctionListDeploymentsResponseDeploymentStatus.Publishing => "publishing",
+                FunctionListDeploymentsResponseDeploymentStatus.Active => "active",
+                FunctionListDeploymentsResponseDeploymentStatus.Failed => "failed",
+                FunctionListDeploymentsResponseDeploymentStatus.Superseded => "superseded",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Functions/FunctionListEventTypesParams.cs b/src/Zavudev/Models/Functions/FunctionListEventTypesParams.cs
new file mode 100644
index 0000000..f8d12b5
--- /dev/null
+++ b/src/Zavudev/Models/Functions/FunctionListEventTypesParams.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions;
+
+/// <summary>
+/// List the event types a function trigger can subscribe to. Includes the special
+/// type `cron`, which fires on a schedule (see POST /v1/functions/{functionId}/triggers)
+/// rather than on a messaging event.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class FunctionListEventTypesParams : ParamsBase
+{
+    public FunctionListEventTypesParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public FunctionListEventTypesParams(FunctionListEventTypesParams functionListEventTypesParams)
+        : base(functionListEventTypesParams) { }
+#pragma warning restore CS8618
+
+    public FunctionListEventTypesParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    FunctionListEventTypesParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static FunctionListEventTypesParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(FunctionListEventTypesParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/functions/event-types")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/FunctionListEventTypesResponse.cs b/src/Zavudev/Models/Functions/FunctionListEventTypesResponse.cs
new file mode 100644
index 0000000..be1ebcc
--- /dev/null
+++ b/src/Zavudev/Models/Functions/FunctionListEventTypesResponse.cs
@@ -0,0 +1,86 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions;
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        FunctionListEventTypesResponse,
+        FunctionListEventTypesResponseFromRaw
+    >)
+)]
+public sealed record class FunctionListEventTypesResponse : JsonModel
+{
+    public required IReadOnlyList<string> Events
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<string>>("events");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<string>>(
+                "events",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Events;
+    }
+
+    public FunctionListEventTypesResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public FunctionListEventTypesResponse(
+        FunctionListEventTypesResponse functionListEventTypesResponse
+    )
+        : base(functionListEventTypesResponse) { }
+#pragma warning restore CS8618
+
+    public FunctionListEventTypesResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    FunctionListEventTypesResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="FunctionListEventTypesResponseFromRaw.FromRawUnchecked"/>
+    public static FunctionListEventTypesResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public FunctionListEventTypesResponse(IReadOnlyList<string> events)
+        : this()
+    {
+        this.Events = events;
+    }
+}
+
+class FunctionListEventTypesResponseFromRaw : IFromRawJson<FunctionListEventTypesResponse>
+{
+    /// <inheritdoc/>
+    public FunctionListEventTypesResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => FunctionListEventTypesResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Functions/FunctionRollbackDeploymentParams.cs b/src/Zavudev/Models/Functions/FunctionRollbackDeploymentParams.cs
new file mode 100644
index 0000000..ea72a0e
--- /dev/null
+++ b/src/Zavudev/Models/Functions/FunctionRollbackDeploymentParams.cs
@@ -0,0 +1,166 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions;
+
+/// <summary>
+/// Re-deploy a previous version by copying its source, dependencies, and runtime
+/// pin onto the function's draft, then deploying. Returns immediately with a deployment
+/// ID — poll GET /v1/functions/deployments/{deploymentId} until status is active
+/// or failed. Secrets are not rolled back.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class FunctionRollbackDeploymentParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? FunctionID { get; init; }
+
+    /// <summary>
+    /// ID of the deployment to roll back to.
+    /// </summary>
+    public required string DeploymentID
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("deploymentId");
+        }
+        init { this._rawBodyData.Set("deploymentId", value); }
+    }
+
+    public FunctionRollbackDeploymentParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public FunctionRollbackDeploymentParams(
+        FunctionRollbackDeploymentParams functionRollbackDeploymentParams
+    )
+        : base(functionRollbackDeploymentParams)
+    {
+        this.FunctionID = functionRollbackDeploymentParams.FunctionID;
+
+        this._rawBodyData = new(functionRollbackDeploymentParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public FunctionRollbackDeploymentParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    FunctionRollbackDeploymentParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string functionID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.FunctionID = functionID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static FunctionRollbackDeploymentParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string functionID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            functionID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["FunctionID"] = JsonSerializer.SerializeToElement(this.FunctionID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(FunctionRollbackDeploymentParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.FunctionID?.Equals(other.FunctionID) ?? other.FunctionID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/{0}/rollback", this.FunctionID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/FunctionRollbackDeploymentResponse.cs b/src/Zavudev/Models/Functions/FunctionRollbackDeploymentResponse.cs
new file mode 100644
index 0000000..9010f1e
--- /dev/null
+++ b/src/Zavudev/Models/Functions/FunctionRollbackDeploymentResponse.cs
@@ -0,0 +1,371 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Functions;
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        FunctionRollbackDeploymentResponse,
+        FunctionRollbackDeploymentResponseFromRaw
+    >)
+)]
+public sealed record class FunctionRollbackDeploymentResponse : JsonModel
+{
+    public required FunctionRollbackDeploymentResponseDeployment Deployment
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<FunctionRollbackDeploymentResponseDeployment>(
+                "deployment"
+            );
+        }
+        init { this._rawData.Set("deployment", value); }
+    }
+
+    /// <summary>
+    /// The draft that was replaced, so a UI can offer to restore it.
+    /// </summary>
+    public JsonElement? PreviousDraft
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<JsonElement>("previousDraft");
+        }
+        init { this._rawData.Set("previousDraft", value); }
+    }
+
+    public long? RolledBackToVersion
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("rolledBackToVersion");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("rolledBackToVersion", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Deployment.Validate();
+        _ = this.PreviousDraft;
+        _ = this.RolledBackToVersion;
+    }
+
+    public FunctionRollbackDeploymentResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public FunctionRollbackDeploymentResponse(
+        FunctionRollbackDeploymentResponse functionRollbackDeploymentResponse
+    )
+        : base(functionRollbackDeploymentResponse) { }
+#pragma warning restore CS8618
+
+    public FunctionRollbackDeploymentResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    FunctionRollbackDeploymentResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="FunctionRollbackDeploymentResponseFromRaw.FromRawUnchecked"/>
+    public static FunctionRollbackDeploymentResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public FunctionRollbackDeploymentResponse(
+        FunctionRollbackDeploymentResponseDeployment deployment
+    )
+        : this()
+    {
+        this.Deployment = deployment;
+    }
+}
+
+class FunctionRollbackDeploymentResponseFromRaw : IFromRawJson<FunctionRollbackDeploymentResponse>
+{
+    /// <inheritdoc/>
+    public FunctionRollbackDeploymentResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => FunctionRollbackDeploymentResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        FunctionRollbackDeploymentResponseDeployment,
+        FunctionRollbackDeploymentResponseDeploymentFromRaw
+    >)
+)]
+public sealed record class FunctionRollbackDeploymentResponseDeployment : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    public required string FunctionID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("functionId");
+        }
+        init { this._rawData.Set("functionId", value); }
+    }
+
+    /// <summary>
+    /// Stage of a function deployment.
+    /// </summary>
+    public required ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus> Status
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, FunctionRollbackDeploymentResponseDeploymentStatus>
+            >("status");
+        }
+        init { this._rawData.Set("status", value); }
+    }
+
+    /// <summary>
+    /// Monotonically increasing deployment version, starting at 1.
+    /// </summary>
+    public required long Version
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("version");
+        }
+        init { this._rawData.Set("version", value); }
+    }
+
+    /// <summary>
+    /// What the build printed: dependency installation, the bundler's output, and
+    /// the compiler's message when it failed. Returned when fetching a single deployment,
+    /// omitted from the list. Read this first when a deploy fails — `errorMessage`
+    /// is often the outer wrapper's summary, and the line that names the broken
+    /// import or the syntax error is here.
+    /// </summary>
+    public string? BuildLogs
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("buildLogs");
+        }
+        init { this._rawData.Set("buildLogs", value); }
+    }
+
+    /// <summary>
+    /// Size of the built bundle in bytes. Null until the build finishes.
+    /// </summary>
+    public long? BundleBytes
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("bundleBytes");
+        }
+        init { this._rawData.Set("bundleBytes", value); }
+    }
+
+    public DateTimeOffset? DeployedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("deployedAt");
+        }
+        init { this._rawData.Set("deployedAt", value); }
+    }
+
+    /// <summary>
+    /// Failure reason when status is 'failed'.
+    /// </summary>
+    public string? ErrorMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("errorMessage");
+        }
+        init { this._rawData.Set("errorMessage", value); }
+    }
+
+    /// <summary>
+    /// Total size of the deployed source tree in bytes.
+    /// </summary>
+    public long? SourceCodeBytes
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("sourceCodeBytes");
+        }
+        init { this._rawData.Set("sourceCodeBytes", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.CreatedAt;
+        _ = this.FunctionID;
+        this.Status.Validate();
+        _ = this.Version;
+        _ = this.BuildLogs;
+        _ = this.BundleBytes;
+        _ = this.DeployedAt;
+        _ = this.ErrorMessage;
+        _ = this.SourceCodeBytes;
+    }
+
+    public FunctionRollbackDeploymentResponseDeployment() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public FunctionRollbackDeploymentResponseDeployment(
+        FunctionRollbackDeploymentResponseDeployment functionRollbackDeploymentResponseDeployment
+    )
+        : base(functionRollbackDeploymentResponseDeployment) { }
+#pragma warning restore CS8618
+
+    public FunctionRollbackDeploymentResponseDeployment(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    FunctionRollbackDeploymentResponseDeployment(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="FunctionRollbackDeploymentResponseDeploymentFromRaw.FromRawUnchecked"/>
+    public static FunctionRollbackDeploymentResponseDeployment FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class FunctionRollbackDeploymentResponseDeploymentFromRaw
+    : IFromRawJson<FunctionRollbackDeploymentResponseDeployment>
+{
+    /// <inheritdoc/>
+    public FunctionRollbackDeploymentResponseDeployment FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => FunctionRollbackDeploymentResponseDeployment.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Stage of a function deployment.
+/// </summary>
+[JsonConverter(typeof(FunctionRollbackDeploymentResponseDeploymentStatusConverter))]
+public enum FunctionRollbackDeploymentResponseDeploymentStatus
+{
+    Pending,
+    Bundling,
+    Uploading,
+    Publishing,
+    Active,
+    Failed,
+    Superseded,
+}
+
+sealed class FunctionRollbackDeploymentResponseDeploymentStatusConverter
+    : JsonConverter<FunctionRollbackDeploymentResponseDeploymentStatus>
+{
+    public override FunctionRollbackDeploymentResponseDeploymentStatus Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "pending" => FunctionRollbackDeploymentResponseDeploymentStatus.Pending,
+            "bundling" => FunctionRollbackDeploymentResponseDeploymentStatus.Bundling,
+            "uploading" => FunctionRollbackDeploymentResponseDeploymentStatus.Uploading,
+            "publishing" => FunctionRollbackDeploymentResponseDeploymentStatus.Publishing,
+            "active" => FunctionRollbackDeploymentResponseDeploymentStatus.Active,
+            "failed" => FunctionRollbackDeploymentResponseDeploymentStatus.Failed,
+            "superseded" => FunctionRollbackDeploymentResponseDeploymentStatus.Superseded,
+            _ => (FunctionRollbackDeploymentResponseDeploymentStatus)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        FunctionRollbackDeploymentResponseDeploymentStatus value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                FunctionRollbackDeploymentResponseDeploymentStatus.Pending => "pending",
+                FunctionRollbackDeploymentResponseDeploymentStatus.Bundling => "bundling",
+                FunctionRollbackDeploymentResponseDeploymentStatus.Uploading => "uploading",
+                FunctionRollbackDeploymentResponseDeploymentStatus.Publishing => "publishing",
+                FunctionRollbackDeploymentResponseDeploymentStatus.Active => "active",
+                FunctionRollbackDeploymentResponseDeploymentStatus.Failed => "failed",
+                FunctionRollbackDeploymentResponseDeploymentStatus.Superseded => "superseded",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Functions/FunctionUpdateParams.cs b/src/Zavudev/Models/Functions/FunctionUpdateParams.cs
index 46cc800..bc0557e 100644
--- a/src/Zavudev/Models/Functions/FunctionUpdateParams.cs
+++ b/src/Zavudev/Models/Functions/FunctionUpdateParams.cs
@@ -55,6 +55,58 @@ public IReadOnlyDictionary<string, string>? Dependencies
         }
     }
 
+    /// <summary>
+    /// Which file in `files` is the entry point. Defaults to `index.ts`.
+    /// </summary>
+    public string? Entrypoint
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("entrypoint");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("entrypoint", value);
+        }
+    }
+
+    /// <summary>
+    /// The project's source files, keyed by path relative to the project root (e.g.
+    /// `index.ts`, `lib/orders.ts`). Imports between them are resolved when the
+    /// function is built, so a function can be split across as many files as it needs.
+    ///
+    /// <para>Paths must be relative and use forward slashes; `..`, `node_modules/`
+    /// and `package.json` are rejected. npm packages are not uploaded here — declare
+    /// them under `dependencies` and Zavu installs them. Limits: 200 files and 900,000
+    /// bytes for the whole tree.</para>
+    /// </summary>
+    public IReadOnlyDictionary<string, string>? Files
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<FrozenDictionary<string, string>>("files");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<FrozenDictionary<string, string>?>(
+                "files",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
     /// <summary>
     /// Expose the function on its public HTTPS URL, or take it down. Applies to
     /// the already-deployed function without redeploying; the URL is returned as `publicUrl`.
@@ -78,7 +130,9 @@ public bool? HttpEnabled
     }
 
     /// <summary>
-    /// New source code for the draft (replaces it).
+    /// Shortcut for a single-file function: exactly equivalent to sending `files`
+    /// with one entry named after `entrypoint` (`index.ts` by default). Fully supported
+    /// — use whichever fits. If both are sent, `files` wins.
     /// </summary>
     public string? SourceCode
     {
diff --git a/src/Zavudev/Models/Functions/GitLink/GitLinkDeployNowParams.cs b/src/Zavudev/Models/Functions/GitLink/GitLinkDeployNowParams.cs
new file mode 100644
index 0000000..8c66606
--- /dev/null
+++ b/src/Zavudev/Models/Functions/GitLink/GitLinkDeployNowParams.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.GitLink;
+
+/// <summary>
+/// Fetch the linked branch and deploy it without waiting for a push. Returns immediately;
+/// follow the outcome with `GET /v1/functions/{functionId}/git-link`, whose `lastStatus`
+/// and `lastError` describe the run.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class GitLinkDeployNowParams : ParamsBase
+{
+    public string? FunctionID { get; init; }
+
+    public GitLinkDeployNowParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkDeployNowParams(GitLinkDeployNowParams gitLinkDeployNowParams)
+        : base(gitLinkDeployNowParams)
+    {
+        this.FunctionID = gitLinkDeployNowParams.FunctionID;
+    }
+#pragma warning restore CS8618
+
+    public GitLinkDeployNowParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkDeployNowParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.FunctionID = functionID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static GitLinkDeployNowParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            functionID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["FunctionID"] = JsonSerializer.SerializeToElement(this.FunctionID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(GitLinkDeployNowParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.FunctionID?.Equals(other.FunctionID) ?? other.FunctionID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/{0}/git-link/deploy", this.FunctionID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/GitLink/GitLinkDeployNowResponse.cs b/src/Zavudev/Models/Functions/GitLink/GitLinkDeployNowResponse.cs
new file mode 100644
index 0000000..9fd56c0
--- /dev/null
+++ b/src/Zavudev/Models/Functions/GitLink/GitLinkDeployNowResponse.cs
@@ -0,0 +1,74 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.GitLink;
+
+[JsonConverter(
+    typeof(JsonModelConverter<GitLinkDeployNowResponse, GitLinkDeployNowResponseFromRaw>)
+)]
+public sealed record class GitLinkDeployNowResponse : JsonModel
+{
+    public required bool Scheduled
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("scheduled");
+        }
+        init { this._rawData.Set("scheduled", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Scheduled;
+    }
+
+    public GitLinkDeployNowResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkDeployNowResponse(GitLinkDeployNowResponse gitLinkDeployNowResponse)
+        : base(gitLinkDeployNowResponse) { }
+#pragma warning restore CS8618
+
+    public GitLinkDeployNowResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkDeployNowResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="GitLinkDeployNowResponseFromRaw.FromRawUnchecked"/>
+    public static GitLinkDeployNowResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public GitLinkDeployNowResponse(bool scheduled)
+        : this()
+    {
+        this.Scheduled = scheduled;
+    }
+}
+
+class GitLinkDeployNowResponseFromRaw : IFromRawJson<GitLinkDeployNowResponse>
+{
+    /// <inheritdoc/>
+    public GitLinkDeployNowResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => GitLinkDeployNowResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Functions/GitLink/GitLinkLinkParams.cs b/src/Zavudev/Models/Functions/GitLink/GitLinkLinkParams.cs
new file mode 100644
index 0000000..3d1ac9b
--- /dev/null
+++ b/src/Zavudev/Models/Functions/GitLink/GitLinkLinkParams.cs
@@ -0,0 +1,236 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.GitLink;
+
+/// <summary>
+/// Bind a repository to this function so every push to `branch` deploys it. A function
+/// holds at most one link; linking again returns 400.
+///
+/// <para>**The server decides how the link authenticates.** If the project has the
+/// Zavu GitHub App installed, the link uses that installation: private repositories
+/// work and there is nothing to configure in the repository. Otherwise it falls
+/// back to a manual link and the response carries a `webhookSecret` you add to the
+/// repository yourself. `connection` says which one you got.</para>
+///
+/// <para>The repository is not checked against GitHub here, because it cannot be:
+/// an owner/repo that does not exist, or that the installation cannot see, is accepted
+/// and fails on the first deploy with a fetch error.</para>
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class GitLinkLinkParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? FunctionID { get; init; }
+
+    public required string Owner
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("owner");
+        }
+        init { this._rawBodyData.Set("owner", value); }
+    }
+
+    public required string Repo
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("repo");
+        }
+        init { this._rawBodyData.Set("repo", value); }
+    }
+
+    public bool? AutoDeploy
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<bool>("autoDeploy");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("autoDeploy", value);
+        }
+    }
+
+    public string? Branch
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("branch");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("branch", value);
+        }
+    }
+
+    /// <summary>
+    /// Subdirectory holding the project, for monorepos.
+    /// </summary>
+    public string? RootDir
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("rootDir");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("rootDir", value);
+        }
+    }
+
+    public GitLinkLinkParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkLinkParams(GitLinkLinkParams gitLinkLinkParams)
+        : base(gitLinkLinkParams)
+    {
+        this.FunctionID = gitLinkLinkParams.FunctionID;
+
+        this._rawBodyData = new(gitLinkLinkParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public GitLinkLinkParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkLinkParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string functionID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.FunctionID = functionID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static GitLinkLinkParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string functionID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            functionID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["FunctionID"] = JsonSerializer.SerializeToElement(this.FunctionID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(GitLinkLinkParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.FunctionID?.Equals(other.FunctionID) ?? other.FunctionID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/{0}/git-link", this.FunctionID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/GitLink/GitLinkLinkResponse.cs b/src/Zavudev/Models/Functions/GitLink/GitLinkLinkResponse.cs
new file mode 100644
index 0000000..3ea6390
--- /dev/null
+++ b/src/Zavudev/Models/Functions/GitLink/GitLinkLinkResponse.cs
@@ -0,0 +1,504 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Functions.GitLink;
+
+[JsonConverter(typeof(JsonModelConverter<GitLinkLinkResponse, GitLinkLinkResponseFromRaw>))]
+public sealed record class GitLinkLinkResponse : JsonModel
+{
+    /// <summary>
+    /// A GitHub repository bound to a function. A push to `branch` deploys the function.
+    /// A function holds at most one link.
+    /// </summary>
+    public required GitLinkLinkResponseLink Link
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<GitLinkLinkResponseLink>("link");
+        }
+        init { this._rawData.Set("link", value); }
+    }
+
+    /// <summary>
+    /// Endpoint that receives GitHub's push deliveries. Only needed on a `manual`
+    /// link, where you add it to the repository yourself.
+    /// </summary>
+    public required string WebhookUrl
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("webhookUrl");
+        }
+        init { this._rawData.Set("webhookUrl", value); }
+    }
+
+    /// <summary>
+    /// Shared secret for the repository's webhook. **Returned only when creating
+    /// a `manual` link, and only there** — every later read strips it, and re-linking
+    /// mints a new one. Absent entirely on an `app` link, which needs no secret
+    /// of its own.
+    /// </summary>
+    public string? WebhookSecret
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("webhookSecret");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("webhookSecret", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Link.Validate();
+        _ = this.WebhookUrl;
+        _ = this.WebhookSecret;
+    }
+
+    public GitLinkLinkResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkLinkResponse(GitLinkLinkResponse gitLinkLinkResponse)
+        : base(gitLinkLinkResponse) { }
+#pragma warning restore CS8618
+
+    public GitLinkLinkResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkLinkResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="GitLinkLinkResponseFromRaw.FromRawUnchecked"/>
+    public static GitLinkLinkResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class GitLinkLinkResponseFromRaw : IFromRawJson<GitLinkLinkResponse>
+{
+    /// <inheritdoc/>
+    public GitLinkLinkResponse FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        GitLinkLinkResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// A GitHub repository bound to a function. A push to `branch` deploys the function.
+/// A function holds at most one link.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<GitLinkLinkResponseLink, GitLinkLinkResponseLinkFromRaw>))]
+public sealed record class GitLinkLinkResponseLink : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    /// <summary>
+    /// When false the link is kept and pushes are ignored.
+    /// </summary>
+    public required bool AutoDeploy
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("autoDeploy");
+        }
+        init { this._rawData.Set("autoDeploy", value); }
+    }
+
+    /// <summary>
+    /// Only pushes to this branch deploy.
+    /// </summary>
+    public required string Branch
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("branch");
+        }
+        init { this._rawData.Set("branch", value); }
+    }
+
+    /// <summary>
+    /// How this link authenticates, decided by the server rather than by the caller.
+    /// - `app`: the Zavu GitHub App is installed on the account. Pushes arrive on
+    /// the app's webhook and private repositories work. Nothing to configure in
+    /// the repository. - `manual`: no installation. The link carries its own secret
+    /// and you add the webhook to the repository yourself.
+    /// </summary>
+    public required ApiEnum<string, GitLinkLinkResponseLinkConnection> Connection
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, GitLinkLinkResponseLinkConnection>
+            >("connection");
+        }
+        init { this._rawData.Set("connection", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    public required string FunctionID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("functionId");
+        }
+        init { this._rawData.Set("functionId", value); }
+    }
+
+    public required string Owner
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("owner");
+        }
+        init { this._rawData.Set("owner", value); }
+    }
+
+    public required ApiEnum<string, GitLinkLinkResponseLinkProvider> Provider
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, GitLinkLinkResponseLinkProvider>>(
+                "provider"
+            );
+        }
+        init { this._rawData.Set("provider", value); }
+    }
+
+    public required string Repo
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("repo");
+        }
+        init { this._rawData.Set("repo", value); }
+    }
+
+    public required DateTimeOffset UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("updatedAt");
+        }
+        init { this._rawData.Set("updatedAt", value); }
+    }
+
+    public string? LastCommitMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("lastCommitMessage");
+        }
+        init { this._rawData.Set("lastCommitMessage", value); }
+    }
+
+    public string? LastCommitSha
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("lastCommitSha");
+        }
+        init { this._rawData.Set("lastCommitSha", value); }
+    }
+
+    public DateTimeOffset? LastDeployAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("lastDeployAt");
+        }
+        init { this._rawData.Set("lastDeployAt", value); }
+    }
+
+    /// <summary>
+    /// Why the last deploy failed. Null otherwise.
+    /// </summary>
+    public string? LastError
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("lastError");
+        }
+        init { this._rawData.Set("lastError", value); }
+    }
+
+    public ApiEnum<string, GitLinkLinkResponseLinkLastStatus>? LastStatus
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<
+                ApiEnum<string, GitLinkLinkResponseLinkLastStatus>
+            >("lastStatus");
+        }
+        init { this._rawData.Set("lastStatus", value); }
+    }
+
+    /// <summary>
+    /// Subdirectory holding the project, for monorepos. Null when the project is
+    /// at the repository root.
+    /// </summary>
+    public string? RootDir
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("rootDir");
+        }
+        init { this._rawData.Set("rootDir", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.AutoDeploy;
+        _ = this.Branch;
+        this.Connection.Validate();
+        _ = this.CreatedAt;
+        _ = this.FunctionID;
+        _ = this.Owner;
+        this.Provider.Validate();
+        _ = this.Repo;
+        _ = this.UpdatedAt;
+        _ = this.LastCommitMessage;
+        _ = this.LastCommitSha;
+        _ = this.LastDeployAt;
+        _ = this.LastError;
+        this.LastStatus?.Validate();
+        _ = this.RootDir;
+    }
+
+    public GitLinkLinkResponseLink() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkLinkResponseLink(GitLinkLinkResponseLink gitLinkLinkResponseLink)
+        : base(gitLinkLinkResponseLink) { }
+#pragma warning restore CS8618
+
+    public GitLinkLinkResponseLink(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkLinkResponseLink(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="GitLinkLinkResponseLinkFromRaw.FromRawUnchecked"/>
+    public static GitLinkLinkResponseLink FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class GitLinkLinkResponseLinkFromRaw : IFromRawJson<GitLinkLinkResponseLink>
+{
+    /// <inheritdoc/>
+    public GitLinkLinkResponseLink FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => GitLinkLinkResponseLink.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// How this link authenticates, decided by the server rather than by the caller.
+/// - `app`: the Zavu GitHub App is installed on the account. Pushes arrive on the
+/// app's webhook and private repositories work. Nothing to configure in the repository.
+/// - `manual`: no installation. The link carries its own secret and you add the
+/// webhook to the repository yourself.
+/// </summary>
+[JsonConverter(typeof(GitLinkLinkResponseLinkConnectionConverter))]
+public enum GitLinkLinkResponseLinkConnection
+{
+    App,
+    Manual,
+}
+
+sealed class GitLinkLinkResponseLinkConnectionConverter
+    : JsonConverter<GitLinkLinkResponseLinkConnection>
+{
+    public override GitLinkLinkResponseLinkConnection Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "app" => GitLinkLinkResponseLinkConnection.App,
+            "manual" => GitLinkLinkResponseLinkConnection.Manual,
+            _ => (GitLinkLinkResponseLinkConnection)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        GitLinkLinkResponseLinkConnection value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                GitLinkLinkResponseLinkConnection.App => "app",
+                GitLinkLinkResponseLinkConnection.Manual => "manual",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+[JsonConverter(typeof(GitLinkLinkResponseLinkProviderConverter))]
+public enum GitLinkLinkResponseLinkProvider
+{
+    GitHub,
+}
+
+sealed class GitLinkLinkResponseLinkProviderConverter
+    : JsonConverter<GitLinkLinkResponseLinkProvider>
+{
+    public override GitLinkLinkResponseLinkProvider Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "github" => GitLinkLinkResponseLinkProvider.GitHub,
+            _ => (GitLinkLinkResponseLinkProvider)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        GitLinkLinkResponseLinkProvider value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                GitLinkLinkResponseLinkProvider.GitHub => "github",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+[JsonConverter(typeof(GitLinkLinkResponseLinkLastStatusConverter))]
+public enum GitLinkLinkResponseLinkLastStatus
+{
+    Deploying,
+    Deployed,
+    Failed,
+}
+
+sealed class GitLinkLinkResponseLinkLastStatusConverter
+    : JsonConverter<GitLinkLinkResponseLinkLastStatus>
+{
+    public override GitLinkLinkResponseLinkLastStatus Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "deploying" => GitLinkLinkResponseLinkLastStatus.Deploying,
+            "deployed" => GitLinkLinkResponseLinkLastStatus.Deployed,
+            "failed" => GitLinkLinkResponseLinkLastStatus.Failed,
+            _ => (GitLinkLinkResponseLinkLastStatus)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        GitLinkLinkResponseLinkLastStatus value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                GitLinkLinkResponseLinkLastStatus.Deploying => "deploying",
+                GitLinkLinkResponseLinkLastStatus.Deployed => "deployed",
+                GitLinkLinkResponseLinkLastStatus.Failed => "failed",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Functions/GitLink/GitLinkRetrieveParams.cs b/src/Zavudev/Models/Functions/GitLink/GitLinkRetrieveParams.cs
new file mode 100644
index 0000000..8252305
--- /dev/null
+++ b/src/Zavudev/Models/Functions/GitLink/GitLinkRetrieveParams.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.GitLink;
+
+/// <summary>
+/// The link and its last deploy. Never returns the webhook secret.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class GitLinkRetrieveParams : ParamsBase
+{
+    public string? FunctionID { get; init; }
+
+    public GitLinkRetrieveParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkRetrieveParams(GitLinkRetrieveParams gitLinkRetrieveParams)
+        : base(gitLinkRetrieveParams)
+    {
+        this.FunctionID = gitLinkRetrieveParams.FunctionID;
+    }
+#pragma warning restore CS8618
+
+    public GitLinkRetrieveParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkRetrieveParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.FunctionID = functionID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static GitLinkRetrieveParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            functionID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["FunctionID"] = JsonSerializer.SerializeToElement(this.FunctionID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(GitLinkRetrieveParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.FunctionID?.Equals(other.FunctionID) ?? other.FunctionID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/{0}/git-link", this.FunctionID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/GitLink/GitLinkRetrieveResponse.cs b/src/Zavudev/Models/Functions/GitLink/GitLinkRetrieveResponse.cs
new file mode 100644
index 0000000..c4c7c49
--- /dev/null
+++ b/src/Zavudev/Models/Functions/GitLink/GitLinkRetrieveResponse.cs
@@ -0,0 +1,489 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Functions.GitLink;
+
+[JsonConverter(typeof(JsonModelConverter<GitLinkRetrieveResponse, GitLinkRetrieveResponseFromRaw>))]
+public sealed record class GitLinkRetrieveResponse : JsonModel
+{
+    /// <summary>
+    /// A GitHub repository bound to a function. A push to `branch` deploys the function.
+    /// A function holds at most one link.
+    /// </summary>
+    public required Link Link
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<Link>("link");
+        }
+        init { this._rawData.Set("link", value); }
+    }
+
+    /// <summary>
+    /// Endpoint that receives GitHub's push deliveries. Only needed on a `manual`
+    /// link, where you add it to the repository yourself.
+    /// </summary>
+    public required string WebhookUrl
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("webhookUrl");
+        }
+        init { this._rawData.Set("webhookUrl", value); }
+    }
+
+    /// <summary>
+    /// Shared secret for the repository's webhook. **Returned only when creating
+    /// a `manual` link, and only there** — every later read strips it, and re-linking
+    /// mints a new one. Absent entirely on an `app` link, which needs no secret
+    /// of its own.
+    /// </summary>
+    public string? WebhookSecret
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("webhookSecret");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("webhookSecret", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Link.Validate();
+        _ = this.WebhookUrl;
+        _ = this.WebhookSecret;
+    }
+
+    public GitLinkRetrieveResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkRetrieveResponse(GitLinkRetrieveResponse gitLinkRetrieveResponse)
+        : base(gitLinkRetrieveResponse) { }
+#pragma warning restore CS8618
+
+    public GitLinkRetrieveResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkRetrieveResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="GitLinkRetrieveResponseFromRaw.FromRawUnchecked"/>
+    public static GitLinkRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class GitLinkRetrieveResponseFromRaw : IFromRawJson<GitLinkRetrieveResponse>
+{
+    /// <inheritdoc/>
+    public GitLinkRetrieveResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => GitLinkRetrieveResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// A GitHub repository bound to a function. A push to `branch` deploys the function.
+/// A function holds at most one link.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Link, LinkFromRaw>))]
+public sealed record class Link : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    /// <summary>
+    /// When false the link is kept and pushes are ignored.
+    /// </summary>
+    public required bool AutoDeploy
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("autoDeploy");
+        }
+        init { this._rawData.Set("autoDeploy", value); }
+    }
+
+    /// <summary>
+    /// Only pushes to this branch deploy.
+    /// </summary>
+    public required string Branch
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("branch");
+        }
+        init { this._rawData.Set("branch", value); }
+    }
+
+    /// <summary>
+    /// How this link authenticates, decided by the server rather than by the caller.
+    /// - `app`: the Zavu GitHub App is installed on the account. Pushes arrive on
+    /// the app's webhook and private repositories work. Nothing to configure in
+    /// the repository. - `manual`: no installation. The link carries its own secret
+    /// and you add the webhook to the repository yourself.
+    /// </summary>
+    public required ApiEnum<string, Connection> Connection
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, Connection>>("connection");
+        }
+        init { this._rawData.Set("connection", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    public required string FunctionID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("functionId");
+        }
+        init { this._rawData.Set("functionId", value); }
+    }
+
+    public required string Owner
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("owner");
+        }
+        init { this._rawData.Set("owner", value); }
+    }
+
+    public required ApiEnum<string, Provider> Provider
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, Provider>>("provider");
+        }
+        init { this._rawData.Set("provider", value); }
+    }
+
+    public required string Repo
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("repo");
+        }
+        init { this._rawData.Set("repo", value); }
+    }
+
+    public required DateTimeOffset UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("updatedAt");
+        }
+        init { this._rawData.Set("updatedAt", value); }
+    }
+
+    public string? LastCommitMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("lastCommitMessage");
+        }
+        init { this._rawData.Set("lastCommitMessage", value); }
+    }
+
+    public string? LastCommitSha
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("lastCommitSha");
+        }
+        init { this._rawData.Set("lastCommitSha", value); }
+    }
+
+    public DateTimeOffset? LastDeployAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("lastDeployAt");
+        }
+        init { this._rawData.Set("lastDeployAt", value); }
+    }
+
+    /// <summary>
+    /// Why the last deploy failed. Null otherwise.
+    /// </summary>
+    public string? LastError
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("lastError");
+        }
+        init { this._rawData.Set("lastError", value); }
+    }
+
+    public ApiEnum<string, LastStatus>? LastStatus
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<ApiEnum<string, LastStatus>>("lastStatus");
+        }
+        init { this._rawData.Set("lastStatus", value); }
+    }
+
+    /// <summary>
+    /// Subdirectory holding the project, for monorepos. Null when the project is
+    /// at the repository root.
+    /// </summary>
+    public string? RootDir
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("rootDir");
+        }
+        init { this._rawData.Set("rootDir", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.AutoDeploy;
+        _ = this.Branch;
+        this.Connection.Validate();
+        _ = this.CreatedAt;
+        _ = this.FunctionID;
+        _ = this.Owner;
+        this.Provider.Validate();
+        _ = this.Repo;
+        _ = this.UpdatedAt;
+        _ = this.LastCommitMessage;
+        _ = this.LastCommitSha;
+        _ = this.LastDeployAt;
+        _ = this.LastError;
+        this.LastStatus?.Validate();
+        _ = this.RootDir;
+    }
+
+    public Link() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Link(Link link)
+        : base(link) { }
+#pragma warning restore CS8618
+
+    public Link(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Link(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="LinkFromRaw.FromRawUnchecked"/>
+    public static Link FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class LinkFromRaw : IFromRawJson<Link>
+{
+    /// <inheritdoc/>
+    public Link FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Link.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// How this link authenticates, decided by the server rather than by the caller.
+/// - `app`: the Zavu GitHub App is installed on the account. Pushes arrive on the
+/// app's webhook and private repositories work. Nothing to configure in the repository.
+/// - `manual`: no installation. The link carries its own secret and you add the
+/// webhook to the repository yourself.
+/// </summary>
+[JsonConverter(typeof(ConnectionConverter))]
+public enum Connection
+{
+    App,
+    Manual,
+}
+
+sealed class ConnectionConverter : JsonConverter<Connection>
+{
+    public override Connection Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "app" => Connection.App,
+            "manual" => Connection.Manual,
+            _ => (Connection)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        Connection value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Connection.App => "app",
+                Connection.Manual => "manual",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+[JsonConverter(typeof(ProviderConverter))]
+public enum Provider
+{
+    GitHub,
+}
+
+sealed class ProviderConverter : JsonConverter<Provider>
+{
+    public override Provider Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "github" => Provider.GitHub,
+            _ => (Provider)(-1),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, Provider value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Provider.GitHub => "github",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+[JsonConverter(typeof(LastStatusConverter))]
+public enum LastStatus
+{
+    Deploying,
+    Deployed,
+    Failed,
+}
+
+sealed class LastStatusConverter : JsonConverter<LastStatus>
+{
+    public override LastStatus Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "deploying" => LastStatus.Deploying,
+            "deployed" => LastStatus.Deployed,
+            "failed" => LastStatus.Failed,
+            _ => (LastStatus)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        LastStatus value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                LastStatus.Deploying => "deploying",
+                LastStatus.Deployed => "deployed",
+                LastStatus.Failed => "failed",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Functions/GitLink/GitLinkUnlinkParams.cs b/src/Zavudev/Models/Functions/GitLink/GitLinkUnlinkParams.cs
new file mode 100644
index 0000000..3456a02
--- /dev/null
+++ b/src/Zavudev/Models/Functions/GitLink/GitLinkUnlinkParams.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.GitLink;
+
+/// <summary>
+/// Remove the link. The function and its deployments stay. A manual webhook left
+/// in the repository stops being accepted, so remove it there too.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class GitLinkUnlinkParams : ParamsBase
+{
+    public string? FunctionID { get; init; }
+
+    public GitLinkUnlinkParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkUnlinkParams(GitLinkUnlinkParams gitLinkUnlinkParams)
+        : base(gitLinkUnlinkParams)
+    {
+        this.FunctionID = gitLinkUnlinkParams.FunctionID;
+    }
+#pragma warning restore CS8618
+
+    public GitLinkUnlinkParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkUnlinkParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.FunctionID = functionID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static GitLinkUnlinkParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            functionID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["FunctionID"] = JsonSerializer.SerializeToElement(this.FunctionID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(GitLinkUnlinkParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.FunctionID?.Equals(other.FunctionID) ?? other.FunctionID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/{0}/git-link", this.FunctionID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/GitLink/GitLinkUpdateParams.cs b/src/Zavudev/Models/Functions/GitLink/GitLinkUpdateParams.cs
new file mode 100644
index 0000000..e72a0ae
--- /dev/null
+++ b/src/Zavudev/Models/Functions/GitLink/GitLinkUpdateParams.cs
@@ -0,0 +1,195 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.GitLink;
+
+/// <summary>
+/// Change the branch, the root directory, or whether pushes deploy. Pass at least
+/// one field. `rootDir: null` clears the subdirectory.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class GitLinkUpdateParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? FunctionID { get; init; }
+
+    public bool? AutoDeploy
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<bool>("autoDeploy");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("autoDeploy", value);
+        }
+    }
+
+    public string? Branch
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("branch");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("branch", value);
+        }
+    }
+
+    public string? RootDir
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("rootDir");
+        }
+        init { this._rawBodyData.Set("rootDir", value); }
+    }
+
+    public GitLinkUpdateParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkUpdateParams(GitLinkUpdateParams gitLinkUpdateParams)
+        : base(gitLinkUpdateParams)
+    {
+        this.FunctionID = gitLinkUpdateParams.FunctionID;
+
+        this._rawBodyData = new(gitLinkUpdateParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public GitLinkUpdateParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkUpdateParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string functionID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.FunctionID = functionID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static GitLinkUpdateParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string functionID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            functionID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["FunctionID"] = JsonSerializer.SerializeToElement(this.FunctionID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(GitLinkUpdateParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.FunctionID?.Equals(other.FunctionID) ?? other.FunctionID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/{0}/git-link", this.FunctionID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/GitLink/GitLinkUpdateResponse.cs b/src/Zavudev/Models/Functions/GitLink/GitLinkUpdateResponse.cs
new file mode 100644
index 0000000..50b6049
--- /dev/null
+++ b/src/Zavudev/Models/Functions/GitLink/GitLinkUpdateResponse.cs
@@ -0,0 +1,507 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Functions.GitLink;
+
+[JsonConverter(typeof(JsonModelConverter<GitLinkUpdateResponse, GitLinkUpdateResponseFromRaw>))]
+public sealed record class GitLinkUpdateResponse : JsonModel
+{
+    /// <summary>
+    /// A GitHub repository bound to a function. A push to `branch` deploys the function.
+    /// A function holds at most one link.
+    /// </summary>
+    public required GitLinkUpdateResponseLink Link
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<GitLinkUpdateResponseLink>("link");
+        }
+        init { this._rawData.Set("link", value); }
+    }
+
+    /// <summary>
+    /// Endpoint that receives GitHub's push deliveries. Only needed on a `manual`
+    /// link, where you add it to the repository yourself.
+    /// </summary>
+    public required string WebhookUrl
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("webhookUrl");
+        }
+        init { this._rawData.Set("webhookUrl", value); }
+    }
+
+    /// <summary>
+    /// Shared secret for the repository's webhook. **Returned only when creating
+    /// a `manual` link, and only there** — every later read strips it, and re-linking
+    /// mints a new one. Absent entirely on an `app` link, which needs no secret
+    /// of its own.
+    /// </summary>
+    public string? WebhookSecret
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("webhookSecret");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("webhookSecret", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Link.Validate();
+        _ = this.WebhookUrl;
+        _ = this.WebhookSecret;
+    }
+
+    public GitLinkUpdateResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkUpdateResponse(GitLinkUpdateResponse gitLinkUpdateResponse)
+        : base(gitLinkUpdateResponse) { }
+#pragma warning restore CS8618
+
+    public GitLinkUpdateResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkUpdateResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="GitLinkUpdateResponseFromRaw.FromRawUnchecked"/>
+    public static GitLinkUpdateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class GitLinkUpdateResponseFromRaw : IFromRawJson<GitLinkUpdateResponse>
+{
+    /// <inheritdoc/>
+    public GitLinkUpdateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => GitLinkUpdateResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// A GitHub repository bound to a function. A push to `branch` deploys the function.
+/// A function holds at most one link.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<GitLinkUpdateResponseLink, GitLinkUpdateResponseLinkFromRaw>)
+)]
+public sealed record class GitLinkUpdateResponseLink : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    /// <summary>
+    /// When false the link is kept and pushes are ignored.
+    /// </summary>
+    public required bool AutoDeploy
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("autoDeploy");
+        }
+        init { this._rawData.Set("autoDeploy", value); }
+    }
+
+    /// <summary>
+    /// Only pushes to this branch deploy.
+    /// </summary>
+    public required string Branch
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("branch");
+        }
+        init { this._rawData.Set("branch", value); }
+    }
+
+    /// <summary>
+    /// How this link authenticates, decided by the server rather than by the caller.
+    /// - `app`: the Zavu GitHub App is installed on the account. Pushes arrive on
+    /// the app's webhook and private repositories work. Nothing to configure in
+    /// the repository. - `manual`: no installation. The link carries its own secret
+    /// and you add the webhook to the repository yourself.
+    /// </summary>
+    public required ApiEnum<string, GitLinkUpdateResponseLinkConnection> Connection
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, GitLinkUpdateResponseLinkConnection>
+            >("connection");
+        }
+        init { this._rawData.Set("connection", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    public required string FunctionID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("functionId");
+        }
+        init { this._rawData.Set("functionId", value); }
+    }
+
+    public required string Owner
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("owner");
+        }
+        init { this._rawData.Set("owner", value); }
+    }
+
+    public required ApiEnum<string, GitLinkUpdateResponseLinkProvider> Provider
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<
+                ApiEnum<string, GitLinkUpdateResponseLinkProvider>
+            >("provider");
+        }
+        init { this._rawData.Set("provider", value); }
+    }
+
+    public required string Repo
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("repo");
+        }
+        init { this._rawData.Set("repo", value); }
+    }
+
+    public required DateTimeOffset UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("updatedAt");
+        }
+        init { this._rawData.Set("updatedAt", value); }
+    }
+
+    public string? LastCommitMessage
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("lastCommitMessage");
+        }
+        init { this._rawData.Set("lastCommitMessage", value); }
+    }
+
+    public string? LastCommitSha
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("lastCommitSha");
+        }
+        init { this._rawData.Set("lastCommitSha", value); }
+    }
+
+    public DateTimeOffset? LastDeployAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("lastDeployAt");
+        }
+        init { this._rawData.Set("lastDeployAt", value); }
+    }
+
+    /// <summary>
+    /// Why the last deploy failed. Null otherwise.
+    /// </summary>
+    public string? LastError
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("lastError");
+        }
+        init { this._rawData.Set("lastError", value); }
+    }
+
+    public ApiEnum<string, GitLinkUpdateResponseLinkLastStatus>? LastStatus
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<
+                ApiEnum<string, GitLinkUpdateResponseLinkLastStatus>
+            >("lastStatus");
+        }
+        init { this._rawData.Set("lastStatus", value); }
+    }
+
+    /// <summary>
+    /// Subdirectory holding the project, for monorepos. Null when the project is
+    /// at the repository root.
+    /// </summary>
+    public string? RootDir
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("rootDir");
+        }
+        init { this._rawData.Set("rootDir", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.AutoDeploy;
+        _ = this.Branch;
+        this.Connection.Validate();
+        _ = this.CreatedAt;
+        _ = this.FunctionID;
+        _ = this.Owner;
+        this.Provider.Validate();
+        _ = this.Repo;
+        _ = this.UpdatedAt;
+        _ = this.LastCommitMessage;
+        _ = this.LastCommitSha;
+        _ = this.LastDeployAt;
+        _ = this.LastError;
+        this.LastStatus?.Validate();
+        _ = this.RootDir;
+    }
+
+    public GitLinkUpdateResponseLink() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public GitLinkUpdateResponseLink(GitLinkUpdateResponseLink gitLinkUpdateResponseLink)
+        : base(gitLinkUpdateResponseLink) { }
+#pragma warning restore CS8618
+
+    public GitLinkUpdateResponseLink(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    GitLinkUpdateResponseLink(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="GitLinkUpdateResponseLinkFromRaw.FromRawUnchecked"/>
+    public static GitLinkUpdateResponseLink FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class GitLinkUpdateResponseLinkFromRaw : IFromRawJson<GitLinkUpdateResponseLink>
+{
+    /// <inheritdoc/>
+    public GitLinkUpdateResponseLink FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => GitLinkUpdateResponseLink.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// How this link authenticates, decided by the server rather than by the caller.
+/// - `app`: the Zavu GitHub App is installed on the account. Pushes arrive on the
+/// app's webhook and private repositories work. Nothing to configure in the repository.
+/// - `manual`: no installation. The link carries its own secret and you add the
+/// webhook to the repository yourself.
+/// </summary>
+[JsonConverter(typeof(GitLinkUpdateResponseLinkConnectionConverter))]
+public enum GitLinkUpdateResponseLinkConnection
+{
+    App,
+    Manual,
+}
+
+sealed class GitLinkUpdateResponseLinkConnectionConverter
+    : JsonConverter<GitLinkUpdateResponseLinkConnection>
+{
+    public override GitLinkUpdateResponseLinkConnection Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "app" => GitLinkUpdateResponseLinkConnection.App,
+            "manual" => GitLinkUpdateResponseLinkConnection.Manual,
+            _ => (GitLinkUpdateResponseLinkConnection)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        GitLinkUpdateResponseLinkConnection value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                GitLinkUpdateResponseLinkConnection.App => "app",
+                GitLinkUpdateResponseLinkConnection.Manual => "manual",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+[JsonConverter(typeof(GitLinkUpdateResponseLinkProviderConverter))]
+public enum GitLinkUpdateResponseLinkProvider
+{
+    GitHub,
+}
+
+sealed class GitLinkUpdateResponseLinkProviderConverter
+    : JsonConverter<GitLinkUpdateResponseLinkProvider>
+{
+    public override GitLinkUpdateResponseLinkProvider Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "github" => GitLinkUpdateResponseLinkProvider.GitHub,
+            _ => (GitLinkUpdateResponseLinkProvider)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        GitLinkUpdateResponseLinkProvider value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                GitLinkUpdateResponseLinkProvider.GitHub => "github",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+[JsonConverter(typeof(GitLinkUpdateResponseLinkLastStatusConverter))]
+public enum GitLinkUpdateResponseLinkLastStatus
+{
+    Deploying,
+    Deployed,
+    Failed,
+}
+
+sealed class GitLinkUpdateResponseLinkLastStatusConverter
+    : JsonConverter<GitLinkUpdateResponseLinkLastStatus>
+{
+    public override GitLinkUpdateResponseLinkLastStatus Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "deploying" => GitLinkUpdateResponseLinkLastStatus.Deploying,
+            "deployed" => GitLinkUpdateResponseLinkLastStatus.Deployed,
+            "failed" => GitLinkUpdateResponseLinkLastStatus.Failed,
+            _ => (GitLinkUpdateResponseLinkLastStatus)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        GitLinkUpdateResponseLinkLastStatus value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                GitLinkUpdateResponseLinkLastStatus.Deploying => "deploying",
+                GitLinkUpdateResponseLinkLastStatus.Deployed => "deployed",
+                GitLinkUpdateResponseLinkLastStatus.Failed => "failed",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Functions/Triggers/TriggerCreateParams.cs b/src/Zavudev/Models/Functions/Triggers/TriggerCreateParams.cs
new file mode 100644
index 0000000..5b3fe77
--- /dev/null
+++ b/src/Zavudev/Models/Functions/Triggers/TriggerCreateParams.cs
@@ -0,0 +1,217 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.Triggers;
+
+/// <summary>
+/// Subscribe a function to one or more event types, optionally scoped to specific
+/// senders. Provide eventTypes and senderIds (use null in senderIds for all senders);
+/// a trigger is created for each event type and sender combination.
+///
+/// <para>The special event type `cron` runs the function on a schedule instead of
+/// a messaging event: include a `cron` field with a 5-field UTC cron expression
+/// (minimum granularity one minute). A cron trigger ignores the sender axis, and
+/// a function may hold several cron triggers with different expressions. The function
+/// receives an event with `type: "cron"` and `data.cron`.</para>
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class TriggerCreateParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? FunctionID { get; init; }
+
+    /// <summary>
+    /// Event types to subscribe to.
+    /// </summary>
+    public required IReadOnlyList<string> EventTypes
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullStruct<ImmutableArray<string>>("eventTypes");
+        }
+        init
+        {
+            this._rawBodyData.Set<ImmutableArray<string>>(
+                "eventTypes",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Senders to scope the triggers to. Use null for all senders.
+    /// </summary>
+    public required IReadOnlyList<string?> SenderIds
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullStruct<ImmutableArray<string?>>("senderIds");
+        }
+        init
+        {
+            this._rawBodyData.Set<ImmutableArray<string?>>(
+                "senderIds",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Required when eventTypes includes `cron`: a 5-field cron expression (minute
+    /// hour day-of-month month day-of-week), evaluated in UTC.
+    /// </summary>
+    public string? Cron
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("cron");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("cron", value);
+        }
+    }
+
+    public TriggerCreateParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TriggerCreateParams(TriggerCreateParams triggerCreateParams)
+        : base(triggerCreateParams)
+    {
+        this.FunctionID = triggerCreateParams.FunctionID;
+
+        this._rawBodyData = new(triggerCreateParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public TriggerCreateParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TriggerCreateParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string functionID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.FunctionID = functionID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static TriggerCreateParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string functionID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            functionID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["FunctionID"] = JsonSerializer.SerializeToElement(this.FunctionID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(TriggerCreateParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.FunctionID?.Equals(other.FunctionID) ?? other.FunctionID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/{0}/triggers", this.FunctionID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/Triggers/TriggerCreateResponse.cs b/src/Zavudev/Models/Functions/Triggers/TriggerCreateResponse.cs
new file mode 100644
index 0000000..02c4885
--- /dev/null
+++ b/src/Zavudev/Models/Functions/Triggers/TriggerCreateResponse.cs
@@ -0,0 +1,275 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.Triggers;
+
+[JsonConverter(typeof(JsonModelConverter<TriggerCreateResponse, TriggerCreateResponseFromRaw>))]
+public sealed record class TriggerCreateResponse : JsonModel
+{
+    public required long Added
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("added");
+        }
+        init { this._rawData.Set("added", value); }
+    }
+
+    /// <summary>
+    /// Number of triggers that already existed.
+    /// </summary>
+    public required long Skipped
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("skipped");
+        }
+        init { this._rawData.Set("skipped", value); }
+    }
+
+    public required IReadOnlyList<Trigger> Triggers
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<Trigger>>("triggers");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<Trigger>>(
+                "triggers",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Added;
+        _ = this.Skipped;
+        foreach (var item in this.Triggers)
+        {
+            item.Validate();
+        }
+    }
+
+    public TriggerCreateResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TriggerCreateResponse(TriggerCreateResponse triggerCreateResponse)
+        : base(triggerCreateResponse) { }
+#pragma warning restore CS8618
+
+    public TriggerCreateResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TriggerCreateResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TriggerCreateResponseFromRaw.FromRawUnchecked"/>
+    public static TriggerCreateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class TriggerCreateResponseFromRaw : IFromRawJson<TriggerCreateResponse>
+{
+    /// <inheritdoc/>
+    public TriggerCreateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => TriggerCreateResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// A subscription that runs a Zavu Function when a messaging event fires.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Trigger, TriggerFromRaw>))]
+public sealed record class Trigger : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required bool Active
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("active");
+        }
+        init { this._rawData.Set("active", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Event type that fires the function. See GET /v1/functions/event-types for
+    /// the supported list. The special type `cron` fires on a schedule instead of
+    /// a messaging event and carries a `cron` expression.
+    /// </summary>
+    public required string EventType
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("eventType");
+        }
+        init { this._rawData.Set("eventType", value); }
+    }
+
+    public required string FunctionID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("functionId");
+        }
+        init { this._rawData.Set("functionId", value); }
+    }
+
+    public required DateTimeOffset UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("updatedAt");
+        }
+        init { this._rawData.Set("updatedAt", value); }
+    }
+
+    /// <summary>
+    /// 5-field cron expression (minute hour day-of-month month day-of-week), evaluated
+    /// in UTC. Present only on `cron` triggers.
+    /// </summary>
+    public string? Cron
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("cron");
+        }
+        init { this._rawData.Set("cron", value); }
+    }
+
+    /// <summary>
+    /// Last time the schedule fired. Null until the first fire.
+    /// </summary>
+    public DateTimeOffset? LastRunAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("lastRunAt");
+        }
+        init { this._rawData.Set("lastRunAt", value); }
+    }
+
+    /// <summary>
+    /// Next scheduled fire time. Present only on `cron` triggers.
+    /// </summary>
+    public DateTimeOffset? NextRunAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("nextRunAt");
+        }
+        init { this._rawData.Set("nextRunAt", value); }
+    }
+
+    /// <summary>
+    /// Restrict the trigger to a single sender. Null means all senders in the project.
+    /// </summary>
+    public string? SenderID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("senderId");
+        }
+        init { this._rawData.Set("senderId", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.Active;
+        _ = this.CreatedAt;
+        _ = this.EventType;
+        _ = this.FunctionID;
+        _ = this.UpdatedAt;
+        _ = this.Cron;
+        _ = this.LastRunAt;
+        _ = this.NextRunAt;
+        _ = this.SenderID;
+    }
+
+    public Trigger() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Trigger(Trigger trigger)
+        : base(trigger) { }
+#pragma warning restore CS8618
+
+    public Trigger(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Trigger(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TriggerFromRaw.FromRawUnchecked"/>
+    public static Trigger FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class TriggerFromRaw : IFromRawJson<Trigger>
+{
+    /// <inheritdoc/>
+    public Trigger FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Trigger.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Functions/Triggers/TriggerDeleteParams.cs b/src/Zavudev/Models/Functions/Triggers/TriggerDeleteParams.cs
new file mode 100644
index 0000000..8b97066
--- /dev/null
+++ b/src/Zavudev/Models/Functions/Triggers/TriggerDeleteParams.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.Triggers;
+
+/// <summary>
+/// Delete a trigger
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class TriggerDeleteParams : ParamsBase
+{
+    public string? TriggerID { get; init; }
+
+    public TriggerDeleteParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TriggerDeleteParams(TriggerDeleteParams triggerDeleteParams)
+        : base(triggerDeleteParams)
+    {
+        this.TriggerID = triggerDeleteParams.TriggerID;
+    }
+#pragma warning restore CS8618
+
+    public TriggerDeleteParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TriggerDeleteParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string triggerID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.TriggerID = triggerID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static TriggerDeleteParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string triggerID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            triggerID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["TriggerID"] = JsonSerializer.SerializeToElement(this.TriggerID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(TriggerDeleteParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.TriggerID?.Equals(other.TriggerID) ?? other.TriggerID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/triggers/{0}", this.TriggerID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/Triggers/TriggerListParams.cs b/src/Zavudev/Models/Functions/Triggers/TriggerListParams.cs
new file mode 100644
index 0000000..3b4a5cc
--- /dev/null
+++ b/src/Zavudev/Models/Functions/Triggers/TriggerListParams.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.Triggers;
+
+/// <summary>
+/// List function triggers
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class TriggerListParams : ParamsBase
+{
+    public string? FunctionID { get; init; }
+
+    public TriggerListParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TriggerListParams(TriggerListParams triggerListParams)
+        : base(triggerListParams)
+    {
+        this.FunctionID = triggerListParams.FunctionID;
+    }
+#pragma warning restore CS8618
+
+    public TriggerListParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TriggerListParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.FunctionID = functionID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static TriggerListParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string functionID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            functionID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["FunctionID"] = JsonSerializer.SerializeToElement(this.FunctionID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(TriggerListParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.FunctionID?.Equals(other.FunctionID) ?? other.FunctionID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/{0}/triggers", this.FunctionID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/Triggers/TriggerListResponse.cs b/src/Zavudev/Models/Functions/Triggers/TriggerListResponse.cs
new file mode 100644
index 0000000..ea69191
--- /dev/null
+++ b/src/Zavudev/Models/Functions/Triggers/TriggerListResponse.cs
@@ -0,0 +1,263 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.Triggers;
+
+[JsonConverter(typeof(JsonModelConverter<TriggerListResponse, TriggerListResponseFromRaw>))]
+public sealed record class TriggerListResponse : JsonModel
+{
+    public required IReadOnlyList<TriggerListResponseTrigger> Triggers
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<TriggerListResponseTrigger>>(
+                "triggers"
+            );
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<TriggerListResponseTrigger>>(
+                "triggers",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Triggers)
+        {
+            item.Validate();
+        }
+    }
+
+    public TriggerListResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TriggerListResponse(TriggerListResponse triggerListResponse)
+        : base(triggerListResponse) { }
+#pragma warning restore CS8618
+
+    public TriggerListResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TriggerListResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TriggerListResponseFromRaw.FromRawUnchecked"/>
+    public static TriggerListResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public TriggerListResponse(IReadOnlyList<TriggerListResponseTrigger> triggers)
+        : this()
+    {
+        this.Triggers = triggers;
+    }
+}
+
+class TriggerListResponseFromRaw : IFromRawJson<TriggerListResponse>
+{
+    /// <inheritdoc/>
+    public TriggerListResponse FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        TriggerListResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// A subscription that runs a Zavu Function when a messaging event fires.
+/// </summary>
+[JsonConverter(
+    typeof(JsonModelConverter<TriggerListResponseTrigger, TriggerListResponseTriggerFromRaw>)
+)]
+public sealed record class TriggerListResponseTrigger : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required bool Active
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("active");
+        }
+        init { this._rawData.Set("active", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Event type that fires the function. See GET /v1/functions/event-types for
+    /// the supported list. The special type `cron` fires on a schedule instead of
+    /// a messaging event and carries a `cron` expression.
+    /// </summary>
+    public required string EventType
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("eventType");
+        }
+        init { this._rawData.Set("eventType", value); }
+    }
+
+    public required string FunctionID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("functionId");
+        }
+        init { this._rawData.Set("functionId", value); }
+    }
+
+    public required DateTimeOffset UpdatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("updatedAt");
+        }
+        init { this._rawData.Set("updatedAt", value); }
+    }
+
+    /// <summary>
+    /// 5-field cron expression (minute hour day-of-month month day-of-week), evaluated
+    /// in UTC. Present only on `cron` triggers.
+    /// </summary>
+    public string? Cron
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("cron");
+        }
+        init { this._rawData.Set("cron", value); }
+    }
+
+    /// <summary>
+    /// Last time the schedule fired. Null until the first fire.
+    /// </summary>
+    public DateTimeOffset? LastRunAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("lastRunAt");
+        }
+        init { this._rawData.Set("lastRunAt", value); }
+    }
+
+    /// <summary>
+    /// Next scheduled fire time. Present only on `cron` triggers.
+    /// </summary>
+    public DateTimeOffset? NextRunAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<DateTimeOffset>("nextRunAt");
+        }
+        init { this._rawData.Set("nextRunAt", value); }
+    }
+
+    /// <summary>
+    /// Restrict the trigger to a single sender. Null means all senders in the project.
+    /// </summary>
+    public string? SenderID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("senderId");
+        }
+        init { this._rawData.Set("senderId", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.Active;
+        _ = this.CreatedAt;
+        _ = this.EventType;
+        _ = this.FunctionID;
+        _ = this.UpdatedAt;
+        _ = this.Cron;
+        _ = this.LastRunAt;
+        _ = this.NextRunAt;
+        _ = this.SenderID;
+    }
+
+    public TriggerListResponseTrigger() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TriggerListResponseTrigger(TriggerListResponseTrigger triggerListResponseTrigger)
+        : base(triggerListResponseTrigger) { }
+#pragma warning restore CS8618
+
+    public TriggerListResponseTrigger(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TriggerListResponseTrigger(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TriggerListResponseTriggerFromRaw.FromRawUnchecked"/>
+    public static TriggerListResponseTrigger FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class TriggerListResponseTriggerFromRaw : IFromRawJson<TriggerListResponseTrigger>
+{
+    /// <inheritdoc/>
+    public TriggerListResponseTrigger FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => TriggerListResponseTrigger.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Functions/Triggers/TriggerUpdateParams.cs b/src/Zavudev/Models/Functions/Triggers/TriggerUpdateParams.cs
new file mode 100644
index 0000000..836ef2b
--- /dev/null
+++ b/src/Zavudev/Models/Functions/Triggers/TriggerUpdateParams.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.Triggers;
+
+/// <summary>
+/// Enable or disable a trigger
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class TriggerUpdateParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? TriggerID { get; init; }
+
+    public required bool Active
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullStruct<bool>("active");
+        }
+        init { this._rawBodyData.Set("active", value); }
+    }
+
+    public TriggerUpdateParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TriggerUpdateParams(TriggerUpdateParams triggerUpdateParams)
+        : base(triggerUpdateParams)
+    {
+        this.TriggerID = triggerUpdateParams.TriggerID;
+
+        this._rawBodyData = new(triggerUpdateParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public TriggerUpdateParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TriggerUpdateParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string triggerID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.TriggerID = triggerID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static TriggerUpdateParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string triggerID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            triggerID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["TriggerID"] = JsonSerializer.SerializeToElement(this.TriggerID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(TriggerUpdateParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.TriggerID?.Equals(other.TriggerID) ?? other.TriggerID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/functions/triggers/{0}", this.TriggerID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Functions/Triggers/TriggerUpdateResponse.cs b/src/Zavudev/Models/Functions/Triggers/TriggerUpdateResponse.cs
new file mode 100644
index 0000000..3028064
--- /dev/null
+++ b/src/Zavudev/Models/Functions/Triggers/TriggerUpdateResponse.cs
@@ -0,0 +1,76 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Functions.Triggers;
+
+[JsonConverter(typeof(JsonModelConverter<TriggerUpdateResponse, TriggerUpdateResponseFromRaw>))]
+public sealed record class TriggerUpdateResponse : JsonModel
+{
+    public required bool Active
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("active");
+        }
+        init { this._rawData.Set("active", value); }
+    }
+
+    public required bool Ok
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("ok");
+        }
+        init { this._rawData.Set("ok", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Active;
+        _ = this.Ok;
+    }
+
+    public TriggerUpdateResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TriggerUpdateResponse(TriggerUpdateResponse triggerUpdateResponse)
+        : base(triggerUpdateResponse) { }
+#pragma warning restore CS8618
+
+    public TriggerUpdateResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TriggerUpdateResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TriggerUpdateResponseFromRaw.FromRawUnchecked"/>
+    public static TriggerUpdateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class TriggerUpdateResponseFromRaw : IFromRawJson<TriggerUpdateResponse>
+{
+    /// <inheritdoc/>
+    public TriggerUpdateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => TriggerUpdateResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Introspect/IntrospectValidateEmailParams.cs b/src/Zavudev/Models/Introspect/IntrospectValidateEmailParams.cs
new file mode 100644
index 0000000..109a30a
--- /dev/null
+++ b/src/Zavudev/Models/Introspect/IntrospectValidateEmailParams.cs
@@ -0,0 +1,192 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Introspect;
+
+/// <summary>
+/// Heuristic email validation to run before sending: catches invalid syntax, dead
+/// domains (no MX/A records), disposable inboxes, role-based addresses (info@, contacto@,
+/// sales@), and addresses already on your project's suppression list. Use it to clean
+/// a list before a broadcast and keep your bounce rate low.
+///
+/// <para>No mailbox-level (SMTP) probe is performed, so a `deliverable` verdict
+/// is not a delivery guarantee — it means no negative signal was found. Treat `risky`
+/// addresses with care and drop `undeliverable` ones.</para>
+///
+/// <para>Accepts a single `email` or an `emails` batch (max 100 per request).</para>
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class IntrospectValidateEmailParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    /// <summary>
+    /// Single email address to validate.
+    /// </summary>
+    public string? Email
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("email");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("email", value);
+        }
+    }
+
+    /// <summary>
+    /// Batch of email addresses to validate (max 100).
+    /// </summary>
+    public IReadOnlyList<string>? Emails
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableStruct<ImmutableArray<string>>("emails");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set<ImmutableArray<string>?>(
+                "emails",
+                value == null ? null : ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public IntrospectValidateEmailParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public IntrospectValidateEmailParams(
+        IntrospectValidateEmailParams introspectValidateEmailParams
+    )
+        : base(introspectValidateEmailParams)
+    {
+        this._rawBodyData = new(introspectValidateEmailParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public IntrospectValidateEmailParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    IntrospectValidateEmailParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static IntrospectValidateEmailParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(IntrospectValidateEmailParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/introspect/email")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Introspect/IntrospectValidateEmailResponse.cs b/src/Zavudev/Models/Introspect/IntrospectValidateEmailResponse.cs
new file mode 100644
index 0000000..2372c01
--- /dev/null
+++ b/src/Zavudev/Models/Introspect/IntrospectValidateEmailResponse.cs
@@ -0,0 +1,427 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+
+namespace Zavudev.Models.Introspect;
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        IntrospectValidateEmailResponse,
+        IntrospectValidateEmailResponseFromRaw
+    >)
+)]
+public sealed record class IntrospectValidateEmailResponse : JsonModel
+{
+    /// <summary>
+    /// One result per submitted address, in the same order.
+    /// </summary>
+    public required IReadOnlyList<Result> Results
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<Result>>("results");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<Result>>(
+                "results",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    public required Summary Summary
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<Summary>("summary");
+        }
+        init { this._rawData.Set("summary", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Results)
+        {
+            item.Validate();
+        }
+        this.Summary.Validate();
+    }
+
+    public IntrospectValidateEmailResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public IntrospectValidateEmailResponse(
+        IntrospectValidateEmailResponse introspectValidateEmailResponse
+    )
+        : base(introspectValidateEmailResponse) { }
+#pragma warning restore CS8618
+
+    public IntrospectValidateEmailResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    IntrospectValidateEmailResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IntrospectValidateEmailResponseFromRaw.FromRawUnchecked"/>
+    public static IntrospectValidateEmailResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class IntrospectValidateEmailResponseFromRaw : IFromRawJson<IntrospectValidateEmailResponse>
+{
+    /// <inheritdoc/>
+    public IntrospectValidateEmailResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => IntrospectValidateEmailResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(JsonModelConverter<Result, ResultFromRaw>))]
+public sealed record class Result : JsonModel
+{
+    /// <summary>
+    /// Domain part of the address. Null when the syntax is invalid.
+    /// </summary>
+    public required string? Domain
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("domain");
+        }
+        init { this._rawData.Set("domain", value); }
+    }
+
+    /// <summary>
+    /// The address exactly as submitted.
+    /// </summary>
+    public required string Email
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("email");
+        }
+        init { this._rawData.Set("email", value); }
+    }
+
+    /// <summary>
+    /// Lowercased, trimmed form of the address. Null when the syntax is invalid.
+    /// </summary>
+    public required string? Normalized
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("normalized");
+        }
+        init { this._rawData.Set("normalized", value); }
+    }
+
+    /// <summary>
+    /// Signals behind the verdict. Empty for a clean `deliverable` address.
+    /// </summary>
+    public required IReadOnlyList<ApiEnum<string, Reason>> Reasons
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<ApiEnum<string, Reason>>>(
+                "reasons"
+            );
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<ApiEnum<string, Reason>>>(
+                "reasons",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Validation verdict. - `deliverable`: nothing suggests the address will bounce.
+    /// - `risky`: sendable, but a signal predicts elevated bounce/complaint odds
+    /// (role address, disposable domain, MX-less domain, prior soft bounce). - `undeliverable`:
+    /// will bounce or is blocked (invalid syntax, dead domain, or the address is
+    /// on your suppression list after a hard bounce/complaint).
+    /// </summary>
+    public required ApiEnum<string, Verdict> Verdict
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, Verdict>>("verdict");
+        }
+        init { this._rawData.Set("verdict", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Domain;
+        _ = this.Email;
+        _ = this.Normalized;
+        foreach (var item in this.Reasons)
+        {
+            item.Validate();
+        }
+        this.Verdict.Validate();
+    }
+
+    public Result() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Result(Result result)
+        : base(result) { }
+#pragma warning restore CS8618
+
+    public Result(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Result(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ResultFromRaw.FromRawUnchecked"/>
+    public static Result FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ResultFromRaw : IFromRawJson<Result>
+{
+    /// <inheritdoc/>
+    public Result FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Result.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(typeof(ReasonConverter))]
+public enum Reason
+{
+    InvalidSyntax,
+    DomainNotFound,
+    DomainNoMx,
+    DisposableDomain,
+    RoleAddress,
+    SuppressedHardBounce,
+    SuppressedSoftBounce,
+    SuppressedComplaint,
+    SuppressedManual,
+    SuppressedUnsubscribe,
+}
+
+sealed class ReasonConverter : JsonConverter<Reason>
+{
+    public override Reason Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "invalid_syntax" => Reason.InvalidSyntax,
+            "domain_not_found" => Reason.DomainNotFound,
+            "domain_no_mx" => Reason.DomainNoMx,
+            "disposable_domain" => Reason.DisposableDomain,
+            "role_address" => Reason.RoleAddress,
+            "suppressed_hard_bounce" => Reason.SuppressedHardBounce,
+            "suppressed_soft_bounce" => Reason.SuppressedSoftBounce,
+            "suppressed_complaint" => Reason.SuppressedComplaint,
+            "suppressed_manual" => Reason.SuppressedManual,
+            "suppressed_unsubscribe" => Reason.SuppressedUnsubscribe,
+            _ => (Reason)(-1),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, Reason value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Reason.InvalidSyntax => "invalid_syntax",
+                Reason.DomainNotFound => "domain_not_found",
+                Reason.DomainNoMx => "domain_no_mx",
+                Reason.DisposableDomain => "disposable_domain",
+                Reason.RoleAddress => "role_address",
+                Reason.SuppressedHardBounce => "suppressed_hard_bounce",
+                Reason.SuppressedSoftBounce => "suppressed_soft_bounce",
+                Reason.SuppressedComplaint => "suppressed_complaint",
+                Reason.SuppressedManual => "suppressed_manual",
+                Reason.SuppressedUnsubscribe => "suppressed_unsubscribe",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Validation verdict. - `deliverable`: nothing suggests the address will bounce.
+/// - `risky`: sendable, but a signal predicts elevated bounce/complaint odds (role
+/// address, disposable domain, MX-less domain, prior soft bounce). - `undeliverable`:
+/// will bounce or is blocked (invalid syntax, dead domain, or the address is on your
+/// suppression list after a hard bounce/complaint).
+/// </summary>
+[JsonConverter(typeof(VerdictConverter))]
+public enum Verdict
+{
+    Deliverable,
+    Risky,
+    Undeliverable,
+}
+
+sealed class VerdictConverter : JsonConverter<Verdict>
+{
+    public override Verdict Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "deliverable" => Verdict.Deliverable,
+            "risky" => Verdict.Risky,
+            "undeliverable" => Verdict.Undeliverable,
+            _ => (Verdict)(-1),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, Verdict value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Verdict.Deliverable => "deliverable",
+                Verdict.Risky => "risky",
+                Verdict.Undeliverable => "undeliverable",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+[JsonConverter(typeof(JsonModelConverter<Summary, SummaryFromRaw>))]
+public sealed record class Summary : JsonModel
+{
+    public required long Deliverable
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("deliverable");
+        }
+        init { this._rawData.Set("deliverable", value); }
+    }
+
+    public required long Risky
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("risky");
+        }
+        init { this._rawData.Set("risky", value); }
+    }
+
+    public required long Total
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("total");
+        }
+        init { this._rawData.Set("total", value); }
+    }
+
+    public required long Undeliverable
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("undeliverable");
+        }
+        init { this._rawData.Set("undeliverable", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Deliverable;
+        _ = this.Risky;
+        _ = this.Total;
+        _ = this.Undeliverable;
+    }
+
+    public Summary() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Summary(Summary summary)
+        : base(summary) { }
+#pragma warning restore CS8618
+
+    public Summary(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Summary(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="SummaryFromRaw.FromRawUnchecked"/>
+    public static Summary FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class SummaryFromRaw : IFromRawJson<Summary>
+{
+    /// <inheritdoc/>
+    public Summary FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Summary.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Messages/Message.cs b/src/Zavudev/Models/Messages/Message.cs
index 4e543c0..679a990 100644
--- a/src/Zavudev/Models/Messages/Message.cs
+++ b/src/Zavudev/Models/Messages/Message.cs
@@ -5,6 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Zavudev.Core;
+using Zavudev.Exceptions;
 
 namespace Zavudev.Models.Messages;
 
@@ -44,6 +45,20 @@ public required DateTimeOffset CreatedAt
         init { this._rawData.Set("createdAt", value); }
     }
 
+    /// <summary>
+    /// Who sent the message. Needed to render a thread: `status` cannot tell the
+    /// two apart, because an inbound message is also stored as `delivered`.
+    /// </summary>
+    public required ApiEnum<string, Direction> Direction
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<ApiEnum<string, Direction>>("direction");
+        }
+        init { this._rawData.Set("direction", value); }
+    }
+
     /// <summary>
     /// Type of message. Non-text types are supported by WhatsApp and Telegram (varies
     /// by type).
@@ -319,6 +334,7 @@ public override void Validate()
         _ = this.ID;
         this.Channel.Validate();
         _ = this.CreatedAt;
+        this.Direction.Validate();
         this.MessageType.Validate();
         this.Status.Validate();
         _ = this.To;
@@ -371,3 +387,51 @@ class MessageFromRaw : IFromRawJson<Message>
     public Message FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
         Message.FromRawUnchecked(rawData);
 }
+
+/// <summary>
+/// Who sent the message. Needed to render a thread: `status` cannot tell the two
+/// apart, because an inbound message is also stored as `delivered`.
+/// </summary>
+[JsonConverter(typeof(DirectionConverter))]
+public enum Direction
+{
+    Inbound,
+    Outbound,
+}
+
+sealed class DirectionConverter : JsonConverter<Direction>
+{
+    public override Direction Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "inbound" => Direction.Inbound,
+            "outbound" => Direction.Outbound,
+            _ => (Direction)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        Direction value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                Direction.Inbound => "inbound",
+                Direction.Outbound => "outbound",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
diff --git a/src/Zavudev/Models/Messages/MessageContent.cs b/src/Zavudev/Models/Messages/MessageContent.cs
index 2258d55..3a8cf29 100644
--- a/src/Zavudev/Models/Messages/MessageContent.cs
+++ b/src/Zavudev/Models/Messages/MessageContent.cs
@@ -424,6 +424,35 @@ public string? ReactToMessageID
         }
     }
 
+    /// <summary>
+    /// Click-to-WhatsApp (CTWA) ad attribution: where an inbound conversation came from.
+    ///
+    /// <para>WhatsApp only. Present on the **first inbound message** of a conversation
+    /// opened from a Meta ad or post, and on no message after it — so store it when
+    /// it arrives rather than expecting it again. Organic conversations never carry it.</para>
+    ///
+    /// <para>Field names are camelCased to match the rest of this API; Meta sends
+    /// them as snake_case (`ctwa_clid`, `source_id`, ...). Fields that do not apply
+    /// are omitted: a `post` source has no click id, and an image ad has no `videoUrl`.</para>
+    /// </summary>
+    public Referral? Referral
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<Referral>("referral");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("referral", value);
+        }
+    }
+
     /// <summary>
     /// Sender of the quoted message (phone number in E.164 format).
     /// </summary>
@@ -701,6 +730,7 @@ public override void Validate()
         _ = this.MediaUrl;
         _ = this.MimeType;
         _ = this.ReactToMessageID;
+        this.Referral?.Validate();
         _ = this.ReplyToFrom;
         _ = this.ReplyToMessageID;
         _ = this.ReplyToMessageType;
@@ -953,6 +983,376 @@ JsonSerializerOptions options
     }
 }
 
+/// <summary>
+/// Click-to-WhatsApp (CTWA) ad attribution: where an inbound conversation came from.
+///
+/// <para>WhatsApp only. Present on the **first inbound message** of a conversation
+/// opened from a Meta ad or post, and on no message after it — so store it when it
+/// arrives rather than expecting it again. Organic conversations never carry it.</para>
+///
+/// <para>Field names are camelCased to match the rest of this API; Meta sends them
+/// as snake_case (`ctwa_clid`, `source_id`, ...). Fields that do not apply are omitted:
+/// a `post` source has no click id, and an image ad has no `videoUrl`.</para>
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Referral, ReferralFromRaw>))]
+public sealed record class Referral : JsonModel
+{
+    /// <summary>
+    /// Body copy of the ad or post.
+    /// </summary>
+    public string? Body
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("body");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("body", value);
+        }
+    }
+
+    /// <summary>
+    /// Click-to-WhatsApp click identifier. This is the value Meta's Conversions API
+    /// needs to credit a conversion back to the ad that produced the conversation.
+    /// Present on `ad` sources; a `post` source has none.
+    /// </summary>
+    public string? CtwaClid
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("ctwaClid");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("ctwaClid", value);
+        }
+    }
+
+    /// <summary>
+    /// Headline of the ad or post.
+    /// </summary>
+    public string? Headline
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("headline");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("headline", value);
+        }
+    }
+
+    /// <summary>
+    /// Image of the ad. Present when `mediaType` is `image`.
+    /// </summary>
+    public string? ImageUrl
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("imageUrl");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("imageUrl", value);
+        }
+    }
+
+    /// <summary>
+    /// Type of media on the ad, when it had any.
+    /// </summary>
+    public ApiEnum<string, MediaType>? MediaType
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<ApiEnum<string, MediaType>>("mediaType");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("mediaType", value);
+        }
+    }
+
+    /// <summary>
+    /// Identifier of the ad or post that produced the click.
+    /// </summary>
+    public string? SourceID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("sourceId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("sourceId", value);
+        }
+    }
+
+    /// <summary>
+    /// Where the click came from.
+    /// </summary>
+    public ApiEnum<string, SourceType>? SourceType
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<ApiEnum<string, SourceType>>("sourceType");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("sourceType", value);
+        }
+    }
+
+    /// <summary>
+    /// Meta permalink to the ad or post.
+    /// </summary>
+    public string? SourceUrl
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("sourceUrl");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("sourceUrl", value);
+        }
+    }
+
+    /// <summary>
+    /// Thumbnail of the ad media.
+    /// </summary>
+    public string? ThumbnailUrl
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("thumbnailUrl");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("thumbnailUrl", value);
+        }
+    }
+
+    /// <summary>
+    /// Video of the ad. Present when `mediaType` is `video`.
+    /// </summary>
+    public string? VideoUrl
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("videoUrl");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("videoUrl", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Body;
+        _ = this.CtwaClid;
+        _ = this.Headline;
+        _ = this.ImageUrl;
+        this.MediaType?.Validate();
+        _ = this.SourceID;
+        this.SourceType?.Validate();
+        _ = this.SourceUrl;
+        _ = this.ThumbnailUrl;
+        _ = this.VideoUrl;
+    }
+
+    public Referral() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Referral(Referral referral)
+        : base(referral) { }
+#pragma warning restore CS8618
+
+    public Referral(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Referral(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ReferralFromRaw.FromRawUnchecked"/>
+    public static Referral FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ReferralFromRaw : IFromRawJson<Referral>
+{
+    /// <inheritdoc/>
+    public Referral FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Referral.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// Type of media on the ad, when it had any.
+/// </summary>
+[JsonConverter(typeof(MediaTypeConverter))]
+public enum MediaType
+{
+    Image,
+    Video,
+}
+
+sealed class MediaTypeConverter : JsonConverter<MediaType>
+{
+    public override MediaType Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "image" => MediaType.Image,
+            "video" => MediaType.Video,
+            _ => (MediaType)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        MediaType value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                MediaType.Image => "image",
+                MediaType.Video => "video",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
+/// <summary>
+/// Where the click came from.
+/// </summary>
+[JsonConverter(typeof(SourceTypeConverter))]
+public enum SourceType
+{
+    Ad,
+    Post,
+}
+
+sealed class SourceTypeConverter : JsonConverter<SourceType>
+{
+    public override SourceType Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return JsonSerializer.Deserialize<string>(ref reader, options) switch
+        {
+            "ad" => SourceType.Ad,
+            "post" => SourceType.Post,
+            _ => (SourceType)(-1),
+        };
+    }
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        SourceType value,
+        JsonSerializerOptions options
+    )
+    {
+        JsonSerializer.Serialize(
+            writer,
+            value switch
+            {
+                SourceType.Ad => "ad",
+                SourceType.Post => "post",
+                _ => throw new ZavudevInvalidDataException(
+                    string.Format("Invalid value '{0}' in {1}", value, nameof(value))
+                ),
+            },
+            options
+        );
+    }
+}
+
 [JsonConverter(typeof(JsonModelConverter<Section, SectionFromRaw>))]
 public sealed record class Section : JsonModel
 {
diff --git a/src/Zavudev/Models/Messages/MessageListAttachmentsParams.cs b/src/Zavudev/Models/Messages/MessageListAttachmentsParams.cs
new file mode 100644
index 0000000..f983506
--- /dev/null
+++ b/src/Zavudev/Models/Messages/MessageListAttachmentsParams.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Messages;
+
+/// <summary>
+/// List the stored file attachments for an email message and get a short-lived signed
+/// `downloadUrl` for each. Works for both inbound emails (received via `message.inbound`)
+/// and outbound emails you sent with attachments. Messages without stored attachments
+/// (including SMS, WhatsApp, and other channels) return an empty list. Each `downloadUrl`
+/// is generated fresh per request and expires — fetch the file promptly and do not
+/// cache the URL.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class MessageListAttachmentsParams : ParamsBase
+{
+    public string? MessageID { get; init; }
+
+    public MessageListAttachmentsParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public MessageListAttachmentsParams(MessageListAttachmentsParams messageListAttachmentsParams)
+        : base(messageListAttachmentsParams)
+    {
+        this.MessageID = messageListAttachmentsParams.MessageID;
+    }
+#pragma warning restore CS8618
+
+    public MessageListAttachmentsParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    MessageListAttachmentsParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string messageID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.MessageID = messageID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static MessageListAttachmentsParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string messageID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            messageID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["MessageID"] = JsonSerializer.SerializeToElement(this.MessageID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(MessageListAttachmentsParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.MessageID?.Equals(other.MessageID) ?? other.MessageID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/messages/{0}/attachments", this.MessageID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Messages/MessageListAttachmentsResponse.cs b/src/Zavudev/Models/Messages/MessageListAttachmentsResponse.cs
new file mode 100644
index 0000000..a80184a
--- /dev/null
+++ b/src/Zavudev/Models/Messages/MessageListAttachmentsResponse.cs
@@ -0,0 +1,243 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Messages;
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        MessageListAttachmentsResponse,
+        MessageListAttachmentsResponseFromRaw
+    >)
+)]
+public sealed record class MessageListAttachmentsResponse : JsonModel
+{
+    public required IReadOnlyList<Item> Items
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<Item>>("items");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<Item>>(
+                "items",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Items)
+        {
+            item.Validate();
+        }
+    }
+
+    public MessageListAttachmentsResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public MessageListAttachmentsResponse(
+        MessageListAttachmentsResponse messageListAttachmentsResponse
+    )
+        : base(messageListAttachmentsResponse) { }
+#pragma warning restore CS8618
+
+    public MessageListAttachmentsResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    MessageListAttachmentsResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="MessageListAttachmentsResponseFromRaw.FromRawUnchecked"/>
+    public static MessageListAttachmentsResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public MessageListAttachmentsResponse(IReadOnlyList<Item> items)
+        : this()
+    {
+        this.Items = items;
+    }
+}
+
+class MessageListAttachmentsResponseFromRaw : IFromRawJson<MessageListAttachmentsResponse>
+{
+    /// <inheritdoc/>
+    public MessageListAttachmentsResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => MessageListAttachmentsResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// A stored file attachment for an email message (inbound or outbound).
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Item, ItemFromRaw>))]
+public sealed record class Item : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    /// <summary>
+    /// Content-ID for inline attachments (referenced in the HTML body as `cid:&lt;contentId&gt;`).
+    /// Null for regular attachments.
+    /// </summary>
+    public required string? ContentID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("contentId");
+        }
+        init { this._rawData.Set("contentId", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    /// <summary>
+    /// Short-lived signed URL to download the attachment bytes. Freshly generated
+    /// on each request and expires; do not cache it. Null if the stored file is no
+    /// longer available.
+    /// </summary>
+    public required string? DownloadUrl
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("downloadUrl");
+        }
+        init { this._rawData.Set("downloadUrl", value); }
+    }
+
+    public required string Filename
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("filename");
+        }
+        init { this._rawData.Set("filename", value); }
+    }
+
+    /// <summary>
+    /// Whether the attachment is inline (embedded in the HTML body) rather than
+    /// a regular attachment.
+    /// </summary>
+    public required bool IsInline
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("isInline");
+        }
+        init { this._rawData.Set("isInline", value); }
+    }
+
+    /// <summary>
+    /// MIME type of the attachment.
+    /// </summary>
+    public required string MimeType
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("mimeType");
+        }
+        init { this._rawData.Set("mimeType", value); }
+    }
+
+    /// <summary>
+    /// Size of the attachment in bytes.
+    /// </summary>
+    public required long Size
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("size");
+        }
+        init { this._rawData.Set("size", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.ContentID;
+        _ = this.CreatedAt;
+        _ = this.DownloadUrl;
+        _ = this.Filename;
+        _ = this.IsInline;
+        _ = this.MimeType;
+        _ = this.Size;
+    }
+
+    public Item() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Item(Item item)
+        : base(item) { }
+#pragma warning restore CS8618
+
+    public Item(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Item(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ItemFromRaw.FromRawUnchecked"/>
+    public static Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ItemFromRaw : IFromRawJson<Item>
+{
+    /// <inheritdoc/>
+    public Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Item.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Messages/MessageSendParams.cs b/src/Zavudev/Models/Messages/MessageSendParams.cs
index 7ab088b..cc83de7 100644
--- a/src/Zavudev/Models/Messages/MessageSendParams.cs
+++ b/src/Zavudev/Models/Messages/MessageSendParams.cs
@@ -34,6 +34,31 @@ namespace Zavudev.Models.Messages;
 /// email quotas instead - SMS and voice are billed per message from your balance
 /// on every plan</para>
 ///
+/// <para>**Account verification and daily limits:** - A brand-new account can send
+/// on every channel immediately, but `sms`, `sms_oneway` and `voice` reach only
+/// the phone numbers the project has verified. Sending elsewhere returns `403` with
+/// code `destination_not_verified`; `details.verifiedNumbers` lists the numbers
+/// that are reachable. A number is verified from the dashboard's Sandbox screen:
+/// generate a code and send the pre-filled WhatsApp message from that phone to Zavu's
+/// sandbox number. One verification covers WhatsApp, SMS and calls, up to 5 numbers
+/// per project. To send to any destination, do any one of these: verify your identity,
+/// add a payment method, settle a deposit, or subscribe to a paid plan. Business
+/// verification (KYB) is never required to send - Daily ceilings apply per channel
+/// group and rise with verification. An account that has verified nothing: 25/day
+/// across `sms` + `sms_oneway`, 5/day for `voice`, 100/day across WhatsApp, Telegram,
+/// Instagram and Messenger combined. Past that floor: 200/day for SMS, or 10,000/day
+/// once identity or business verification is approved (or a higher limit agreed
+/// for your account); 50/day voice and 250/day conversational on Free. **Paid plans
+/// have no voice or conversational daily ceiling.** Over a ceiling, sends return
+/// `429` with code `daily_limit_exceeded` and `details.limit`; the count resets at
+/// 00:00 UTC - The daily ceiling never reduces the monthly allowance: 100/day on
+/// the conversational group still reaches the 2,000 monthly A2P messages Free includes
+/// - Email needs no account verification here: a sender with a verified domain sends
+/// from day one, within the plan quota (100/day and 3,000/month on Free). Over the
+/// daily quota it returns `429` with code `daily_limit_exceeded`. Email broadcasts
+/// are the exception: they need the account past the unverified level, see `POST
+/// /v1/broadcasts/{broadcastId}/send` - Full reference: https://docs.zavu.dev/concepts/sending-limits</para>
+///
 /// <para>**Email recipient pre-flight:** Email messages are validated automatically
 /// before dispatch. Sends that would be a guaranteed hard bounce are failed instead
 /// of sent, protecting your bounce rate: the message transitions to `failed` (visible
diff --git a/src/Zavudev/Models/Number10dlc/Brands/BrandSubmitParams.cs b/src/Zavudev/Models/Number10dlc/Brands/BrandSubmitParams.cs
index 51e6214..306ba17 100644
--- a/src/Zavudev/Models/Number10dlc/Brands/BrandSubmitParams.cs
+++ b/src/Zavudev/Models/Number10dlc/Brands/BrandSubmitParams.cs
@@ -10,11 +10,15 @@ namespace Zavudev.Models.Number10dlc.Brands;
 
 /// <summary>
 /// Submit a draft brand to The Campaign Registry (TCR) for vetting. The brand must
-/// be in draft status. TCR's one-time $4 brand registration fee is charged from your
-/// balance at submission (passed through at cost) and refunded if the carrier rejects
-/// the registration. A team that already paid this fee through the compliance flow
-/// is not charged again. Campaign registration is billed separately when a campaign
-/// is submitted.
+/// be in draft status, and the team must have an approved Business Verification (KYB)
+/// — carriers register a brand against a vetted legal entity, so submitting without
+/// one returns `403` with code `kyb_required`.
+///
+/// <para>TCR's one-time $4 brand registration fee is charged from your balance at
+/// submission (passed through at cost) and refunded if the carrier rejects the registration.
+/// The fee is per BRAND: a team registering a second legal entity pays it again.
+/// A brand already paid for through the compliance flow is not charged twice. Campaign
+/// registration is billed separately when a campaign is submitted.</para>
 ///
 /// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
 /// breaking changes in non-major versions. We may add new methods in the future that
diff --git a/src/Zavudev/Models/Number10dlc/Campaigns/CampaignSubmitParams.cs b/src/Zavudev/Models/Number10dlc/Campaigns/CampaignSubmitParams.cs
index 20b1d54..63cfa2e 100644
--- a/src/Zavudev/Models/Number10dlc/Campaigns/CampaignSubmitParams.cs
+++ b/src/Zavudev/Models/Number10dlc/Campaigns/CampaignSubmitParams.cs
@@ -9,13 +9,14 @@
 namespace Zavudev.Models.Number10dlc.Campaigns;
 
 /// <summary>
-/// Submit a draft campaign for carrier review. The campaign must be in draft status
-/// and its brand must be verified. TCR's one-time registration fee is charged from
-/// your balance at submission ($15 for standard use cases, $2 for LOW_VOLUME), passed
-/// through at cost and refunded if the carrier rejects it. Once approved, the campaign's
-/// monthly TCR fee ($10 standard, $2 LOW_VOLUME) is charged from your balance while
-/// the campaign is active — see registrationCostCents and monthlyFeeCents on the
-/// campaign object.
+/// The team must have an approved Business Verification (KYB): submitting without
+/// one returns `403` with code `kyb_required`. Submit a draft campaign for carrier
+/// review. The campaign must be in draft status and its brand must be verified. TCR's
+/// one-time registration fee is charged from your balance at submission ($15 for
+/// standard use cases, $2 for LOW_VOLUME), passed through at cost and refunded if
+/// the carrier rejects it. Once approved, the campaign's monthly TCR fee ($10 standard,
+/// $2 LOW_VOLUME) is charged from your balance while the campaign is active — see
+/// registrationCostCents and monthlyFeeCents on the campaign object.
 ///
 /// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
 /// breaking changes in non-major versions. We may add new methods in the future that
diff --git a/src/Zavudev/Models/PhoneNumbers/PhoneNumberType.cs b/src/Zavudev/Models/PhoneNumbers/PhoneNumberType.cs
index 507195f..7f23303 100644
--- a/src/Zavudev/Models/PhoneNumbers/PhoneNumberType.cs
+++ b/src/Zavudev/Models/PhoneNumbers/PhoneNumberType.cs
@@ -5,12 +5,18 @@
 
 namespace Zavudev.Models.PhoneNumbers;
 
+/// <summary>
+/// Type of phone number. `mobile` is stocked in countries where no geographic (`local`)
+/// or non-geographic (`national`) inventory exists, and in several markets it is
+/// the only type that can receive SMS.
+/// </summary>
 [JsonConverter(typeof(PhoneNumberTypeConverter))]
 public enum PhoneNumberType
 {
     Local,
     National,
     TollFree,
+    Mobile,
 }
 
 sealed class PhoneNumberTypeConverter : JsonConverter<PhoneNumberType>
@@ -26,6 +32,7 @@ JsonSerializerOptions options
             "local" => PhoneNumberType.Local,
             "national" => PhoneNumberType.National,
             "tollFree" => PhoneNumberType.TollFree,
+            "mobile" => PhoneNumberType.Mobile,
             _ => (PhoneNumberType)(-1),
         };
     }
@@ -43,6 +50,7 @@ JsonSerializerOptions options
                 PhoneNumberType.Local => "local",
                 PhoneNumberType.National => "national",
                 PhoneNumberType.TollFree => "tollFree",
+                PhoneNumberType.Mobile => "mobile",
                 _ => throw new ZavudevInvalidDataException(
                     string.Format("Invalid value '{0}' in {1}", value, nameof(value))
                 ),
diff --git a/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentParams.cs b/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentParams.cs
new file mode 100644
index 0000000..65ccac4
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentParams.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Agent.KnowledgeBases.Documents;
+
+/// <summary>
+/// Get a single document from a knowledge base.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class DocumentRetrieveDocumentParams : ParamsBase
+{
+    public required string SenderID { get; init; }
+
+    public required string KBID { get; init; }
+
+    public string? DocID { get; init; }
+
+    public DocumentRetrieveDocumentParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public DocumentRetrieveDocumentParams(
+        DocumentRetrieveDocumentParams documentRetrieveDocumentParams
+    )
+        : base(documentRetrieveDocumentParams)
+    {
+        this.SenderID = documentRetrieveDocumentParams.SenderID;
+        this.KBID = documentRetrieveDocumentParams.KBID;
+        this.DocID = documentRetrieveDocumentParams.DocID;
+    }
+#pragma warning restore CS8618
+
+    public DocumentRetrieveDocumentParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    DocumentRetrieveDocumentParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string senderID,
+        string kbid,
+        string docID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.SenderID = senderID;
+        this.KBID = kbid;
+        this.DocID = docID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static DocumentRetrieveDocumentParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string senderID,
+        string kbid,
+        string docID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            senderID,
+            kbid,
+            docID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["SenderID"] = JsonSerializer.SerializeToElement(this.SenderID),
+                    ["KBID"] = JsonSerializer.SerializeToElement(this.KBID),
+                    ["DocID"] = JsonSerializer.SerializeToElement(this.DocID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(DocumentRetrieveDocumentParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this.SenderID.Equals(other.SenderID)
+            && this.KBID.Equals(other.KBID)
+            && (this.DocID?.Equals(other.DocID) ?? other.DocID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format(
+                    "/v1/senders/{0}/agent/knowledge-bases/{1}/documents/{2}",
+                    this.SenderID,
+                    this.KBID,
+                    this.DocID
+                )
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentResponse.cs b/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentResponse.cs
new file mode 100644
index 0000000..832345c
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentRetrieveDocumentResponse.cs
@@ -0,0 +1,79 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Agent.KnowledgeBases.Documents;
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        DocumentRetrieveDocumentResponse,
+        DocumentRetrieveDocumentResponseFromRaw
+    >)
+)]
+public sealed record class DocumentRetrieveDocumentResponse : JsonModel
+{
+    public required AgentDocument Document
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<AgentDocument>("document");
+        }
+        init { this._rawData.Set("document", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Document.Validate();
+    }
+
+    public DocumentRetrieveDocumentResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public DocumentRetrieveDocumentResponse(
+        DocumentRetrieveDocumentResponse documentRetrieveDocumentResponse
+    )
+        : base(documentRetrieveDocumentResponse) { }
+#pragma warning restore CS8618
+
+    public DocumentRetrieveDocumentResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    DocumentRetrieveDocumentResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="DocumentRetrieveDocumentResponseFromRaw.FromRawUnchecked"/>
+    public static DocumentRetrieveDocumentResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public DocumentRetrieveDocumentResponse(AgentDocument document)
+        : this()
+    {
+        this.Document = document;
+    }
+}
+
+class DocumentRetrieveDocumentResponseFromRaw : IFromRawJson<DocumentRetrieveDocumentResponse>
+{
+    /// <inheritdoc/>
+    public DocumentRetrieveDocumentResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => DocumentRetrieveDocumentResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentParams.cs b/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentParams.cs
new file mode 100644
index 0000000..a126956
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentParams.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Agent.KnowledgeBases.Documents;
+
+/// <summary>
+/// Update a document's title or content. Updating content reprocesses the document
+/// for RAG.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class DocumentUpdateDocumentParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public required string SenderID { get; init; }
+
+    public required string KBID { get; init; }
+
+    public string? DocID { get; init; }
+
+    public string? Content
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("content");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("content", value);
+        }
+    }
+
+    public string? Title
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("title");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("title", value);
+        }
+    }
+
+    public DocumentUpdateDocumentParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public DocumentUpdateDocumentParams(DocumentUpdateDocumentParams documentUpdateDocumentParams)
+        : base(documentUpdateDocumentParams)
+    {
+        this.SenderID = documentUpdateDocumentParams.SenderID;
+        this.KBID = documentUpdateDocumentParams.KBID;
+        this.DocID = documentUpdateDocumentParams.DocID;
+
+        this._rawBodyData = new(documentUpdateDocumentParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public DocumentUpdateDocumentParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    DocumentUpdateDocumentParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string senderID,
+        string kbid,
+        string docID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.SenderID = senderID;
+        this.KBID = kbid;
+        this.DocID = docID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static DocumentUpdateDocumentParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string senderID,
+        string kbid,
+        string docID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            senderID,
+            kbid,
+            docID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["SenderID"] = JsonSerializer.SerializeToElement(this.SenderID),
+                    ["KBID"] = JsonSerializer.SerializeToElement(this.KBID),
+                    ["DocID"] = JsonSerializer.SerializeToElement(this.DocID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(DocumentUpdateDocumentParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this.SenderID.Equals(other.SenderID)
+            && this.KBID.Equals(other.KBID)
+            && (this.DocID?.Equals(other.DocID) ?? other.DocID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format(
+                    "/v1/senders/{0}/agent/knowledge-bases/{1}/documents/{2}",
+                    this.SenderID,
+                    this.KBID,
+                    this.DocID
+                )
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentResponse.cs b/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentResponse.cs
new file mode 100644
index 0000000..1bce6df
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Agent/KnowledgeBases/Documents/DocumentUpdateDocumentResponse.cs
@@ -0,0 +1,79 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Agent.KnowledgeBases.Documents;
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        DocumentUpdateDocumentResponse,
+        DocumentUpdateDocumentResponseFromRaw
+    >)
+)]
+public sealed record class DocumentUpdateDocumentResponse : JsonModel
+{
+    public required AgentDocument Document
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<AgentDocument>("document");
+        }
+        init { this._rawData.Set("document", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Document.Validate();
+    }
+
+    public DocumentUpdateDocumentResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public DocumentUpdateDocumentResponse(
+        DocumentUpdateDocumentResponse documentUpdateDocumentResponse
+    )
+        : base(documentUpdateDocumentResponse) { }
+#pragma warning restore CS8618
+
+    public DocumentUpdateDocumentResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    DocumentUpdateDocumentResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="DocumentUpdateDocumentResponseFromRaw.FromRawUnchecked"/>
+    public static DocumentUpdateDocumentResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public DocumentUpdateDocumentResponse(AgentDocument document)
+        : this()
+    {
+        this.Document = document;
+    }
+}
+
+class DocumentUpdateDocumentResponseFromRaw : IFromRawJson<DocumentUpdateDocumentResponse>
+{
+    /// <inheritdoc/>
+    public DocumentUpdateDocumentResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => DocumentUpdateDocumentResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Senders/Agent/Tools/ToolListTestRunsParams.cs b/src/Zavudev/Models/Senders/Agent/Tools/ToolListTestRunsParams.cs
new file mode 100644
index 0000000..413f144
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Agent/Tools/ToolListTestRunsParams.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Agent.Tools;
+
+/// <summary>
+/// Recent runs of this tool triggered from the test endpoint, newest first. Covers
+/// manual tests only: a tool called by an agent during a real conversation is not
+/// recorded here.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class ToolListTestRunsParams : ParamsBase
+{
+    public required string SenderID { get; init; }
+
+    public string? ToolID { get; init; }
+
+    public long? Limit
+    {
+        get
+        {
+            this._rawQueryData.Freeze();
+            return this._rawQueryData.GetNullableStruct<long>("limit");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawQueryData.Set("limit", value);
+        }
+    }
+
+    public ToolListTestRunsParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ToolListTestRunsParams(ToolListTestRunsParams toolListTestRunsParams)
+        : base(toolListTestRunsParams)
+    {
+        this.SenderID = toolListTestRunsParams.SenderID;
+        this.ToolID = toolListTestRunsParams.ToolID;
+    }
+#pragma warning restore CS8618
+
+    public ToolListTestRunsParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ToolListTestRunsParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string senderID,
+        string toolID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.SenderID = senderID;
+        this.ToolID = toolID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static ToolListTestRunsParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string senderID,
+        string toolID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            senderID,
+            toolID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["SenderID"] = JsonSerializer.SerializeToElement(this.SenderID),
+                    ["ToolID"] = JsonSerializer.SerializeToElement(this.ToolID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(ToolListTestRunsParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this.SenderID.Equals(other.SenderID)
+            && (this.ToolID?.Equals(other.ToolID) ?? other.ToolID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format(
+                    "/v1/senders/{0}/agent/tools/{1}/test-runs",
+                    this.SenderID,
+                    this.ToolID
+                )
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Senders/Agent/Tools/ToolListTestRunsResponse.cs b/src/Zavudev/Models/Senders/Agent/Tools/ToolListTestRunsResponse.cs
new file mode 100644
index 0000000..6d2a13b
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Agent/Tools/ToolListTestRunsResponse.cs
@@ -0,0 +1,258 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Agent.Tools;
+
+[JsonConverter(
+    typeof(JsonModelConverter<ToolListTestRunsResponse, ToolListTestRunsResponseFromRaw>)
+)]
+public sealed record class ToolListTestRunsResponse : JsonModel
+{
+    public required IReadOnlyList<Item> Items
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<Item>>("items");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<Item>>(
+                "items",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        foreach (var item in this.Items)
+        {
+            item.Validate();
+        }
+    }
+
+    public ToolListTestRunsResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public ToolListTestRunsResponse(ToolListTestRunsResponse toolListTestRunsResponse)
+        : base(toolListTestRunsResponse) { }
+#pragma warning restore CS8618
+
+    public ToolListTestRunsResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    ToolListTestRunsResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ToolListTestRunsResponseFromRaw.FromRawUnchecked"/>
+    public static ToolListTestRunsResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public ToolListTestRunsResponse(IReadOnlyList<Item> items)
+        : this()
+    {
+        this.Items = items;
+    }
+}
+
+class ToolListTestRunsResponseFromRaw : IFromRawJson<ToolListTestRunsResponse>
+{
+    /// <inheritdoc/>
+    public ToolListTestRunsResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => ToolListTestRunsResponse.FromRawUnchecked(rawData);
+}
+
+/// <summary>
+/// One run of a tool triggered from the test endpoint. Recorded so a test is verifiable
+/// after the fact rather than only visible in the response.
+/// </summary>
+[JsonConverter(typeof(JsonModelConverter<Item, ItemFromRaw>))]
+public sealed record class Item : JsonModel
+{
+    public required string ID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("id");
+        }
+        init { this._rawData.Set("id", value); }
+    }
+
+    public required DateTimeOffset CreatedAt
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<DateTimeOffset>("createdAt");
+        }
+        init { this._rawData.Set("createdAt", value); }
+    }
+
+    public required long DurationMs
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("durationMs");
+        }
+        init { this._rawData.Set("durationMs", value); }
+    }
+
+    /// <summary>
+    /// Whether the tool returned without error. A tool that answered with a non-2xx
+    /// status is a failed run, not an error of this endpoint.
+    /// </summary>
+    public required bool Success
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("success");
+        }
+        init { this._rawData.Set("success", value); }
+    }
+
+    public required string ToolID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("toolId");
+        }
+        init { this._rawData.Set("toolId", value); }
+    }
+
+    /// <summary>
+    /// Why the run failed, when it did.
+    /// </summary>
+    public string? Error
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("error");
+        }
+        init { this._rawData.Set("error", value); }
+    }
+
+    /// <summary>
+    /// The parameters the tool was called with.
+    /// </summary>
+    public IReadOnlyDictionary<string, JsonElement>? Params
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<FrozenDictionary<string, JsonElement>>("params");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set<FrozenDictionary<string, JsonElement>?>(
+                "params",
+                value == null ? null : FrozenDictionary.ToFrozenDictionary(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// The tool's response body, truncated.
+    /// </summary>
+    public string? Response
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("response");
+        }
+        init { this._rawData.Set("response", value); }
+    }
+
+    /// <summary>
+    /// HTTP status the tool's webhook returned. Absent for tools that do not go over HTTP.
+    /// </summary>
+    public long? StatusCode
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableStruct<long>("statusCode");
+        }
+        init { this._rawData.Set("statusCode", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.ID;
+        _ = this.CreatedAt;
+        _ = this.DurationMs;
+        _ = this.Success;
+        _ = this.ToolID;
+        _ = this.Error;
+        _ = this.Params;
+        _ = this.Response;
+        _ = this.StatusCode;
+    }
+
+    public Item() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public Item(Item item)
+        : base(item) { }
+#pragma warning restore CS8618
+
+    public Item(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    Item(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="ItemFromRaw.FromRawUnchecked"/>
+    public static Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class ItemFromRaw : IFromRawJson<Item>
+{
+    /// <inheritdoc/>
+    public Item FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        Item.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Senders/Agent/Tools/Webhook/WebhookRotateSecretParams.cs b/src/Zavudev/Models/Senders/Agent/Tools/Webhook/WebhookRotateSecretParams.cs
new file mode 100644
index 0000000..ac96b51
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Agent/Tools/Webhook/WebhookRotateSecretParams.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Agent.Tools.Webhook;
+
+/// <summary>
+/// Generate a new signing secret for this tool. The previous one stops working on
+/// the next call, with no overlap, so update your endpoint first. The tool keeps
+/// its id, so flows that reference it by name are unaffected.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class WebhookRotateSecretParams : ParamsBase
+{
+    public required string SenderID { get; init; }
+
+    public string? ToolID { get; init; }
+
+    public WebhookRotateSecretParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public WebhookRotateSecretParams(WebhookRotateSecretParams webhookRotateSecretParams)
+        : base(webhookRotateSecretParams)
+    {
+        this.SenderID = webhookRotateSecretParams.SenderID;
+        this.ToolID = webhookRotateSecretParams.ToolID;
+    }
+#pragma warning restore CS8618
+
+    public WebhookRotateSecretParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    WebhookRotateSecretParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string senderID,
+        string toolID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.SenderID = senderID;
+        this.ToolID = toolID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static WebhookRotateSecretParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string senderID,
+        string toolID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            senderID,
+            toolID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["SenderID"] = JsonSerializer.SerializeToElement(this.SenderID),
+                    ["ToolID"] = JsonSerializer.SerializeToElement(this.ToolID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(WebhookRotateSecretParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this.SenderID.Equals(other.SenderID)
+            && (this.ToolID?.Equals(other.ToolID) ?? other.ToolID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format(
+                    "/v1/senders/{0}/agent/tools/{1}/webhook/secret",
+                    this.SenderID,
+                    this.ToolID
+                )
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Senders/Telegram/TelegramConnectParams.cs b/src/Zavudev/Models/Senders/Telegram/TelegramConnectParams.cs
new file mode 100644
index 0000000..102192f
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Telegram/TelegramConnectParams.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Telegram;
+
+/// <summary>
+/// Connect a Telegram bot to a sender. Provide the bot token from @BotFather; Zavu
+/// validates it, registers the webhook, and routes the sender's Telegram messages
+/// through it.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class TelegramConnectParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? SenderID { get; init; }
+
+    /// <summary>
+    /// Bot token from @BotFather.
+    /// </summary>
+    public required string BotToken
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("botToken");
+        }
+        init { this._rawBodyData.Set("botToken", value); }
+    }
+
+    public TelegramConnectParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TelegramConnectParams(TelegramConnectParams telegramConnectParams)
+        : base(telegramConnectParams)
+    {
+        this.SenderID = telegramConnectParams.SenderID;
+
+        this._rawBodyData = new(telegramConnectParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public TelegramConnectParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TelegramConnectParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string senderID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.SenderID = senderID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static TelegramConnectParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string senderID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            senderID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["SenderID"] = JsonSerializer.SerializeToElement(this.SenderID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(TelegramConnectParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.SenderID?.Equals(other.SenderID) ?? other.SenderID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/senders/{0}/telegram", this.SenderID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Senders/Telegram/TelegramConnectResponse.cs b/src/Zavudev/Models/Senders/Telegram/TelegramConnectResponse.cs
new file mode 100644
index 0000000..3f1fce9
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Telegram/TelegramConnectResponse.cs
@@ -0,0 +1,181 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Telegram;
+
+[JsonConverter(typeof(JsonModelConverter<TelegramConnectResponse, TelegramConnectResponseFromRaw>))]
+public sealed record class TelegramConnectResponse : JsonModel
+{
+    public required TelegramConnectResponseTelegram Telegram
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<TelegramConnectResponseTelegram>("telegram");
+        }
+        init { this._rawData.Set("telegram", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        this.Telegram.Validate();
+    }
+
+    public TelegramConnectResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TelegramConnectResponse(TelegramConnectResponse telegramConnectResponse)
+        : base(telegramConnectResponse) { }
+#pragma warning restore CS8618
+
+    public TelegramConnectResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TelegramConnectResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TelegramConnectResponseFromRaw.FromRawUnchecked"/>
+    public static TelegramConnectResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public TelegramConnectResponse(TelegramConnectResponseTelegram telegram)
+        : this()
+    {
+        this.Telegram = telegram;
+    }
+}
+
+class TelegramConnectResponseFromRaw : IFromRawJson<TelegramConnectResponse>
+{
+    /// <inheritdoc/>
+    public TelegramConnectResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => TelegramConnectResponse.FromRawUnchecked(rawData);
+}
+
+[JsonConverter(
+    typeof(JsonModelConverter<
+        TelegramConnectResponseTelegram,
+        TelegramConnectResponseTelegramFromRaw
+    >)
+)]
+public sealed record class TelegramConnectResponseTelegram : JsonModel
+{
+    public required bool Connected
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<bool>("connected");
+        }
+        init { this._rawData.Set("connected", value); }
+    }
+
+    public string? BotID
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("botId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("botId", value);
+        }
+    }
+
+    public string? BotUsername
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNullableClass<string>("botUsername");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawData.Set("botUsername", value);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Connected;
+        _ = this.BotID;
+        _ = this.BotUsername;
+    }
+
+    public TelegramConnectResponseTelegram() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TelegramConnectResponseTelegram(
+        TelegramConnectResponseTelegram telegramConnectResponseTelegram
+    )
+        : base(telegramConnectResponseTelegram) { }
+#pragma warning restore CS8618
+
+    public TelegramConnectResponseTelegram(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TelegramConnectResponseTelegram(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TelegramConnectResponseTelegramFromRaw.FromRawUnchecked"/>
+    public static TelegramConnectResponseTelegram FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+
+    [SetsRequiredMembers]
+    public TelegramConnectResponseTelegram(bool connected)
+        : this()
+    {
+        this.Connected = connected;
+    }
+}
+
+class TelegramConnectResponseTelegramFromRaw : IFromRawJson<TelegramConnectResponseTelegram>
+{
+    /// <inheritdoc/>
+    public TelegramConnectResponseTelegram FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => TelegramConnectResponseTelegram.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Senders/Telegram/TelegramDisconnectParams.cs b/src/Zavudev/Models/Senders/Telegram/TelegramDisconnectParams.cs
new file mode 100644
index 0000000..10b18de
--- /dev/null
+++ b/src/Zavudev/Models/Senders/Telegram/TelegramDisconnectParams.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Senders.Telegram;
+
+/// <summary>
+/// Disconnect Telegram from a sender and remove the webhook.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class TelegramDisconnectParams : ParamsBase
+{
+    public string? SenderID { get; init; }
+
+    public TelegramDisconnectParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TelegramDisconnectParams(TelegramDisconnectParams telegramDisconnectParams)
+        : base(telegramDisconnectParams)
+    {
+        this.SenderID = telegramDisconnectParams.SenderID;
+    }
+#pragma warning restore CS8618
+
+    public TelegramDisconnectParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TelegramDisconnectParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        string senderID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this.SenderID = senderID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static TelegramDisconnectParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        string senderID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            senderID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["SenderID"] = JsonSerializer.SerializeToElement(this.SenderID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(TelegramDisconnectParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.SenderID?.Equals(other.SenderID) ?? other.SenderID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/senders/{0}/telegram", this.SenderID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Senders/WebhookEvent.cs b/src/Zavudev/Models/Senders/WebhookEvent.cs
index cef13a1..f3103b5 100644
--- a/src/Zavudev/Models/Senders/WebhookEvent.cs
+++ b/src/Zavudev/Models/Senders/WebhookEvent.cs
@@ -27,8 +27,12 @@ namespace Zavudev.Models.Senders;
 /// receive time in Unix milliseconds (the moment the channel received the message
 /// from the contact — WhatsApp, Telegram, Instagram, Messenger; `null` for SMS and
 /// email). Compare it against the top-level `timestamp` (when Zavu dispatched the
-/// webhook) to detect and ignore delayed deliveries. - `message.unsupported`: Received
-/// a message type that is not supported</para>
+/// webhook) to detect and ignore delayed deliveries. When the conversation was opened
+/// from a Click-to-WhatsApp ad or post, `data.referral` carries the ad attribution
+/// — including `ctwaClid`, the identifier Meta's Conversions API needs to credit
+/// a conversion back to that ad. WhatsApp only, and only on the first message of
+/// the thread: it is absent from every later message, so persist it when it arrives.
+/// - `message.unsupported`: Received a message type that is not supported</para>
 ///
 /// <para>**Broadcast events:** - `broadcast.status_changed`: Broadcast status changed
 /// (pending_review, approved, rejected, sending, completed, cancelled)</para>
diff --git a/src/Zavudev/Models/Templates/TemplateSyncParams.cs b/src/Zavudev/Models/Templates/TemplateSyncParams.cs
new file mode 100644
index 0000000..c8ac37e
--- /dev/null
+++ b/src/Zavudev/Models/Templates/TemplateSyncParams.cs
@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Templates;
+
+/// <summary>
+/// Reconcile this project's templates against WhatsApp. Two things happen per connected
+/// WhatsApp Business Account: templates that exist on Meta but not in Zavu are imported
+/// (or linked to an existing template with the same name), and the approval status
+/// of the templates Zavu already knows about is refreshed from Meta.
+///
+/// <para>This is what to call when a template was created outside Zavu — in Meta
+/// Business Manager, or by another tool — or when a `template.status_changed` webhook
+/// was missed and a template is stuck in `pending`. Status changes normally arrive
+/// by webhook; this endpoint is the recovery path and the only path for a template
+/// Zavu never created.</para>
+///
+/// <para>Templates that Meta reports as rejected or disabled are not imported; they
+/// are counted in `skipped`. Existing local templates are matched first by Meta
+/// template ID, then by name.</para>
+///
+/// <para>By default every sender in the project with a WhatsApp Business Account
+/// is synced. Pass `senderId` to sync only that sender's account. The call is synchronous
+/// — it waits for Meta and returns what changed — so it can take a few seconds per
+/// account. A failure on one account does not fail the request: it is reported in
+/// `errors` and the remaining accounts are still synced.</para>
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class TemplateSyncParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    /// <summary>
+    /// Sync only the WhatsApp Business Account attached to this sender. If omitted,
+    /// every WhatsApp sender in the project is synced.
+    /// </summary>
+    public string? SenderID
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNullableClass<string>("senderId");
+        }
+        init
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            this._rawBodyData.Set("senderId", value);
+        }
+    }
+
+    public TemplateSyncParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TemplateSyncParams(TemplateSyncParams templateSyncParams)
+        : base(templateSyncParams)
+    {
+        this._rawBodyData = new(templateSyncParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public TemplateSyncParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TemplateSyncParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static TemplateSyncParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData)
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(TemplateSyncParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/v1/templates/sync")
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Templates/TemplateSyncResponse.cs b/src/Zavudev/Models/Templates/TemplateSyncResponse.cs
new file mode 100644
index 0000000..63b698a
--- /dev/null
+++ b/src/Zavudev/Models/Templates/TemplateSyncResponse.cs
@@ -0,0 +1,148 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Templates;
+
+[JsonConverter(typeof(JsonModelConverter<TemplateSyncResponse, TemplateSyncResponseFromRaw>))]
+public sealed record class TemplateSyncResponse : JsonModel
+{
+    /// <summary>
+    /// WhatsApp Business Accounts reconciled in this call.
+    /// </summary>
+    public required long AccountsSynced
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("accountsSynced");
+        }
+        init { this._rawData.Set("accountsSynced", value); }
+    }
+
+    /// <summary>
+    /// Problems hit while syncing. Non-empty with a 200 means part of the sync did
+    /// not complete — the rest still did.
+    /// </summary>
+    public required IReadOnlyList<string> Errors
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<ImmutableArray<string>>("errors");
+        }
+        init
+        {
+            this._rawData.Set<ImmutableArray<string>>(
+                "errors",
+                ImmutableArray.ToImmutableArray(value)
+            );
+        }
+    }
+
+    /// <summary>
+    /// Templates that existed on Meta and were created in Zavu by this call.
+    /// </summary>
+    public required long Imported
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("imported");
+        }
+        init { this._rawData.Set("imported", value); }
+    }
+
+    /// <summary>
+    /// Existing Zavu templates that were matched to a Meta template by name and bound
+    /// to its Meta ID.
+    /// </summary>
+    public required long Linked
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("linked");
+        }
+        init { this._rawData.Set("linked", value); }
+    }
+
+    /// <summary>
+    /// Meta templates left alone: already linked to a Zavu template, or rejected/disabled
+    /// on Meta.
+    /// </summary>
+    public required long Skipped
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("skipped");
+        }
+        init { this._rawData.Set("skipped", value); }
+    }
+
+    /// <summary>
+    /// Templates whose approval status changed to match Meta.
+    /// </summary>
+    public required long Updated
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullStruct<long>("updated");
+        }
+        init { this._rawData.Set("updated", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.AccountsSynced;
+        _ = this.Errors;
+        _ = this.Imported;
+        _ = this.Linked;
+        _ = this.Skipped;
+        _ = this.Updated;
+    }
+
+    public TemplateSyncResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public TemplateSyncResponse(TemplateSyncResponse templateSyncResponse)
+        : base(templateSyncResponse) { }
+#pragma warning restore CS8618
+
+    public TemplateSyncResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    TemplateSyncResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="TemplateSyncResponseFromRaw.FromRawUnchecked"/>
+    public static TemplateSyncResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class TemplateSyncResponseFromRaw : IFromRawJson<TemplateSyncResponse>
+{
+    /// <inheritdoc/>
+    public TemplateSyncResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    ) => TemplateSyncResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Models/Urls/UrlEscalateParams.cs b/src/Zavudev/Models/Urls/UrlEscalateParams.cs
new file mode 100644
index 0000000..affe571
--- /dev/null
+++ b/src/Zavudev/Models/Urls/UrlEscalateParams.cs
@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Urls;
+
+/// <summary>
+/// Request manual review of a rejected URL. Only URLs in 'rejected' status can be
+/// escalated; the status then moves to 'escalated'.
+///
+/// <para>NOTE: Do not inherit from this type outside the SDK unless you're okay with
+/// breaking changes in non-major versions. We may add new methods in the future that
+/// cause existing derived classes to break.</para>
+/// </summary>
+public record class UrlEscalateParams : ParamsBase
+{
+    readonly JsonDictionary _rawBodyData = new();
+    public IReadOnlyDictionary<string, JsonElement> RawBodyData
+    {
+        get { return this._rawBodyData.Freeze(); }
+    }
+
+    public string? UrlID { get; init; }
+
+    /// <summary>
+    /// Why the URL should be reviewed manually.
+    /// </summary>
+    public required string Reason
+    {
+        get
+        {
+            this._rawBodyData.Freeze();
+            return this._rawBodyData.GetNotNullClass<string>("reason");
+        }
+        init { this._rawBodyData.Set("reason", value); }
+    }
+
+    public UrlEscalateParams() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public UrlEscalateParams(UrlEscalateParams urlEscalateParams)
+        : base(urlEscalateParams)
+    {
+        this.UrlID = urlEscalateParams.UrlID;
+
+        this._rawBodyData = new(urlEscalateParams._rawBodyData);
+    }
+#pragma warning restore CS8618
+
+    public UrlEscalateParams(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    UrlEscalateParams(
+        FrozenDictionary<string, JsonElement> rawHeaderData,
+        FrozenDictionary<string, JsonElement> rawQueryData,
+        FrozenDictionary<string, JsonElement> rawBodyData,
+        string urlID
+    )
+    {
+        this._rawHeaderData = new(rawHeaderData);
+        this._rawQueryData = new(rawQueryData);
+        this._rawBodyData = new(rawBodyData);
+        this.UrlID = urlID;
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="IFromRawJson{T}.FromRawUnchecked"/>
+    public static UrlEscalateParams FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawHeaderData,
+        IReadOnlyDictionary<string, JsonElement> rawQueryData,
+        IReadOnlyDictionary<string, JsonElement> rawBodyData,
+        string urlID
+    )
+    {
+        return new(
+            FrozenDictionary.ToFrozenDictionary(rawHeaderData),
+            FrozenDictionary.ToFrozenDictionary(rawQueryData),
+            FrozenDictionary.ToFrozenDictionary(rawBodyData),
+            urlID
+        );
+    }
+
+    public override string ToString() =>
+        JsonSerializer.Serialize(
+            FriendlyJsonPrinter.PrintValue(
+                new Dictionary<string, JsonElement>()
+                {
+                    ["UrlID"] = JsonSerializer.SerializeToElement(this.UrlID),
+                    ["HeaderData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawHeaderData.Freeze())
+                    ),
+                    ["QueryData"] = FriendlyJsonPrinter.PrintValue(
+                        JsonSerializer.SerializeToElement(this._rawQueryData.Freeze())
+                    ),
+                    ["BodyData"] = FriendlyJsonPrinter.PrintValue(this._rawBodyData.Freeze()),
+                }
+            ),
+            ModelBase.ToStringSerializerOptions
+        );
+
+    public virtual bool Equals(UrlEscalateParams? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+        return (this.UrlID?.Equals(other.UrlID) ?? other.UrlID == null)
+            && this._rawHeaderData.Equals(other._rawHeaderData)
+            && this._rawQueryData.Equals(other._rawQueryData)
+            && this._rawBodyData.Equals(other._rawBodyData);
+    }
+
+    public override Uri Url(ClientOptions options)
+    {
+        return new UriBuilder(
+            options.BaseUrl.ToString().TrimEnd('/')
+                + string.Format("/v1/urls/{0}/escalate", this.UrlID)
+        )
+        {
+            Query = this.QueryString(options),
+        }.Uri;
+    }
+
+    internal override HttpContent? BodyContent()
+    {
+        return new StringContent(
+            JsonSerializer.Serialize(this.RawBodyData, ModelBase.SerializerOptions),
+            Encoding.UTF8,
+            "application/json"
+        );
+    }
+
+    internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
+    {
+        ParamsBase.AddDefaultHeaders(request, options);
+        foreach (var item in this.RawHeaderData)
+        {
+            ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+}
diff --git a/src/Zavudev/Models/Urls/UrlEscalateResponse.cs b/src/Zavudev/Models/Urls/UrlEscalateResponse.cs
new file mode 100644
index 0000000..0f0291b
--- /dev/null
+++ b/src/Zavudev/Models/Urls/UrlEscalateResponse.cs
@@ -0,0 +1,75 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Zavudev.Core;
+
+namespace Zavudev.Models.Urls;
+
+[JsonConverter(typeof(JsonModelConverter<UrlEscalateResponse, UrlEscalateResponseFromRaw>))]
+public sealed record class UrlEscalateResponse : JsonModel
+{
+    public required string Message
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<string>("message");
+        }
+        init { this._rawData.Set("message", value); }
+    }
+
+    public required VerifiedUrl Url
+    {
+        get
+        {
+            this._rawData.Freeze();
+            return this._rawData.GetNotNullClass<VerifiedUrl>("url");
+        }
+        init { this._rawData.Set("url", value); }
+    }
+
+    /// <inheritdoc/>
+    public override void Validate()
+    {
+        _ = this.Message;
+        this.Url.Validate();
+    }
+
+    public UrlEscalateResponse() { }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    public UrlEscalateResponse(UrlEscalateResponse urlEscalateResponse)
+        : base(urlEscalateResponse) { }
+#pragma warning restore CS8618
+
+    public UrlEscalateResponse(IReadOnlyDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+
+#pragma warning disable CS8618
+    [SetsRequiredMembers]
+    UrlEscalateResponse(FrozenDictionary<string, JsonElement> rawData)
+    {
+        this._rawData = new(rawData);
+    }
+#pragma warning restore CS8618
+
+    /// <inheritdoc cref="UrlEscalateResponseFromRaw.FromRawUnchecked"/>
+    public static UrlEscalateResponse FromRawUnchecked(
+        IReadOnlyDictionary<string, JsonElement> rawData
+    )
+    {
+        return new(FrozenDictionary.ToFrozenDictionary(rawData));
+    }
+}
+
+class UrlEscalateResponseFromRaw : IFromRawJson<UrlEscalateResponse>
+{
+    /// <inheritdoc/>
+    public UrlEscalateResponse FromRawUnchecked(IReadOnlyDictionary<string, JsonElement> rawData) =>
+        UrlEscalateResponse.FromRawUnchecked(rawData);
+}
diff --git a/src/Zavudev/Services/AgentService.cs b/src/Zavudev/Services/AgentService.cs
new file mode 100644
index 0000000..7c169ef
--- /dev/null
+++ b/src/Zavudev/Services/AgentService.cs
@@ -0,0 +1,446 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Agents;
+using Agents = Zavudev.Services.Agents;
+
+namespace Zavudev.Services;
+
+/// <inheritdoc/>
+public sealed class AgentService : IAgentService
+{
+    readonly Lazy<IAgentServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public IAgentServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public IAgentService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new AgentService(this._client.WithOptions(modifier));
+    }
+
+    public AgentService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() => new AgentServiceWithRawResponse(client.WithRawResponse));
+        _senders = new(() => new Agents::SenderService(client));
+    }
+
+    readonly Lazy<Agents::ISenderService> _senders;
+    public Agents::ISenderService Senders
+    {
+        get { return _senders.Value; }
+    }
+
+    /// <inheritdoc/>
+    public async Task<AgentCreateResponse> Create(
+        AgentCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Create(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<AgentRetrieveResponse> Retrieve(
+        AgentRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Retrieve(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<AgentRetrieveResponse> Retrieve(
+        string agentID,
+        AgentRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { AgentID = agentID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<AgentUpdateResponse> Update(
+        AgentUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Update(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<AgentUpdateResponse> Update(
+        string agentID,
+        AgentUpdateParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Update(parameters with { AgentID = agentID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<AgentListPage> List(
+        AgentListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.List(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task Delete(AgentDeleteParams parameters, CancellationToken cancellationToken = default)
+    {
+        return this.WithRawResponse.Delete(parameters, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task Delete(
+        string agentID,
+        AgentDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        await this.Delete(parameters with { AgentID = agentID }, cancellationToken)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<AgentListVoicesResponse> ListVoices(
+        AgentListVoicesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.ListVoices(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<AgentTestResponse> Test(
+        AgentTestParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Test(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<AgentTestResponse> Test(
+        string agentID,
+        AgentTestParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Test(parameters with { AgentID = agentID }, cancellationToken);
+    }
+}
+
+/// <inheritdoc/>
+public sealed class AgentServiceWithRawResponse : IAgentServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public IAgentServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new AgentServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public AgentServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+
+        _senders = new(() => new Agents::SenderServiceWithRawResponse(client));
+    }
+
+    readonly Lazy<Agents::ISenderServiceWithRawResponse> _senders;
+    public Agents::ISenderServiceWithRawResponse Senders
+    {
+        get { return _senders.Value; }
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<AgentCreateResponse>> Create(
+        AgentCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        HttpRequest<AgentCreateParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var agent = await response
+                    .Deserialize<AgentCreateResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    agent.Validate();
+                }
+                return agent;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<AgentRetrieveResponse>> Retrieve(
+        AgentRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.AgentID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.AgentID' cannot be null");
+        }
+
+        HttpRequest<AgentRetrieveParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var agent = await response
+                    .Deserialize<AgentRetrieveResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    agent.Validate();
+                }
+                return agent;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<AgentRetrieveResponse>> Retrieve(
+        string agentID,
+        AgentRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { AgentID = agentID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<AgentUpdateResponse>> Update(
+        AgentUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.AgentID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.AgentID' cannot be null");
+        }
+
+        HttpRequest<AgentUpdateParams> request = new()
+        {
+            Method = ZavudevClientWithRawResponse.PatchMethod,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var agent = await response
+                    .Deserialize<AgentUpdateResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    agent.Validate();
+                }
+                return agent;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<AgentUpdateResponse>> Update(
+        string agentID,
+        AgentUpdateParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Update(parameters with { AgentID = agentID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<AgentListPage>> List(
+        AgentListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        HttpRequest<AgentListParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var page = await response
+                    .Deserialize<AgentListPageResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    page.Validate();
+                }
+                return new AgentListPage(this, parameters, page);
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Delete(
+        AgentDeleteParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.AgentID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.AgentID' cannot be null");
+        }
+
+        HttpRequest<AgentDeleteParams> request = new()
+        {
+            Method = HttpMethod.Delete,
+            Params = parameters,
+        };
+        return this._client.Execute(request, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Delete(
+        string agentID,
+        AgentDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Delete(parameters with { AgentID = agentID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<AgentListVoicesResponse>> ListVoices(
+        AgentListVoicesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        HttpRequest<AgentListVoicesParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<AgentListVoicesResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<AgentTestResponse>> Test(
+        AgentTestParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.AgentID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.AgentID' cannot be null");
+        }
+
+        HttpRequest<AgentTestParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<AgentTestResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<AgentTestResponse>> Test(
+        string agentID,
+        AgentTestParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Test(parameters with { AgentID = agentID }, cancellationToken);
+    }
+}
diff --git a/src/Zavudev/Services/AgentTemplateService.cs b/src/Zavudev/Services/AgentTemplateService.cs
new file mode 100644
index 0000000..3f77a3c
--- /dev/null
+++ b/src/Zavudev/Services/AgentTemplateService.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.AgentTemplates;
+
+namespace Zavudev.Services;
+
+/// <inheritdoc/>
+public sealed class AgentTemplateService : IAgentTemplateService
+{
+    readonly Lazy<IAgentTemplateServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public IAgentTemplateServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public IAgentTemplateService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new AgentTemplateService(this._client.WithOptions(modifier));
+    }
+
+    public AgentTemplateService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() =>
+            new AgentTemplateServiceWithRawResponse(client.WithRawResponse)
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<AgentTemplateRetrieveResponse> Retrieve(
+        AgentTemplateRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Retrieve(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<AgentTemplateRetrieveResponse> Retrieve(
+        string templateID,
+        AgentTemplateRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { TemplateID = templateID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<AgentTemplateListResponse> List(
+        AgentTemplateListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.List(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+}
+
+/// <inheritdoc/>
+public sealed class AgentTemplateServiceWithRawResponse : IAgentTemplateServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public IAgentTemplateServiceWithRawResponse WithOptions(
+        Func<ClientOptions, ClientOptions> modifier
+    )
+    {
+        return new AgentTemplateServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public AgentTemplateServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<AgentTemplateRetrieveResponse>> Retrieve(
+        AgentTemplateRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.TemplateID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.TemplateID' cannot be null");
+        }
+
+        HttpRequest<AgentTemplateRetrieveParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var agentTemplate = await response
+                    .Deserialize<AgentTemplateRetrieveResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    agentTemplate.Validate();
+                }
+                return agentTemplate;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<AgentTemplateRetrieveResponse>> Retrieve(
+        string templateID,
+        AgentTemplateRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { TemplateID = templateID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<AgentTemplateListResponse>> List(
+        AgentTemplateListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        HttpRequest<AgentTemplateListParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var agentTemplates = await response
+                    .Deserialize<AgentTemplateListResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    agentTemplates.Validate();
+                }
+                return agentTemplates;
+            }
+        );
+    }
+}
diff --git a/src/Zavudev/Services/Agents/ISenderService.cs b/src/Zavudev/Services/Agents/ISenderService.cs
new file mode 100644
index 0000000..3ceda1a
--- /dev/null
+++ b/src/Zavudev/Services/Agents/ISenderService.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.Agents.Senders;
+
+namespace Zavudev.Services.Agents;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface ISenderService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    ISenderServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    ISenderService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Make the agent answer on this sender. An agent can serve several senders; a
+    /// sender answers with at most one agent, so connecting one that is already in use
+    /// returns `400` naming the agent that holds it.
+    /// </summary>
+    Task<SenderConnectResponse> Connect(
+        SenderConnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Connect(SenderConnectParams, CancellationToken)"/>
+    Task<SenderConnectResponse> Connect(
+        string agentID,
+        SenderConnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Stop the agent answering on this sender. The agent's primary sender is part of
+    /// the agent itself and cannot be disconnected here.
+    /// </summary>
+    Task Disconnect(
+        SenderDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Disconnect(SenderDisconnectParams, CancellationToken)"/>
+    Task Disconnect(
+        string senderID,
+        SenderDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="ISenderService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface ISenderServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    ISenderServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/agents/{agentId}/senders</c>, but is otherwise the
+    /// same as <see cref="ISenderService.Connect(SenderConnectParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<SenderConnectResponse>> Connect(
+        SenderConnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Connect(SenderConnectParams, CancellationToken)"/>
+    Task<HttpResponse<SenderConnectResponse>> Connect(
+        string agentID,
+        SenderConnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>delete /v1/agents/{agentId}/senders/{senderId}</c>, but is otherwise the
+    /// same as <see cref="ISenderService.Disconnect(SenderDisconnectParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse> Disconnect(
+        SenderDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Disconnect(SenderDisconnectParams, CancellationToken)"/>
+    Task<HttpResponse> Disconnect(
+        string senderID,
+        SenderDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/Agents/SenderService.cs b/src/Zavudev/Services/Agents/SenderService.cs
new file mode 100644
index 0000000..d18ca9d
--- /dev/null
+++ b/src/Zavudev/Services/Agents/SenderService.cs
@@ -0,0 +1,167 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Agents.Senders;
+
+namespace Zavudev.Services.Agents;
+
+/// <inheritdoc/>
+public sealed class SenderService : ISenderService
+{
+    readonly Lazy<ISenderServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public ISenderServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public ISenderService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new SenderService(this._client.WithOptions(modifier));
+    }
+
+    public SenderService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() => new SenderServiceWithRawResponse(client.WithRawResponse));
+    }
+
+    /// <inheritdoc/>
+    public async Task<SenderConnectResponse> Connect(
+        SenderConnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Connect(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<SenderConnectResponse> Connect(
+        string agentID,
+        SenderConnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Connect(parameters with { AgentID = agentID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task Disconnect(
+        SenderDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.WithRawResponse.Disconnect(parameters, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task Disconnect(
+        string senderID,
+        SenderDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        await this.Disconnect(parameters with { SenderID = senderID }, cancellationToken)
+            .ConfigureAwait(false);
+    }
+}
+
+/// <inheritdoc/>
+public sealed class SenderServiceWithRawResponse : ISenderServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public ISenderServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new SenderServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public SenderServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<SenderConnectResponse>> Connect(
+        SenderConnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.AgentID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.AgentID' cannot be null");
+        }
+
+        HttpRequest<SenderConnectParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<SenderConnectResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<SenderConnectResponse>> Connect(
+        string agentID,
+        SenderConnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Connect(parameters with { AgentID = agentID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Disconnect(
+        SenderDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.SenderID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.SenderID' cannot be null");
+        }
+
+        HttpRequest<SenderDisconnectParams> request = new()
+        {
+            Method = HttpMethod.Delete,
+            Params = parameters,
+        };
+        return this._client.Execute(request, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Disconnect(
+        string senderID,
+        SenderDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Disconnect(parameters with { SenderID = senderID }, cancellationToken);
+    }
+}
diff --git a/src/Zavudev/Services/CallService.cs b/src/Zavudev/Services/CallService.cs
new file mode 100644
index 0000000..5292a02
--- /dev/null
+++ b/src/Zavudev/Services/CallService.cs
@@ -0,0 +1,273 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Services;
+
+/// <inheritdoc/>
+public sealed class CallService : ICallService
+{
+    readonly Lazy<ICallServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public ICallServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public ICallService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new CallService(this._client.WithOptions(modifier));
+    }
+
+    public CallService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() => new CallServiceWithRawResponse(client.WithRawResponse));
+    }
+
+    /// <inheritdoc/>
+    public async Task<CallCreateResponse> Create(
+        CallCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Create(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<CallRetrieveResponse> Retrieve(
+        CallRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Retrieve(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<CallRetrieveResponse> Retrieve(
+        string callID,
+        CallRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { CallID = callID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<CallListPage> List(
+        CallListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.List(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<CallHangupResponse> Hangup(
+        CallHangupParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Hangup(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<CallHangupResponse> Hangup(
+        string callID,
+        CallHangupParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Hangup(parameters with { CallID = callID }, cancellationToken);
+    }
+}
+
+/// <inheritdoc/>
+public sealed class CallServiceWithRawResponse : ICallServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public ICallServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new CallServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public CallServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<CallCreateResponse>> Create(
+        CallCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        HttpRequest<CallCreateParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var call = await response
+                    .Deserialize<CallCreateResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    call.Validate();
+                }
+                return call;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<CallRetrieveResponse>> Retrieve(
+        CallRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.CallID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.CallID' cannot be null");
+        }
+
+        HttpRequest<CallRetrieveParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var call = await response
+                    .Deserialize<CallRetrieveResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    call.Validate();
+                }
+                return call;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<CallRetrieveResponse>> Retrieve(
+        string callID,
+        CallRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { CallID = callID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<CallListPage>> List(
+        CallListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        HttpRequest<CallListParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var page = await response
+                    .Deserialize<CallListPageResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    page.Validate();
+                }
+                return new CallListPage(this, parameters, page);
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<CallHangupResponse>> Hangup(
+        CallHangupParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.CallID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.CallID' cannot be null");
+        }
+
+        HttpRequest<CallHangupParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<CallHangupResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<CallHangupResponse>> Hangup(
+        string callID,
+        CallHangupParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Hangup(parameters with { CallID = callID }, cancellationToken);
+    }
+}
diff --git a/src/Zavudev/Services/ContactService.cs b/src/Zavudev/Services/ContactService.cs
index 626661f..4d3530a 100644
--- a/src/Zavudev/Services/ContactService.cs
+++ b/src/Zavudev/Services/ContactService.cs
@@ -136,34 +136,6 @@ await this.Delete(parameters with { ContactID = contactID }, cancellationToken)
             .ConfigureAwait(false);
     }
 
-    /// <inheritdoc/>
-    public Task DismissMergeSuggestion(
-        ContactDismissMergeSuggestionParams parameters,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return this.WithRawResponse.DismissMergeSuggestion(parameters, cancellationToken);
-    }
-
-    /// <inheritdoc/>
-    public async Task DismissMergeSuggestion(
-        string contactID,
-        ContactDismissMergeSuggestionParams? parameters = null,
-        CancellationToken cancellationToken = default
-    )
-    {
-        parameters ??= new();
-
-        await this.DismissMergeSuggestion(
-                parameters with
-                {
-                    ContactID = contactID,
-                },
-                cancellationToken
-            )
-            .ConfigureAwait(false);
-    }
-
     /// <inheritdoc/>
     public async Task<Contact> Merge(
         ContactMergeParams parameters,
@@ -414,43 +386,6 @@ public Task<HttpResponse> Delete(
         return this.Delete(parameters with { ContactID = contactID }, cancellationToken);
     }
 
-    /// <inheritdoc/>
-    public Task<HttpResponse> DismissMergeSuggestion(
-        ContactDismissMergeSuggestionParams parameters,
-        CancellationToken cancellationToken = default
-    )
-    {
-        if (parameters.ContactID == null)
-        {
-            throw new ZavudevInvalidDataException("'parameters.ContactID' cannot be null");
-        }
-
-        HttpRequest<ContactDismissMergeSuggestionParams> request = new()
-        {
-            Method = HttpMethod.Delete,
-            Params = parameters,
-        };
-        return this._client.Execute(request, cancellationToken);
-    }
-
-    /// <inheritdoc/>
-    public Task<HttpResponse> DismissMergeSuggestion(
-        string contactID,
-        ContactDismissMergeSuggestionParams? parameters = null,
-        CancellationToken cancellationToken = default
-    )
-    {
-        parameters ??= new();
-
-        return this.DismissMergeSuggestion(
-            parameters with
-            {
-                ContactID = contactID,
-            },
-            cancellationToken
-        );
-    }
-
     /// <inheritdoc/>
     public async Task<HttpResponse<Contact>> Merge(
         ContactMergeParams parameters,
diff --git a/src/Zavudev/Services/ConversationService.cs b/src/Zavudev/Services/ConversationService.cs
new file mode 100644
index 0000000..67a6408
--- /dev/null
+++ b/src/Zavudev/Services/ConversationService.cs
@@ -0,0 +1,342 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Conversations;
+
+namespace Zavudev.Services;
+
+/// <inheritdoc/>
+public sealed class ConversationService : IConversationService
+{
+    readonly Lazy<IConversationServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public IConversationServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public IConversationService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new ConversationService(this._client.WithOptions(modifier));
+    }
+
+    public ConversationService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() =>
+            new ConversationServiceWithRawResponse(client.WithRawResponse)
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<ConversationRetrieveResponse> Retrieve(
+        ConversationRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Retrieve(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<ConversationRetrieveResponse> Retrieve(
+        string conversationID,
+        ConversationRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(
+            parameters with
+            {
+                ConversationID = conversationID,
+            },
+            cancellationToken
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<ConversationListPage> List(
+        ConversationListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.List(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<ConversationListMessagesPage> ListMessages(
+        ConversationListMessagesParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.ListMessages(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<ConversationListMessagesPage> ListMessages(
+        string conversationID,
+        ConversationListMessagesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.ListMessages(
+            parameters with
+            {
+                ConversationID = conversationID,
+            },
+            cancellationToken
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<ConversationMarkAsReadResponse> MarkAsRead(
+        ConversationMarkAsReadParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.MarkAsRead(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<ConversationMarkAsReadResponse> MarkAsRead(
+        string conversationID,
+        ConversationMarkAsReadParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.MarkAsRead(
+            parameters with
+            {
+                ConversationID = conversationID,
+            },
+            cancellationToken
+        );
+    }
+}
+
+/// <inheritdoc/>
+public sealed class ConversationServiceWithRawResponse : IConversationServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public IConversationServiceWithRawResponse WithOptions(
+        Func<ClientOptions, ClientOptions> modifier
+    )
+    {
+        return new ConversationServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public ConversationServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<ConversationRetrieveResponse>> Retrieve(
+        ConversationRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.ConversationID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.ConversationID' cannot be null");
+        }
+
+        HttpRequest<ConversationRetrieveParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var conversation = await response
+                    .Deserialize<ConversationRetrieveResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    conversation.Validate();
+                }
+                return conversation;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<ConversationRetrieveResponse>> Retrieve(
+        string conversationID,
+        ConversationRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(
+            parameters with
+            {
+                ConversationID = conversationID,
+            },
+            cancellationToken
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<ConversationListPage>> List(
+        ConversationListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        HttpRequest<ConversationListParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var page = await response
+                    .Deserialize<ConversationListPageResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    page.Validate();
+                }
+                return new ConversationListPage(this, parameters, page);
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<ConversationListMessagesPage>> ListMessages(
+        ConversationListMessagesParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.ConversationID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.ConversationID' cannot be null");
+        }
+
+        HttpRequest<ConversationListMessagesParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var page = await response
+                    .Deserialize<ConversationListMessagesPageResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    page.Validate();
+                }
+                return new ConversationListMessagesPage(this, parameters, page);
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<ConversationListMessagesPage>> ListMessages(
+        string conversationID,
+        ConversationListMessagesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.ListMessages(
+            parameters with
+            {
+                ConversationID = conversationID,
+            },
+            cancellationToken
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<ConversationMarkAsReadResponse>> MarkAsRead(
+        ConversationMarkAsReadParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.ConversationID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.ConversationID' cannot be null");
+        }
+
+        HttpRequest<ConversationMarkAsReadParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<ConversationMarkAsReadResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<ConversationMarkAsReadResponse>> MarkAsRead(
+        string conversationID,
+        ConversationMarkAsReadParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.MarkAsRead(
+            parameters with
+            {
+                ConversationID = conversationID,
+            },
+            cancellationToken
+        );
+    }
+}
diff --git a/src/Zavudev/Services/EmailDomainService.cs b/src/Zavudev/Services/EmailDomainService.cs
new file mode 100644
index 0000000..744f078
--- /dev/null
+++ b/src/Zavudev/Services/EmailDomainService.cs
@@ -0,0 +1,328 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Services;
+
+/// <inheritdoc/>
+public sealed class EmailDomainService : IEmailDomainService
+{
+    readonly Lazy<IEmailDomainServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public IEmailDomainServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public IEmailDomainService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new EmailDomainService(this._client.WithOptions(modifier));
+    }
+
+    public EmailDomainService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() => new EmailDomainServiceWithRawResponse(client.WithRawResponse));
+    }
+
+    /// <inheritdoc/>
+    public async Task<EmailDomainCreateResponse> Create(
+        EmailDomainCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Create(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<EmailDomainRetrieveResponse> Retrieve(
+        EmailDomainRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Retrieve(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<EmailDomainRetrieveResponse> Retrieve(
+        string domainID,
+        EmailDomainRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { DomainID = domainID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<EmailDomainListResponse> List(
+        EmailDomainListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.List(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task Delete(
+        EmailDomainDeleteParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.WithRawResponse.Delete(parameters, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task Delete(
+        string domainID,
+        EmailDomainDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        await this.Delete(parameters with { DomainID = domainID }, cancellationToken)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<EmailDomainVerifyResponse> Verify(
+        EmailDomainVerifyParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Verify(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<EmailDomainVerifyResponse> Verify(
+        string domainID,
+        EmailDomainVerifyParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Verify(parameters with { DomainID = domainID }, cancellationToken);
+    }
+}
+
+/// <inheritdoc/>
+public sealed class EmailDomainServiceWithRawResponse : IEmailDomainServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public IEmailDomainServiceWithRawResponse WithOptions(
+        Func<ClientOptions, ClientOptions> modifier
+    )
+    {
+        return new EmailDomainServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public EmailDomainServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<EmailDomainCreateResponse>> Create(
+        EmailDomainCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        HttpRequest<EmailDomainCreateParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var emailDomain = await response
+                    .Deserialize<EmailDomainCreateResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    emailDomain.Validate();
+                }
+                return emailDomain;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<EmailDomainRetrieveResponse>> Retrieve(
+        EmailDomainRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.DomainID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.DomainID' cannot be null");
+        }
+
+        HttpRequest<EmailDomainRetrieveParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var emailDomain = await response
+                    .Deserialize<EmailDomainRetrieveResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    emailDomain.Validate();
+                }
+                return emailDomain;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<EmailDomainRetrieveResponse>> Retrieve(
+        string domainID,
+        EmailDomainRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { DomainID = domainID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<EmailDomainListResponse>> List(
+        EmailDomainListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        HttpRequest<EmailDomainListParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var emailDomains = await response
+                    .Deserialize<EmailDomainListResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    emailDomains.Validate();
+                }
+                return emailDomains;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Delete(
+        EmailDomainDeleteParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.DomainID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.DomainID' cannot be null");
+        }
+
+        HttpRequest<EmailDomainDeleteParams> request = new()
+        {
+            Method = HttpMethod.Delete,
+            Params = parameters,
+        };
+        return this._client.Execute(request, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Delete(
+        string domainID,
+        EmailDomainDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Delete(parameters with { DomainID = domainID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<EmailDomainVerifyResponse>> Verify(
+        EmailDomainVerifyParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.DomainID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.DomainID' cannot be null");
+        }
+
+        HttpRequest<EmailDomainVerifyParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<EmailDomainVerifyResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<EmailDomainVerifyResponse>> Verify(
+        string domainID,
+        EmailDomainVerifyParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Verify(parameters with { DomainID = domainID }, cancellationToken);
+    }
+}
diff --git a/src/Zavudev/Services/FunctionService.cs b/src/Zavudev/Services/FunctionService.cs
index eaf0d98..f09be72 100644
--- a/src/Zavudev/Services/FunctionService.cs
+++ b/src/Zavudev/Services/FunctionService.cs
@@ -34,6 +34,8 @@ public FunctionService(IZavudevClient client)
 
         _withRawResponse = new(() => new FunctionServiceWithRawResponse(client.WithRawResponse));
         _secrets = new(() => new SecretService(client));
+        _triggers = new(() => new TriggerService(client));
+        _gitLink = new(() => new GitLinkService(client));
     }
 
     readonly Lazy<ISecretService> _secrets;
@@ -42,6 +44,18 @@ public ISecretService Secrets
         get { return _secrets.Value; }
     }
 
+    readonly Lazy<ITriggerService> _triggers;
+    public ITriggerService Triggers
+    {
+        get { return _triggers.Value; }
+    }
+
+    readonly Lazy<IGitLinkService> _gitLink;
+    public IGitLinkService GitLink
+    {
+        get { return _gitLink.Value; }
+    }
+
     /// <inheritdoc/>
     public async Task<FunctionCreateResponse> Create(
         FunctionCreateParams parameters,
@@ -180,6 +194,70 @@ parameters with
         );
     }
 
+    /// <inheritdoc/>
+    public async Task<FunctionListDeploymentsResponse> ListDeployments(
+        FunctionListDeploymentsParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.ListDeployments(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<FunctionListDeploymentsResponse> ListDeployments(
+        string functionID,
+        FunctionListDeploymentsParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.ListDeployments(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<FunctionListEventTypesResponse> ListEventTypes(
+        FunctionListEventTypesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.ListEventTypes(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<FunctionRollbackDeploymentResponse> RollbackDeployment(
+        FunctionRollbackDeploymentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.RollbackDeployment(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<FunctionRollbackDeploymentResponse> RollbackDeployment(
+        string functionID,
+        FunctionRollbackDeploymentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.RollbackDeployment(
+            parameters with
+            {
+                FunctionID = functionID,
+            },
+            cancellationToken
+        );
+    }
+
     /// <inheritdoc/>
     public async Task<FunctionTailLogsResponse> TailLogs(
         FunctionTailLogsParams parameters,
@@ -221,6 +299,8 @@ public FunctionServiceWithRawResponse(IZavudevClientWithRawResponse client)
         _client = client;
 
         _secrets = new(() => new SecretServiceWithRawResponse(client));
+        _triggers = new(() => new TriggerServiceWithRawResponse(client));
+        _gitLink = new(() => new GitLinkServiceWithRawResponse(client));
     }
 
     readonly Lazy<ISecretServiceWithRawResponse> _secrets;
@@ -229,6 +309,18 @@ public ISecretServiceWithRawResponse Secrets
         get { return _secrets.Value; }
     }
 
+    readonly Lazy<ITriggerServiceWithRawResponse> _triggers;
+    public ITriggerServiceWithRawResponse Triggers
+    {
+        get { return _triggers.Value; }
+    }
+
+    readonly Lazy<IGitLinkServiceWithRawResponse> _gitLink;
+    public IGitLinkServiceWithRawResponse GitLink
+    {
+        get { return _gitLink.Value; }
+    }
+
     /// <inheritdoc/>
     public async Task<HttpResponse<FunctionCreateResponse>> Create(
         FunctionCreateParams parameters,
@@ -488,6 +580,130 @@ parameters with
         );
     }
 
+    /// <inheritdoc/>
+    public async Task<HttpResponse<FunctionListDeploymentsResponse>> ListDeployments(
+        FunctionListDeploymentsParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.FunctionID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.FunctionID' cannot be null");
+        }
+
+        HttpRequest<FunctionListDeploymentsParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<FunctionListDeploymentsResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<FunctionListDeploymentsResponse>> ListDeployments(
+        string functionID,
+        FunctionListDeploymentsParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.ListDeployments(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<FunctionListEventTypesResponse>> ListEventTypes(
+        FunctionListEventTypesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        HttpRequest<FunctionListEventTypesParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<FunctionListEventTypesResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<FunctionRollbackDeploymentResponse>> RollbackDeployment(
+        FunctionRollbackDeploymentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.FunctionID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.FunctionID' cannot be null");
+        }
+
+        HttpRequest<FunctionRollbackDeploymentParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<FunctionRollbackDeploymentResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<FunctionRollbackDeploymentResponse>> RollbackDeployment(
+        string functionID,
+        FunctionRollbackDeploymentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.RollbackDeployment(
+            parameters with
+            {
+                FunctionID = functionID,
+            },
+            cancellationToken
+        );
+    }
+
     /// <inheritdoc/>
     public async Task<HttpResponse<FunctionTailLogsResponse>> TailLogs(
         FunctionTailLogsParams parameters,
diff --git a/src/Zavudev/Services/Functions/GitLinkService.cs b/src/Zavudev/Services/Functions/GitLinkService.cs
new file mode 100644
index 0000000..ece543a
--- /dev/null
+++ b/src/Zavudev/Services/Functions/GitLinkService.cs
@@ -0,0 +1,378 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Services.Functions;
+
+/// <inheritdoc/>
+public sealed class GitLinkService : IGitLinkService
+{
+    readonly Lazy<IGitLinkServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public IGitLinkServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public IGitLinkService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new GitLinkService(this._client.WithOptions(modifier));
+    }
+
+    public GitLinkService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() => new GitLinkServiceWithRawResponse(client.WithRawResponse));
+    }
+
+    /// <inheritdoc/>
+    public async Task<GitLinkRetrieveResponse> Retrieve(
+        GitLinkRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Retrieve(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<GitLinkRetrieveResponse> Retrieve(
+        string functionID,
+        GitLinkRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<GitLinkUpdateResponse> Update(
+        GitLinkUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Update(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<GitLinkUpdateResponse> Update(
+        string functionID,
+        GitLinkUpdateParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Update(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<GitLinkDeployNowResponse> DeployNow(
+        GitLinkDeployNowParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.DeployNow(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<GitLinkDeployNowResponse> DeployNow(
+        string functionID,
+        GitLinkDeployNowParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.DeployNow(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<GitLinkLinkResponse> Link(
+        GitLinkLinkParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Link(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<GitLinkLinkResponse> Link(
+        string functionID,
+        GitLinkLinkParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Link(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task Unlink(
+        GitLinkUnlinkParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.WithRawResponse.Unlink(parameters, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task Unlink(
+        string functionID,
+        GitLinkUnlinkParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        await this.Unlink(parameters with { FunctionID = functionID }, cancellationToken)
+            .ConfigureAwait(false);
+    }
+}
+
+/// <inheritdoc/>
+public sealed class GitLinkServiceWithRawResponse : IGitLinkServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public IGitLinkServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new GitLinkServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public GitLinkServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<GitLinkRetrieveResponse>> Retrieve(
+        GitLinkRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.FunctionID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.FunctionID' cannot be null");
+        }
+
+        HttpRequest<GitLinkRetrieveParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var gitLink = await response
+                    .Deserialize<GitLinkRetrieveResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    gitLink.Validate();
+                }
+                return gitLink;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<GitLinkRetrieveResponse>> Retrieve(
+        string functionID,
+        GitLinkRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Retrieve(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<GitLinkUpdateResponse>> Update(
+        GitLinkUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.FunctionID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.FunctionID' cannot be null");
+        }
+
+        HttpRequest<GitLinkUpdateParams> request = new()
+        {
+            Method = ZavudevClientWithRawResponse.PatchMethod,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var gitLink = await response
+                    .Deserialize<GitLinkUpdateResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    gitLink.Validate();
+                }
+                return gitLink;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<GitLinkUpdateResponse>> Update(
+        string functionID,
+        GitLinkUpdateParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Update(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<GitLinkDeployNowResponse>> DeployNow(
+        GitLinkDeployNowParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.FunctionID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.FunctionID' cannot be null");
+        }
+
+        HttpRequest<GitLinkDeployNowParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<GitLinkDeployNowResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<GitLinkDeployNowResponse>> DeployNow(
+        string functionID,
+        GitLinkDeployNowParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.DeployNow(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<GitLinkLinkResponse>> Link(
+        GitLinkLinkParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.FunctionID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.FunctionID' cannot be null");
+        }
+
+        HttpRequest<GitLinkLinkParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<GitLinkLinkResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<GitLinkLinkResponse>> Link(
+        string functionID,
+        GitLinkLinkParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Link(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Unlink(
+        GitLinkUnlinkParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.FunctionID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.FunctionID' cannot be null");
+        }
+
+        HttpRequest<GitLinkUnlinkParams> request = new()
+        {
+            Method = HttpMethod.Delete,
+            Params = parameters,
+        };
+        return this._client.Execute(request, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Unlink(
+        string functionID,
+        GitLinkUnlinkParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Unlink(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+}
diff --git a/src/Zavudev/Services/Functions/IGitLinkService.cs b/src/Zavudev/Services/Functions/IGitLinkService.cs
new file mode 100644
index 0000000..6b1d12b
--- /dev/null
+++ b/src/Zavudev/Services/Functions/IGitLinkService.cs
@@ -0,0 +1,209 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.Functions.GitLink;
+
+namespace Zavudev.Services.Functions;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface IGitLinkService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    IGitLinkServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IGitLinkService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// The link and its last deploy. Never returns the webhook secret.
+    /// </summary>
+    Task<GitLinkRetrieveResponse> Retrieve(
+        GitLinkRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(GitLinkRetrieveParams, CancellationToken)"/>
+    Task<GitLinkRetrieveResponse> Retrieve(
+        string functionID,
+        GitLinkRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Change the branch, the root directory, or whether pushes deploy. Pass at least
+    /// one field. `rootDir: null` clears the subdirectory.
+    /// </summary>
+    Task<GitLinkUpdateResponse> Update(
+        GitLinkUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Update(GitLinkUpdateParams, CancellationToken)"/>
+    Task<GitLinkUpdateResponse> Update(
+        string functionID,
+        GitLinkUpdateParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Fetch the linked branch and deploy it without waiting for a push. Returns
+    /// immediately; follow the outcome with `GET /v1/functions/{functionId}/git-link`,
+    /// whose `lastStatus` and `lastError` describe the run.
+    /// </summary>
+    Task<GitLinkDeployNowResponse> DeployNow(
+        GitLinkDeployNowParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="DeployNow(GitLinkDeployNowParams, CancellationToken)"/>
+    Task<GitLinkDeployNowResponse> DeployNow(
+        string functionID,
+        GitLinkDeployNowParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Bind a repository to this function so every push to `branch` deploys it. A
+    /// function holds at most one link; linking again returns 400.
+    ///
+    /// <para>**The server decides how the link authenticates.** If the project has the
+    /// Zavu GitHub App installed, the link uses that installation: private repositories
+    /// work and there is nothing to configure in the repository. Otherwise it falls
+    /// back to a manual link and the response carries a `webhookSecret` you add to the
+    /// repository yourself. `connection` says which one you got.</para>
+    ///
+    /// <para>The repository is not checked against GitHub here, because it cannot be:
+    /// an owner/repo that does not exist, or that the installation cannot see, is
+    /// accepted and fails on the first deploy with a fetch error.</para>
+    /// </summary>
+    Task<GitLinkLinkResponse> Link(
+        GitLinkLinkParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Link(GitLinkLinkParams, CancellationToken)"/>
+    Task<GitLinkLinkResponse> Link(
+        string functionID,
+        GitLinkLinkParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Remove the link. The function and its deployments stay. A manual webhook left in
+    /// the repository stops being accepted, so remove it there too.
+    /// </summary>
+    Task Unlink(GitLinkUnlinkParams parameters, CancellationToken cancellationToken = default);
+
+    /// <inheritdoc cref="Unlink(GitLinkUnlinkParams, CancellationToken)"/>
+    Task Unlink(
+        string functionID,
+        GitLinkUnlinkParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="IGitLinkService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface IGitLinkServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IGitLinkServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/functions/{functionId}/git-link</c>, but is otherwise the
+    /// same as <see cref="IGitLinkService.Retrieve(GitLinkRetrieveParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<GitLinkRetrieveResponse>> Retrieve(
+        GitLinkRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(GitLinkRetrieveParams, CancellationToken)"/>
+    Task<HttpResponse<GitLinkRetrieveResponse>> Retrieve(
+        string functionID,
+        GitLinkRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>patch /v1/functions/{functionId}/git-link</c>, but is otherwise the
+    /// same as <see cref="IGitLinkService.Update(GitLinkUpdateParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<GitLinkUpdateResponse>> Update(
+        GitLinkUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Update(GitLinkUpdateParams, CancellationToken)"/>
+    Task<HttpResponse<GitLinkUpdateResponse>> Update(
+        string functionID,
+        GitLinkUpdateParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/functions/{functionId}/git-link/deploy</c>, but is otherwise the
+    /// same as <see cref="IGitLinkService.DeployNow(GitLinkDeployNowParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<GitLinkDeployNowResponse>> DeployNow(
+        GitLinkDeployNowParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="DeployNow(GitLinkDeployNowParams, CancellationToken)"/>
+    Task<HttpResponse<GitLinkDeployNowResponse>> DeployNow(
+        string functionID,
+        GitLinkDeployNowParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/functions/{functionId}/git-link</c>, but is otherwise the
+    /// same as <see cref="IGitLinkService.Link(GitLinkLinkParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<GitLinkLinkResponse>> Link(
+        GitLinkLinkParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Link(GitLinkLinkParams, CancellationToken)"/>
+    Task<HttpResponse<GitLinkLinkResponse>> Link(
+        string functionID,
+        GitLinkLinkParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>delete /v1/functions/{functionId}/git-link</c>, but is otherwise the
+    /// same as <see cref="IGitLinkService.Unlink(GitLinkUnlinkParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse> Unlink(
+        GitLinkUnlinkParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Unlink(GitLinkUnlinkParams, CancellationToken)"/>
+    Task<HttpResponse> Unlink(
+        string functionID,
+        GitLinkUnlinkParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/Functions/ITriggerService.cs b/src/Zavudev/Services/Functions/ITriggerService.cs
new file mode 100644
index 0000000..cbf831c
--- /dev/null
+++ b/src/Zavudev/Services/Functions/ITriggerService.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.Functions.Triggers;
+
+namespace Zavudev.Services.Functions;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface ITriggerService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    ITriggerServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    ITriggerService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Subscribe a function to one or more event types, optionally scoped to specific
+    /// senders. Provide eventTypes and senderIds (use null in senderIds for all
+    /// senders); a trigger is created for each event type and sender combination.
+    ///
+    /// <para>The special event type `cron` runs the function on a schedule instead of a
+    /// messaging event: include a `cron` field with a 5-field UTC cron expression
+    /// (minimum granularity one minute). A cron trigger ignores the sender axis, and a
+    /// function may hold several cron triggers with different expressions. The function
+    /// receives an event with `type: "cron"` and `data.cron`.</para>
+    /// </summary>
+    Task<TriggerCreateResponse> Create(
+        TriggerCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Create(TriggerCreateParams, CancellationToken)"/>
+    Task<TriggerCreateResponse> Create(
+        string functionID,
+        TriggerCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Enable or disable a trigger
+    /// </summary>
+    Task<TriggerUpdateResponse> Update(
+        TriggerUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Update(TriggerUpdateParams, CancellationToken)"/>
+    Task<TriggerUpdateResponse> Update(
+        string triggerID,
+        TriggerUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// List function triggers
+    /// </summary>
+    Task<TriggerListResponse> List(
+        TriggerListParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="List(TriggerListParams, CancellationToken)"/>
+    Task<TriggerListResponse> List(
+        string functionID,
+        TriggerListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Delete a trigger
+    /// </summary>
+    Task Delete(TriggerDeleteParams parameters, CancellationToken cancellationToken = default);
+
+    /// <inheritdoc cref="Delete(TriggerDeleteParams, CancellationToken)"/>
+    Task Delete(
+        string triggerID,
+        TriggerDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="ITriggerService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface ITriggerServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    ITriggerServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/functions/{functionId}/triggers</c>, but is otherwise the
+    /// same as <see cref="ITriggerService.Create(TriggerCreateParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<TriggerCreateResponse>> Create(
+        TriggerCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Create(TriggerCreateParams, CancellationToken)"/>
+    Task<HttpResponse<TriggerCreateResponse>> Create(
+        string functionID,
+        TriggerCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>patch /v1/functions/triggers/{triggerId}</c>, but is otherwise the
+    /// same as <see cref="ITriggerService.Update(TriggerUpdateParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<TriggerUpdateResponse>> Update(
+        TriggerUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Update(TriggerUpdateParams, CancellationToken)"/>
+    Task<HttpResponse<TriggerUpdateResponse>> Update(
+        string triggerID,
+        TriggerUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/functions/{functionId}/triggers</c>, but is otherwise the
+    /// same as <see cref="ITriggerService.List(TriggerListParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<TriggerListResponse>> List(
+        TriggerListParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="List(TriggerListParams, CancellationToken)"/>
+    Task<HttpResponse<TriggerListResponse>> List(
+        string functionID,
+        TriggerListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>delete /v1/functions/triggers/{triggerId}</c>, but is otherwise the
+    /// same as <see cref="ITriggerService.Delete(TriggerDeleteParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse> Delete(
+        TriggerDeleteParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Delete(TriggerDeleteParams, CancellationToken)"/>
+    Task<HttpResponse> Delete(
+        string triggerID,
+        TriggerDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/Functions/TriggerService.cs b/src/Zavudev/Services/Functions/TriggerService.cs
new file mode 100644
index 0000000..d1b62ff
--- /dev/null
+++ b/src/Zavudev/Services/Functions/TriggerService.cs
@@ -0,0 +1,305 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Functions.Triggers;
+
+namespace Zavudev.Services.Functions;
+
+/// <inheritdoc/>
+public sealed class TriggerService : ITriggerService
+{
+    readonly Lazy<ITriggerServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public ITriggerServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public ITriggerService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new TriggerService(this._client.WithOptions(modifier));
+    }
+
+    public TriggerService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() => new TriggerServiceWithRawResponse(client.WithRawResponse));
+    }
+
+    /// <inheritdoc/>
+    public async Task<TriggerCreateResponse> Create(
+        TriggerCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Create(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<TriggerCreateResponse> Create(
+        string functionID,
+        TriggerCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Create(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<TriggerUpdateResponse> Update(
+        TriggerUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Update(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<TriggerUpdateResponse> Update(
+        string triggerID,
+        TriggerUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Update(parameters with { TriggerID = triggerID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<TriggerListResponse> List(
+        TriggerListParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.List(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<TriggerListResponse> List(
+        string functionID,
+        TriggerListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.List(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task Delete(
+        TriggerDeleteParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.WithRawResponse.Delete(parameters, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task Delete(
+        string triggerID,
+        TriggerDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        await this.Delete(parameters with { TriggerID = triggerID }, cancellationToken)
+            .ConfigureAwait(false);
+    }
+}
+
+/// <inheritdoc/>
+public sealed class TriggerServiceWithRawResponse : ITriggerServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public ITriggerServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new TriggerServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public TriggerServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<TriggerCreateResponse>> Create(
+        TriggerCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.FunctionID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.FunctionID' cannot be null");
+        }
+
+        HttpRequest<TriggerCreateParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var trigger = await response
+                    .Deserialize<TriggerCreateResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    trigger.Validate();
+                }
+                return trigger;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<TriggerCreateResponse>> Create(
+        string functionID,
+        TriggerCreateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Create(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<TriggerUpdateResponse>> Update(
+        TriggerUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.TriggerID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.TriggerID' cannot be null");
+        }
+
+        HttpRequest<TriggerUpdateParams> request = new()
+        {
+            Method = ZavudevClientWithRawResponse.PatchMethod,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var trigger = await response
+                    .Deserialize<TriggerUpdateResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    trigger.Validate();
+                }
+                return trigger;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<TriggerUpdateResponse>> Update(
+        string triggerID,
+        TriggerUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Update(parameters with { TriggerID = triggerID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<TriggerListResponse>> List(
+        TriggerListParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.FunctionID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.FunctionID' cannot be null");
+        }
+
+        HttpRequest<TriggerListParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var triggers = await response
+                    .Deserialize<TriggerListResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    triggers.Validate();
+                }
+                return triggers;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<TriggerListResponse>> List(
+        string functionID,
+        TriggerListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.List(parameters with { FunctionID = functionID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Delete(
+        TriggerDeleteParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.TriggerID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.TriggerID' cannot be null");
+        }
+
+        HttpRequest<TriggerDeleteParams> request = new()
+        {
+            Method = HttpMethod.Delete,
+            Params = parameters,
+        };
+        return this._client.Execute(request, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Delete(
+        string triggerID,
+        TriggerDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Delete(parameters with { TriggerID = triggerID }, cancellationToken);
+    }
+}
diff --git a/src/Zavudev/Services/IAgentService.cs b/src/Zavudev/Services/IAgentService.cs
new file mode 100644
index 0000000..1e0b47a
--- /dev/null
+++ b/src/Zavudev/Services/IAgentService.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.Agents;
+using Agents = Zavudev.Services.Agents;
+
+namespace Zavudev.Services;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface IAgentService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    IAgentServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IAgentService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    Agents::ISenderService Senders { get; }
+
+    /// <summary>
+    /// Create an agent without a sender. It is created disabled; connect a sender and
+    /// enable it when you are ready for it to answer.
+    ///
+    /// <para>**Sub-resources.** An agent's tools, flows and knowledge bases are
+    /// reachable at `/v1/agents/{agentId}/tools`, `/v1/agents/{agentId}/flows` and
+    /// `/v1/agents/{agentId}/knowledge-bases`, mirroring the sender-scoped routes
+    /// documented under `/v1/senders/{senderId}/agent/...` exactly. Use the
+    /// agent-scoped form while the agent has no sender: the sender-scoped one cannot
+    /// address it.</para>
+    /// </summary>
+    Task<AgentCreateResponse> Create(
+        AgentCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Get an agent
+    /// </summary>
+    Task<AgentRetrieveResponse> Retrieve(
+        AgentRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(AgentRetrieveParams, CancellationToken)"/>
+    Task<AgentRetrieveResponse> Retrieve(
+        string agentID,
+        AgentRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Update an agent
+    /// </summary>
+    Task<AgentUpdateResponse> Update(
+        AgentUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Update(AgentUpdateParams, CancellationToken)"/>
+    Task<AgentUpdateResponse> Update(
+        string agentID,
+        AgentUpdateParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Every agent in the project, newest first — including agents that are not
+    /// connected to any sender yet, which the sender-scoped routes cannot reach. Each
+    /// item carries `senderIds`, the senders the agent answers on.
+    /// </summary>
+    Task<AgentListPage> List(
+        AgentListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Delete an agent
+    /// </summary>
+    Task Delete(AgentDeleteParams parameters, CancellationToken cancellationToken = default);
+
+    /// <inheritdoc cref="Delete(AgentDeleteParams, CancellationToken)"/>
+    Task Delete(
+        string agentID,
+        AgentDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// The voices an agent can speak with, for `voice.ttsVoiceId`. Filter by `language`
+    /// to get the ones that speak it; a voice can still be used with `language: auto`,
+    /// where the agent follows the caller and keeps the chosen voice.
+    /// </summary>
+    Task<AgentListVoicesResponse> ListVoices(
+        AgentListVoicesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Run the agent's prompt, model and knowledge base against a message and return
+    /// the reply instead of delivering it. Writes nothing and charges nothing, so it is
+    /// safe to call repeatedly while iterating on a prompt.
+    ///
+    /// <para>Note that a dry run never **executes** tools — running them would cause
+    /// real side effects. Live conversations on every channel do call them. When the
+    /// agent has enabled tools, that gap is reported in `warnings` rather than silently
+    /// producing an answer that looks like a tool call happened.</para>
+    /// </summary>
+    Task<AgentTestResponse> Test(
+        AgentTestParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Test(AgentTestParams, CancellationToken)"/>
+    Task<AgentTestResponse> Test(
+        string agentID,
+        AgentTestParams parameters,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="IAgentService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface IAgentServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IAgentServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    Agents::ISenderServiceWithRawResponse Senders { get; }
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/agents</c>, but is otherwise the
+    /// same as <see cref="IAgentService.Create(AgentCreateParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<AgentCreateResponse>> Create(
+        AgentCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/agents/{agentId}</c>, but is otherwise the
+    /// same as <see cref="IAgentService.Retrieve(AgentRetrieveParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<AgentRetrieveResponse>> Retrieve(
+        AgentRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(AgentRetrieveParams, CancellationToken)"/>
+    Task<HttpResponse<AgentRetrieveResponse>> Retrieve(
+        string agentID,
+        AgentRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>patch /v1/agents/{agentId}</c>, but is otherwise the
+    /// same as <see cref="IAgentService.Update(AgentUpdateParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<AgentUpdateResponse>> Update(
+        AgentUpdateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Update(AgentUpdateParams, CancellationToken)"/>
+    Task<HttpResponse<AgentUpdateResponse>> Update(
+        string agentID,
+        AgentUpdateParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/agents</c>, but is otherwise the
+    /// same as <see cref="IAgentService.List(AgentListParams?, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<AgentListPage>> List(
+        AgentListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>delete /v1/agents/{agentId}</c>, but is otherwise the
+    /// same as <see cref="IAgentService.Delete(AgentDeleteParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse> Delete(
+        AgentDeleteParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Delete(AgentDeleteParams, CancellationToken)"/>
+    Task<HttpResponse> Delete(
+        string agentID,
+        AgentDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/agents/voices</c>, but is otherwise the
+    /// same as <see cref="IAgentService.ListVoices(AgentListVoicesParams?, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<AgentListVoicesResponse>> ListVoices(
+        AgentListVoicesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/agents/{agentId}/test</c>, but is otherwise the
+    /// same as <see cref="IAgentService.Test(AgentTestParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<AgentTestResponse>> Test(
+        AgentTestParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Test(AgentTestParams, CancellationToken)"/>
+    Task<HttpResponse<AgentTestResponse>> Test(
+        string agentID,
+        AgentTestParams parameters,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/IAgentTemplateService.cs b/src/Zavudev/Services/IAgentTemplateService.cs
new file mode 100644
index 0000000..4b1ea8f
--- /dev/null
+++ b/src/Zavudev/Services/IAgentTemplateService.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.AgentTemplates;
+
+namespace Zavudev.Services;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface IAgentTemplateService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    IAgentTemplateServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IAgentTemplateService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Fetch a single factory agent fully rendered: the function files to scaffold (an
+    /// `index.ts` that declares the agent with `defineAgent` and its skills with
+    /// `defineTool`) plus the secrets it needs. This is what `npx zavudev agents pull
+    /// &lt;id&gt;` writes to disk before `npx zavudev deploy`.
+    /// </summary>
+    Task<AgentTemplateRetrieveResponse> Retrieve(
+        AgentTemplateRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(AgentTemplateRetrieveParams, CancellationToken)"/>
+    Task<AgentTemplateRetrieveResponse> Retrieve(
+        string templateID,
+        AgentTemplateRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// List the factory agents available to scaffold with `npx zavudev agents pull`.
+    /// Each entry is a ready-made voice or text agent (system prompt, skills, and — for
+    /// voice agents — a co-located voice config).
+    /// </summary>
+    Task<AgentTemplateListResponse> List(
+        AgentTemplateListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="IAgentTemplateService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface IAgentTemplateServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IAgentTemplateServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/agent-templates/{templateId}</c>, but is otherwise the
+    /// same as <see cref="IAgentTemplateService.Retrieve(AgentTemplateRetrieveParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<AgentTemplateRetrieveResponse>> Retrieve(
+        AgentTemplateRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(AgentTemplateRetrieveParams, CancellationToken)"/>
+    Task<HttpResponse<AgentTemplateRetrieveResponse>> Retrieve(
+        string templateID,
+        AgentTemplateRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/agent-templates</c>, but is otherwise the
+    /// same as <see cref="IAgentTemplateService.List(AgentTemplateListParams?, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<AgentTemplateListResponse>> List(
+        AgentTemplateListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/IBroadcastService.cs b/src/Zavudev/Services/IBroadcastService.cs
index 219d0a1..ac4ad51 100644
--- a/src/Zavudev/Services/IBroadcastService.cs
+++ b/src/Zavudev/Services/IBroadcastService.cs
@@ -170,12 +170,22 @@ Task<BroadcastRetryReviewResponse> RetryReview(
     /// <summary>
     /// Start sending the broadcast immediately or schedule for later.
     ///
-    /// <para>**Verification is required to send, and there are two of them.** The team
-    /// must have completed both identity verification (KYC) and business verification
-    /// (KYB); passing one is not enough. Drafts can be created, edited and kept without
-    /// either. Every send path — dashboard, API and CLI alike — enforces both,
-    /// returning `403` with code `kyc_required` or `kyb_required` for whichever is
-    /// outstanding.</para>
+    /// <para>**The account must be past the unverified level to send, except on
+    /// WhatsApp.** An account that has verified nothing is refused with `403` and code
+    /// `kyc_required` on every channel other than `whatsapp`. Any one of these lifts
+    /// it: identity verification (KYC), a saved payment method, a settled deposit, or a
+    /// paid plan. Business verification (KYB) is not required to broadcast; it gates
+    /// 10DLC registration only. A `whatsapp` broadcast is exempt: it can only be built
+    /// on a template, and Meta vets the business and the content when it approves that
+    /// template, so an unapproved template is refused instead. `smart` is not exempt,
+    /// since it can route a contact to SMS or email. Drafts can be created, edited and
+    /// kept without any check. Every send path (dashboard, API and CLI) enforces the
+    /// same rule.</para>
+    ///
+    /// <para>**Daily ceilings apply per recipient.** Each message a broadcast sends
+    /// counts against the channel's daily ceiling (see `POST /v1/messages`). Once the
+    /// ceiling is reached, the remaining recipients are marked `failed` with
+    /// `errorCode` `DAILY_LIMIT_EXCEEDED`; they are not retried the next day.</para>
     ///
     /// <para>**Review depends on the channel, and cannot be bypassed.** A draft is
     /// submitted to automated content review here; it does not go straight out. A
diff --git a/src/Zavudev/Services/ICallService.cs b/src/Zavudev/Services/ICallService.cs
new file mode 100644
index 0000000..a9db150
--- /dev/null
+++ b/src/Zavudev/Services/ICallService.cs
@@ -0,0 +1,162 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.Calls;
+
+namespace Zavudev.Services;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface ICallService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    ICallServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    ICallService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Place an outbound voice call answered by the voice agent configured on the
+    /// sender. Zavu dials the recipient and runs the conversation through its managed
+    /// voice pipeline (speech recognition, the agent's LLM, and speech synthesis, with
+    /// real-time interruption handling).
+    ///
+    /// <para>**Requirements:** - The Voice Agents feature must be enabled for your team
+    /// (otherwise `403`). - An account that has verified nothing may only call the
+    /// phone numbers the project has verified (`403` with code
+    /// `destination_not_verified`, and `details.verifiedNumbers` lists them), and at
+    /// most 5 calls a day (`429` with code `daily_limit_exceeded`). A number is
+    /// verified from the dashboard's Sandbox screen by sending the pre-filled WhatsApp
+    /// message from that phone; the same verification covers SMS and calls. Verify your
+    /// identity, add a payment method, settle a deposit or subscribe to call any
+    /// destination. That raises the ceiling to 50 calls a day on Free; paid plans have
+    /// no daily call ceiling. Full reference:
+    /// https://docs.zavu.dev/concepts/sending-limits - The sender's agent must have
+    /// `voice.enabled` set to `true`. - Not available with test-mode API keys.</para>
+    ///
+    /// <para>**Billing:** Voice calls are billed per minute of connected time plus
+    /// telephony, deducted from your prepaid balance. A short-duration estimate is
+    /// reserved when the call is placed; you are charged for the actual duration when
+    /// the call ends.</para>
+    /// </summary>
+    Task<CallCreateResponse> Create(
+        CallCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Retrieve a single voice call, including its full transcript once the
+    /// conversation has produced turns.
+    /// </summary>
+    Task<CallRetrieveResponse> Retrieve(
+        CallRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(CallRetrieveParams, CancellationToken)"/>
+    Task<CallRetrieveResponse> Retrieve(
+        string callID,
+        CallRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// List voice calls for this project, most recent first. Transcripts are omitted
+    /// from the list; fetch a single call to get its transcript.
+    /// </summary>
+    Task<CallListPage> List(
+        CallListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// End an active voice call. The call must still be ringing or in progress. Not
+    /// available with test-mode API keys.
+    /// </summary>
+    Task<CallHangupResponse> Hangup(
+        CallHangupParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Hangup(CallHangupParams, CancellationToken)"/>
+    Task<CallHangupResponse> Hangup(
+        string callID,
+        CallHangupParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="ICallService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface ICallServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    ICallServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/calls</c>, but is otherwise the
+    /// same as <see cref="ICallService.Create(CallCreateParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<CallCreateResponse>> Create(
+        CallCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/calls/{callId}</c>, but is otherwise the
+    /// same as <see cref="ICallService.Retrieve(CallRetrieveParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<CallRetrieveResponse>> Retrieve(
+        CallRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(CallRetrieveParams, CancellationToken)"/>
+    Task<HttpResponse<CallRetrieveResponse>> Retrieve(
+        string callID,
+        CallRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/calls</c>, but is otherwise the
+    /// same as <see cref="ICallService.List(CallListParams?, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<CallListPage>> List(
+        CallListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/calls/{callId}/hangup</c>, but is otherwise the
+    /// same as <see cref="ICallService.Hangup(CallHangupParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<CallHangupResponse>> Hangup(
+        CallHangupParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Hangup(CallHangupParams, CancellationToken)"/>
+    Task<HttpResponse<CallHangupResponse>> Hangup(
+        string callID,
+        CallHangupParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/IContactService.cs b/src/Zavudev/Services/IContactService.cs
index 897a543..b4a8e94 100644
--- a/src/Zavudev/Services/IContactService.cs
+++ b/src/Zavudev/Services/IContactService.cs
@@ -92,21 +92,6 @@ Task Delete(
         CancellationToken cancellationToken = default
     );
 
-    /// <summary>
-    /// Dismiss the merge suggestion for a contact.
-    /// </summary>
-    Task DismissMergeSuggestion(
-        ContactDismissMergeSuggestionParams parameters,
-        CancellationToken cancellationToken = default
-    );
-
-    /// <inheritdoc cref="DismissMergeSuggestion(ContactDismissMergeSuggestionParams, CancellationToken)"/>
-    Task DismissMergeSuggestion(
-        string contactID,
-        ContactDismissMergeSuggestionParams? parameters = null,
-        CancellationToken cancellationToken = default
-    );
-
     /// <summary>
     /// Merge a source contact into this contact. All channels from the source contact
     /// will be moved to the target contact, and the source contact will be marked as
@@ -221,22 +206,6 @@ Task<HttpResponse> Delete(
         CancellationToken cancellationToken = default
     );
 
-    /// <summary>
-    /// Returns a raw HTTP response for <c>delete /v1/contacts/{contactId}/merge-suggestion</c>, but is otherwise the
-    /// same as <see cref="IContactService.DismissMergeSuggestion(ContactDismissMergeSuggestionParams, CancellationToken)"/>.
-    /// </summary>
-    Task<HttpResponse> DismissMergeSuggestion(
-        ContactDismissMergeSuggestionParams parameters,
-        CancellationToken cancellationToken = default
-    );
-
-    /// <inheritdoc cref="DismissMergeSuggestion(ContactDismissMergeSuggestionParams, CancellationToken)"/>
-    Task<HttpResponse> DismissMergeSuggestion(
-        string contactID,
-        ContactDismissMergeSuggestionParams? parameters = null,
-        CancellationToken cancellationToken = default
-    );
-
     /// <summary>
     /// Returns a raw HTTP response for <c>post /v1/contacts/{contactId}/merge</c>, but is otherwise the
     /// same as <see cref="IContactService.Merge(ContactMergeParams, CancellationToken)"/>.
diff --git a/src/Zavudev/Services/IConversationService.cs b/src/Zavudev/Services/IConversationService.cs
new file mode 100644
index 0000000..6a9cae5
--- /dev/null
+++ b/src/Zavudev/Services/IConversationService.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.Conversations;
+
+namespace Zavudev.Services;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface IConversationService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    IConversationServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IConversationService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Get conversation
+    /// </summary>
+    Task<ConversationRetrieveResponse> Retrieve(
+        ConversationRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(ConversationRetrieveParams, CancellationToken)"/>
+    Task<ConversationRetrieveResponse> Retrieve(
+        string conversationID,
+        ConversationRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// List inbox threads, most recently active first. A conversation groups every
+    /// message with one contact across channels, which is what you need to build an
+    /// inbox: `GET /v1/messages` returns a flat log with no thread to hang it on.
+    ///
+    /// <para>Use `senderId` to scope the list to a single number, and `channel` to keep
+    /// only threads that have carried that channel.</para>
+    /// </summary>
+    Task<ConversationListPage> List(
+        ConversationListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Messages in this thread, newest first, across every channel it has carried.
+    /// Reply with `POST /v1/messages`, passing the conversation's `senderId` as the
+    /// `Zavu-Sender` header so the answer leaves from the number the contact already
+    /// knows.
+    /// </summary>
+    Task<ConversationListMessagesPage> ListMessages(
+        ConversationListMessagesParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="ListMessages(ConversationListMessagesParams, CancellationToken)"/>
+    Task<ConversationListMessagesPage> ListMessages(
+        string conversationID,
+        ConversationListMessagesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Reset the thread's `unreadCount` to zero. Marks the thread read in your own
+    /// inbox only: it does not send a read receipt to the contact.
+    /// </summary>
+    Task<ConversationMarkAsReadResponse> MarkAsRead(
+        ConversationMarkAsReadParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="MarkAsRead(ConversationMarkAsReadParams, CancellationToken)"/>
+    Task<ConversationMarkAsReadResponse> MarkAsRead(
+        string conversationID,
+        ConversationMarkAsReadParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="IConversationService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface IConversationServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IConversationServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/conversations/{conversationId}</c>, but is otherwise the
+    /// same as <see cref="IConversationService.Retrieve(ConversationRetrieveParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<ConversationRetrieveResponse>> Retrieve(
+        ConversationRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(ConversationRetrieveParams, CancellationToken)"/>
+    Task<HttpResponse<ConversationRetrieveResponse>> Retrieve(
+        string conversationID,
+        ConversationRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/conversations</c>, but is otherwise the
+    /// same as <see cref="IConversationService.List(ConversationListParams?, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<ConversationListPage>> List(
+        ConversationListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/conversations/{conversationId}/messages</c>, but is otherwise the
+    /// same as <see cref="IConversationService.ListMessages(ConversationListMessagesParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<ConversationListMessagesPage>> ListMessages(
+        ConversationListMessagesParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="ListMessages(ConversationListMessagesParams, CancellationToken)"/>
+    Task<HttpResponse<ConversationListMessagesPage>> ListMessages(
+        string conversationID,
+        ConversationListMessagesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/conversations/{conversationId}/read</c>, but is otherwise the
+    /// same as <see cref="IConversationService.MarkAsRead(ConversationMarkAsReadParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<ConversationMarkAsReadResponse>> MarkAsRead(
+        ConversationMarkAsReadParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="MarkAsRead(ConversationMarkAsReadParams, CancellationToken)"/>
+    Task<HttpResponse<ConversationMarkAsReadResponse>> MarkAsRead(
+        string conversationID,
+        ConversationMarkAsReadParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/IEmailDomainService.cs b/src/Zavudev/Services/IEmailDomainService.cs
new file mode 100644
index 0000000..f93f62d
--- /dev/null
+++ b/src/Zavudev/Services/IEmailDomainService.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.EmailDomains;
+
+namespace Zavudev.Services;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface IEmailDomainService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    IEmailDomainServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IEmailDomainService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Add a domain to send email from. Returns the DNS records to publish (DKIM CNAMEs
+    /// are required; SPF, DMARC, and MAIL FROM are recommended). Publish them at your
+    /// DNS provider, then verify.
+    /// </summary>
+    Task<EmailDomainCreateResponse> Create(
+        EmailDomainCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Fetch a domain with its DNS records and current status.
+    /// </summary>
+    Task<EmailDomainRetrieveResponse> Retrieve(
+        EmailDomainRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(EmailDomainRetrieveParams, CancellationToken)"/>
+    Task<EmailDomainRetrieveResponse> Retrieve(
+        string domainID,
+        EmailDomainRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// List email domains
+    /// </summary>
+    Task<EmailDomainListResponse> List(
+        EmailDomainListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Remove an email domain
+    /// </summary>
+    Task Delete(EmailDomainDeleteParams parameters, CancellationToken cancellationToken = default);
+
+    /// <inheritdoc cref="Delete(EmailDomainDeleteParams, CancellationToken)"/>
+    Task Delete(
+        string domainID,
+        EmailDomainDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Re-check the domain's published DNS records and refresh its status.
+    /// </summary>
+    Task<EmailDomainVerifyResponse> Verify(
+        EmailDomainVerifyParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Verify(EmailDomainVerifyParams, CancellationToken)"/>
+    Task<EmailDomainVerifyResponse> Verify(
+        string domainID,
+        EmailDomainVerifyParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="IEmailDomainService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface IEmailDomainServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IEmailDomainServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/email-domains</c>, but is otherwise the
+    /// same as <see cref="IEmailDomainService.Create(EmailDomainCreateParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<EmailDomainCreateResponse>> Create(
+        EmailDomainCreateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/email-domains/{domainId}</c>, but is otherwise the
+    /// same as <see cref="IEmailDomainService.Retrieve(EmailDomainRetrieveParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<EmailDomainRetrieveResponse>> Retrieve(
+        EmailDomainRetrieveParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Retrieve(EmailDomainRetrieveParams, CancellationToken)"/>
+    Task<HttpResponse<EmailDomainRetrieveResponse>> Retrieve(
+        string domainID,
+        EmailDomainRetrieveParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/email-domains</c>, but is otherwise the
+    /// same as <see cref="IEmailDomainService.List(EmailDomainListParams?, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<EmailDomainListResponse>> List(
+        EmailDomainListParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>delete /v1/email-domains/{domainId}</c>, but is otherwise the
+    /// same as <see cref="IEmailDomainService.Delete(EmailDomainDeleteParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse> Delete(
+        EmailDomainDeleteParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Delete(EmailDomainDeleteParams, CancellationToken)"/>
+    Task<HttpResponse> Delete(
+        string domainID,
+        EmailDomainDeleteParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/email-domains/{domainId}/verify</c>, but is otherwise the
+    /// same as <see cref="IEmailDomainService.Verify(EmailDomainVerifyParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<EmailDomainVerifyResponse>> Verify(
+        EmailDomainVerifyParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Verify(EmailDomainVerifyParams, CancellationToken)"/>
+    Task<HttpResponse<EmailDomainVerifyResponse>> Verify(
+        string domainID,
+        EmailDomainVerifyParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/IFunctionService.cs b/src/Zavudev/Services/IFunctionService.cs
index ef38dfb..1f3ff46 100644
--- a/src/Zavudev/Services/IFunctionService.cs
+++ b/src/Zavudev/Services/IFunctionService.cs
@@ -29,6 +29,10 @@ public interface IFunctionService
 
     ISecretService Secrets { get; }
 
+    ITriggerService Triggers { get; }
+
+    IGitLinkService GitLink { get; }
+
     /// <summary>
     /// Create a new Zavu Function. The function starts in `draft` status. A dedicated
     /// API key is auto-provisioned and injected as the `ZAVU_API_KEY` secret so the
@@ -126,6 +130,51 @@ Task<FunctionGetDeploymentResponse> GetDeployment(
         CancellationToken cancellationToken = default
     );
 
+    /// <summary>
+    /// List a function's deployment history, newest first. Source code is omitted;
+    /// fetch a single deployment via GET /v1/functions/deployments/{deploymentId} for
+    /// full details.
+    /// </summary>
+    Task<FunctionListDeploymentsResponse> ListDeployments(
+        FunctionListDeploymentsParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="ListDeployments(FunctionListDeploymentsParams, CancellationToken)"/>
+    Task<FunctionListDeploymentsResponse> ListDeployments(
+        string functionID,
+        FunctionListDeploymentsParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// List the event types a function trigger can subscribe to. Includes the special
+    /// type `cron`, which fires on a schedule (see POST
+    /// /v1/functions/{functionId}/triggers) rather than on a messaging event.
+    /// </summary>
+    Task<FunctionListEventTypesResponse> ListEventTypes(
+        FunctionListEventTypesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Re-deploy a previous version by copying its source, dependencies, and runtime
+    /// pin onto the function's draft, then deploying. Returns immediately with a
+    /// deployment ID — poll GET /v1/functions/deployments/{deploymentId} until status
+    /// is active or failed. Secrets are not rolled back.
+    /// </summary>
+    Task<FunctionRollbackDeploymentResponse> RollbackDeployment(
+        FunctionRollbackDeploymentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="RollbackDeployment(FunctionRollbackDeploymentParams, CancellationToken)"/>
+    Task<FunctionRollbackDeploymentResponse> RollbackDeployment(
+        string functionID,
+        FunctionRollbackDeploymentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Fetch invocation logs for a function. Logs are paginated via `nextToken`. Pass
     /// `startTime` / `endTime` (Unix epoch milliseconds) to bound the window, or
@@ -159,6 +208,10 @@ public interface IFunctionServiceWithRawResponse
 
     ISecretServiceWithRawResponse Secrets { get; }
 
+    ITriggerServiceWithRawResponse Triggers { get; }
+
+    IGitLinkServiceWithRawResponse GitLink { get; }
+
     /// <summary>
     /// Returns a raw HTTP response for <c>post /v1/functions</c>, but is otherwise the
     /// same as <see cref="IFunctionService.Create(FunctionCreateParams, CancellationToken)"/>.
@@ -248,6 +301,47 @@ Task<HttpResponse<FunctionGetDeploymentResponse>> GetDeployment(
         CancellationToken cancellationToken = default
     );
 
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/functions/{functionId}/deployments</c>, but is otherwise the
+    /// same as <see cref="IFunctionService.ListDeployments(FunctionListDeploymentsParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<FunctionListDeploymentsResponse>> ListDeployments(
+        FunctionListDeploymentsParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="ListDeployments(FunctionListDeploymentsParams, CancellationToken)"/>
+    Task<HttpResponse<FunctionListDeploymentsResponse>> ListDeployments(
+        string functionID,
+        FunctionListDeploymentsParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/functions/event-types</c>, but is otherwise the
+    /// same as <see cref="IFunctionService.ListEventTypes(FunctionListEventTypesParams?, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<FunctionListEventTypesResponse>> ListEventTypes(
+        FunctionListEventTypesParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/functions/{functionId}/rollback</c>, but is otherwise the
+    /// same as <see cref="IFunctionService.RollbackDeployment(FunctionRollbackDeploymentParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<FunctionRollbackDeploymentResponse>> RollbackDeployment(
+        FunctionRollbackDeploymentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="RollbackDeployment(FunctionRollbackDeploymentParams, CancellationToken)"/>
+    Task<HttpResponse<FunctionRollbackDeploymentResponse>> RollbackDeployment(
+        string functionID,
+        FunctionRollbackDeploymentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Returns a raw HTTP response for <c>get /v1/functions/{functionId}/logs</c>, but is otherwise the
     /// same as <see cref="IFunctionService.TailLogs(FunctionTailLogsParams, CancellationToken)"/>.
diff --git a/src/Zavudev/Services/IIntrospectService.cs b/src/Zavudev/Services/IIntrospectService.cs
index 39f00cf..da1270f 100644
--- a/src/Zavudev/Services/IIntrospectService.cs
+++ b/src/Zavudev/Services/IIntrospectService.cs
@@ -26,6 +26,23 @@ public interface IIntrospectService
     /// </summary>
     IIntrospectService WithOptions(Func<ClientOptions, ClientOptions> modifier);
 
+    /// <summary>
+    /// Heuristic email validation to run before sending: catches invalid syntax, dead
+    /// domains (no MX/A records), disposable inboxes, role-based addresses (info@,
+    /// contacto@, sales@), and addresses already on your project's suppression list.
+    /// Use it to clean a list before a broadcast and keep your bounce rate low.
+    ///
+    /// <para>No mailbox-level (SMTP) probe is performed, so a `deliverable` verdict is
+    /// not a delivery guarantee — it means no negative signal was found. Treat `risky`
+    /// addresses with care and drop `undeliverable` ones.</para>
+    ///
+    /// <para>Accepts a single `email` or an `emails` batch (max 100 per request).</para>
+    /// </summary>
+    Task<IntrospectValidateEmailResponse> ValidateEmail(
+        IntrospectValidateEmailParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Validate a phone number and check if a WhatsApp conversation window is open.
     /// </summary>
@@ -48,6 +65,15 @@ public interface IIntrospectServiceWithRawResponse
     /// </summary>
     IIntrospectServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
 
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/introspect/email</c>, but is otherwise the
+    /// same as <see cref="IIntrospectService.ValidateEmail(IntrospectValidateEmailParams?, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<IntrospectValidateEmailResponse>> ValidateEmail(
+        IntrospectValidateEmailParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Returns a raw HTTP response for <c>post /v1/introspect/phone</c>, but is otherwise the
     /// same as <see cref="IIntrospectService.ValidatePhone(IntrospectValidatePhoneParams, CancellationToken)"/>.
diff --git a/src/Zavudev/Services/IMessageService.cs b/src/Zavudev/Services/IMessageService.cs
index bdf2042..bebcd35 100644
--- a/src/Zavudev/Services/IMessageService.cs
+++ b/src/Zavudev/Services/IMessageService.cs
@@ -49,6 +49,26 @@ Task<MessageListPage> List(
         CancellationToken cancellationToken = default
     );
 
+    /// <summary>
+    /// List the stored file attachments for an email message and get a short-lived
+    /// signed `downloadUrl` for each. Works for both inbound emails (received via
+    /// `message.inbound`) and outbound emails you sent with attachments. Messages
+    /// without stored attachments (including SMS, WhatsApp, and other channels) return
+    /// an empty list. Each `downloadUrl` is generated fresh per request and expires —
+    /// fetch the file promptly and do not cache the URL.
+    /// </summary>
+    Task<MessageListAttachmentsResponse> ListAttachments(
+        MessageListAttachmentsParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="ListAttachments(MessageListAttachmentsParams, CancellationToken)"/>
+    Task<MessageListAttachmentsResponse> ListAttachments(
+        string messageID,
+        MessageListAttachmentsParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Send an emoji reaction to an existing WhatsApp message. Reactions are only
     /// supported for WhatsApp messages.
@@ -88,6 +108,32 @@ Task<MessageResponse> React(
     /// earlier plans keep their original email quotas instead - SMS and voice are
     /// billed per message from your balance on every plan</para>
     ///
+    /// <para>**Account verification and daily limits:** - A brand-new account can send
+    /// on every channel immediately, but `sms`, `sms_oneway` and `voice` reach only the
+    /// phone numbers the project has verified. Sending elsewhere returns `403` with
+    /// code `destination_not_verified`; `details.verifiedNumbers` lists the numbers
+    /// that are reachable. A number is verified from the dashboard's Sandbox screen:
+    /// generate a code and send the pre-filled WhatsApp message from that phone to
+    /// Zavu's sandbox number. One verification covers WhatsApp, SMS and calls, up to 5
+    /// numbers per project. To send to any destination, do any one of these: verify
+    /// your identity, add a payment method, settle a deposit, or subscribe to a paid
+    /// plan. Business verification (KYB) is never required to send - Daily ceilings
+    /// apply per channel group and rise with verification. An account that has verified
+    /// nothing: 25/day across `sms` + `sms_oneway`, 5/day for `voice`, 100/day across
+    /// WhatsApp, Telegram, Instagram and Messenger combined. Past that floor: 200/day
+    /// for SMS, or 10,000/day once identity or business verification is approved (or a
+    /// higher limit agreed for your account); 50/day voice and 250/day conversational
+    /// on Free. **Paid plans have no voice or conversational daily ceiling.** Over a
+    /// ceiling, sends return `429` with code `daily_limit_exceeded` and
+    /// `details.limit`; the count resets at 00:00 UTC - The daily ceiling never reduces
+    /// the monthly allowance: 100/day on the conversational group still reaches the
+    /// 2,000 monthly A2P messages Free includes - Email needs no account verification
+    /// here: a sender with a verified domain sends from day one, within the plan quota
+    /// (100/day and 3,000/month on Free). Over the daily quota it returns `429` with
+    /// code `daily_limit_exceeded`. Email broadcasts are the exception: they need the
+    /// account past the unverified level, see `POST /v1/broadcasts/{broadcastId}/send`
+    /// - Full reference: https://docs.zavu.dev/concepts/sending-limits</para>
+    ///
     /// <para>**Email recipient pre-flight:** Email messages are validated automatically
     /// before dispatch. Sends that would be a guaranteed hard bounce are failed instead
     /// of sent, protecting your bounce rate: the message transitions to `failed`
@@ -162,6 +208,22 @@ Task<HttpResponse<MessageListPage>> List(
         CancellationToken cancellationToken = default
     );
 
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/messages/{messageId}/attachments</c>, but is otherwise the
+    /// same as <see cref="IMessageService.ListAttachments(MessageListAttachmentsParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<MessageListAttachmentsResponse>> ListAttachments(
+        MessageListAttachmentsParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="ListAttachments(MessageListAttachmentsParams, CancellationToken)"/>
+    Task<HttpResponse<MessageListAttachmentsResponse>> ListAttachments(
+        string messageID,
+        MessageListAttachmentsParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Returns a raw HTTP response for <c>post /v1/messages/{messageId}/reactions</c>, but is otherwise the
     /// same as <see cref="IMessageService.React(MessageReactParams, CancellationToken)"/>.
diff --git a/src/Zavudev/Services/ISenderService.cs b/src/Zavudev/Services/ISenderService.cs
index 2aaba62..92aff29 100644
--- a/src/Zavudev/Services/ISenderService.cs
+++ b/src/Zavudev/Services/ISenderService.cs
@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using Zavudev.Core;
 using Zavudev.Models.Senders;
-using Zavudev.Services.Senders;
+using Senders = Zavudev.Services.Senders;
 
 namespace Zavudev.Services;
 
@@ -27,9 +27,11 @@ public interface ISenderService
     /// </summary>
     ISenderService WithOptions(Func<ClientOptions, ClientOptions> modifier);
 
-    IAgentService Agent { get; }
+    Senders::IAgentService Agent { get; }
 
-    IWhatsappSyncService WhatsappSync { get; }
+    Senders::IWhatsappSyncService WhatsappSync { get; }
+
+    Senders::ITelegramService Telegram { get; }
 
     /// <summary>
     /// Create sender
@@ -167,9 +169,11 @@ public interface ISenderServiceWithRawResponse
     /// </summary>
     ISenderServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
 
-    IAgentServiceWithRawResponse Agent { get; }
+    Senders::IAgentServiceWithRawResponse Agent { get; }
+
+    Senders::IWhatsappSyncServiceWithRawResponse WhatsappSync { get; }
 
-    IWhatsappSyncServiceWithRawResponse WhatsappSync { get; }
+    Senders::ITelegramServiceWithRawResponse Telegram { get; }
 
     /// <summary>
     /// Returns a raw HTTP response for <c>post /v1/senders</c>, but is otherwise the
diff --git a/src/Zavudev/Services/ITemplateService.cs b/src/Zavudev/Services/ITemplateService.cs
index a278426..fc71bb7 100644
--- a/src/Zavudev/Services/ITemplateService.cs
+++ b/src/Zavudev/Services/ITemplateService.cs
@@ -86,6 +86,34 @@ Task<Template> Submit(
         TemplateSubmitParams parameters,
         CancellationToken cancellationToken = default
     );
+
+    /// <summary>
+    /// Reconcile this project's templates against WhatsApp. Two things happen per
+    /// connected WhatsApp Business Account: templates that exist on Meta but not in
+    /// Zavu are imported (or linked to an existing template with the same name), and
+    /// the approval status of the templates Zavu already knows about is refreshed from
+    /// Meta.
+    ///
+    /// <para>This is what to call when a template was created outside Zavu — in Meta
+    /// Business Manager, or by another tool — or when a `template.status_changed`
+    /// webhook was missed and a template is stuck in `pending`. Status changes normally
+    /// arrive by webhook; this endpoint is the recovery path and the only path for a
+    /// template Zavu never created.</para>
+    ///
+    /// <para>Templates that Meta reports as rejected or disabled are not imported; they
+    /// are counted in `skipped`. Existing local templates are matched first by Meta
+    /// template ID, then by name.</para>
+    ///
+    /// <para>By default every sender in the project with a WhatsApp Business Account is
+    /// synced. Pass `senderId` to sync only that sender's account. The call is
+    /// synchronous — it waits for Meta and returns what changed — so it can take a few
+    /// seconds per account. A failure on one account does not fail the request: it is
+    /// reported in `errors` and the remaining accounts are still synced.</para>
+    /// </summary>
+    Task<TemplateSyncResponse> Sync(
+        TemplateSyncParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
 }
 
 /// <summary>
@@ -166,4 +194,13 @@ Task<HttpResponse<Template>> Submit(
         TemplateSubmitParams parameters,
         CancellationToken cancellationToken = default
     );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/templates/sync</c>, but is otherwise the
+    /// same as <see cref="ITemplateService.Sync(TemplateSyncParams?, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<TemplateSyncResponse>> Sync(
+        TemplateSyncParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
 }
diff --git a/src/Zavudev/Services/IUrlService.cs b/src/Zavudev/Services/IUrlService.cs
index 8f36dee..2cf3281 100644
--- a/src/Zavudev/Services/IUrlService.cs
+++ b/src/Zavudev/Services/IUrlService.cs
@@ -26,6 +26,22 @@ public interface IUrlService
     /// </summary>
     IUrlService WithOptions(Func<ClientOptions, ClientOptions> modifier);
 
+    /// <summary>
+    /// Request manual review of a rejected URL. Only URLs in 'rejected' status can be
+    /// escalated; the status then moves to 'escalated'.
+    /// </summary>
+    Task<UrlEscalateResponse> Escalate(
+        UrlEscalateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Escalate(UrlEscalateParams, CancellationToken)"/>
+    Task<UrlEscalateResponse> Escalate(
+        string urlID,
+        UrlEscalateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// List URLs that have been verified for this project.
     /// </summary>
@@ -77,6 +93,22 @@ public interface IUrlServiceWithRawResponse
     /// </summary>
     IUrlServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
 
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/urls/{urlId}/escalate</c>, but is otherwise the
+    /// same as <see cref="IUrlService.Escalate(UrlEscalateParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<UrlEscalateResponse>> Escalate(
+        UrlEscalateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Escalate(UrlEscalateParams, CancellationToken)"/>
+    Task<HttpResponse<UrlEscalateResponse>> Escalate(
+        string urlID,
+        UrlEscalateParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Returns a raw HTTP response for <c>get /v1/urls</c>, but is otherwise the
     /// same as <see cref="IUrlService.ListVerified(UrlListVerifiedParams?, CancellationToken)"/>.
diff --git a/src/Zavudev/Services/IntrospectService.cs b/src/Zavudev/Services/IntrospectService.cs
index bcd4709..535a065 100644
--- a/src/Zavudev/Services/IntrospectService.cs
+++ b/src/Zavudev/Services/IntrospectService.cs
@@ -33,6 +33,18 @@ public IntrospectService(IZavudevClient client)
         _withRawResponse = new(() => new IntrospectServiceWithRawResponse(client.WithRawResponse));
     }
 
+    /// <inheritdoc/>
+    public async Task<IntrospectValidateEmailResponse> ValidateEmail(
+        IntrospectValidateEmailParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.ValidateEmail(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
     /// <inheritdoc/>
     public async Task<IntrospectValidatePhoneResponse> ValidatePhone(
         IntrospectValidatePhoneParams parameters,
@@ -64,6 +76,36 @@ public IntrospectServiceWithRawResponse(IZavudevClientWithRawResponse client)
         _client = client;
     }
 
+    /// <inheritdoc/>
+    public async Task<HttpResponse<IntrospectValidateEmailResponse>> ValidateEmail(
+        IntrospectValidateEmailParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        HttpRequest<IntrospectValidateEmailParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<IntrospectValidateEmailResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
     /// <inheritdoc/>
     public async Task<HttpResponse<IntrospectValidatePhoneResponse>> ValidatePhone(
         IntrospectValidatePhoneParams parameters,
diff --git a/src/Zavudev/Services/MessageService.cs b/src/Zavudev/Services/MessageService.cs
index 68b73f0..6a98dc4 100644
--- a/src/Zavudev/Services/MessageService.cs
+++ b/src/Zavudev/Services/MessageService.cs
@@ -70,6 +70,30 @@ public async Task<MessageListPage> List(
         return await response.Deserialize(cancellationToken).ConfigureAwait(false);
     }
 
+    /// <inheritdoc/>
+    public async Task<MessageListAttachmentsResponse> ListAttachments(
+        MessageListAttachmentsParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.ListAttachments(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<MessageListAttachmentsResponse> ListAttachments(
+        string messageID,
+        MessageListAttachmentsParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.ListAttachments(parameters with { MessageID = messageID }, cancellationToken);
+    }
+
     /// <inheritdoc/>
     public async Task<MessageResponse> React(
         MessageReactParams parameters,
@@ -220,6 +244,51 @@ public async Task<HttpResponse<MessageListPage>> List(
         );
     }
 
+    /// <inheritdoc/>
+    public async Task<HttpResponse<MessageListAttachmentsResponse>> ListAttachments(
+        MessageListAttachmentsParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.MessageID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.MessageID' cannot be null");
+        }
+
+        HttpRequest<MessageListAttachmentsParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<MessageListAttachmentsResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<MessageListAttachmentsResponse>> ListAttachments(
+        string messageID,
+        MessageListAttachmentsParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.ListAttachments(parameters with { MessageID = messageID }, cancellationToken);
+    }
+
     /// <inheritdoc/>
     public async Task<HttpResponse<MessageResponse>> React(
         MessageReactParams parameters,
diff --git a/src/Zavudev/Services/Number10dlc/IBrandService.cs b/src/Zavudev/Services/Number10dlc/IBrandService.cs
index 465a5ad..2983968 100644
--- a/src/Zavudev/Services/Number10dlc/IBrandService.cs
+++ b/src/Zavudev/Services/Number10dlc/IBrandService.cs
@@ -95,11 +95,16 @@ Task<BrandListUseCasesResponse> ListUseCases(
 
     /// <summary>
     /// Submit a draft brand to The Campaign Registry (TCR) for vetting. The brand must
-    /// be in draft status. TCR's one-time $4 brand registration fee is charged from
-    /// your balance at submission (passed through at cost) and refunded if the carrier
-    /// rejects the registration. A team that already paid this fee through the
-    /// compliance flow is not charged again. Campaign registration is billed separately
-    /// when a campaign is submitted.
+    /// be in draft status, and the team must have an approved Business Verification
+    /// (KYB) — carriers register a brand against a vetted legal entity, so submitting
+    /// without one returns `403` with code `kyb_required`.
+    ///
+    /// <para>TCR's one-time $4 brand registration fee is charged from your balance at
+    /// submission (passed through at cost) and refunded if the carrier rejects the
+    /// registration. The fee is per BRAND: a team registering a second legal entity
+    /// pays it again. A brand already paid for through the compliance flow is not
+    /// charged twice. Campaign registration is billed separately when a campaign is
+    /// submitted.</para>
     /// </summary>
     Task<BrandSubmitResponse> Submit(
         BrandSubmitParams parameters,
diff --git a/src/Zavudev/Services/Number10dlc/ICampaignService.cs b/src/Zavudev/Services/Number10dlc/ICampaignService.cs
index 8ca2b94..bc89ec6 100644
--- a/src/Zavudev/Services/Number10dlc/ICampaignService.cs
+++ b/src/Zavudev/Services/Number10dlc/ICampaignService.cs
@@ -89,13 +89,14 @@ Task Delete(
     );
 
     /// <summary>
-    /// Submit a draft campaign for carrier review. The campaign must be in draft status
-    /// and its brand must be verified. TCR's one-time registration fee is charged from
-    /// your balance at submission ($15 for standard use cases, $2 for LOW_VOLUME),
-    /// passed through at cost and refunded if the carrier rejects it. Once approved,
-    /// the campaign's monthly TCR fee ($10 standard, $2 LOW_VOLUME) is charged from
-    /// your balance while the campaign is active — see registrationCostCents and
-    /// monthlyFeeCents on the campaign object.
+    /// The team must have an approved Business Verification (KYB): submitting without
+    /// one returns `403` with code `kyb_required`. Submit a draft campaign for carrier
+    /// review. The campaign must be in draft status and its brand must be verified.
+    /// TCR's one-time registration fee is charged from your balance at submission ($15
+    /// for standard use cases, $2 for LOW_VOLUME), passed through at cost and refunded
+    /// if the carrier rejects it. Once approved, the campaign's monthly TCR fee ($10
+    /// standard, $2 LOW_VOLUME) is charged from your balance while the campaign is
+    /// active — see registrationCostCents and monthlyFeeCents on the campaign object.
     /// </summary>
     Task<CampaignSubmitResponse> Submit(
         CampaignSubmitParams parameters,
diff --git a/src/Zavudev/Services/SenderService.cs b/src/Zavudev/Services/SenderService.cs
index e215d90..5714f4b 100644
--- a/src/Zavudev/Services/SenderService.cs
+++ b/src/Zavudev/Services/SenderService.cs
@@ -5,7 +5,7 @@
 using Zavudev.Core;
 using Zavudev.Exceptions;
 using Zavudev.Models.Senders;
-using Zavudev.Services.Senders;
+using Senders = Zavudev.Services.Senders;
 
 namespace Zavudev.Services;
 
@@ -33,22 +33,29 @@ public SenderService(IZavudevClient client)
         _client = client;
 
         _withRawResponse = new(() => new SenderServiceWithRawResponse(client.WithRawResponse));
-        _agent = new(() => new AgentService(client));
-        _whatsappSync = new(() => new WhatsappSyncService(client));
+        _agent = new(() => new Senders::AgentService(client));
+        _whatsappSync = new(() => new Senders::WhatsappSyncService(client));
+        _telegram = new(() => new Senders::TelegramService(client));
     }
 
-    readonly Lazy<IAgentService> _agent;
-    public IAgentService Agent
+    readonly Lazy<Senders::IAgentService> _agent;
+    public Senders::IAgentService Agent
     {
         get { return _agent.Value; }
     }
 
-    readonly Lazy<IWhatsappSyncService> _whatsappSync;
-    public IWhatsappSyncService WhatsappSync
+    readonly Lazy<Senders::IWhatsappSyncService> _whatsappSync;
+    public Senders::IWhatsappSyncService WhatsappSync
     {
         get { return _whatsappSync.Value; }
     }
 
+    readonly Lazy<Senders::ITelegramService> _telegram;
+    public Senders::ITelegramService Telegram
+    {
+        get { return _telegram.Value; }
+    }
+
     /// <inheritdoc/>
     public async Task<Sender> Create(
         SenderCreateParams parameters,
@@ -262,22 +269,29 @@ public SenderServiceWithRawResponse(IZavudevClientWithRawResponse client)
     {
         _client = client;
 
-        _agent = new(() => new AgentServiceWithRawResponse(client));
-        _whatsappSync = new(() => new WhatsappSyncServiceWithRawResponse(client));
+        _agent = new(() => new Senders::AgentServiceWithRawResponse(client));
+        _whatsappSync = new(() => new Senders::WhatsappSyncServiceWithRawResponse(client));
+        _telegram = new(() => new Senders::TelegramServiceWithRawResponse(client));
     }
 
-    readonly Lazy<IAgentServiceWithRawResponse> _agent;
-    public IAgentServiceWithRawResponse Agent
+    readonly Lazy<Senders::IAgentServiceWithRawResponse> _agent;
+    public Senders::IAgentServiceWithRawResponse Agent
     {
         get { return _agent.Value; }
     }
 
-    readonly Lazy<IWhatsappSyncServiceWithRawResponse> _whatsappSync;
-    public IWhatsappSyncServiceWithRawResponse WhatsappSync
+    readonly Lazy<Senders::IWhatsappSyncServiceWithRawResponse> _whatsappSync;
+    public Senders::IWhatsappSyncServiceWithRawResponse WhatsappSync
     {
         get { return _whatsappSync.Value; }
     }
 
+    readonly Lazy<Senders::ITelegramServiceWithRawResponse> _telegram;
+    public Senders::ITelegramServiceWithRawResponse Telegram
+    {
+        get { return _telegram.Value; }
+    }
+
     /// <inheritdoc/>
     public async Task<HttpResponse<Sender>> Create(
         SenderCreateParams parameters,
diff --git a/src/Zavudev/Services/Senders/Agent/IToolService.cs b/src/Zavudev/Services/Senders/Agent/IToolService.cs
index 67c0334..a4a5030 100644
--- a/src/Zavudev/Services/Senders/Agent/IToolService.cs
+++ b/src/Zavudev/Services/Senders/Agent/IToolService.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Zavudev.Core;
 using Zavudev.Models.Senders.Agent.Tools;
+using Zavudev.Services.Senders.Agent.Tools;
 
 namespace Zavudev.Services.Senders.Agent;
 
@@ -26,6 +27,8 @@ public interface IToolService
     /// </summary>
     IToolService WithOptions(Func<ClientOptions, ClientOptions> modifier);
 
+    IWebhookService Webhook { get; }
+
     /// <summary>
     /// Create a new tool for an agent. Tools allow the agent to call external webhooks.
     /// </summary>
@@ -98,6 +101,23 @@ Task Delete(
         CancellationToken cancellationToken = default
     );
 
+    /// <summary>
+    /// Recent runs of this tool triggered from the test endpoint, newest first. Covers
+    /// manual tests only: a tool called by an agent during a real conversation is not
+    /// recorded here.
+    /// </summary>
+    Task<ToolListTestRunsResponse> ListTestRuns(
+        ToolListTestRunsParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="ListTestRuns(ToolListTestRunsParams, CancellationToken)"/>
+    Task<ToolListTestRunsResponse> ListTestRuns(
+        string toolID,
+        ToolListTestRunsParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Run a tool with the parameters you supply and return what it answered.
     ///
@@ -136,6 +156,8 @@ public interface IToolServiceWithRawResponse
     /// </summary>
     IToolServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
 
+    IWebhookServiceWithRawResponse Webhook { get; }
+
     /// <summary>
     /// Returns a raw HTTP response for <c>post /v1/senders/{senderId}/agent/tools</c>, but is otherwise the
     /// same as <see cref="IToolService.Create(ToolCreateParams, CancellationToken)"/>.
@@ -216,6 +238,22 @@ Task<HttpResponse> Delete(
         CancellationToken cancellationToken = default
     );
 
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/senders/{senderId}/agent/tools/{toolId}/test-runs</c>, but is otherwise the
+    /// same as <see cref="IToolService.ListTestRuns(ToolListTestRunsParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<ToolListTestRunsResponse>> ListTestRuns(
+        ToolListTestRunsParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="ListTestRuns(ToolListTestRunsParams, CancellationToken)"/>
+    Task<HttpResponse<ToolListTestRunsResponse>> ListTestRuns(
+        string toolID,
+        ToolListTestRunsParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
     /// <summary>
     /// Returns a raw HTTP response for <c>post /v1/senders/{senderId}/agent/tools/{toolId}/test</c>, but is otherwise the
     /// same as <see cref="IToolService.Test(ToolTestParams, CancellationToken)"/>.
diff --git a/src/Zavudev/Services/Senders/Agent/KnowledgeBases/DocumentService.cs b/src/Zavudev/Services/Senders/Agent/KnowledgeBases/DocumentService.cs
index 97b7ef7..1157f97 100644
--- a/src/Zavudev/Services/Senders/Agent/KnowledgeBases/DocumentService.cs
+++ b/src/Zavudev/Services/Senders/Agent/KnowledgeBases/DocumentService.cs
@@ -97,6 +97,50 @@ public async Task Delete(
         await this.Delete(parameters with { DocID = docID }, cancellationToken)
             .ConfigureAwait(false);
     }
+
+    /// <inheritdoc/>
+    public async Task<DocumentRetrieveDocumentResponse> RetrieveDocument(
+        DocumentRetrieveDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.RetrieveDocument(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<DocumentRetrieveDocumentResponse> RetrieveDocument(
+        string docID,
+        DocumentRetrieveDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.RetrieveDocument(parameters with { DocID = docID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<DocumentUpdateDocumentResponse> UpdateDocument(
+        DocumentUpdateDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.UpdateDocument(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<DocumentUpdateDocumentResponse> UpdateDocument(
+        string docID,
+        DocumentUpdateDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.UpdateDocument(parameters with { DocID = docID }, cancellationToken);
+    }
 }
 
 /// <inheritdoc/>
@@ -229,4 +273,90 @@ public Task<HttpResponse> Delete(
     {
         return this.Delete(parameters with { DocID = docID }, cancellationToken);
     }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<DocumentRetrieveDocumentResponse>> RetrieveDocument(
+        DocumentRetrieveDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.DocID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.DocID' cannot be null");
+        }
+
+        HttpRequest<DocumentRetrieveDocumentParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<DocumentRetrieveDocumentResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<DocumentRetrieveDocumentResponse>> RetrieveDocument(
+        string docID,
+        DocumentRetrieveDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.RetrieveDocument(parameters with { DocID = docID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<DocumentUpdateDocumentResponse>> UpdateDocument(
+        DocumentUpdateDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.DocID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.DocID' cannot be null");
+        }
+
+        HttpRequest<DocumentUpdateDocumentParams> request = new()
+        {
+            Method = ZavudevClientWithRawResponse.PatchMethod,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<DocumentUpdateDocumentResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<DocumentUpdateDocumentResponse>> UpdateDocument(
+        string docID,
+        DocumentUpdateDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.UpdateDocument(parameters with { DocID = docID }, cancellationToken);
+    }
 }
diff --git a/src/Zavudev/Services/Senders/Agent/KnowledgeBases/IDocumentService.cs b/src/Zavudev/Services/Senders/Agent/KnowledgeBases/IDocumentService.cs
index 3464e48..eccbbd7 100644
--- a/src/Zavudev/Services/Senders/Agent/KnowledgeBases/IDocumentService.cs
+++ b/src/Zavudev/Services/Senders/Agent/KnowledgeBases/IDocumentService.cs
@@ -68,6 +68,37 @@ Task Delete(
         DocumentDeleteParams parameters,
         CancellationToken cancellationToken = default
     );
+
+    /// <summary>
+    /// Get a single document from a knowledge base.
+    /// </summary>
+    Task<DocumentRetrieveDocumentResponse> RetrieveDocument(
+        DocumentRetrieveDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="RetrieveDocument(DocumentRetrieveDocumentParams, CancellationToken)"/>
+    Task<DocumentRetrieveDocumentResponse> RetrieveDocument(
+        string docID,
+        DocumentRetrieveDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Update a document's title or content. Updating content reprocesses the document
+    /// for RAG.
+    /// </summary>
+    Task<DocumentUpdateDocumentResponse> UpdateDocument(
+        DocumentUpdateDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="UpdateDocument(DocumentUpdateDocumentParams, CancellationToken)"/>
+    Task<DocumentUpdateDocumentResponse> UpdateDocument(
+        string docID,
+        DocumentUpdateDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    );
 }
 
 /// <summary>
@@ -130,4 +161,36 @@ Task<HttpResponse> Delete(
         DocumentDeleteParams parameters,
         CancellationToken cancellationToken = default
     );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>get /v1/senders/{senderId}/agent/knowledge-bases/{kbId}/documents/{docId}</c>, but is otherwise the
+    /// same as <see cref="IDocumentService.RetrieveDocument(DocumentRetrieveDocumentParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<DocumentRetrieveDocumentResponse>> RetrieveDocument(
+        DocumentRetrieveDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="RetrieveDocument(DocumentRetrieveDocumentParams, CancellationToken)"/>
+    Task<HttpResponse<DocumentRetrieveDocumentResponse>> RetrieveDocument(
+        string docID,
+        DocumentRetrieveDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>patch /v1/senders/{senderId}/agent/knowledge-bases/{kbId}/documents/{docId}</c>, but is otherwise the
+    /// same as <see cref="IDocumentService.UpdateDocument(DocumentUpdateDocumentParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<DocumentUpdateDocumentResponse>> UpdateDocument(
+        DocumentUpdateDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="UpdateDocument(DocumentUpdateDocumentParams, CancellationToken)"/>
+    Task<HttpResponse<DocumentUpdateDocumentResponse>> UpdateDocument(
+        string docID,
+        DocumentUpdateDocumentParams parameters,
+        CancellationToken cancellationToken = default
+    );
 }
diff --git a/src/Zavudev/Services/Senders/Agent/ToolService.cs b/src/Zavudev/Services/Senders/Agent/ToolService.cs
index 9417263..3feb5f5 100644
--- a/src/Zavudev/Services/Senders/Agent/ToolService.cs
+++ b/src/Zavudev/Services/Senders/Agent/ToolService.cs
@@ -5,6 +5,7 @@
 using Zavudev.Core;
 using Zavudev.Exceptions;
 using Zavudev.Models.Senders.Agent.Tools;
+using Zavudev.Services.Senders.Agent.Tools;
 
 namespace Zavudev.Services.Senders.Agent;
 
@@ -32,6 +33,13 @@ public ToolService(IZavudevClient client)
         _client = client;
 
         _withRawResponse = new(() => new ToolServiceWithRawResponse(client.WithRawResponse));
+        _webhook = new(() => new WebhookService(client));
+    }
+
+    readonly Lazy<IWebhookService> _webhook;
+    public IWebhookService Webhook
+    {
+        get { return _webhook.Value; }
     }
 
     /// <inheritdoc/>
@@ -141,6 +149,28 @@ await this.Delete(parameters with { ToolID = toolID }, cancellationToken)
             .ConfigureAwait(false);
     }
 
+    /// <inheritdoc/>
+    public async Task<ToolListTestRunsResponse> ListTestRuns(
+        ToolListTestRunsParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.ListTestRuns(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<ToolListTestRunsResponse> ListTestRuns(
+        string toolID,
+        ToolListTestRunsParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.ListTestRuns(parameters with { ToolID = toolID }, cancellationToken);
+    }
+
     /// <inheritdoc/>
     public async Task<ToolTestResponse> Test(
         ToolTestParams parameters,
@@ -178,6 +208,14 @@ public IToolServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions
     public ToolServiceWithRawResponse(IZavudevClientWithRawResponse client)
     {
         _client = client;
+
+        _webhook = new(() => new WebhookServiceWithRawResponse(client));
+    }
+
+    readonly Lazy<IWebhookServiceWithRawResponse> _webhook;
+    public IWebhookServiceWithRawResponse Webhook
+    {
+        get { return _webhook.Value; }
     }
 
     /// <inheritdoc/>
@@ -383,6 +421,49 @@ public Task<HttpResponse> Delete(
         return this.Delete(parameters with { ToolID = toolID }, cancellationToken);
     }
 
+    /// <inheritdoc/>
+    public async Task<HttpResponse<ToolListTestRunsResponse>> ListTestRuns(
+        ToolListTestRunsParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.ToolID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.ToolID' cannot be null");
+        }
+
+        HttpRequest<ToolListTestRunsParams> request = new()
+        {
+            Method = HttpMethod.Get,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<ToolListTestRunsResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<ToolListTestRunsResponse>> ListTestRuns(
+        string toolID,
+        ToolListTestRunsParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.ListTestRuns(parameters with { ToolID = toolID }, cancellationToken);
+    }
+
     /// <inheritdoc/>
     public async Task<HttpResponse<ToolTestResponse>> Test(
         ToolTestParams parameters,
diff --git a/src/Zavudev/Services/Senders/Agent/Tools/IWebhookService.cs b/src/Zavudev/Services/Senders/Agent/Tools/IWebhookService.cs
new file mode 100644
index 0000000..bf5b11a
--- /dev/null
+++ b/src/Zavudev/Services/Senders/Agent/Tools/IWebhookService.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.Senders;
+using Zavudev.Models.Senders.Agent.Tools.Webhook;
+
+namespace Zavudev.Services.Senders.Agent.Tools;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface IWebhookService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    IWebhookServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IWebhookService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Generate a new signing secret for this tool. The previous one stops working on
+    /// the next call, with no overlap, so update your endpoint first. The tool keeps
+    /// its id, so flows that reference it by name are unaffected.
+    /// </summary>
+    Task<WebhookSecretResponse> RotateSecret(
+        WebhookRotateSecretParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="RotateSecret(WebhookRotateSecretParams, CancellationToken)"/>
+    Task<WebhookSecretResponse> RotateSecret(
+        string toolID,
+        WebhookRotateSecretParams parameters,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="IWebhookService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface IWebhookServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    IWebhookServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/senders/{senderId}/agent/tools/{toolId}/webhook/secret</c>, but is otherwise the
+    /// same as <see cref="IWebhookService.RotateSecret(WebhookRotateSecretParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<WebhookSecretResponse>> RotateSecret(
+        WebhookRotateSecretParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="RotateSecret(WebhookRotateSecretParams, CancellationToken)"/>
+    Task<HttpResponse<WebhookSecretResponse>> RotateSecret(
+        string toolID,
+        WebhookRotateSecretParams parameters,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/Senders/Agent/Tools/WebhookService.cs b/src/Zavudev/Services/Senders/Agent/Tools/WebhookService.cs
new file mode 100644
index 0000000..0ce04cb
--- /dev/null
+++ b/src/Zavudev/Services/Senders/Agent/Tools/WebhookService.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Senders;
+using Zavudev.Models.Senders.Agent.Tools.Webhook;
+
+namespace Zavudev.Services.Senders.Agent.Tools;
+
+/// <inheritdoc/>
+public sealed class WebhookService : IWebhookService
+{
+    readonly Lazy<IWebhookServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public IWebhookServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public IWebhookService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new WebhookService(this._client.WithOptions(modifier));
+    }
+
+    public WebhookService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() => new WebhookServiceWithRawResponse(client.WithRawResponse));
+    }
+
+    /// <inheritdoc/>
+    public async Task<WebhookSecretResponse> RotateSecret(
+        WebhookRotateSecretParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.RotateSecret(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<WebhookSecretResponse> RotateSecret(
+        string toolID,
+        WebhookRotateSecretParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.RotateSecret(parameters with { ToolID = toolID }, cancellationToken);
+    }
+}
+
+/// <inheritdoc/>
+public sealed class WebhookServiceWithRawResponse : IWebhookServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public IWebhookServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new WebhookServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public WebhookServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<WebhookSecretResponse>> RotateSecret(
+        WebhookRotateSecretParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.ToolID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.ToolID' cannot be null");
+        }
+
+        HttpRequest<WebhookRotateSecretParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var webhookSecretResponse = await response
+                    .Deserialize<WebhookSecretResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    webhookSecretResponse.Validate();
+                }
+                return webhookSecretResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<WebhookSecretResponse>> RotateSecret(
+        string toolID,
+        WebhookRotateSecretParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.RotateSecret(parameters with { ToolID = toolID }, cancellationToken);
+    }
+}
diff --git a/src/Zavudev/Services/Senders/ITelegramService.cs b/src/Zavudev/Services/Senders/ITelegramService.cs
new file mode 100644
index 0000000..c01ef2b
--- /dev/null
+++ b/src/Zavudev/Services/Senders/ITelegramService.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Models.Senders.Telegram;
+
+namespace Zavudev.Services.Senders;
+
+/// <summary>
+/// NOTE: Do not inherit from this type outside the SDK unless you're okay with breaking
+/// changes in non-major versions. We may add new methods in the future that cause
+/// existing derived classes to break.
+/// </summary>
+public interface ITelegramService
+{
+    /// <summary>
+    /// Returns a view of this service that provides access to raw HTTP responses
+    /// for each method.
+    /// </summary>
+    ITelegramServiceWithRawResponse WithRawResponse { get; }
+
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    ITelegramService WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Connect a Telegram bot to a sender. Provide the bot token from @BotFather; Zavu
+    /// validates it, registers the webhook, and routes the sender's Telegram messages
+    /// through it.
+    /// </summary>
+    Task<TelegramConnectResponse> Connect(
+        TelegramConnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Connect(TelegramConnectParams, CancellationToken)"/>
+    Task<TelegramConnectResponse> Connect(
+        string senderID,
+        TelegramConnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Disconnect Telegram from a sender and remove the webhook.
+    /// </summary>
+    Task Disconnect(
+        TelegramDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Disconnect(TelegramDisconnectParams, CancellationToken)"/>
+    Task Disconnect(
+        string senderID,
+        TelegramDisconnectParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
+
+/// <summary>
+/// A view of <see cref="ITelegramService"/> that provides access to raw
+/// HTTP responses for each method.
+/// </summary>
+public interface ITelegramServiceWithRawResponse
+{
+    /// <summary>
+    /// Returns a view of this service with the given option modifications applied.
+    ///
+    /// <para>The original service is not modified.</para>
+    /// </summary>
+    ITelegramServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier);
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>post /v1/senders/{senderId}/telegram</c>, but is otherwise the
+    /// same as <see cref="ITelegramService.Connect(TelegramConnectParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse<TelegramConnectResponse>> Connect(
+        TelegramConnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Connect(TelegramConnectParams, CancellationToken)"/>
+    Task<HttpResponse<TelegramConnectResponse>> Connect(
+        string senderID,
+        TelegramConnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Returns a raw HTTP response for <c>delete /v1/senders/{senderId}/telegram</c>, but is otherwise the
+    /// same as <see cref="ITelegramService.Disconnect(TelegramDisconnectParams, CancellationToken)"/>.
+    /// </summary>
+    Task<HttpResponse> Disconnect(
+        TelegramDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <inheritdoc cref="Disconnect(TelegramDisconnectParams, CancellationToken)"/>
+    Task<HttpResponse> Disconnect(
+        string senderID,
+        TelegramDisconnectParams? parameters = null,
+        CancellationToken cancellationToken = default
+    );
+}
diff --git a/src/Zavudev/Services/Senders/TelegramService.cs b/src/Zavudev/Services/Senders/TelegramService.cs
new file mode 100644
index 0000000..b984e57
--- /dev/null
+++ b/src/Zavudev/Services/Senders/TelegramService.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Zavudev.Core;
+using Zavudev.Exceptions;
+using Zavudev.Models.Senders.Telegram;
+
+namespace Zavudev.Services.Senders;
+
+/// <inheritdoc/>
+public sealed class TelegramService : ITelegramService
+{
+    readonly Lazy<ITelegramServiceWithRawResponse> _withRawResponse;
+
+    /// <inheritdoc/>
+    public ITelegramServiceWithRawResponse WithRawResponse
+    {
+        get { return _withRawResponse.Value; }
+    }
+
+    readonly IZavudevClient _client;
+
+    /// <inheritdoc/>
+    public ITelegramService WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new TelegramService(this._client.WithOptions(modifier));
+    }
+
+    public TelegramService(IZavudevClient client)
+    {
+        _client = client;
+
+        _withRawResponse = new(() => new TelegramServiceWithRawResponse(client.WithRawResponse));
+    }
+
+    /// <inheritdoc/>
+    public async Task<TelegramConnectResponse> Connect(
+        TelegramConnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Connect(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<TelegramConnectResponse> Connect(
+        string senderID,
+        TelegramConnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Connect(parameters with { SenderID = senderID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task Disconnect(
+        TelegramDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.WithRawResponse.Disconnect(parameters, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public async Task Disconnect(
+        string senderID,
+        TelegramDisconnectParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        await this.Disconnect(parameters with { SenderID = senderID }, cancellationToken)
+            .ConfigureAwait(false);
+    }
+}
+
+/// <inheritdoc/>
+public sealed class TelegramServiceWithRawResponse : ITelegramServiceWithRawResponse
+{
+    readonly IZavudevClientWithRawResponse _client;
+
+    /// <inheritdoc/>
+    public ITelegramServiceWithRawResponse WithOptions(Func<ClientOptions, ClientOptions> modifier)
+    {
+        return new TelegramServiceWithRawResponse(this._client.WithOptions(modifier));
+    }
+
+    public TelegramServiceWithRawResponse(IZavudevClientWithRawResponse client)
+    {
+        _client = client;
+    }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<TelegramConnectResponse>> Connect(
+        TelegramConnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.SenderID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.SenderID' cannot be null");
+        }
+
+        HttpRequest<TelegramConnectParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<TelegramConnectResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<TelegramConnectResponse>> Connect(
+        string senderID,
+        TelegramConnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Connect(parameters with { SenderID = senderID }, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Disconnect(
+        TelegramDisconnectParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.SenderID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.SenderID' cannot be null");
+        }
+
+        HttpRequest<TelegramDisconnectParams> request = new()
+        {
+            Method = HttpMethod.Delete,
+            Params = parameters,
+        };
+        return this._client.Execute(request, cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse> Disconnect(
+        string senderID,
+        TelegramDisconnectParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        return this.Disconnect(parameters with { SenderID = senderID }, cancellationToken);
+    }
+}
diff --git a/src/Zavudev/Services/TemplateService.cs b/src/Zavudev/Services/TemplateService.cs
index 3f50973..83af89c 100644
--- a/src/Zavudev/Services/TemplateService.cs
+++ b/src/Zavudev/Services/TemplateService.cs
@@ -125,6 +125,18 @@ public Task<Template> Submit(
     {
         return this.Submit(parameters with { TemplateID = templateID }, cancellationToken);
     }
+
+    /// <inheritdoc/>
+    public async Task<TemplateSyncResponse> Sync(
+        TemplateSyncParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Sync(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
 }
 
 /// <inheritdoc/>
@@ -313,4 +325,34 @@ public Task<HttpResponse<Template>> Submit(
     {
         return this.Submit(parameters with { TemplateID = templateID }, cancellationToken);
     }
+
+    /// <inheritdoc/>
+    public async Task<HttpResponse<TemplateSyncResponse>> Sync(
+        TemplateSyncParams? parameters = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        parameters ??= new();
+
+        HttpRequest<TemplateSyncParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<TemplateSyncResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
 }
diff --git a/src/Zavudev/Services/UrlService.cs b/src/Zavudev/Services/UrlService.cs
index 932376b..3343a06 100644
--- a/src/Zavudev/Services/UrlService.cs
+++ b/src/Zavudev/Services/UrlService.cs
@@ -34,6 +34,28 @@ public UrlService(IZavudevClient client)
         _withRawResponse = new(() => new UrlServiceWithRawResponse(client.WithRawResponse));
     }
 
+    /// <inheritdoc/>
+    public async Task<UrlEscalateResponse> Escalate(
+        UrlEscalateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        using var response = await this
+            .WithRawResponse.Escalate(parameters, cancellationToken)
+            .ConfigureAwait(false);
+        return await response.Deserialize(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<UrlEscalateResponse> Escalate(
+        string urlID,
+        UrlEscalateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Escalate(parameters with { UrlID = urlID }, cancellationToken);
+    }
+
     /// <inheritdoc/>
     public async Task<UrlListVerifiedPage> ListVerified(
         UrlListVerifiedParams? parameters = null,
@@ -99,6 +121,49 @@ public UrlServiceWithRawResponse(IZavudevClientWithRawResponse client)
         _client = client;
     }
 
+    /// <inheritdoc/>
+    public async Task<HttpResponse<UrlEscalateResponse>> Escalate(
+        UrlEscalateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (parameters.UrlID == null)
+        {
+            throw new ZavudevInvalidDataException("'parameters.UrlID' cannot be null");
+        }
+
+        HttpRequest<UrlEscalateParams> request = new()
+        {
+            Method = HttpMethod.Post,
+            Params = parameters,
+        };
+        var response = await this._client.Execute(request, cancellationToken).ConfigureAwait(false);
+        return new(
+            response,
+            async (token) =>
+            {
+                var deserializedResponse = await response
+                    .Deserialize<UrlEscalateResponse>(token)
+                    .ConfigureAwait(false);
+                if (this._client.ResponseValidation)
+                {
+                    deserializedResponse.Validate();
+                }
+                return deserializedResponse;
+            }
+        );
+    }
+
+    /// <inheritdoc/>
+    public Task<HttpResponse<UrlEscalateResponse>> Escalate(
+        string urlID,
+        UrlEscalateParams parameters,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return this.Escalate(parameters with { UrlID = urlID }, cancellationToken);
+    }
+
     /// <inheritdoc/>
     public async Task<HttpResponse<UrlListVerifiedPage>> ListVerified(
         UrlListVerifiedParams? parameters = null,
diff --git a/src/Zavudev/Zavudev.csproj b/src/Zavudev/Zavudev.csproj
index e59cf39..17ecca7 100644
--- a/src/Zavudev/Zavudev.csproj
+++ b/src/Zavudev/Zavudev.csproj
@@ -3,7 +3,7 @@
     <!-- Metadata -->
     <AssemblyTitle>Zavudev C#</AssemblyTitle>
     <AssemblyName>Zavudev</AssemblyName>
-    <VersionPrefix>0.0.2</VersionPrefix>
+    <VersionPrefix>0.1.0</VersionPrefix>
     <Description>The official .NET library for the Zavudev API.</Description>
     <OutputType>Library</OutputType>
     <PackageReadmeFile>README.md</PackageReadmeFile>
diff --git a/src/Zavudev/ZavudevClient.cs b/src/Zavudev/ZavudevClient.cs
index 5f60098..2f87e5b 100644
--- a/src/Zavudev/ZavudevClient.cs
+++ b/src/Zavudev/ZavudevClient.cs
@@ -168,6 +168,36 @@ public IFunctionService Functions
         get { return _functions.Value; }
     }
 
+    readonly Lazy<IConversationService> _conversations;
+    public IConversationService Conversations
+    {
+        get { return _conversations.Value; }
+    }
+
+    readonly Lazy<ICallService> _calls;
+    public ICallService Calls
+    {
+        get { return _calls.Value; }
+    }
+
+    readonly Lazy<IAgentTemplateService> _agentTemplates;
+    public IAgentTemplateService AgentTemplates
+    {
+        get { return _agentTemplates.Value; }
+    }
+
+    readonly Lazy<IEmailDomainService> _emailDomains;
+    public IEmailDomainService EmailDomains
+    {
+        get { return _emailDomains.Value; }
+    }
+
+    readonly Lazy<IAgentService> _agents;
+    public IAgentService Agents
+    {
+        get { return _agents.Value; }
+    }
+
     public void Dispose() => this.HttpClient.Dispose();
 
     public ZavudevClient()
@@ -191,6 +221,11 @@ public ZavudevClient()
         _number10dlc = new(() => new Number10dlcService(this));
         _me = new(() => new MeService(this));
         _functions = new(() => new FunctionService(this));
+        _conversations = new(() => new ConversationService(this));
+        _calls = new(() => new CallService(this));
+        _agentTemplates = new(() => new AgentTemplateService(this));
+        _emailDomains = new(() => new EmailDomainService(this));
+        _agents = new(() => new AgentService(this));
     }
 
     public ZavudevClient(ClientOptions options)
@@ -362,6 +397,36 @@ public IFunctionServiceWithRawResponse Functions
         get { return _functions.Value; }
     }
 
+    readonly Lazy<IConversationServiceWithRawResponse> _conversations;
+    public IConversationServiceWithRawResponse Conversations
+    {
+        get { return _conversations.Value; }
+    }
+
+    readonly Lazy<ICallServiceWithRawResponse> _calls;
+    public ICallServiceWithRawResponse Calls
+    {
+        get { return _calls.Value; }
+    }
+
+    readonly Lazy<IAgentTemplateServiceWithRawResponse> _agentTemplates;
+    public IAgentTemplateServiceWithRawResponse AgentTemplates
+    {
+        get { return _agentTemplates.Value; }
+    }
+
+    readonly Lazy<IEmailDomainServiceWithRawResponse> _emailDomains;
+    public IEmailDomainServiceWithRawResponse EmailDomains
+    {
+        get { return _emailDomains.Value; }
+    }
+
+    readonly Lazy<IAgentServiceWithRawResponse> _agents;
+    public IAgentServiceWithRawResponse Agents
+    {
+        get { return _agents.Value; }
+    }
+
     /// <inheritdoc/>
     public async Task<HttpResponse> Execute<T>(
         HttpRequest<T> request,
@@ -576,6 +641,11 @@ public ZavudevClientWithRawResponse()
         _number10dlc = new(() => new Number10dlcServiceWithRawResponse(this));
         _me = new(() => new MeServiceWithRawResponse(this));
         _functions = new(() => new FunctionServiceWithRawResponse(this));
+        _conversations = new(() => new ConversationServiceWithRawResponse(this));
+        _calls = new(() => new CallServiceWithRawResponse(this));
+        _agentTemplates = new(() => new AgentTemplateServiceWithRawResponse(this));
+        _emailDomains = new(() => new EmailDomainServiceWithRawResponse(this));
+        _agents = new(() => new AgentServiceWithRawResponse(this));
     }
 
     public ZavudevClientWithRawResponse(ClientOptions options)