diff --git a/src/PocketBaseClient.CodeGenerator/Generation/ItemInfo.cs b/src/PocketBaseClient.CodeGenerator/Generation/ItemInfo.cs
index a73be2d..a388f98 100644
--- a/src/PocketBaseClient.CodeGenerator/Generation/ItemInfo.cs
+++ b/src/PocketBaseClient.CodeGenerator/Generation/ItemInfo.cs
@@ -164,8 +164,9 @@ public override void UpdateWith(ItemBase itemBase)
             : base(id, created, updated)
         {{");
             foreach (var field in Fields)
-                sb.AppendLine($@"            {field.PropertyName} = {GetParameterNameForConstructor(field)};");
+                sb.AppendLine($@"            this.{field.PropertyName} = {GetParameterNameForConstructor(field)};");
             sb.AppendLine($@"
+            AddInternal(this);
         }}
         #endregion");
 
diff --git a/src/PocketBaseClient/Extensions/PocketBaseExtensions.cs b/src/PocketBaseClient/Extensions/PocketBaseExtensions.cs
index 77f2701..3fdcfab 100644
--- a/src/PocketBaseClient/Extensions/PocketBaseExtensions.cs
+++ b/src/PocketBaseClient/Extensions/PocketBaseExtensions.cs
@@ -70,7 +70,7 @@ private static void Send(this PocketBase pocketBase, string path, HttpMethod met
                     response.EnsureSuccessStatusCode();
 
                     using (var stream = response.Content.ReadAsStream())
-                        return JsonSerializer.Deserialize<T>(stream);
+                        return JsonSerializer.Deserialize<T>(stream, new JsonSerializerOptions(JsonSerializerDefaults.Web));
                 }
                 catch (Exception ex)
                 {
diff --git a/src/PocketBaseClient/Orm/ItemBase.cs b/src/PocketBaseClient/Orm/ItemBase.cs
index ad43fc6..45b1865 100644
--- a/src/PocketBaseClient/Orm/ItemBase.cs
+++ b/src/PocketBaseClient/Orm/ItemBase.cs
@@ -289,12 +289,13 @@ public ItemBase()
         [JsonConstructor]
         public ItemBase(string? id, DateTime? created, DateTime? updated)
         {
-            Id = id;
+            _Id = id;
             Created = created;
             Updated = updated;
+            Metadata_.SetLoaded();
         }
 
-        //protected object? AddInternal(object? element) => Collection.AddInternal(element);
+        protected object? AddInternal(object? element) => Collection.AddInternal(element);
 
         /// <inheritdoc />
         public override string ToString()