diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
index eaafcc615..ac22fb16a 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
@@ -919,10 +919,8 @@ namespace Flax.Build.Bindings
             // Properties
             foreach (var propertyInfo in classInfo.Properties)
             {
-                if (propertyInfo.IsHidden)
+                if (propertyInfo.IsHidden || !useUnmanaged)
                     continue;
-                if (!useUnmanaged)
-                    throw new NotImplementedException("TODO: support properties inside non-static and non-scripting API class types.");
 
                 contents.AppendLine();
                 GenerateCSharpComment(contents, indent, propertyInfo.Comment, true);
diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
index dc5190f36..921043e1d 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
@@ -1440,6 +1440,11 @@ namespace Flax.Build.Bindings
                         continue;
                     if (GenerateCppAutoSerializationSkip(buildData, typeInfo, propertyInfo, propertyInfo.Type))
                         continue;
+                    CppAutoSerializeProperties.Add(propertyInfo);
+
+                    // Skip writing deprecated properties (read-only deserialization to allow reading old data)
+                    if (propertyInfo.HasAttribute("Obsolete"))
+                        continue;
 
                     contents.Append("    {");
                     contents.Append(" const auto");
@@ -1456,7 +1461,6 @@ namespace Flax.Build.Bindings
                     contents.Append($"stream.JKEY(\"{propertyInfo.Name}\"); Serialization::Serialize(stream, value, nullptr);");
                     contents.Append(" }");
                     contents.Append('}').AppendLine();
-                    CppAutoSerializeProperties.Add(propertyInfo);
                 }
             }
             else if (structureInfo != null)
@@ -1488,14 +1492,14 @@ namespace Flax.Build.Bindings
 
             foreach (var propertyInfo in CppAutoSerializeProperties)
             {
-                contents.Append("    {");
-                contents.Append($"        const auto e = SERIALIZE_FIND_MEMBER(stream, \"{propertyInfo.Name}\");");
-                contents.Append("        if (e != stream.MemberEnd()) {");
-                contents.Append($"            auto p = {propertyInfo.Getter.Name}();");
-                contents.Append("            Serialization::Deserialize(e->value, p, modifier);");
-                contents.Append($"            {propertyInfo.Setter.Name}(p);");
-                contents.Append("        }");
-                contents.Append('}').AppendLine();
+                contents.AppendLine("    {");
+                contents.AppendLine($"        const auto e = SERIALIZE_FIND_MEMBER(stream, \"{propertyInfo.Name}\");");
+                contents.AppendLine("        if (e != stream.MemberEnd()) {");
+                contents.AppendLine($"            auto p = {propertyInfo.Getter.Name}();");
+                contents.AppendLine("            Serialization::Deserialize(e->value, p, modifier);");
+                contents.AppendLine($"            {propertyInfo.Setter.Name}(p);");
+                contents.AppendLine("        }");
+                contents.AppendLine("    }");
             }
 
             contents.Append('}').AppendLine();