diff --git a/templates/dotnet/Package/Converters/ObjectToInferredTypesConverter.cs.twig b/templates/dotnet/Package/Converters/ObjectToInferredTypesConverter.cs.twig
index 563f92992..fd9512f9b 100644
--- a/templates/dotnet/Package/Converters/ObjectToInferredTypesConverter.cs.twig
+++ b/templates/dotnet/Package/Converters/ObjectToInferredTypesConverter.cs.twig
@@ -7,32 +7,60 @@ namespace {{ spec.title | caseUcfirst }}.Converters
 {
     public class ObjectToInferredTypesConverter : JsonConverter<object>
     {
-        public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override object? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            switch (reader.TokenType)
+            using (JsonDocument document = JsonDocument.ParseValue(ref reader))
             {
-                case JsonTokenType.True:
-                    return true;
-                case JsonTokenType.False:
-                    return false;
-                case JsonTokenType.Number:
-                    if (reader.TryGetInt64(out long l))
+                return ConvertElement(document.RootElement);
+            }
+        }
+
+        private object? ConvertElement(JsonElement element)
+        {
+            switch (element.ValueKind)
+            {
+                case JsonValueKind.Object:
+                    var dictionary = new Dictionary<string, object?>();
+                    foreach (var property in element.EnumerateObject())
                     {
-                        return l;
+                        dictionary[property.Name] = ConvertElement(property.Value);
+                    }
+                    return dictionary;
+
+                case JsonValueKind.Array:
+                    var list = new List<object?>();
+                    foreach (var item in element.EnumerateArray())
+                    {
+                        list.Add(ConvertElement(item));
                     }
-                    return reader.GetDouble();
-                case JsonTokenType.String:
-                    if (reader.TryGetDateTime(out DateTime datetime))
+                    return list;
+
+                case JsonValueKind.String:
+                    if (element.TryGetDateTime(out DateTime datetime))
                     {
                         return datetime;
                     }
-                    return reader.GetString()!;
-                case JsonTokenType.StartObject:
-                    return JsonSerializer.Deserialize<Dictionary<string, object>>(ref reader, options)!;
-                case JsonTokenType.StartArray:
-                    return JsonSerializer.Deserialize<object[]>(ref reader, options)!;
+                    return element.GetString();
+
+                case JsonValueKind.Number:
+                    if (element.TryGetInt64(out long l))
+                    {
+                        return l;
+                    }
+                    return element.GetDouble();
+
+                case JsonValueKind.True:
+                    return true;
+
+                case JsonValueKind.False:
+                    return false;
+
+                case JsonValueKind.Null:
+                case JsonValueKind.Undefined:
+                    return null;
+
                 default:
-                    return JsonDocument.ParseValue(ref reader).RootElement.Clone();
+                    throw new JsonException($"Unsupported JsonValueKind: {element.ValueKind}");
             }
         }
 
@@ -41,4 +69,4 @@ namespace {{ spec.title | caseUcfirst }}.Converters
             JsonSerializer.Serialize(writer, objectToWrite, objectToWrite.GetType(), options);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/templates/dotnet/Package/Enums/Enum.cs.twig b/templates/dotnet/Package/Enums/Enum.cs.twig
index 6720ce59b..d3c768a4e 100644
--- a/templates/dotnet/Package/Enums/Enum.cs.twig
+++ b/templates/dotnet/Package/Enums/Enum.cs.twig
@@ -16,4 +16,4 @@ namespace {{ spec.title | caseUcfirst }}.Enums
         public static {{ enum.name | caseUcfirst | overrideIdentifier }} {{ key | caseEnumKey }} => new {{ enum.name | caseUcfirst | overrideIdentifier }}("{{ value }}");
         {%~ endfor %}
     }
-}
+}
\ No newline at end of file
diff --git a/templates/dotnet/Package/Exception.cs.twig b/templates/dotnet/Package/Exception.cs.twig
index e78d78c2c..31d9c70ad 100644
--- a/templates/dotnet/Package/Exception.cs.twig
+++ b/templates/dotnet/Package/Exception.cs.twig
@@ -18,10 +18,10 @@ namespace {{spec.title | caseUcfirst}}
             this.Type = type;
             this.Response = response;
         }
+
         public {{spec.title | caseUcfirst}}Exception(string message, Exception inner)
         : base(message, inner)
         {
         }
     }
 }
-
diff --git a/templates/dotnet/Package/Models/InputFile.cs.twig b/templates/dotnet/Package/Models/InputFile.cs.twig
index 241a3adad..4464608d0 100644
--- a/templates/dotnet/Package/Models/InputFile.cs.twig
+++ b/templates/dotnet/Package/Models/InputFile.cs.twig
@@ -1,5 +1,5 @@
 using System.IO;
-using Appwrite.Extensions;
+using {{ spec.title | caseUcfirst }}.Extensions;
 
 namespace {{ spec.title | caseUcfirst }}.Models
 {
diff --git a/templates/dotnet/Package/Models/Model.cs.twig b/templates/dotnet/Package/Models/Model.cs.twig
index ff46ff18e..f4eabaa7d 100644
--- a/templates/dotnet/Package/Models/Model.cs.twig
+++ b/templates/dotnet/Package/Models/Model.cs.twig
@@ -1,6 +1,5 @@
 {% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst | overrideIdentifier}}>{% else %}{{property.sub_schema | caseUcfirst | overrideIdentifier}}{% endif %}{% else %}{{property | typeName}}{% endif %}{% if not property.required %}?{% endif %}{% endmacro %}
 {% macro property_name(definition, property) %}{{ property.name | caseUcfirst | removeDollarSign | escapeKeyword }}{% endmacro %}
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -40,31 +39,29 @@ namespace {{ spec.title | caseUcfirst }}.Models
         public static {{ definition.name | caseUcfirst | overrideIdentifier }} From(Dictionary<string, object> map) => new {{ definition.name | caseUcfirst | overrideIdentifier }}(
             {%~ for property in definition.properties %}
             {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}:{{' '}}
+                {%- if not property.required -%}map.ContainsKey("{{ property.name }}") ? {% endif %}
                 {%- if property.sub_schema %}
                     {%- if property.type == 'array' -%}
-                        map["{{ property.name }}"] is JsonElement jsonArray{{ loop.index }} ? jsonArray{{ loop.index }}.Deserialize<List<Dictionary<string, object>>>()!.Select(it => {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: it)).ToList() : ((IEnumerable<Dictionary<string, object>>)map["{{ property.name }}"]).Select(it => {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: it)).ToList()
+                        ((IEnumerable<object>)map["{{ property.name }}"]).Select(it => {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: (Dictionary<string, object>)it)).ToList()
                     {%- else -%}
-                        {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: map["{{ property.name }}"] is JsonElement jsonObj{{ loop.index }} ? jsonObj{{ loop.index }}.Deserialize<Dictionary<string, object>>()! : (Dictionary<string, object>)map["{{ property.name }}"])
+                        {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: (Dictionary<string, object>)map["{{ property.name }}"])
                     {%- endif %}
                 {%- else %}
                     {%- if property.type == 'array' -%}
-                        map["{{ property.name }}"] is JsonElement jsonArrayProp{{ loop.index }} ? jsonArrayProp{{ loop.index }}.Deserialize<{{ property | typeName }}>()! : ({{ property | typeName }})map["{{ property.name }}"]
+                        ((IEnumerable<object>)map["{{ property.name }}"]).Select(x => {% if property.items.type == "string" %}x?.ToString(){% elseif property.items.type == "integer" %}{% if not property.required %}x == null ? (long?)null : {% endif %}Convert.ToInt64(x){% elseif property.items.type == "number" %}{% if not property.required %}x == null ? (double?)null : {% endif %}Convert.ToDouble(x){% elseif property.items.type == "boolean" %}{% if not property.required %}x == null ? (bool?)null : {% endif %}(bool)x{% else %}x{% endif %}).{% if property.items.type == "string" and property.required %}Where(x => x != null).{% endif %}ToList()!
                     {%- else %}
                         {%- if property.type == "integer" or property.type == "number" %}
-                            {%- if not property.required -%}map["{{ property.name }}"] == null ? null :{% endif %}Convert.To{% if property.type == "integer" %}Int64{% else %}Double{% endif %}(map["{{ property.name }}"])
+                            {%- if not property.required -%}map["{{ property.name }}"] == null ? null : {% endif %}Convert.To{% if property.type == "integer" %}Int64{% else %}Double{% endif %}(map["{{ property.name }}"])
                         {%- else %}
                             {%- if property.type == "boolean" -%}
                                 ({{ property | typeName }}{% if not property.required %}?{% endif %})map["{{ property.name }}"]
-                            {%- else %}
-                                {%- if not property.required -%}
-                                    map.TryGetValue("{{ property.name }}", out var {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}) ? {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}?.ToString() : null
-                                {%- else -%}
-                                    map["{{ property.name }}"].ToString()
-                                {%- endif %}
+                            {%- else -%}
+                                map["{{ property.name }}"]{% if not property.required %}?{% endif %}.ToString()
                             {%- endif %}
                         {%~ endif %}
                     {%~ endif %}
                 {%~ endif %}
+                {%- if not property.required %} : null{% endif %}
                 {%- if not loop.last or (loop.last and definition.additionalProperties) %},
                 {%~ endif %}
             {%~ endfor %}
@@ -101,4 +98,4 @@ namespace {{ spec.title | caseUcfirst }}.Models
         {%~ endif %}
         {%~ endfor %}
     }
-}
+}
\ No newline at end of file
diff --git a/templates/dotnet/Package/Role.cs.twig b/templates/dotnet/Package/Role.cs.twig
index b3ecf2610..4dc45dcb7 100644
--- a/templates/dotnet/Package/Role.cs.twig
+++ b/templates/dotnet/Package/Role.cs.twig
@@ -1,4 +1,4 @@
-namespace Appwrite
+namespace {{ spec.title | caseUcfirst }}
 {
     /// <summary>
     /// Helper class to generate role strings for Permission.