diff --git a/README.md b/README.md
index d2449f96..02265b1b 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
 - **Android**: SDK 24 (Android 7.0) or later
 - **Xcode**: 16.4 or later
 - **JDK**: 17 or later
-- **Nitro Modules**: 0.25.2 or later
+- **Nitro Modules**: 0.33.2 or later
 
 ## Known Issues
 
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 27bbf120..b67556ef 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -8,7 +8,7 @@ PODS:
   - hermes-engine (0.79.2):
     - hermes-engine/Pre-built (= 0.79.2)
   - hermes-engine/Pre-built (0.79.2)
-  - NitroModules (0.31.10):
+  - NitroModules (0.33.2):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2261,7 +2261,7 @@ SPEC CHECKSUMS:
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
   hermes-engine: 314be5250afa5692b57b4dd1705959e1973a8ebe
-  NitroModules: 7f50ee216f8403e8eb243acfc504f3f856d6914c
+  NitroModules: ce8f342b7ec187c3330e317601cdaf5a59c903ba
   RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809
   RCTDeprecation: 83ffb90c23ee5cea353bd32008a7bca100908f8c
   RCTRequired: eb7c0aba998009f47a540bec9e9d69a54f68136e
diff --git a/example/package.json b/example/package.json
index 7018208b..8a28730c 100644
--- a/example/package.json
+++ b/example/package.json
@@ -19,7 +19,7 @@
     "react": "19.0.0",
     "react-native": "0.79.2",
     "react-native-gesture-handler": "2.29.1",
-    "react-native-nitro-modules": "0.31.10",
+    "react-native-nitro-modules": "0.33.2",
     "react-native-reanimated": "4.1.5",
     "react-native-safe-area-context": "^5.4.0",
     "react-native-worklets": "0.6.1"
diff --git a/expo-example/package.json b/expo-example/package.json
index 68fecae8..53894daf 100644
--- a/expo-example/package.json
+++ b/expo-example/package.json
@@ -35,7 +35,7 @@
     "react-dom": "19.1.0",
     "react-native": "0.81.5",
     "react-native-gesture-handler": "2.29.1",
-    "react-native-nitro-modules": "0.31.10",
+    "react-native-nitro-modules": "0.33.2",
     "react-native-reanimated": "4.1.5",
     "react-native-safe-area-context": "~5.6.0",
     "react-native-screens": "~4.16.0",
diff --git a/nitrogen/generated/android/c++/JAlignment.hpp b/nitrogen/generated/android/c++/JAlignment.hpp
index 98f5fb30..b2202d90 100644
--- a/nitrogen/generated/android/c++/JAlignment.hpp
+++ b/nitrogen/generated/android/c++/JAlignment.hpp
@@ -2,7 +2,7 @@
 /// JAlignment.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,34 +41,33 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JAlignment> fromCpp(Alignment value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldTOPLEFT = clazz->getStaticField<JAlignment>("TOPLEFT");
-      static const auto fieldTOPCENTER = clazz->getStaticField<JAlignment>("TOPCENTER");
-      static const auto fieldTOPRIGHT = clazz->getStaticField<JAlignment>("TOPRIGHT");
-      static const auto fieldCENTERLEFT = clazz->getStaticField<JAlignment>("CENTERLEFT");
-      static const auto fieldCENTER = clazz->getStaticField<JAlignment>("CENTER");
-      static const auto fieldCENTERRIGHT = clazz->getStaticField<JAlignment>("CENTERRIGHT");
-      static const auto fieldBOTTOMLEFT = clazz->getStaticField<JAlignment>("BOTTOMLEFT");
-      static const auto fieldBOTTOMCENTER = clazz->getStaticField<JAlignment>("BOTTOMCENTER");
-      static const auto fieldBOTTOMRIGHT = clazz->getStaticField<JAlignment>("BOTTOMRIGHT");
-      
       switch (value) {
         case Alignment::TOPLEFT:
+          static const auto fieldTOPLEFT = clazz->getStaticField<JAlignment>("TOPLEFT");
           return clazz->getStaticFieldValue(fieldTOPLEFT);
         case Alignment::TOPCENTER:
+          static const auto fieldTOPCENTER = clazz->getStaticField<JAlignment>("TOPCENTER");
           return clazz->getStaticFieldValue(fieldTOPCENTER);
         case Alignment::TOPRIGHT:
+          static const auto fieldTOPRIGHT = clazz->getStaticField<JAlignment>("TOPRIGHT");
           return clazz->getStaticFieldValue(fieldTOPRIGHT);
         case Alignment::CENTERLEFT:
+          static const auto fieldCENTERLEFT = clazz->getStaticField<JAlignment>("CENTERLEFT");
           return clazz->getStaticFieldValue(fieldCENTERLEFT);
         case Alignment::CENTER:
+          static const auto fieldCENTER = clazz->getStaticField<JAlignment>("CENTER");
           return clazz->getStaticFieldValue(fieldCENTER);
         case Alignment::CENTERRIGHT:
+          static const auto fieldCENTERRIGHT = clazz->getStaticField<JAlignment>("CENTERRIGHT");
           return clazz->getStaticFieldValue(fieldCENTERRIGHT);
         case Alignment::BOTTOMLEFT:
+          static const auto fieldBOTTOMLEFT = clazz->getStaticField<JAlignment>("BOTTOMLEFT");
           return clazz->getStaticFieldValue(fieldBOTTOMLEFT);
         case Alignment::BOTTOMCENTER:
+          static const auto fieldBOTTOMCENTER = clazz->getStaticField<JAlignment>("BOTTOMCENTER");
           return clazz->getStaticFieldValue(fieldBOTTOMCENTER);
         case Alignment::BOTTOMRIGHT:
+          static const auto fieldBOTTOMRIGHT = clazz->getStaticField<JAlignment>("BOTTOMRIGHT");
           return clazz->getStaticFieldValue(fieldBOTTOMRIGHT);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
diff --git a/nitrogen/generated/android/c++/JArtboardBy.hpp b/nitrogen/generated/android/c++/JArtboardBy.hpp
index 95b99267..3b8eab87 100644
--- a/nitrogen/generated/android/c++/JArtboardBy.hpp
+++ b/nitrogen/generated/android/c++/JArtboardBy.hpp
@@ -2,7 +2,7 @@
 /// JArtboardBy.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JArtboardByTypes.hpp b/nitrogen/generated/android/c++/JArtboardByTypes.hpp
index b71bb139..1332b18d 100644
--- a/nitrogen/generated/android/c++/JArtboardByTypes.hpp
+++ b/nitrogen/generated/android/c++/JArtboardByTypes.hpp
@@ -2,7 +2,7 @@
 /// JArtboardByTypes.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,13 +41,12 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JArtboardByTypes> fromCpp(ArtboardByTypes value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldINDEX = clazz->getStaticField<JArtboardByTypes>("INDEX");
-      static const auto fieldNAME = clazz->getStaticField<JArtboardByTypes>("NAME");
-      
       switch (value) {
         case ArtboardByTypes::INDEX:
+          static const auto fieldINDEX = clazz->getStaticField<JArtboardByTypes>("INDEX");
           return clazz->getStaticFieldValue(fieldINDEX);
         case ArtboardByTypes::NAME:
+          static const auto fieldNAME = clazz->getStaticField<JArtboardByTypes>("NAME");
           return clazz->getStaticFieldValue(fieldNAME);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
diff --git a/nitrogen/generated/android/c++/JDataBindByName.hpp b/nitrogen/generated/android/c++/JDataBindByName.hpp
index 0a147537..11c85e79 100644
--- a/nitrogen/generated/android/c++/JDataBindByName.hpp
+++ b/nitrogen/generated/android/c++/JDataBindByName.hpp
@@ -2,7 +2,7 @@
 /// JDataBindByName.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JDataBindMode.hpp b/nitrogen/generated/android/c++/JDataBindMode.hpp
index 26c6b865..3c1480e7 100644
--- a/nitrogen/generated/android/c++/JDataBindMode.hpp
+++ b/nitrogen/generated/android/c++/JDataBindMode.hpp
@@ -2,7 +2,7 @@
 /// JDataBindMode.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,13 +41,12 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JDataBindMode> fromCpp(DataBindMode value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldAUTO = clazz->getStaticField<JDataBindMode>("AUTO");
-      static const auto fieldNONE = clazz->getStaticField<JDataBindMode>("NONE");
-      
       switch (value) {
         case DataBindMode::AUTO:
+          static const auto fieldAUTO = clazz->getStaticField<JDataBindMode>("AUTO");
           return clazz->getStaticFieldValue(fieldAUTO);
         case DataBindMode::NONE:
+          static const auto fieldNONE = clazz->getStaticField<JDataBindMode>("NONE");
           return clazz->getStaticFieldValue(fieldNONE);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
diff --git a/nitrogen/generated/android/c++/JEventPropertiesOutput.cpp b/nitrogen/generated/android/c++/JEventPropertiesOutput.cpp
index 154ad7cf..b628e155 100644
--- a/nitrogen/generated/android/c++/JEventPropertiesOutput.cpp
+++ b/nitrogen/generated/android/c++/JEventPropertiesOutput.cpp
@@ -2,7 +2,7 @@
 /// JEventPropertiesOutput.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JEventPropertiesOutput.hpp"
diff --git a/nitrogen/generated/android/c++/JEventPropertiesOutput.hpp b/nitrogen/generated/android/c++/JEventPropertiesOutput.hpp
index db8af03c..707ff32d 100644
--- a/nitrogen/generated/android/c++/JEventPropertiesOutput.hpp
+++ b/nitrogen/generated/android/c++/JEventPropertiesOutput.hpp
@@ -2,7 +2,7 @@
 /// JEventPropertiesOutput.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -50,7 +50,7 @@ namespace margelo::nitro::rive {
   };
 
   namespace JEventPropertiesOutput_impl {
-    class First: public jni::JavaClass<First, JEventPropertiesOutput> {
+    class First final: public jni::JavaClass<First, JEventPropertiesOutput> {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$First;";
     
@@ -60,7 +60,7 @@ namespace margelo::nitro::rive {
       }
     };
     
-    class Second: public jni::JavaClass<Second, JEventPropertiesOutput> {
+    class Second final: public jni::JavaClass<Second, JEventPropertiesOutput> {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$Second;";
     
@@ -70,7 +70,7 @@ namespace margelo::nitro::rive {
       }
     };
     
-    class Third: public jni::JavaClass<Third, JEventPropertiesOutput> {
+    class Third final: public jni::JavaClass<Third, JEventPropertiesOutput> {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$Third;";
     
diff --git a/nitrogen/generated/android/c++/JFit.hpp b/nitrogen/generated/android/c++/JFit.hpp
index 29d73897..4e936801 100644
--- a/nitrogen/generated/android/c++/JFit.hpp
+++ b/nitrogen/generated/android/c++/JFit.hpp
@@ -2,7 +2,7 @@
 /// JFit.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,31 +41,30 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JFit> fromCpp(Fit value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldFILL = clazz->getStaticField<JFit>("FILL");
-      static const auto fieldCONTAIN = clazz->getStaticField<JFit>("CONTAIN");
-      static const auto fieldCOVER = clazz->getStaticField<JFit>("COVER");
-      static const auto fieldFITWIDTH = clazz->getStaticField<JFit>("FITWIDTH");
-      static const auto fieldFITHEIGHT = clazz->getStaticField<JFit>("FITHEIGHT");
-      static const auto fieldNONE = clazz->getStaticField<JFit>("NONE");
-      static const auto fieldSCALEDOWN = clazz->getStaticField<JFit>("SCALEDOWN");
-      static const auto fieldLAYOUT = clazz->getStaticField<JFit>("LAYOUT");
-      
       switch (value) {
         case Fit::FILL:
+          static const auto fieldFILL = clazz->getStaticField<JFit>("FILL");
           return clazz->getStaticFieldValue(fieldFILL);
         case Fit::CONTAIN:
+          static const auto fieldCONTAIN = clazz->getStaticField<JFit>("CONTAIN");
           return clazz->getStaticFieldValue(fieldCONTAIN);
         case Fit::COVER:
+          static const auto fieldCOVER = clazz->getStaticField<JFit>("COVER");
           return clazz->getStaticFieldValue(fieldCOVER);
         case Fit::FITWIDTH:
+          static const auto fieldFITWIDTH = clazz->getStaticField<JFit>("FITWIDTH");
           return clazz->getStaticFieldValue(fieldFITWIDTH);
         case Fit::FITHEIGHT:
+          static const auto fieldFITHEIGHT = clazz->getStaticField<JFit>("FITHEIGHT");
           return clazz->getStaticFieldValue(fieldFITHEIGHT);
         case Fit::NONE:
+          static const auto fieldNONE = clazz->getStaticField<JFit>("NONE");
           return clazz->getStaticFieldValue(fieldNONE);
         case Fit::SCALEDOWN:
+          static const auto fieldSCALEDOWN = clazz->getStaticField<JFit>("SCALEDOWN");
           return clazz->getStaticFieldValue(fieldSCALEDOWN);
         case Fit::LAYOUT:
+          static const auto fieldLAYOUT = clazz->getStaticField<JFit>("LAYOUT");
           return clazz->getStaticFieldValue(fieldLAYOUT);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
diff --git a/nitrogen/generated/android/c++/JFunc_void.hpp b/nitrogen/generated/android/c++/JFunc_void.hpp
index da3cbaeb..083013ff 100644
--- a/nitrogen/generated/android/c++/JFunc_void.hpp
+++ b/nitrogen/generated/android/c++/JFunc_void.hpp
@@ -2,7 +2,7 @@
 /// JFunc_void.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JFunc_void_RiveError.hpp b/nitrogen/generated/android/c++/JFunc_void_RiveError.hpp
index fb7d7d79..7a850bdf 100644
--- a/nitrogen/generated/android/c++/JFunc_void_RiveError.hpp
+++ b/nitrogen/generated/android/c++/JFunc_void_RiveError.hpp
@@ -2,7 +2,7 @@
 /// JFunc_void_RiveError.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JFunc_void_UnifiedRiveEvent.hpp b/nitrogen/generated/android/c++/JFunc_void_UnifiedRiveEvent.hpp
index 78474609..5649b9c0 100644
--- a/nitrogen/generated/android/c++/JFunc_void_UnifiedRiveEvent.hpp
+++ b/nitrogen/generated/android/c++/JFunc_void_UnifiedRiveEvent.hpp
@@ -2,7 +2,7 @@
 /// JFunc_void_UnifiedRiveEvent.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JFunc_void_bool.hpp b/nitrogen/generated/android/c++/JFunc_void_bool.hpp
index 2bd61eea..bf659485 100644
--- a/nitrogen/generated/android/c++/JFunc_void_bool.hpp
+++ b/nitrogen/generated/android/c++/JFunc_void_bool.hpp
@@ -2,7 +2,7 @@
 /// JFunc_void_bool.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JFunc_void_double.hpp b/nitrogen/generated/android/c++/JFunc_void_double.hpp
index cbfb57ce..28cacc93 100644
--- a/nitrogen/generated/android/c++/JFunc_void_double.hpp
+++ b/nitrogen/generated/android/c++/JFunc_void_double.hpp
@@ -2,7 +2,7 @@
 /// JFunc_void_double.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JFunc_void_std__string.hpp b/nitrogen/generated/android/c++/JFunc_void_std__string.hpp
index befda334..7374b41a 100644
--- a/nitrogen/generated/android/c++/JFunc_void_std__string.hpp
+++ b/nitrogen/generated/android/c++/JFunc_void_std__string.hpp
@@ -2,7 +2,7 @@
 /// JFunc_void_std__string.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.cpp b/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.cpp
index 6dc44007..e8ef34a6 100644
--- a/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridBindableArtboardSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridBindableArtboardSpec.hpp"
@@ -28,6 +28,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridBindableArtboardSpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridBindableArtboardSpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridBindableArtboardSpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.hpp b/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.hpp
index f3fb084d..1f8ee44d 100644
--- a/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridBindableArtboardSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.cpp b/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.cpp
index 4aaf76aa..b06f4fbf 100644
--- a/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridRiveFileFactorySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridRiveFileFactorySpec.hpp"
@@ -32,7 +32,6 @@ namespace margelo::nitro::rive { class HybridRiveImageSpec; }
 #include "JHybridRiveImageSpec.hpp"
 #include <NitroModules/ArrayBuffer.hpp>
 #include <NitroModules/JArrayBuffer.hpp>
-#include <NitroModules/JUnit.hpp>
 
 namespace margelo::nitro::rive {
 
@@ -51,6 +50,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridRiveFileFactorySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridRiveFileFactorySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridRiveFileFactorySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.hpp b/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.hpp
index 173cac84..2f9e446b 100644
--- a/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileFactorySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridRiveFileSpec.cpp b/nitrogen/generated/android/c++/JHybridRiveFileSpec.cpp
index baae959c..0c0b133b 100644
--- a/nitrogen/generated/android/c++/JHybridRiveFileSpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridRiveFileSpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridRiveFileSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridRiveFileSpec.hpp"
@@ -59,6 +59,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridRiveFileSpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridRiveFileSpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridRiveFileSpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridRiveFileSpec.hpp b/nitrogen/generated/android/c++/JHybridRiveFileSpec.hpp
index e25c1f04..bcd57e0a 100644
--- a/nitrogen/generated/android/c++/JHybridRiveFileSpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridRiveFileSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.cpp b/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.cpp
index e2fa5a3f..7a24bb4b 100644
--- a/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridRiveImageFactorySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridRiveImageFactorySpec.hpp"
@@ -18,7 +18,6 @@ namespace margelo::nitro::rive { class HybridRiveImageSpec; }
 #include <string>
 #include <NitroModules/ArrayBuffer.hpp>
 #include <NitroModules/JArrayBuffer.hpp>
-#include <NitroModules/JUnit.hpp>
 
 namespace margelo::nitro::rive {
 
@@ -37,6 +36,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridRiveImageFactorySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridRiveImageFactorySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridRiveImageFactorySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.hpp b/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.hpp
index 22fc437a..a98f9981 100644
--- a/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageFactorySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridRiveImageSpec.cpp b/nitrogen/generated/android/c++/JHybridRiveImageSpec.cpp
index f362417d..fdbe77ca 100644
--- a/nitrogen/generated/android/c++/JHybridRiveImageSpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridRiveImageSpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridRiveImageSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridRiveImageSpec.hpp"
@@ -28,6 +28,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridRiveImageSpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridRiveImageSpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridRiveImageSpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridRiveImageSpec.hpp b/nitrogen/generated/android/c++/JHybridRiveImageSpec.hpp
index 2a0ee669..10e10845 100644
--- a/nitrogen/generated/android/c++/JHybridRiveImageSpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridRiveImageSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridRiveSpec.cpp b/nitrogen/generated/android/c++/JHybridRiveSpec.cpp
index f1098c6a..f1fcd7a4 100644
--- a/nitrogen/generated/android/c++/JHybridRiveSpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridRiveSpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridRiveSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridRiveSpec.hpp"
@@ -28,6 +28,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridRiveSpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridRiveSpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridRiveSpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridRiveSpec.hpp b/nitrogen/generated/android/c++/JHybridRiveSpec.hpp
index 47f09c28..633677a6 100644
--- a/nitrogen/generated/android/c++/JHybridRiveSpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridRiveSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridRiveViewSpec.cpp b/nitrogen/generated/android/c++/JHybridRiveViewSpec.cpp
index da36269f..f9c78c5b 100644
--- a/nitrogen/generated/android/c++/JHybridRiveViewSpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridRiveViewSpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridRiveViewSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridRiveViewSpec.hpp"
@@ -54,6 +54,7 @@ namespace margelo::nitro::rive { enum class RiveEventType; }
 #include "JRiveErrorType.hpp"
 #include <NitroModules/Promise.hpp>
 #include <NitroModules/JPromise.hpp>
+#include <NitroModules/JUnit.hpp>
 #include "UnifiedRiveEvent.hpp"
 #include "JFunc_void_UnifiedRiveEvent.hpp"
 #include "JUnifiedRiveEvent.hpp"
@@ -79,6 +80,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridRiveViewSpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridRiveViewSpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridRiveViewSpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridRiveViewSpec.hpp b/nitrogen/generated/android/c++/JHybridRiveViewSpec.hpp
index 73be9a3a..6f981c2b 100644
--- a/nitrogen/generated/android/c++/JHybridRiveViewSpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridRiveViewSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveViewSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.cpp
index b64ef9cf..e6d4d6dc 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelArtboardPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelArtboardPropertySpec.hpp"
@@ -32,6 +32,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelArtboardPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelArtboardPropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelArtboardPropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.hpp
index 97c0e6e2..1cc26d41 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelArtboardPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.cpp
index 7320ea86..d78723ee 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelBooleanPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelBooleanPropertySpec.hpp"
@@ -31,6 +31,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelBooleanPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelBooleanPropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelBooleanPropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp
index 28112d5e..9fc4cde1 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelBooleanPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.cpp
index b2e2a469..a4bdcc2e 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelColorPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelColorPropertySpec.hpp"
@@ -31,6 +31,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelColorPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelColorPropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelColorPropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.hpp
index df907013..e9d5812f 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelColorPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.cpp
index dfcead0e..9defc0c5 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelEnumPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelEnumPropertySpec.hpp"
@@ -32,6 +32,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelEnumPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelEnumPropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelEnumPropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.hpp
index ac80cac6..2264f3ce 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelEnumPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.cpp
index 9720d8ec..d40ef5a6 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelImagePropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelImagePropertySpec.hpp"
@@ -35,6 +35,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelImagePropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelImagePropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelImagePropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.hpp
index 52976dce..b6be7e04 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelImagePropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.cpp
index da3984bf..f6abcdd9 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelInstanceSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelInstanceSpec.hpp"
@@ -69,6 +69,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelInstanceSpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelInstanceSpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelInstanceSpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.hpp
index cc574581..b54b1d9e 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelInstanceSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.cpp
index aeb3b912..de3c1643 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelListPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelListPropertySpec.hpp"
@@ -35,6 +35,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelListPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelListPropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelListPropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.hpp
index 49fe4ede..53c40f47 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelListPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.cpp
index 9f23ffa1..ea71cc90 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelNumberPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelNumberPropertySpec.hpp"
@@ -31,6 +31,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelNumberPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelNumberPropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelNumberPropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.hpp
index bda0818e..5dd702bd 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelNumberPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.cpp
index 0db9f6b4..6990210c 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelPropertySpec.hpp"
@@ -28,6 +28,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelPropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelPropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.hpp
index 8f2d796f..e57f7d4a 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelSpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelSpec.cpp
index d16fb367..9799a925 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelSpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelSpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelSpec.hpp"
@@ -33,6 +33,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelSpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelSpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelSpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelSpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelSpec.hpp
index 461a5959..3e6bc329 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelSpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -40,6 +40,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.cpp
index 7fbdd009..f01cb8f8 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelStringPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelStringPropertySpec.hpp"
@@ -32,6 +32,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelStringPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelStringPropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelStringPropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.hpp
index c7399ae2..e24f5ee5 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelStringPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.cpp
index 7b53249c..5dae4ed9 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// JHybridViewModelTriggerPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridViewModelTriggerPropertySpec.hpp"
@@ -30,6 +30,13 @@ namespace margelo::nitro::rive {
     return method(_javaPart);
   }
 
+  bool JHybridViewModelTriggerPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
+    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelTriggerPropertySpec>(other)) {
+      return _javaPart == otherCast->_javaPart;
+    }
+    return false;
+  }
+
   void JHybridViewModelTriggerPropertySpec::dispose() noexcept {
     static const auto method = javaClassStatic()->getMethod<void()>("dispose");
     method(_javaPart);
diff --git a/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.hpp
index ff775351..92643536 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.hpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelTriggerPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,6 +41,7 @@ namespace margelo::nitro::rive {
 
   public:
     size_t getExternalMemorySize() noexcept override;
+    bool equals(const std::shared_ptr<HybridObject>& other) override;
     void dispose() noexcept override;
     std::string toString() override;
 
diff --git a/nitrogen/generated/android/c++/JReferencedAssetsType.hpp b/nitrogen/generated/android/c++/JReferencedAssetsType.hpp
index c1f2db6e..94592b1c 100644
--- a/nitrogen/generated/android/c++/JReferencedAssetsType.hpp
+++ b/nitrogen/generated/android/c++/JReferencedAssetsType.hpp
@@ -2,7 +2,7 @@
 /// JReferencedAssetsType.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JResolvedReferencedAsset.hpp b/nitrogen/generated/android/c++/JResolvedReferencedAsset.hpp
index 751958f7..3567a1c4 100644
--- a/nitrogen/generated/android/c++/JResolvedReferencedAsset.hpp
+++ b/nitrogen/generated/android/c++/JResolvedReferencedAsset.hpp
@@ -2,7 +2,7 @@
 /// JResolvedReferencedAsset.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JRiveError.hpp b/nitrogen/generated/android/c++/JRiveError.hpp
index 142a58b3..6d52d3e8 100644
--- a/nitrogen/generated/android/c++/JRiveError.hpp
+++ b/nitrogen/generated/android/c++/JRiveError.hpp
@@ -2,7 +2,7 @@
 /// JRiveError.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JRiveErrorType.hpp b/nitrogen/generated/android/c++/JRiveErrorType.hpp
index 7829ea95..a41e8e7b 100644
--- a/nitrogen/generated/android/c++/JRiveErrorType.hpp
+++ b/nitrogen/generated/android/c++/JRiveErrorType.hpp
@@ -2,7 +2,7 @@
 /// JRiveErrorType.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,28 +41,27 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JRiveErrorType> fromCpp(RiveErrorType value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldUNKNOWN = clazz->getStaticField<JRiveErrorType>("UNKNOWN");
-      static const auto fieldFILENOTFOUND = clazz->getStaticField<JRiveErrorType>("FILENOTFOUND");
-      static const auto fieldMALFORMEDFILE = clazz->getStaticField<JRiveErrorType>("MALFORMEDFILE");
-      static const auto fieldINCORRECTARTBOARDNAME = clazz->getStaticField<JRiveErrorType>("INCORRECTARTBOARDNAME");
-      static const auto fieldINCORRECTSTATEMACHINENAME = clazz->getStaticField<JRiveErrorType>("INCORRECTSTATEMACHINENAME");
-      static const auto fieldVIEWMODELINSTANCENOTFOUND = clazz->getStaticField<JRiveErrorType>("VIEWMODELINSTANCENOTFOUND");
-      static const auto fieldINCORRECTSTATEMACHINEINPUTNAME = clazz->getStaticField<JRiveErrorType>("INCORRECTSTATEMACHINEINPUTNAME");
-      
       switch (value) {
         case RiveErrorType::UNKNOWN:
+          static const auto fieldUNKNOWN = clazz->getStaticField<JRiveErrorType>("UNKNOWN");
           return clazz->getStaticFieldValue(fieldUNKNOWN);
         case RiveErrorType::FILENOTFOUND:
+          static const auto fieldFILENOTFOUND = clazz->getStaticField<JRiveErrorType>("FILENOTFOUND");
           return clazz->getStaticFieldValue(fieldFILENOTFOUND);
         case RiveErrorType::MALFORMEDFILE:
+          static const auto fieldMALFORMEDFILE = clazz->getStaticField<JRiveErrorType>("MALFORMEDFILE");
           return clazz->getStaticFieldValue(fieldMALFORMEDFILE);
         case RiveErrorType::INCORRECTARTBOARDNAME:
+          static const auto fieldINCORRECTARTBOARDNAME = clazz->getStaticField<JRiveErrorType>("INCORRECTARTBOARDNAME");
           return clazz->getStaticFieldValue(fieldINCORRECTARTBOARDNAME);
         case RiveErrorType::INCORRECTSTATEMACHINENAME:
+          static const auto fieldINCORRECTSTATEMACHINENAME = clazz->getStaticField<JRiveErrorType>("INCORRECTSTATEMACHINENAME");
           return clazz->getStaticFieldValue(fieldINCORRECTSTATEMACHINENAME);
         case RiveErrorType::VIEWMODELINSTANCENOTFOUND:
+          static const auto fieldVIEWMODELINSTANCENOTFOUND = clazz->getStaticField<JRiveErrorType>("VIEWMODELINSTANCENOTFOUND");
           return clazz->getStaticFieldValue(fieldVIEWMODELINSTANCENOTFOUND);
         case RiveErrorType::INCORRECTSTATEMACHINEINPUTNAME:
+          static const auto fieldINCORRECTSTATEMACHINEINPUTNAME = clazz->getStaticField<JRiveErrorType>("INCORRECTSTATEMACHINEINPUTNAME");
           return clazz->getStaticFieldValue(fieldINCORRECTSTATEMACHINEINPUTNAME);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
diff --git a/nitrogen/generated/android/c++/JRiveEventType.hpp b/nitrogen/generated/android/c++/JRiveEventType.hpp
index aa215806..98a4ff4d 100644
--- a/nitrogen/generated/android/c++/JRiveEventType.hpp
+++ b/nitrogen/generated/android/c++/JRiveEventType.hpp
@@ -2,7 +2,7 @@
 /// JRiveEventType.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,13 +41,12 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JRiveEventType> fromCpp(RiveEventType value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldGENERAL = clazz->getStaticField<JRiveEventType>("GENERAL");
-      static const auto fieldOPENURL = clazz->getStaticField<JRiveEventType>("OPENURL");
-      
       switch (value) {
         case RiveEventType::GENERAL:
+          static const auto fieldGENERAL = clazz->getStaticField<JRiveEventType>("GENERAL");
           return clazz->getStaticFieldValue(fieldGENERAL);
         case RiveEventType::OPENURL:
+          static const auto fieldOPENURL = clazz->getStaticField<JRiveEventType>("OPENURL");
           return clazz->getStaticFieldValue(fieldOPENURL);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
diff --git a/nitrogen/generated/android/c++/JUnifiedRiveEvent.hpp b/nitrogen/generated/android/c++/JUnifiedRiveEvent.hpp
index b324bbc0..7e77fedf 100644
--- a/nitrogen/generated/android/c++/JUnifiedRiveEvent.hpp
+++ b/nitrogen/generated/android/c++/JUnifiedRiveEvent.hpp
@@ -2,7 +2,7 @@
 /// JUnifiedRiveEvent.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.cpp b/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.cpp
index 01f569a4..111b550a 100644
--- a/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.cpp
+++ b/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.cpp
@@ -2,7 +2,7 @@
 /// JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp"
diff --git a/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp b/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp
index b1db7e8f..1e7a6e67 100644
--- a/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp
+++ b/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp
@@ -2,7 +2,7 @@
 /// JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -57,7 +57,7 @@ namespace margelo::nitro::rive {
   };
 
   namespace JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName_impl {
-    class First: public jni::JavaClass<First, JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName> {
+    class First final: public jni::JavaClass<First, JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName> {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$First;";
     
@@ -67,7 +67,7 @@ namespace margelo::nitro::rive {
       }
     };
     
-    class Second: public jni::JavaClass<Second, JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName> {
+    class Second final: public jni::JavaClass<Second, JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName> {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$Second;";
     
@@ -77,7 +77,7 @@ namespace margelo::nitro::rive {
       }
     };
     
-    class Third: public jni::JavaClass<Third, JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName> {
+    class Third final: public jni::JavaClass<Third, JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName> {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$Third;";
     
diff --git a/nitrogen/generated/android/c++/views/JHybridRiveViewStateUpdater.cpp b/nitrogen/generated/android/c++/views/JHybridRiveViewStateUpdater.cpp
index 653dd660..1ece44f4 100644
--- a/nitrogen/generated/android/c++/views/JHybridRiveViewStateUpdater.cpp
+++ b/nitrogen/generated/android/c++/views/JHybridRiveViewStateUpdater.cpp
@@ -2,7 +2,7 @@
 /// JHybridRiveViewStateUpdater.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridRiveViewStateUpdater.hpp"
diff --git a/nitrogen/generated/android/c++/views/JHybridRiveViewStateUpdater.hpp b/nitrogen/generated/android/c++/views/JHybridRiveViewStateUpdater.hpp
index f0519d1b..6aabe816 100644
--- a/nitrogen/generated/android/c++/views/JHybridRiveViewStateUpdater.hpp
+++ b/nitrogen/generated/android/c++/views/JHybridRiveViewStateUpdater.hpp
@@ -2,7 +2,7 @@
 /// JHybridRiveViewStateUpdater.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Alignment.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Alignment.kt
index c0aebb64..33371c8a 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Alignment.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Alignment.kt
@@ -2,7 +2,7 @@
 /// Alignment.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -25,4 +25,6 @@ enum class Alignment(@DoNotStrip @Keep val value: Int) {
   BOTTOMLEFT(6),
   BOTTOMCENTER(7),
   BOTTOMRIGHT(8);
+
+  companion object
 }
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ArtboardBy.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ArtboardBy.kt
index 0a1494b6..94f2b65f 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ArtboardBy.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ArtboardBy.kt
@@ -2,7 +2,7 @@
 /// ArtboardBy.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -29,7 +29,7 @@ data class ArtboardBy(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ArtboardByTypes.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ArtboardByTypes.kt
index 231f5073..1d113d09 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ArtboardByTypes.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ArtboardByTypes.kt
@@ -2,7 +2,7 @@
 /// ArtboardByTypes.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -18,4 +18,6 @@ import com.facebook.proguard.annotations.DoNotStrip
 enum class ArtboardByTypes(@DoNotStrip @Keep val value: Int) {
   INDEX(0),
   NAME(1);
+
+  companion object
 }
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/DataBindByName.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/DataBindByName.kt
index e1e08187..0c86521b 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/DataBindByName.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/DataBindByName.kt
@@ -2,7 +2,7 @@
 /// DataBindByName.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -23,7 +23,7 @@ data class DataBindByName(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/DataBindMode.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/DataBindMode.kt
index 8570f437..915f8998 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/DataBindMode.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/DataBindMode.kt
@@ -2,7 +2,7 @@
 /// DataBindMode.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -18,4 +18,6 @@ import com.facebook.proguard.annotations.DoNotStrip
 enum class DataBindMode(@DoNotStrip @Keep val value: Int) {
   AUTO(0),
   NONE(1);
+
+  companion object
 }
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/EventPropertiesOutput.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/EventPropertiesOutput.kt
index 48310806..6415cde0 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/EventPropertiesOutput.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/EventPropertiesOutput.kt
@@ -2,7 +2,7 @@
 /// EventPropertiesOutput.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Fit.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Fit.kt
index 01a745dc..2d9e5810 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Fit.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Fit.kt
@@ -2,7 +2,7 @@
 /// Fit.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -24,4 +24,6 @@ enum class Fit(@DoNotStrip @Keep val value: Int) {
   NONE(5),
   SCALEDOWN(6),
   LAYOUT(7);
+
+  companion object
 }
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void.kt
index 4f98edfd..d59786dc 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void.kt
@@ -2,7 +2,7 @@
 /// Func_void.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_RiveError.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_RiveError.kt
index 5fe28945..4e24e28a 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_RiveError.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_RiveError.kt
@@ -2,7 +2,7 @@
 /// Func_void_RiveError.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_UnifiedRiveEvent.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_UnifiedRiveEvent.kt
index 988a958d..a401713d 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_UnifiedRiveEvent.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_UnifiedRiveEvent.kt
@@ -2,7 +2,7 @@
 /// Func_void_UnifiedRiveEvent.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_bool.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_bool.kt
index 42216b67..27925484 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_bool.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_bool.kt
@@ -2,7 +2,7 @@
 /// Func_void_bool.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_double.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_double.kt
index 41e27d12..5f885183 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_double.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_double.kt
@@ -2,7 +2,7 @@
 /// Func_void_double.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_std__string.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_std__string.kt
index 516c468d..65e2b6ef 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_std__string.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Func_void_std__string.kt
@@ -2,7 +2,7 @@
 /// Func_void_std__string.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridBindableArtboardSpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridBindableArtboardSpec.kt
index 81aeaa41..187fc873 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridBindableArtboardSpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridBindableArtboardSpec.kt
@@ -2,7 +2,7 @@
 /// HybridBindableArtboardSpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveFileFactorySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveFileFactorySpec.kt
index f2be50c5..c72930a8 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveFileFactorySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveFileFactorySpec.kt
@@ -2,7 +2,7 @@
 /// HybridRiveFileFactorySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveFileSpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveFileSpec.kt
index 5f012e96..0c5de270 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveFileSpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveFileSpec.kt
@@ -2,7 +2,7 @@
 /// HybridRiveFileSpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveImageFactorySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveImageFactorySpec.kt
index 8bdec2e2..d86418ca 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveImageFactorySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveImageFactorySpec.kt
@@ -2,7 +2,7 @@
 /// HybridRiveImageFactorySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveImageSpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveImageSpec.kt
index a87e8453..501fa546 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveImageSpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveImageSpec.kt
@@ -2,7 +2,7 @@
 /// HybridRiveImageSpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveSpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveSpec.kt
index 4f4d6f1e..826a3b32 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveSpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveSpec.kt
@@ -2,7 +2,7 @@
 /// HybridRiveSpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveViewSpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveViewSpec.kt
index ec606eb5..44479bf8 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveViewSpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridRiveViewSpec.kt
@@ -2,7 +2,7 @@
 /// HybridRiveViewSpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelArtboardPropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelArtboardPropertySpec.kt
index da2bf588..36694357 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelArtboardPropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelArtboardPropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelArtboardPropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelBooleanPropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelBooleanPropertySpec.kt
index f39736d1..70e57ac6 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelBooleanPropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelBooleanPropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelBooleanPropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelColorPropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelColorPropertySpec.kt
index 0a607018..edf4b37b 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelColorPropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelColorPropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelColorPropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelEnumPropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelEnumPropertySpec.kt
index 82bfa296..b3ff4624 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelEnumPropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelEnumPropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelEnumPropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelImagePropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelImagePropertySpec.kt
index 13fe10bf..77f08942 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelImagePropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelImagePropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelImagePropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelInstanceSpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelInstanceSpec.kt
index 24e478d4..13e1f5c6 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelInstanceSpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelInstanceSpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelInstanceSpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelListPropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelListPropertySpec.kt
index 21a1c0d8..7c4943a8 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelListPropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelListPropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelListPropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelNumberPropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelNumberPropertySpec.kt
index e72b0e28..8fd751c6 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelNumberPropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelNumberPropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelNumberPropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelPropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelPropertySpec.kt
index 3ef5c1bf..76ec7d1d 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelPropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelPropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelPropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelSpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelSpec.kt
index 7d264382..d75482ae 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelSpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelSpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelSpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelStringPropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelStringPropertySpec.kt
index cf66e11d..7cef1eef 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelStringPropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelStringPropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelStringPropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelTriggerPropertySpec.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelTriggerPropertySpec.kt
index f724ff7c..60bcdb7b 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelTriggerPropertySpec.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelTriggerPropertySpec.kt
@@ -2,7 +2,7 @@
 /// HybridViewModelTriggerPropertySpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ReferencedAssetsType.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ReferencedAssetsType.kt
index 66a44a03..3742280b 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ReferencedAssetsType.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ReferencedAssetsType.kt
@@ -2,7 +2,7 @@
 /// ReferencedAssetsType.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -23,7 +23,7 @@ data class ReferencedAssetsType(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ResolvedReferencedAsset.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ResolvedReferencedAsset.kt
index 6a12e537..e1878a6f 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ResolvedReferencedAsset.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/ResolvedReferencedAsset.kt
@@ -2,7 +2,7 @@
 /// ResolvedReferencedAsset.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -35,7 +35,7 @@ data class ResolvedReferencedAsset(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveError.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveError.kt
index f19b05b6..d24ce4ff 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveError.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveError.kt
@@ -2,7 +2,7 @@
 /// RiveError.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -26,7 +26,7 @@ data class RiveError(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveErrorType.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveErrorType.kt
index ef055008..76b9929b 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveErrorType.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveErrorType.kt
@@ -2,7 +2,7 @@
 /// RiveErrorType.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -23,4 +23,6 @@ enum class RiveErrorType(@DoNotStrip @Keep val value: Int) {
   INCORRECTSTATEMACHINENAME(4),
   VIEWMODELINSTANCENOTFOUND(6),
   INCORRECTSTATEMACHINEINPUTNAME(8);
+
+  companion object
 }
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveEventType.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveEventType.kt
index c5431663..aa9ddef9 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveEventType.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/RiveEventType.kt
@@ -2,7 +2,7 @@
 /// RiveEventType.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -18,4 +18,6 @@ import com.facebook.proguard.annotations.DoNotStrip
 enum class RiveEventType(@DoNotStrip @Keep val value: Int) {
   GENERAL(0),
   OPENURL(1);
+
+  companion object
 }
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/UnifiedRiveEvent.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/UnifiedRiveEvent.kt
index 30ed4b43..3a6aa89d 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/UnifiedRiveEvent.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/UnifiedRiveEvent.kt
@@ -2,7 +2,7 @@
 /// UnifiedRiveEvent.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
@@ -38,7 +38,7 @@ data class UnifiedRiveEvent(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.kt
index 0320458d..1b22fa06 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.kt
@@ -2,7 +2,7 @@
 /// Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/riveOnLoad.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/riveOnLoad.kt
index 331fe7f9..b3f3ff6a 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/riveOnLoad.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/riveOnLoad.kt
@@ -2,7 +2,7 @@
 /// riveOnLoad.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewManager.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewManager.kt
index 25980a23..69cff190 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewManager.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewManager.kt
@@ -2,7 +2,7 @@
 /// HybridRiveViewManager.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive.views
@@ -12,13 +12,20 @@ import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
+import com.margelo.nitro.R.id.associated_hybrid_view_tag
+import com.margelo.nitro.views.RecyclableView
 import com.margelo.nitro.rive.*
 
 /**
  * Represents the React Native `ViewManager` for the "RiveView" Nitro HybridView.
  */
 open class HybridRiveViewManager: SimpleViewManager<View>() {
-  private val views = hashMapOf<View, HybridRiveView>()
+  init {
+    if (RecyclableView::class.java.isAssignableFrom(HybridRiveView::class.java)) {
+      // Enable view recycling
+      super.setupViewRecycling()
+    }
+  }
 
   override fun getName(): String {
     return "RiveView"
@@ -27,17 +34,13 @@ open class HybridRiveViewManager: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = HybridRiveView(reactContext)
     val view = hybridView.view
-    views[view] = hybridView
+    view.setTag(associated_hybrid_view_tag, hybridView)
     return view
   }
 
-  override fun onDropViewInstance(view: View) {
-    super.onDropViewInstance(view)
-    views.remove(view)
-  }
-
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = views[view] ?: throw Error("Couldn't find view $view in local views table!")
+    val hybridView = view.getTag(associated_hybrid_view_tag) as? HybridRiveView
+      ?: throw Error("Couldn't find view $view in local views table!")
 
     // 1. Update each prop individually
     hybridView.beforeUpdate()
@@ -47,4 +50,21 @@ open class HybridRiveViewManager: SimpleViewManager<View>() {
     // 2. Continue in base View props
     return super.updateState(view, props, stateWrapper)
   }
+
+  protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
+    super.prepareToRecycleView(reactContext, view)
+    val hybridView = view.getTag(associated_hybrid_view_tag) as? HybridRiveView
+      ?: return null
+
+    @Suppress("USELESS_IS_CHECK")
+    if (hybridView is RecyclableView) {
+      // Recycle in it's implementation
+      hybridView.prepareForRecycle()
+
+      // Maybe update the view if it changed
+      return hybridView.view
+    } else {
+      return null
+    }
+  }
 }
diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewStateUpdater.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewStateUpdater.kt
index 3ae5e538..0caac58a 100644
--- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewStateUpdater.kt
+++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewStateUpdater.kt
@@ -2,7 +2,7 @@
 /// HybridRiveViewStateUpdater.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.rive.views
diff --git a/nitrogen/generated/android/rive+autolinking.cmake b/nitrogen/generated/android/rive+autolinking.cmake
index d3d7c065..a613c129 100644
--- a/nitrogen/generated/android/rive+autolinking.cmake
+++ b/nitrogen/generated/android/rive+autolinking.cmake
@@ -2,7 +2,7 @@
 # rive+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen
diff --git a/nitrogen/generated/android/rive+autolinking.gradle b/nitrogen/generated/android/rive+autolinking.gradle
index 1a7d21fc..87d70863 100644
--- a/nitrogen/generated/android/rive+autolinking.gradle
+++ b/nitrogen/generated/android/rive+autolinking.gradle
@@ -2,7 +2,7 @@
 /// rive+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen
diff --git a/nitrogen/generated/android/riveOnLoad.cpp b/nitrogen/generated/android/riveOnLoad.cpp
index 9c74c45d..8ffe3fd1 100644
--- a/nitrogen/generated/android/riveOnLoad.cpp
+++ b/nitrogen/generated/android/riveOnLoad.cpp
@@ -2,7 +2,7 @@
 /// riveOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_RIVE_WITH_GENERATED_CMAKE_PROJECT
diff --git a/nitrogen/generated/android/riveOnLoad.hpp b/nitrogen/generated/android/riveOnLoad.hpp
index 8a470626..f93091d2 100644
--- a/nitrogen/generated/android/riveOnLoad.hpp
+++ b/nitrogen/generated/android/riveOnLoad.hpp
@@ -2,7 +2,7 @@
 /// riveOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include <jni.h>
diff --git a/nitrogen/generated/ios/RNRive+autolinking.rb b/nitrogen/generated/ios/RNRive+autolinking.rb
index 0374b781..cb5dd7dc 100644
--- a/nitrogen/generated/ios/RNRive+autolinking.rb
+++ b/nitrogen/generated/ios/RNRive+autolinking.rb
@@ -2,7 +2,7 @@
 # RNRive+autolinking.rb
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a Ruby script that adds all files generated by Nitrogen
@@ -52,7 +52,7 @@ def add_nitrogen_files(spec)
   spec.pod_target_xcconfig = current_pod_target_xcconfig.merge({
     # Use C++ 20
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
-    # Enables C++ <-> Swift interop (by default it's only C)
+    # Enables C++ <-> Swift interop (by default it's only ObjC)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",
diff --git a/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.cpp b/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.cpp
index b2b93052..bd53b582 100644
--- a/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.cpp
+++ b/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.cpp
@@ -2,7 +2,7 @@
 /// RNRive-Swift-Cxx-Bridge.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "RNRive-Swift-Cxx-Bridge.hpp"
diff --git a/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.hpp b/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.hpp
index e843c52a..7946fcfe 100644
--- a/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.hpp
+++ b/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.hpp
@@ -2,7 +2,7 @@
 /// RNRive-Swift-Cxx-Bridge.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -593,7 +593,7 @@ namespace margelo::nitro::rive::bridge::swift {
    * std::variant cannot be used in Swift because of a Swift bug.
    * Not even specializing it works. So we create a wrapper struct.
    */
-  struct std__variant_std__shared_ptr_HybridViewModelInstanceSpec___DataBindMode__DataBindByName_ {
+  struct std__variant_std__shared_ptr_HybridViewModelInstanceSpec___DataBindMode__DataBindByName_ final {
     std::variant<std::shared_ptr<HybridViewModelInstanceSpec>, DataBindMode, DataBindByName> variant;
     std__variant_std__shared_ptr_HybridViewModelInstanceSpec___DataBindMode__DataBindByName_(std::variant<std::shared_ptr<HybridViewModelInstanceSpec>, DataBindMode, DataBindByName> variant): variant(variant) { }
     operator std::variant<std::shared_ptr<HybridViewModelInstanceSpec>, DataBindMode, DataBindByName>() const noexcept {
@@ -748,7 +748,7 @@ namespace margelo::nitro::rive::bridge::swift {
    * std::variant cannot be used in Swift because of a Swift bug.
    * Not even specializing it works. So we create a wrapper struct.
    */
-  struct std__variant_bool__std__string__double_ {
+  struct std__variant_bool__std__string__double_ final {
     std::variant<bool, std::string, double> variant;
     std__variant_bool__std__string__double_(std::variant<bool, std::string, double> variant): variant(variant) { }
     operator std::variant<bool, std::string, double>() const noexcept {
diff --git a/nitrogen/generated/ios/RNRive-Swift-Cxx-Umbrella.hpp b/nitrogen/generated/ios/RNRive-Swift-Cxx-Umbrella.hpp
index 434b4b00..3f761ca0 100644
--- a/nitrogen/generated/ios/RNRive-Swift-Cxx-Umbrella.hpp
+++ b/nitrogen/generated/ios/RNRive-Swift-Cxx-Umbrella.hpp
@@ -2,7 +2,7 @@
 /// RNRive-Swift-Cxx-Umbrella.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/ios/RNRiveAutolinking.mm b/nitrogen/generated/ios/RNRiveAutolinking.mm
index e904f1c3..b606789c 100644
--- a/nitrogen/generated/ios/RNRiveAutolinking.mm
+++ b/nitrogen/generated/ios/RNRiveAutolinking.mm
@@ -2,7 +2,7 @@
 /// RNRiveAutolinking.mm
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #import <Foundation/Foundation.h>
diff --git a/nitrogen/generated/ios/RNRiveAutolinking.swift b/nitrogen/generated/ios/RNRiveAutolinking.swift
index 9e759da3..1f654183 100644
--- a/nitrogen/generated/ios/RNRiveAutolinking.swift
+++ b/nitrogen/generated/ios/RNRiveAutolinking.swift
@@ -2,19 +2,16 @@
 /// RNRiveAutolinking.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
+import NitroModules
+
+// TODO: Use empty enums once Swift supports exporting them as namespaces
+//       See: https://github.com/swiftlang/swift/pull/83616
 public final class RNRiveAutolinking {
   public typealias bridge = margelo.nitro.rive.bridge.swift
 
-  /**
-   * Creates an instance of a Swift class that implements `HybridRiveSpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridRiveSpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `Rive`).
-   */
   public static func createRive() -> bridge.std__shared_ptr_HybridRiveSpec_ {
     let hybridObject = Rive()
     return { () -> bridge.std__shared_ptr_HybridRiveSpec_ in
@@ -23,13 +20,10 @@ public final class RNRiveAutolinking {
     }()
   }
   
-  /**
-   * Creates an instance of a Swift class that implements `HybridRiveFileFactorySpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridRiveFileFactorySpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridRiveFileFactory`).
-   */
+  public static func isRiveRecyclable() -> Bool {
+    return Rive.self is any RecyclableView.Type
+  }
+  
   public static func createRiveFileFactory() -> bridge.std__shared_ptr_HybridRiveFileFactorySpec_ {
     let hybridObject = HybridRiveFileFactory()
     return { () -> bridge.std__shared_ptr_HybridRiveFileFactorySpec_ in
@@ -38,13 +32,10 @@ public final class RNRiveAutolinking {
     }()
   }
   
-  /**
-   * Creates an instance of a Swift class that implements `HybridRiveFileSpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridRiveFileSpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridRiveFile`).
-   */
+  public static func isRiveFileFactoryRecyclable() -> Bool {
+    return HybridRiveFileFactory.self is any RecyclableView.Type
+  }
+  
   public static func createRiveFile() -> bridge.std__shared_ptr_HybridRiveFileSpec_ {
     let hybridObject = HybridRiveFile()
     return { () -> bridge.std__shared_ptr_HybridRiveFileSpec_ in
@@ -53,13 +44,10 @@ public final class RNRiveAutolinking {
     }()
   }
   
-  /**
-   * Creates an instance of a Swift class that implements `HybridRiveViewSpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridRiveViewSpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridRiveView`).
-   */
+  public static func isRiveFileRecyclable() -> Bool {
+    return HybridRiveFile.self is any RecyclableView.Type
+  }
+  
   public static func createRiveView() -> bridge.std__shared_ptr_HybridRiveViewSpec_ {
     let hybridObject = HybridRiveView()
     return { () -> bridge.std__shared_ptr_HybridRiveViewSpec_ in
@@ -68,13 +56,10 @@ public final class RNRiveAutolinking {
     }()
   }
   
-  /**
-   * Creates an instance of a Swift class that implements `HybridRiveImageFactorySpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridRiveImageFactorySpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridRiveImageFactory`).
-   */
+  public static func isRiveViewRecyclable() -> Bool {
+    return HybridRiveView.self is any RecyclableView.Type
+  }
+  
   public static func createRiveImageFactory() -> bridge.std__shared_ptr_HybridRiveImageFactorySpec_ {
     let hybridObject = HybridRiveImageFactory()
     return { () -> bridge.std__shared_ptr_HybridRiveImageFactorySpec_ in
@@ -82,4 +67,8 @@ public final class RNRiveAutolinking {
       return __cxxWrapped.getCxxPart()
     }()
   }
+  
+  public static func isRiveImageFactoryRecyclable() -> Bool {
+    return HybridRiveImageFactory.self is any RecyclableView.Type
+  }
 }
diff --git a/nitrogen/generated/ios/c++/HybridBindableArtboardSpecSwift.cpp b/nitrogen/generated/ios/c++/HybridBindableArtboardSpecSwift.cpp
index 76641480..be49f596 100644
--- a/nitrogen/generated/ios/c++/HybridBindableArtboardSpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridBindableArtboardSpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridBindableArtboardSpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridBindableArtboardSpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridBindableArtboardSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridBindableArtboardSpecSwift.hpp
index f7ac3062..c3740c06 100644
--- a/nitrogen/generated/ios/c++/HybridBindableArtboardSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridBindableArtboardSpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridBindableArtboardSpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -47,6 +47,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridBindableArtboardSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.cpp
index 41f9d276..a9519564 100644
--- a/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileFactorySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveFileFactorySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.hpp
index f78c3dda..258150ff 100644
--- a/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveFileFactorySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileFactorySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -66,6 +66,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridRiveFileFactorySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.cpp b/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.cpp
index d7684872..57113641 100644
--- a/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileSpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveFileSpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.hpp
index 1a7a4099..c2d1cd57 100644
--- a/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveFileSpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileSpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -71,6 +71,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridRiveFileSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridRiveImageFactorySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridRiveImageFactorySpecSwift.cpp
index 1897b92a..1a504626 100644
--- a/nitrogen/generated/ios/c++/HybridRiveImageFactorySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridRiveImageFactorySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageFactorySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveImageFactorySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridRiveImageFactorySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveImageFactorySpecSwift.hpp
index 21145682..953475ee 100644
--- a/nitrogen/generated/ios/c++/HybridRiveImageFactorySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveImageFactorySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageFactorySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -55,6 +55,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridRiveImageFactorySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridRiveImageSpecSwift.cpp b/nitrogen/generated/ios/c++/HybridRiveImageSpecSwift.cpp
index 522d4a8d..d6852ce6 100644
--- a/nitrogen/generated/ios/c++/HybridRiveImageSpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridRiveImageSpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageSpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveImageSpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridRiveImageSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveImageSpecSwift.hpp
index 485c64e0..3fd5e48a 100644
--- a/nitrogen/generated/ios/c++/HybridRiveImageSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveImageSpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageSpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -47,6 +47,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridRiveImageSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridRiveSpecSwift.cpp b/nitrogen/generated/ios/c++/HybridRiveSpecSwift.cpp
index cb6dfec0..06217812 100644
--- a/nitrogen/generated/ios/c++/HybridRiveSpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridRiveSpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveSpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveSpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridRiveSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveSpecSwift.hpp
index 8d8533e1..705422d2 100644
--- a/nitrogen/generated/ios/c++/HybridRiveSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveSpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveSpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -47,6 +47,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridRiveSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.cpp b/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.cpp
index f32609ab..26545fcf 100644
--- a/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveViewSpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveViewSpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.hpp
index 215b70da..b4f184a0 100644
--- a/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridRiveViewSpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveViewSpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -82,6 +82,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridRiveViewSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelArtboardPropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelArtboardPropertySpecSwift.cpp
index 53824bed..b132abce 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelArtboardPropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelArtboardPropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelArtboardPropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelArtboardPropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelArtboardPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelArtboardPropertySpecSwift.hpp
index f1980698..f8de42bd 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelArtboardPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelArtboardPropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelArtboardPropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -54,6 +54,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelArtboardPropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.cpp
index 867dc8a2..3ff6ca18 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelBooleanPropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelBooleanPropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp
index acd7b10a..8fee0cc2 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelBooleanPropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -50,6 +50,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelBooleanPropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.cpp
index 6dc8f931..a462df00 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelColorPropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelColorPropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp
index 063141fe..c86b8a5e 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelColorPropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -50,6 +50,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelColorPropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.cpp
index 7a180d8e..60c8352d 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelEnumPropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelEnumPropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp
index db003a59..93f96d68 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelEnumPropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -51,6 +51,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelEnumPropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.cpp
index cfbed615..16657766 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelImagePropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelImagePropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.hpp
index 26d09c29..41692a35 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelImagePropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -55,6 +55,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelImagePropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.cpp
index 9820d7ee..63418a4f 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelInstanceSpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelInstanceSpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.hpp
index 48e316f5..0c1b54a2 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelInstanceSpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -78,6 +78,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelInstanceSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.cpp
index 1d0429d5..dcc97b7b 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelListPropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelListPropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.hpp
index dfa1ef1d..5c617604 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelListPropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -55,6 +55,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelListPropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.cpp
index 2e1ac1b5..70c7b77b 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelNumberPropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelNumberPropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp
index e7ccb0eb..9e7e9248 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelNumberPropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -50,6 +50,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelNumberPropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.cpp
index 3bb51c10..184f3cf8 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelPropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelPropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.hpp
index 17099073..b6b69376 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelPropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelPropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -47,6 +47,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelPropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.cpp
index fe94778f..a7311625 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelSpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelSpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.hpp
index a02b4d93..353f6f10 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelSpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelSpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -51,6 +51,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.cpp
index 837a2199..9c1114b9 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelStringPropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelStringPropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp
index 56f94925..4e0dfee6 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelStringPropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -51,6 +51,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelStringPropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.cpp b/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.cpp
index 803460e3..40b0cc18 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.cpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelTriggerPropertySpecSwift.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelTriggerPropertySpecSwift.hpp"
diff --git a/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp b/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp
index 8a1863ff..2924cdd5 100644
--- a/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp
+++ b/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelTriggerPropertySpecSwift.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -50,6 +50,12 @@ namespace margelo::nitro::rive {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridViewModelTriggerPropertySpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
diff --git a/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm b/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm
index 07ec5288..b8b5bba5 100644
--- a/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm
+++ b/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm
@@ -2,7 +2,7 @@
 /// HybridRiveViewComponent.mm
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #import "HybridRiveViewComponent.hpp"
@@ -25,6 +25,7 @@
  * Represents the React Native View holder for the Nitro "RiveView" HybridView.
  */
 @interface HybridRiveViewComponent: RCTViewComponentView
++ (BOOL)shouldBeRecycled;
 @end
 
 @implementation HybridRiveViewComponent {
@@ -133,4 +134,14 @@ - (void) updateProps:(const std::shared_ptr<const react::Props>&)props
   [super updateProps:props oldProps:oldProps];
 }
 
++ (BOOL)shouldBeRecycled {
+  return RNRive::RNRiveAutolinking::isRiveViewRecyclable();
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  RNRive::HybridRiveViewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.maybePrepareForRecycle();
+}
+
 @end
diff --git a/nitrogen/generated/ios/swift/Alignment.swift b/nitrogen/generated/ios/swift/Alignment.swift
index 1eada362..ec0c60f4 100644
--- a/nitrogen/generated/ios/swift/Alignment.swift
+++ b/nitrogen/generated/ios/swift/Alignment.swift
@@ -2,7 +2,7 @@
 /// Alignment.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /**
diff --git a/nitrogen/generated/ios/swift/ArtboardBy.swift b/nitrogen/generated/ios/swift/ArtboardBy.swift
index 957efded..ef7029c4 100644
--- a/nitrogen/generated/ios/swift/ArtboardBy.swift
+++ b/nitrogen/generated/ios/swift/ArtboardBy.swift
@@ -2,7 +2,7 @@
 /// ArtboardBy.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -35,55 +35,25 @@ public extension ArtboardBy {
     }())
   }
 
+  @inline(__always)
   var type: ArtboardByTypes {
-    @inline(__always)
-    get {
-      return self.__type
-    }
-    @inline(__always)
-    set {
-      self.__type = newValue
-    }
+    return self.__type
   }
   
+  @inline(__always)
   var index: Double? {
-    @inline(__always)
-    get {
-      return self.__index.value
-    }
-    @inline(__always)
-    set {
-      self.__index = { () -> bridge.std__optional_double_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_double_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return self.__index.value
   }
   
+  @inline(__always)
   var name: String? {
-    @inline(__always)
-    get {
-      return { () -> String? in
-        if bridge.has_value_std__optional_std__string_(self.__name) {
-          let __unwrapped = bridge.get_std__optional_std__string_(self.__name)
-          return String(__unwrapped)
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__name = { () -> bridge.std__optional_std__string_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__name) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__name)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
   }
 }
diff --git a/nitrogen/generated/ios/swift/ArtboardByTypes.swift b/nitrogen/generated/ios/swift/ArtboardByTypes.swift
index 63c396b5..0bee0c0d 100644
--- a/nitrogen/generated/ios/swift/ArtboardByTypes.swift
+++ b/nitrogen/generated/ios/swift/ArtboardByTypes.swift
@@ -2,7 +2,7 @@
 /// ArtboardByTypes.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /**
diff --git a/nitrogen/generated/ios/swift/DataBindByName.swift b/nitrogen/generated/ios/swift/DataBindByName.swift
index 252d9382..8b909dd9 100644
--- a/nitrogen/generated/ios/swift/DataBindByName.swift
+++ b/nitrogen/generated/ios/swift/DataBindByName.swift
@@ -2,7 +2,7 @@
 /// DataBindByName.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -23,14 +23,8 @@ public extension DataBindByName {
     self.init(std.string(byName))
   }
 
+  @inline(__always)
   var byName: String {
-    @inline(__always)
-    get {
-      return String(self.__byName)
-    }
-    @inline(__always)
-    set {
-      self.__byName = std.string(newValue)
-    }
+    return String(self.__byName)
   }
 }
diff --git a/nitrogen/generated/ios/swift/DataBindMode.swift b/nitrogen/generated/ios/swift/DataBindMode.swift
index 40d6f4c3..6cdb5c80 100644
--- a/nitrogen/generated/ios/swift/DataBindMode.swift
+++ b/nitrogen/generated/ios/swift/DataBindMode.swift
@@ -2,7 +2,7 @@
 /// DataBindMode.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /**
diff --git a/nitrogen/generated/ios/swift/EventPropertiesOutput.swift b/nitrogen/generated/ios/swift/EventPropertiesOutput.swift
index a5cd0237..7f6a3b8a 100644
--- a/nitrogen/generated/ios/swift/EventPropertiesOutput.swift
+++ b/nitrogen/generated/ios/swift/EventPropertiesOutput.swift
@@ -2,7 +2,7 @@
 /// EventPropertiesOutput.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 
diff --git a/nitrogen/generated/ios/swift/Fit.swift b/nitrogen/generated/ios/swift/Fit.swift
index 19955c8e..7b08d5f6 100644
--- a/nitrogen/generated/ios/swift/Fit.swift
+++ b/nitrogen/generated/ios/swift/Fit.swift
@@ -2,7 +2,7 @@
 /// Fit.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /**
diff --git a/nitrogen/generated/ios/swift/Func_void.swift b/nitrogen/generated/ios/swift/Func_void.swift
index 4bc7896c..397f6506 100644
--- a/nitrogen/generated/ios/swift/Func_void.swift
+++ b/nitrogen/generated/ios/swift/Func_void.swift
@@ -2,7 +2,7 @@
 /// Func_void.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
diff --git a/nitrogen/generated/ios/swift/Func_void_RiveError.swift b/nitrogen/generated/ios/swift/Func_void_RiveError.swift
index 97710fc9..eb65eba3 100644
--- a/nitrogen/generated/ios/swift/Func_void_RiveError.swift
+++ b/nitrogen/generated/ios/swift/Func_void_RiveError.swift
@@ -2,7 +2,7 @@
 /// Func_void_RiveError.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
diff --git a/nitrogen/generated/ios/swift/Func_void_UnifiedRiveEvent.swift b/nitrogen/generated/ios/swift/Func_void_UnifiedRiveEvent.swift
index 3f5aca10..403337b1 100644
--- a/nitrogen/generated/ios/swift/Func_void_UnifiedRiveEvent.swift
+++ b/nitrogen/generated/ios/swift/Func_void_UnifiedRiveEvent.swift
@@ -2,7 +2,7 @@
 /// Func_void_UnifiedRiveEvent.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
diff --git a/nitrogen/generated/ios/swift/Func_void_bool.swift b/nitrogen/generated/ios/swift/Func_void_bool.swift
index 07f209f2..7348e3a7 100644
--- a/nitrogen/generated/ios/swift/Func_void_bool.swift
+++ b/nitrogen/generated/ios/swift/Func_void_bool.swift
@@ -2,7 +2,7 @@
 /// Func_void_bool.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
diff --git a/nitrogen/generated/ios/swift/Func_void_double.swift b/nitrogen/generated/ios/swift/Func_void_double.swift
index 183c6865..d35f255e 100644
--- a/nitrogen/generated/ios/swift/Func_void_double.swift
+++ b/nitrogen/generated/ios/swift/Func_void_double.swift
@@ -2,7 +2,7 @@
 /// Func_void_double.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
diff --git a/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift b/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift
index bbd3770a..2ea0e877 100644
--- a/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift
+++ b/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift
@@ -2,7 +2,7 @@
 /// Func_void_std__exception_ptr.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
diff --git a/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveFileSpec_.swift b/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveFileSpec_.swift
index 231dbc11..919a63e2 100644
--- a/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveFileSpec_.swift
+++ b/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveFileSpec_.swift
@@ -2,7 +2,7 @@
 /// Func_void_std__shared_ptr_HybridRiveFileSpec_.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -23,7 +23,7 @@ public final class Func_void_std__shared_ptr_HybridRiveFileSpec_ {
 
   @inline(__always)
   public func call(value: bridge.std__shared_ptr_HybridRiveFileSpec_) -> Void {
-    self.closure({ () -> HybridRiveFileSpec in
+    self.closure({ () -> any HybridRiveFileSpec in
       let __unsafePointer = bridge.get_std__shared_ptr_HybridRiveFileSpec_(value)
       let __instance = HybridRiveFileSpec_cxx.fromUnsafe(__unsafePointer)
       return __instance.getHybridRiveFileSpec()
diff --git a/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveImageSpec_.swift b/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveImageSpec_.swift
index 269d4533..6ec0e7a8 100644
--- a/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveImageSpec_.swift
+++ b/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_HybridRiveImageSpec_.swift
@@ -2,7 +2,7 @@
 /// Func_void_std__shared_ptr_HybridRiveImageSpec_.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -23,7 +23,7 @@ public final class Func_void_std__shared_ptr_HybridRiveImageSpec_ {
 
   @inline(__always)
   public func call(value: bridge.std__shared_ptr_HybridRiveImageSpec_) -> Void {
-    self.closure({ () -> HybridRiveImageSpec in
+    self.closure({ () -> any HybridRiveImageSpec in
       let __unsafePointer = bridge.get_std__shared_ptr_HybridRiveImageSpec_(value)
       let __instance = HybridRiveImageSpec_cxx.fromUnsafe(__unsafePointer)
       return __instance.getHybridRiveImageSpec()
diff --git a/nitrogen/generated/ios/swift/Func_void_std__string.swift b/nitrogen/generated/ios/swift/Func_void_std__string.swift
index 516a1b7d..cbf89bd8 100644
--- a/nitrogen/generated/ios/swift/Func_void_std__string.swift
+++ b/nitrogen/generated/ios/swift/Func_void_std__string.swift
@@ -2,7 +2,7 @@
 /// Func_void_std__string.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
diff --git a/nitrogen/generated/ios/swift/HybridBindableArtboardSpec.swift b/nitrogen/generated/ios/swift/HybridBindableArtboardSpec.swift
index e805689b..d57d4976 100644
--- a/nitrogen/generated/ios/swift/HybridBindableArtboardSpec.swift
+++ b/nitrogen/generated/ios/swift/HybridBindableArtboardSpec.swift
@@ -2,7 +2,7 @@
 /// HybridBindableArtboardSpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -30,14 +30,14 @@ open class HybridBindableArtboardSpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridBindableArtboardSpec_cxx {
   #if DEBUG
-    guard self is HybridBindableArtboardSpec else {
+    guard self is any HybridBindableArtboardSpec else {
       fatalError("`self` is not a `HybridBindableArtboardSpec`! Did you accidentally inherit from `HybridBindableArtboardSpec_base` instead of `HybridBindableArtboardSpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridBindableArtboardSpec_cxx(self as! HybridBindableArtboardSpec)
+      let cxxWrapper = HybridBindableArtboardSpec_cxx(self as! any HybridBindableArtboardSpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridBindableArtboardSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridBindableArtboardSpec_cxx.swift
index 224adabc..f685fa79 100644
--- a/nitrogen/generated/ios/swift/HybridBindableArtboardSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridBindableArtboardSpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridBindableArtboardSpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridBindableArtboardSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridBindableArtboardSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec.swift b/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec.swift
index b96fc2de..df3351e7 100644
--- a/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec.swift
@@ -2,7 +2,7 @@
 /// HybridRiveFileFactorySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -33,14 +33,14 @@ open class HybridRiveFileFactorySpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridRiveFileFactorySpec_cxx {
   #if DEBUG
-    guard self is HybridRiveFileFactorySpec else {
+    guard self is any HybridRiveFileFactorySpec else {
       fatalError("`self` is not a `HybridRiveFileFactorySpec`! Did you accidentally inherit from `HybridRiveFileFactorySpec_base` instead of `HybridRiveFileFactorySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridRiveFileFactorySpec_cxx(self as! HybridRiveFileFactorySpec)
+      let cxxWrapper = HybridRiveFileFactorySpec_cxx(self as! any HybridRiveFileFactorySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec_cxx.swift
index caf7bac5..0a39cfc8 100644
--- a/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveFileFactorySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridRiveFileFactorySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridRiveFileFactorySpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridRiveFileFactorySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridRiveFileSpec.swift b/nitrogen/generated/ios/swift/HybridRiveFileSpec.swift
index 66290b12..1c22c3dc 100644
--- a/nitrogen/generated/ios/swift/HybridRiveFileSpec.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveFileSpec.swift
@@ -2,7 +2,7 @@
 /// HybridRiveFileSpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -36,14 +36,14 @@ open class HybridRiveFileSpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridRiveFileSpec_cxx {
   #if DEBUG
-    guard self is HybridRiveFileSpec else {
+    guard self is any HybridRiveFileSpec else {
       fatalError("`self` is not a `HybridRiveFileSpec`! Did you accidentally inherit from `HybridRiveFileSpec_base` instead of `HybridRiveFileSpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridRiveFileSpec_cxx(self as! HybridRiveFileSpec)
+      let cxxWrapper = HybridRiveFileSpec_cxx(self as! any HybridRiveFileSpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridRiveFileSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveFileSpec_cxx.swift
index 013016f6..906a1ab1 100644
--- a/nitrogen/generated/ios/swift/HybridRiveFileSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveFileSpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridRiveFileSpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridRiveFileSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridRiveFileSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridRiveImageFactorySpec.swift b/nitrogen/generated/ios/swift/HybridRiveImageFactorySpec.swift
index 518b93f3..14f93cda 100644
--- a/nitrogen/generated/ios/swift/HybridRiveImageFactorySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveImageFactorySpec.swift
@@ -2,7 +2,7 @@
 /// HybridRiveImageFactorySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -32,14 +32,14 @@ open class HybridRiveImageFactorySpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridRiveImageFactorySpec_cxx {
   #if DEBUG
-    guard self is HybridRiveImageFactorySpec else {
+    guard self is any HybridRiveImageFactorySpec else {
       fatalError("`self` is not a `HybridRiveImageFactorySpec`! Did you accidentally inherit from `HybridRiveImageFactorySpec_base` instead of `HybridRiveImageFactorySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridRiveImageFactorySpec_cxx(self as! HybridRiveImageFactorySpec)
+      let cxxWrapper = HybridRiveImageFactorySpec_cxx(self as! any HybridRiveImageFactorySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridRiveImageFactorySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveImageFactorySpec_cxx.swift
index 5811ef1c..ae49b659 100644
--- a/nitrogen/generated/ios/swift/HybridRiveImageFactorySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveImageFactorySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridRiveImageFactorySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridRiveImageFactorySpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridRiveImageFactorySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridRiveImageSpec.swift b/nitrogen/generated/ios/swift/HybridRiveImageSpec.swift
index d993554a..2ffd9462 100644
--- a/nitrogen/generated/ios/swift/HybridRiveImageSpec.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveImageSpec.swift
@@ -2,7 +2,7 @@
 /// HybridRiveImageSpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -30,14 +30,14 @@ open class HybridRiveImageSpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridRiveImageSpec_cxx {
   #if DEBUG
-    guard self is HybridRiveImageSpec else {
+    guard self is any HybridRiveImageSpec else {
       fatalError("`self` is not a `HybridRiveImageSpec`! Did you accidentally inherit from `HybridRiveImageSpec_base` instead of `HybridRiveImageSpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridRiveImageSpec_cxx(self as! HybridRiveImageSpec)
+      let cxxWrapper = HybridRiveImageSpec_cxx(self as! any HybridRiveImageSpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridRiveImageSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveImageSpec_cxx.swift
index bec9a32a..19753bf5 100644
--- a/nitrogen/generated/ios/swift/HybridRiveImageSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveImageSpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridRiveImageSpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridRiveImageSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridRiveImageSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridRiveSpec.swift b/nitrogen/generated/ios/swift/HybridRiveSpec.swift
index 8ac6398e..8ca7f1e2 100644
--- a/nitrogen/generated/ios/swift/HybridRiveSpec.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveSpec.swift
@@ -2,7 +2,7 @@
 /// HybridRiveSpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -30,14 +30,14 @@ open class HybridRiveSpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridRiveSpec_cxx {
   #if DEBUG
-    guard self is HybridRiveSpec else {
+    guard self is any HybridRiveSpec else {
       fatalError("`self` is not a `HybridRiveSpec`! Did you accidentally inherit from `HybridRiveSpec_base` instead of `HybridRiveSpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridRiveSpec_cxx(self as! HybridRiveSpec)
+      let cxxWrapper = HybridRiveSpec_cxx(self as! any HybridRiveSpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridRiveSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveSpec_cxx.swift
index fdfc2310..84ef93e3 100644
--- a/nitrogen/generated/ios/swift/HybridRiveSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveSpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridRiveSpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridRiveSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridRiveSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridRiveViewSpec.swift b/nitrogen/generated/ios/swift/HybridRiveViewSpec.swift
index 945c9052..341c7b40 100644
--- a/nitrogen/generated/ios/swift/HybridRiveViewSpec.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveViewSpec.swift
@@ -2,7 +2,7 @@
 /// HybridRiveViewSpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -53,14 +53,14 @@ open class HybridRiveViewSpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridRiveViewSpec_cxx {
   #if DEBUG
-    guard self is HybridRiveViewSpec else {
+    guard self is any HybridRiveViewSpec else {
       fatalError("`self` is not a `HybridRiveViewSpec`! Did you accidentally inherit from `HybridRiveViewSpec_base` instead of `HybridRiveViewSpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridRiveViewSpec_cxx(self as! HybridRiveViewSpec)
+      let cxxWrapper = HybridRiveViewSpec_cxx(self as! any HybridRiveViewSpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift
index ffae6b39..134e163a 100644
--- a/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridRiveViewSpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridRiveViewSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridRiveViewSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
@@ -196,7 +204,7 @@ open class HybridRiveViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.file = { () -> HybridRiveFileSpec in
+      self.__implementation.file = { () -> any HybridRiveFileSpec in
         let __unsafePointer = bridge.get_std__shared_ptr_HybridRiveFileSpec_(newValue)
         let __instance = HybridRiveFileSpec_cxx.fromUnsafe(__unsafePointer)
         return __instance.getHybridRiveFileSpec()
@@ -288,7 +296,7 @@ open class HybridRiveViewSpec_cxx {
             switch __variant.index() {
               case 0:
                 let __actual = __variant.get_0()
-                return .first({ () -> HybridViewModelInstanceSpec in
+                return .first({ () -> any HybridViewModelInstanceSpec in
                   let __unsafePointer = bridge.get_std__shared_ptr_HybridViewModelInstanceSpec_(__actual)
                   let __instance = HybridViewModelInstanceSpec_cxx.fromUnsafe(__unsafePointer)
                   return __instance.getHybridViewModelInstanceSpec()
@@ -352,7 +360,7 @@ open class HybridRiveViewSpec_cxx {
   @inline(__always)
   public final func bindViewModelInstance(viewModelInstance: bridge.std__shared_ptr_HybridViewModelInstanceSpec_) -> bridge.Result_void_ {
     do {
-      try self.__implementation.bindViewModelInstance(viewModelInstance: { () -> HybridViewModelInstanceSpec in
+      try self.__implementation.bindViewModelInstance(viewModelInstance: { () -> any HybridViewModelInstanceSpec in
         let __unsafePointer = bridge.get_std__shared_ptr_HybridViewModelInstanceSpec_(viewModelInstance)
         let __instance = HybridViewModelInstanceSpec_cxx.fromUnsafe(__unsafePointer)
         return __instance.getHybridViewModelInstanceSpec()
@@ -620,4 +628,9 @@ open class HybridRiveViewSpec_cxx {
   public final func afterUpdate() {
     __implementation.afterUpdate()
   }
+  
+  public final func maybePrepareForRecycle() {
+    guard let recyclable = __implementation as? RecyclableView else { return }
+    recyclable.prepareForRecycle()
+  }
 }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelArtboardPropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelArtboardPropertySpec.swift
index ba6d2cbc..232807cd 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelArtboardPropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelArtboardPropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelArtboardPropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -30,14 +30,14 @@ open class HybridViewModelArtboardPropertySpec_base: HybridViewModelPropertySpec
   public override init() { super.init() }
   public override func getCxxWrapper() -> HybridViewModelArtboardPropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelArtboardPropertySpec else {
+    guard self is any HybridViewModelArtboardPropertySpec else {
       fatalError("`self` is not a `HybridViewModelArtboardPropertySpec`! Did you accidentally inherit from `HybridViewModelArtboardPropertySpec_base` instead of `HybridViewModelArtboardPropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelArtboardPropertySpec_cxx(self as! HybridViewModelArtboardPropertySpec)
+      let cxxWrapper = HybridViewModelArtboardPropertySpec_cxx(self as! any HybridViewModelArtboardPropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelArtboardPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelArtboardPropertySpec_cxx.swift
index 717e5645..fc7fd184 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelArtboardPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelArtboardPropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelArtboardPropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -99,6 +99,14 @@ open class HybridViewModelArtboardPropertySpec_cxx : HybridViewModelPropertySpec
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelArtboardPropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
@@ -126,7 +134,7 @@ open class HybridViewModelArtboardPropertySpec_cxx : HybridViewModelPropertySpec
       try self.__implementation.set(artboard: { () -> (any HybridBindableArtboardSpec)? in
         if bridge.has_value_std__optional_std__shared_ptr_HybridBindableArtboardSpec__(artboard) {
           let __unwrapped = bridge.get_std__optional_std__shared_ptr_HybridBindableArtboardSpec__(artboard)
-          return { () -> HybridBindableArtboardSpec in
+          return { () -> any HybridBindableArtboardSpec in
             let __unsafePointer = bridge.get_std__shared_ptr_HybridBindableArtboardSpec_(__unwrapped)
             let __instance = HybridBindableArtboardSpec_cxx.fromUnsafe(__unsafePointer)
             return __instance.getHybridBindableArtboardSpec()
diff --git a/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec.swift
index 9b9c7b0a..94db03e7 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelBooleanPropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -31,14 +31,14 @@ open class HybridViewModelBooleanPropertySpec_base: HybridViewModelPropertySpec_
   public override init() { super.init() }
   public override func getCxxWrapper() -> HybridViewModelBooleanPropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelBooleanPropertySpec else {
+    guard self is any HybridViewModelBooleanPropertySpec else {
       fatalError("`self` is not a `HybridViewModelBooleanPropertySpec`! Did you accidentally inherit from `HybridViewModelBooleanPropertySpec_base` instead of `HybridViewModelBooleanPropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelBooleanPropertySpec_cxx(self as! HybridViewModelBooleanPropertySpec)
+      let cxxWrapper = HybridViewModelBooleanPropertySpec_cxx(self as! any HybridViewModelBooleanPropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift
index 606c3d88..19ef6628 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelBooleanPropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -99,6 +99,14 @@ open class HybridViewModelBooleanPropertySpec_cxx : HybridViewModelPropertySpec_
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelBooleanPropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec.swift
index 5a11071a..f25057a8 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelColorPropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -31,14 +31,14 @@ open class HybridViewModelColorPropertySpec_base: HybridViewModelPropertySpec_ba
   public override init() { super.init() }
   public override func getCxxWrapper() -> HybridViewModelColorPropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelColorPropertySpec else {
+    guard self is any HybridViewModelColorPropertySpec else {
       fatalError("`self` is not a `HybridViewModelColorPropertySpec`! Did you accidentally inherit from `HybridViewModelColorPropertySpec_base` instead of `HybridViewModelColorPropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelColorPropertySpec_cxx(self as! HybridViewModelColorPropertySpec)
+      let cxxWrapper = HybridViewModelColorPropertySpec_cxx(self as! any HybridViewModelColorPropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift
index 853d8b11..3e8cf09a 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelColorPropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -99,6 +99,14 @@ open class HybridViewModelColorPropertySpec_cxx : HybridViewModelPropertySpec_cx
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelColorPropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec.swift
index 1cd4db42..7e610beb 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelEnumPropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -31,14 +31,14 @@ open class HybridViewModelEnumPropertySpec_base: HybridViewModelPropertySpec_bas
   public override init() { super.init() }
   public override func getCxxWrapper() -> HybridViewModelEnumPropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelEnumPropertySpec else {
+    guard self is any HybridViewModelEnumPropertySpec else {
       fatalError("`self` is not a `HybridViewModelEnumPropertySpec`! Did you accidentally inherit from `HybridViewModelEnumPropertySpec_base` instead of `HybridViewModelEnumPropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelEnumPropertySpec_cxx(self as! HybridViewModelEnumPropertySpec)
+      let cxxWrapper = HybridViewModelEnumPropertySpec_cxx(self as! any HybridViewModelEnumPropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift
index 5638056d..cbe5f366 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelEnumPropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -99,6 +99,14 @@ open class HybridViewModelEnumPropertySpec_cxx : HybridViewModelPropertySpec_cxx
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelEnumPropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec.swift
index aa9928a6..5f20cab3 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelImagePropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -32,14 +32,14 @@ open class HybridViewModelImagePropertySpec_base: HybridViewModelPropertySpec_ba
   public override init() { super.init() }
   public override func getCxxWrapper() -> HybridViewModelImagePropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelImagePropertySpec else {
+    guard self is any HybridViewModelImagePropertySpec else {
       fatalError("`self` is not a `HybridViewModelImagePropertySpec`! Did you accidentally inherit from `HybridViewModelImagePropertySpec_base` instead of `HybridViewModelImagePropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelImagePropertySpec_cxx(self as! HybridViewModelImagePropertySpec)
+      let cxxWrapper = HybridViewModelImagePropertySpec_cxx(self as! any HybridViewModelImagePropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec_cxx.swift
index 7720ad80..735e6751 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelImagePropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -99,6 +99,14 @@ open class HybridViewModelImagePropertySpec_cxx : HybridViewModelPropertySpec_cx
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelImagePropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
@@ -126,7 +134,7 @@ open class HybridViewModelImagePropertySpec_cxx : HybridViewModelPropertySpec_cx
       try self.__implementation.set(image: { () -> (any HybridRiveImageSpec)? in
         if bridge.has_value_std__optional_std__shared_ptr_HybridRiveImageSpec__(image) {
           let __unwrapped = bridge.get_std__optional_std__shared_ptr_HybridRiveImageSpec__(image)
-          return { () -> HybridRiveImageSpec in
+          return { () -> any HybridRiveImageSpec in
             let __unsafePointer = bridge.get_std__shared_ptr_HybridRiveImageSpec_(__unwrapped)
             let __instance = HybridRiveImageSpec_cxx.fromUnsafe(__unsafePointer)
             return __instance.getHybridRiveImageSpec()
diff --git a/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec.swift b/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec.swift
index 436f52c2..1d7d4edd 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelInstanceSpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -40,14 +40,14 @@ open class HybridViewModelInstanceSpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridViewModelInstanceSpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelInstanceSpec else {
+    guard self is any HybridViewModelInstanceSpec else {
       fatalError("`self` is not a `HybridViewModelInstanceSpec`! Did you accidentally inherit from `HybridViewModelInstanceSpec_base` instead of `HybridViewModelInstanceSpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelInstanceSpec_cxx(self as! HybridViewModelInstanceSpec)
+      let cxxWrapper = HybridViewModelInstanceSpec_cxx(self as! any HybridViewModelInstanceSpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec_cxx.swift
index 9bda15b6..4b98ed40 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelInstanceSpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelInstanceSpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridViewModelInstanceSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelInstanceSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
@@ -335,7 +343,7 @@ open class HybridViewModelInstanceSpec_cxx {
   @inline(__always)
   public final func replaceViewModel(path: std.string, instance: bridge.std__shared_ptr_HybridViewModelInstanceSpec_) -> bridge.Result_void_ {
     do {
-      try self.__implementation.replaceViewModel(path: String(path), instance: { () -> HybridViewModelInstanceSpec in
+      try self.__implementation.replaceViewModel(path: String(path), instance: { () -> any HybridViewModelInstanceSpec in
         let __unsafePointer = bridge.get_std__shared_ptr_HybridViewModelInstanceSpec_(instance)
         let __instance = HybridViewModelInstanceSpec_cxx.fromUnsafe(__unsafePointer)
         return __instance.getHybridViewModelInstanceSpec()
diff --git a/nitrogen/generated/ios/swift/HybridViewModelListPropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelListPropertySpec.swift
index d7fc0c39..af415de4 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelListPropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelListPropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelListPropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -37,14 +37,14 @@ open class HybridViewModelListPropertySpec_base: HybridViewModelPropertySpec_bas
   public override init() { super.init() }
   public override func getCxxWrapper() -> HybridViewModelListPropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelListPropertySpec else {
+    guard self is any HybridViewModelListPropertySpec else {
       fatalError("`self` is not a `HybridViewModelListPropertySpec`! Did you accidentally inherit from `HybridViewModelListPropertySpec_base` instead of `HybridViewModelListPropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelListPropertySpec_cxx(self as! HybridViewModelListPropertySpec)
+      let cxxWrapper = HybridViewModelListPropertySpec_cxx(self as! any HybridViewModelListPropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelListPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelListPropertySpec_cxx.swift
index 842ed2ff..83f2274b 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelListPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelListPropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelListPropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -99,6 +99,14 @@ open class HybridViewModelListPropertySpec_cxx : HybridViewModelPropertySpec_cxx
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelListPropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
@@ -149,7 +157,7 @@ open class HybridViewModelListPropertySpec_cxx : HybridViewModelPropertySpec_cxx
   @inline(__always)
   public final func addInstance(instance: bridge.std__shared_ptr_HybridViewModelInstanceSpec_) -> bridge.Result_void_ {
     do {
-      try self.__implementation.addInstance(instance: { () -> HybridViewModelInstanceSpec in
+      try self.__implementation.addInstance(instance: { () -> any HybridViewModelInstanceSpec in
         let __unsafePointer = bridge.get_std__shared_ptr_HybridViewModelInstanceSpec_(instance)
         let __instance = HybridViewModelInstanceSpec_cxx.fromUnsafe(__unsafePointer)
         return __instance.getHybridViewModelInstanceSpec()
@@ -164,7 +172,7 @@ open class HybridViewModelListPropertySpec_cxx : HybridViewModelPropertySpec_cxx
   @inline(__always)
   public final func addInstanceAt(instance: bridge.std__shared_ptr_HybridViewModelInstanceSpec_, index: Double) -> bridge.Result_bool_ {
     do {
-      let __result = try self.__implementation.addInstanceAt(instance: { () -> HybridViewModelInstanceSpec in
+      let __result = try self.__implementation.addInstanceAt(instance: { () -> any HybridViewModelInstanceSpec in
         let __unsafePointer = bridge.get_std__shared_ptr_HybridViewModelInstanceSpec_(instance)
         let __instance = HybridViewModelInstanceSpec_cxx.fromUnsafe(__unsafePointer)
         return __instance.getHybridViewModelInstanceSpec()
@@ -180,7 +188,7 @@ open class HybridViewModelListPropertySpec_cxx : HybridViewModelPropertySpec_cxx
   @inline(__always)
   public final func removeInstance(instance: bridge.std__shared_ptr_HybridViewModelInstanceSpec_) -> bridge.Result_void_ {
     do {
-      try self.__implementation.removeInstance(instance: { () -> HybridViewModelInstanceSpec in
+      try self.__implementation.removeInstance(instance: { () -> any HybridViewModelInstanceSpec in
         let __unsafePointer = bridge.get_std__shared_ptr_HybridViewModelInstanceSpec_(instance)
         let __instance = HybridViewModelInstanceSpec_cxx.fromUnsafe(__unsafePointer)
         return __instance.getHybridViewModelInstanceSpec()
diff --git a/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec.swift
index ae6032e1..e025fb9e 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelNumberPropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -31,14 +31,14 @@ open class HybridViewModelNumberPropertySpec_base: HybridViewModelPropertySpec_b
   public override init() { super.init() }
   public override func getCxxWrapper() -> HybridViewModelNumberPropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelNumberPropertySpec else {
+    guard self is any HybridViewModelNumberPropertySpec else {
       fatalError("`self` is not a `HybridViewModelNumberPropertySpec`! Did you accidentally inherit from `HybridViewModelNumberPropertySpec_base` instead of `HybridViewModelNumberPropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelNumberPropertySpec_cxx(self as! HybridViewModelNumberPropertySpec)
+      let cxxWrapper = HybridViewModelNumberPropertySpec_cxx(self as! any HybridViewModelNumberPropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec_cxx.swift
index fdd8ff11..064c80bc 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelNumberPropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -99,6 +99,14 @@ open class HybridViewModelNumberPropertySpec_cxx : HybridViewModelPropertySpec_c
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelNumberPropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridViewModelPropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelPropertySpec.swift
index e667ce72..7921786a 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelPropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelPropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelPropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -30,14 +30,14 @@ open class HybridViewModelPropertySpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridViewModelPropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelPropertySpec else {
+    guard self is any HybridViewModelPropertySpec else {
       fatalError("`self` is not a `HybridViewModelPropertySpec`! Did you accidentally inherit from `HybridViewModelPropertySpec_base` instead of `HybridViewModelPropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelPropertySpec_cxx(self as! HybridViewModelPropertySpec)
+      let cxxWrapper = HybridViewModelPropertySpec_cxx(self as! any HybridViewModelPropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelPropertySpec_cxx.swift
index 274a9297..9f659302 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelPropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelPropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridViewModelPropertySpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelPropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridViewModelSpec.swift b/nitrogen/generated/ios/swift/HybridViewModelSpec.swift
index 4cd8662d..23ab3097 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelSpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelSpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelSpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -35,14 +35,14 @@ open class HybridViewModelSpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridViewModelSpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelSpec else {
+    guard self is any HybridViewModelSpec else {
       fatalError("`self` is not a `HybridViewModelSpec`! Did you accidentally inherit from `HybridViewModelSpec_base` instead of `HybridViewModelSpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelSpec_cxx(self as! HybridViewModelSpec)
+      let cxxWrapper = HybridViewModelSpec_cxx(self as! any HybridViewModelSpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelSpec_cxx.swift
index b9da732a..4d84425e 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelSpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelSpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelSpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -96,6 +96,14 @@ open class HybridViewModelSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec.swift
index d9373e4f..f21cef4a 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelStringPropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -31,14 +31,14 @@ open class HybridViewModelStringPropertySpec_base: HybridViewModelPropertySpec_b
   public override init() { super.init() }
   public override func getCxxWrapper() -> HybridViewModelStringPropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelStringPropertySpec else {
+    guard self is any HybridViewModelStringPropertySpec else {
       fatalError("`self` is not a `HybridViewModelStringPropertySpec`! Did you accidentally inherit from `HybridViewModelStringPropertySpec_base` instead of `HybridViewModelStringPropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelStringPropertySpec_cxx(self as! HybridViewModelStringPropertySpec)
+      let cxxWrapper = HybridViewModelStringPropertySpec_cxx(self as! any HybridViewModelStringPropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec_cxx.swift
index 1b2d3bee..53bd50cd 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelStringPropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -99,6 +99,14 @@ open class HybridViewModelStringPropertySpec_cxx : HybridViewModelPropertySpec_c
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelStringPropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec.swift b/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec.swift
index 1928e81f..bd13aaed 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelTriggerPropertySpec.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -32,14 +32,14 @@ open class HybridViewModelTriggerPropertySpec_base: HybridViewModelPropertySpec_
   public override init() { super.init() }
   public override func getCxxWrapper() -> HybridViewModelTriggerPropertySpec_cxx {
   #if DEBUG
-    guard self is HybridViewModelTriggerPropertySpec else {
+    guard self is any HybridViewModelTriggerPropertySpec else {
       fatalError("`self` is not a `HybridViewModelTriggerPropertySpec`! Did you accidentally inherit from `HybridViewModelTriggerPropertySpec_base` instead of `HybridViewModelTriggerPropertySpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridViewModelTriggerPropertySpec_cxx(self as! HybridViewModelTriggerPropertySpec)
+      let cxxWrapper = HybridViewModelTriggerPropertySpec_cxx(self as! any HybridViewModelTriggerPropertySpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }
diff --git a/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec_cxx.swift b/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec_cxx.swift
index 51322eee..375235c6 100644
--- a/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec_cxx.swift
+++ b/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec_cxx.swift
@@ -2,7 +2,7 @@
 /// HybridViewModelTriggerPropertySpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -99,6 +99,14 @@ open class HybridViewModelTriggerPropertySpec_cxx : HybridViewModelPropertySpec_
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridViewModelTriggerPropertySpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
diff --git a/nitrogen/generated/ios/swift/ReferencedAssetsType.swift b/nitrogen/generated/ios/swift/ReferencedAssetsType.swift
index bd8993e7..e4439241 100644
--- a/nitrogen/generated/ios/swift/ReferencedAssetsType.swift
+++ b/nitrogen/generated/ios/swift/ReferencedAssetsType.swift
@@ -2,7 +2,7 @@
 /// ReferencedAssetsType.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -35,41 +35,23 @@ public extension ReferencedAssetsType {
     }())
   }
 
+  @inline(__always)
   var data: Dictionary<String, ResolvedReferencedAsset>? {
-    @inline(__always)
-    get {
-      return { () -> Dictionary<String, ResolvedReferencedAsset>? in
-        if bridge.has_value_std__optional_std__unordered_map_std__string__ResolvedReferencedAsset__(self.__data) {
-          let __unwrapped = bridge.get_std__optional_std__unordered_map_std__string__ResolvedReferencedAsset__(self.__data)
-          return { () -> Dictionary<String, ResolvedReferencedAsset> in
-            var __dictionary = Dictionary<String, ResolvedReferencedAsset>(minimumCapacity: __unwrapped.size())
-            let __keys = bridge.get_std__unordered_map_std__string__ResolvedReferencedAsset__keys(__unwrapped)
-            for __key in __keys {
-              let __value = bridge.get_std__unordered_map_std__string__ResolvedReferencedAsset__value(__unwrapped, __key)
-              __dictionary[String(__key)] = __value
-            }
-            return __dictionary
-          }()
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__data = { () -> bridge.std__optional_std__unordered_map_std__string__ResolvedReferencedAsset__ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__unordered_map_std__string__ResolvedReferencedAsset__({ () -> bridge.std__unordered_map_std__string__ResolvedReferencedAsset_ in
-            var __map = bridge.create_std__unordered_map_std__string__ResolvedReferencedAsset_(__unwrappedValue.count)
-            for (__k, __v) in __unwrappedValue {
-              bridge.emplace_std__unordered_map_std__string__ResolvedReferencedAsset_(&__map, std.string(__k), __v)
-            }
-            return __map
-          }())
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> Dictionary<String, ResolvedReferencedAsset>? in
+      if bridge.has_value_std__optional_std__unordered_map_std__string__ResolvedReferencedAsset__(self.__data) {
+        let __unwrapped = bridge.get_std__optional_std__unordered_map_std__string__ResolvedReferencedAsset__(self.__data)
+        return { () -> Dictionary<String, ResolvedReferencedAsset> in
+          var __dictionary = Dictionary<String, ResolvedReferencedAsset>(minimumCapacity: __unwrapped.size())
+          let __keys = bridge.get_std__unordered_map_std__string__ResolvedReferencedAsset__keys(__unwrapped)
+          for __key in __keys {
+            let __value = bridge.get_std__unordered_map_std__string__ResolvedReferencedAsset__value(__unwrapped, __key)
+            __dictionary[String(__key)] = __value
+          }
+          return __dictionary
+        }()
+      } else {
+        return nil
+      }
+    }()
   }
 }
diff --git a/nitrogen/generated/ios/swift/ResolvedReferencedAsset.swift b/nitrogen/generated/ios/swift/ResolvedReferencedAsset.swift
index 38637983..a93cc8b9 100644
--- a/nitrogen/generated/ios/swift/ResolvedReferencedAsset.swift
+++ b/nitrogen/generated/ios/swift/ResolvedReferencedAsset.swift
@@ -2,7 +2,7 @@
 /// ResolvedReferencedAsset.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -56,130 +56,67 @@ public extension ResolvedReferencedAsset {
     }())
   }
 
+  @inline(__always)
   var sourceUrl: String? {
-    @inline(__always)
-    get {
-      return { () -> String? in
-        if bridge.has_value_std__optional_std__string_(self.__sourceUrl) {
-          let __unwrapped = bridge.get_std__optional_std__string_(self.__sourceUrl)
-          return String(__unwrapped)
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__sourceUrl = { () -> bridge.std__optional_std__string_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__sourceUrl) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__sourceUrl)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
   }
   
+  @inline(__always)
   var sourceAsset: String? {
-    @inline(__always)
-    get {
-      return { () -> String? in
-        if bridge.has_value_std__optional_std__string_(self.__sourceAsset) {
-          let __unwrapped = bridge.get_std__optional_std__string_(self.__sourceAsset)
-          return String(__unwrapped)
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__sourceAsset = { () -> bridge.std__optional_std__string_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__sourceAsset) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__sourceAsset)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
   }
   
+  @inline(__always)
   var sourceAssetId: String? {
-    @inline(__always)
-    get {
-      return { () -> String? in
-        if bridge.has_value_std__optional_std__string_(self.__sourceAssetId) {
-          let __unwrapped = bridge.get_std__optional_std__string_(self.__sourceAssetId)
-          return String(__unwrapped)
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__sourceAssetId = { () -> bridge.std__optional_std__string_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__sourceAssetId) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__sourceAssetId)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
   }
   
+  @inline(__always)
   var path: String? {
-    @inline(__always)
-    get {
-      return { () -> String? in
-        if bridge.has_value_std__optional_std__string_(self.__path) {
-          let __unwrapped = bridge.get_std__optional_std__string_(self.__path)
-          return String(__unwrapped)
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__path = { () -> bridge.std__optional_std__string_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__path) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__path)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
   }
   
+  @inline(__always)
   var image: (any HybridRiveImageSpec)? {
-    @inline(__always)
-    get {
-      return { () -> (any HybridRiveImageSpec)? in
-        if bridge.has_value_std__optional_std__shared_ptr_HybridRiveImageSpec__(self.__image) {
-          let __unwrapped = bridge.get_std__optional_std__shared_ptr_HybridRiveImageSpec__(self.__image)
-          return { () -> HybridRiveImageSpec in
-            let __unsafePointer = bridge.get_std__shared_ptr_HybridRiveImageSpec_(__unwrapped)
-            let __instance = HybridRiveImageSpec_cxx.fromUnsafe(__unsafePointer)
-            return __instance.getHybridRiveImageSpec()
-          }()
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__image = { () -> bridge.std__optional_std__shared_ptr_HybridRiveImageSpec__ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__shared_ptr_HybridRiveImageSpec__({ () -> bridge.std__shared_ptr_HybridRiveImageSpec_ in
-            let __cxxWrapped = __unwrappedValue.getCxxWrapper()
-            return __cxxWrapped.getCxxPart()
-          }())
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> (any HybridRiveImageSpec)? in
+      if bridge.has_value_std__optional_std__shared_ptr_HybridRiveImageSpec__(self.__image) {
+        let __unwrapped = bridge.get_std__optional_std__shared_ptr_HybridRiveImageSpec__(self.__image)
+        return { () -> any HybridRiveImageSpec in
+          let __unsafePointer = bridge.get_std__shared_ptr_HybridRiveImageSpec_(__unwrapped)
+          let __instance = HybridRiveImageSpec_cxx.fromUnsafe(__unsafePointer)
+          return __instance.getHybridRiveImageSpec()
+        }()
+      } else {
+        return nil
+      }
+    }()
   }
 }
diff --git a/nitrogen/generated/ios/swift/RiveError.swift b/nitrogen/generated/ios/swift/RiveError.swift
index cfcc2aa5..fb76144e 100644
--- a/nitrogen/generated/ios/swift/RiveError.swift
+++ b/nitrogen/generated/ios/swift/RiveError.swift
@@ -2,7 +2,7 @@
 /// RiveError.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -23,25 +23,13 @@ public extension RiveError {
     self.init(std.string(message), type)
   }
 
+  @inline(__always)
   var message: String {
-    @inline(__always)
-    get {
-      return String(self.__message)
-    }
-    @inline(__always)
-    set {
-      self.__message = std.string(newValue)
-    }
+    return String(self.__message)
   }
   
+  @inline(__always)
   var type: RiveErrorType {
-    @inline(__always)
-    get {
-      return self.__type
-    }
-    @inline(__always)
-    set {
-      self.__type = newValue
-    }
+    return self.__type
   }
 }
diff --git a/nitrogen/generated/ios/swift/RiveErrorType.swift b/nitrogen/generated/ios/swift/RiveErrorType.swift
index 626cd87c..8019b363 100644
--- a/nitrogen/generated/ios/swift/RiveErrorType.swift
+++ b/nitrogen/generated/ios/swift/RiveErrorType.swift
@@ -2,7 +2,7 @@
 /// RiveErrorType.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /**
diff --git a/nitrogen/generated/ios/swift/RiveEventType.swift b/nitrogen/generated/ios/swift/RiveEventType.swift
index dc37712f..2a914df5 100644
--- a/nitrogen/generated/ios/swift/RiveEventType.swift
+++ b/nitrogen/generated/ios/swift/RiveEventType.swift
@@ -2,7 +2,7 @@
 /// RiveEventType.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /**
diff --git a/nitrogen/generated/ios/swift/UnifiedRiveEvent.swift b/nitrogen/generated/ios/swift/UnifiedRiveEvent.swift
index c508d0ca..255f74ec 100644
--- a/nitrogen/generated/ios/swift/UnifiedRiveEvent.swift
+++ b/nitrogen/generated/ios/swift/UnifiedRiveEvent.swift
@@ -2,7 +2,7 @@
 /// UnifiedRiveEvent.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 import Foundation
@@ -62,152 +62,77 @@ public extension UnifiedRiveEvent {
     }())
   }
 
+  @inline(__always)
   var name: String {
-    @inline(__always)
-    get {
-      return String(self.__name)
-    }
-    @inline(__always)
-    set {
-      self.__name = std.string(newValue)
-    }
+    return String(self.__name)
   }
   
+  @inline(__always)
   var type: RiveEventType {
-    @inline(__always)
-    get {
-      return self.__type
-    }
-    @inline(__always)
-    set {
-      self.__type = newValue
-    }
+    return self.__type
   }
   
+  @inline(__always)
   var delay: Double? {
-    @inline(__always)
-    get {
-      return self.__delay.value
-    }
-    @inline(__always)
-    set {
-      self.__delay = { () -> bridge.std__optional_double_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_double_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return self.__delay.value
   }
   
+  @inline(__always)
   var properties: Dictionary<String, EventPropertiesOutput>? {
-    @inline(__always)
-    get {
-      return { () -> Dictionary<String, EventPropertiesOutput>? in
-        if bridge.has_value_std__optional_std__unordered_map_std__string__std__variant_bool__std__string__double___(self.__properties) {
-          let __unwrapped = bridge.get_std__optional_std__unordered_map_std__string__std__variant_bool__std__string__double___(self.__properties)
-          return { () -> Dictionary<String, EventPropertiesOutput> in
-            var __dictionary = Dictionary<String, EventPropertiesOutput>(minimumCapacity: __unwrapped.size())
-            let __keys = bridge.get_std__unordered_map_std__string__std__variant_bool__std__string__double___keys(__unwrapped)
-            for __key in __keys {
-              let __value = bridge.get_std__unordered_map_std__string__std__variant_bool__std__string__double___value(__unwrapped, __key)
-              __dictionary[String(__key)] = { () -> EventPropertiesOutput in
-                let __variant = bridge.std__variant_bool__std__string__double_(__value)
-                switch __variant.index() {
-                  case 0:
-                    let __actual = __variant.get_0()
-                    return .first(__actual)
-                  case 1:
-                    let __actual = __variant.get_1()
-                    return .second(String(__actual))
-                  case 2:
-                    let __actual = __variant.get_2()
-                    return .third(__actual)
-                  default:
-                    fatalError("Variant can never have index \(__variant.index())!")
-                }
-              }()
-            }
-            return __dictionary
-          }()
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__properties = { () -> bridge.std__optional_std__unordered_map_std__string__std__variant_bool__std__string__double___ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__unordered_map_std__string__std__variant_bool__std__string__double___({ () -> bridge.std__unordered_map_std__string__std__variant_bool__std__string__double__ in
-            var __map = bridge.create_std__unordered_map_std__string__std__variant_bool__std__string__double__(__unwrappedValue.count)
-            for (__k, __v) in __unwrappedValue {
-              bridge.emplace_std__unordered_map_std__string__std__variant_bool__std__string__double__(&__map, std.string(__k), { () -> bridge.std__variant_bool__std__string__double_ in
-                switch __v {
-                  case .first(let __value):
-                    return bridge.create_std__variant_bool__std__string__double_(__value)
-                  case .second(let __value):
-                    return bridge.create_std__variant_bool__std__string__double_(std.string(__value))
-                  case .third(let __value):
-                    return bridge.create_std__variant_bool__std__string__double_(__value)
-                }
-              }().variant)
-            }
-            return __map
-          }())
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> Dictionary<String, EventPropertiesOutput>? in
+      if bridge.has_value_std__optional_std__unordered_map_std__string__std__variant_bool__std__string__double___(self.__properties) {
+        let __unwrapped = bridge.get_std__optional_std__unordered_map_std__string__std__variant_bool__std__string__double___(self.__properties)
+        return { () -> Dictionary<String, EventPropertiesOutput> in
+          var __dictionary = Dictionary<String, EventPropertiesOutput>(minimumCapacity: __unwrapped.size())
+          let __keys = bridge.get_std__unordered_map_std__string__std__variant_bool__std__string__double___keys(__unwrapped)
+          for __key in __keys {
+            let __value = bridge.get_std__unordered_map_std__string__std__variant_bool__std__string__double___value(__unwrapped, __key)
+            __dictionary[String(__key)] = { () -> EventPropertiesOutput in
+              let __variant = bridge.std__variant_bool__std__string__double_(__value)
+              switch __variant.index() {
+                case 0:
+                  let __actual = __variant.get_0()
+                  return .first(__actual)
+                case 1:
+                  let __actual = __variant.get_1()
+                  return .second(String(__actual))
+                case 2:
+                  let __actual = __variant.get_2()
+                  return .third(__actual)
+                default:
+                  fatalError("Variant can never have index \(__variant.index())!")
+              }
+            }()
+          }
+          return __dictionary
+        }()
+      } else {
+        return nil
+      }
+    }()
   }
   
+  @inline(__always)
   var url: String? {
-    @inline(__always)
-    get {
-      return { () -> String? in
-        if bridge.has_value_std__optional_std__string_(self.__url) {
-          let __unwrapped = bridge.get_std__optional_std__string_(self.__url)
-          return String(__unwrapped)
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__url = { () -> bridge.std__optional_std__string_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__url) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__url)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
   }
   
+  @inline(__always)
   var target: String? {
-    @inline(__always)
-    get {
-      return { () -> String? in
-        if bridge.has_value_std__optional_std__string_(self.__target) {
-          let __unwrapped = bridge.get_std__optional_std__string_(self.__target)
-          return String(__unwrapped)
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__target = { () -> bridge.std__optional_std__string_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-        } else {
-          return .init()
-        }
-      }()
-    }
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__target) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__target)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
   }
 }
diff --git a/nitrogen/generated/ios/swift/Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName.swift b/nitrogen/generated/ios/swift/Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName.swift
index 11f1826d..94fdf1a6 100644
--- a/nitrogen/generated/ios/swift/Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName.swift
+++ b/nitrogen/generated/ios/swift/Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName.swift
@@ -2,7 +2,7 @@
 /// Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 
diff --git a/nitrogen/generated/shared/c++/Alignment.hpp b/nitrogen/generated/shared/c++/Alignment.hpp
index cc04d7b6..c890f438 100644
--- a/nitrogen/generated/shared/c++/Alignment.hpp
+++ b/nitrogen/generated/shared/c++/Alignment.hpp
@@ -2,7 +2,7 @@
 /// Alignment.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/ArtboardBy.hpp b/nitrogen/generated/shared/c++/ArtboardBy.hpp
index 9ee89407..f7d2c870 100644
--- a/nitrogen/generated/shared/c++/ArtboardBy.hpp
+++ b/nitrogen/generated/shared/c++/ArtboardBy.hpp
@@ -2,7 +2,7 @@
 /// ArtboardBy.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,6 +22,11 @@
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
 
 // Forward declaration of `ArtboardByTypes` to properly resolve imports.
 namespace margelo::nitro::rive { enum class ArtboardByTypes; }
@@ -35,7 +40,7 @@ namespace margelo::nitro::rive {
   /**
    * A struct which can be represented as a JavaScript object (ArtboardBy).
    */
-  struct ArtboardBy {
+  struct ArtboardBy final {
   public:
     ArtboardByTypes type     SWIFT_PRIVATE;
     std::optional<double> index     SWIFT_PRIVATE;
@@ -44,6 +49,9 @@ namespace margelo::nitro::rive {
   public:
     ArtboardBy() = default;
     explicit ArtboardBy(ArtboardByTypes type, std::optional<double> index, std::optional<std::string> name): type(type), index(index), name(name) {}
+
+  public:
+    friend bool operator==(const ArtboardBy& lhs, const ArtboardBy& rhs) = default;
   };
 
 } // namespace margelo::nitro::rive
@@ -56,16 +64,16 @@ namespace margelo::nitro {
     static inline margelo::nitro::rive::ArtboardBy fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::rive::ArtboardBy(
-        JSIConverter<margelo::nitro::rive::ArtboardByTypes>::fromJSI(runtime, obj.getProperty(runtime, "type")),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "index")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "name"))
+        JSIConverter<margelo::nitro::rive::ArtboardByTypes>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type"))),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "index"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rive::ArtboardBy& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "type", JSIConverter<margelo::nitro::rive::ArtboardByTypes>::toJSI(runtime, arg.type));
-      obj.setProperty(runtime, "index", JSIConverter<std::optional<double>>::toJSI(runtime, arg.index));
-      obj.setProperty(runtime, "name", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.name));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "type"), JSIConverter<margelo::nitro::rive::ArtboardByTypes>::toJSI(runtime, arg.type));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "index"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.index));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "name"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.name));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -76,9 +84,9 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<margelo::nitro::rive::ArtboardByTypes>::canConvert(runtime, obj.getProperty(runtime, "type"))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "index"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "name"))) return false;
+      if (!JSIConverter<margelo::nitro::rive::ArtboardByTypes>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type")))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "index")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name")))) return false;
       return true;
     }
   };
diff --git a/nitrogen/generated/shared/c++/ArtboardByTypes.hpp b/nitrogen/generated/shared/c++/ArtboardByTypes.hpp
index 9032253d..f5a4b9fc 100644
--- a/nitrogen/generated/shared/c++/ArtboardByTypes.hpp
+++ b/nitrogen/generated/shared/c++/ArtboardByTypes.hpp
@@ -2,7 +2,7 @@
 /// ArtboardByTypes.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/DataBindByName.hpp b/nitrogen/generated/shared/c++/DataBindByName.hpp
index 897b5cfe..0b28f31c 100644
--- a/nitrogen/generated/shared/c++/DataBindByName.hpp
+++ b/nitrogen/generated/shared/c++/DataBindByName.hpp
@@ -2,7 +2,7 @@
 /// DataBindByName.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,6 +22,11 @@
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
 
 
 
@@ -32,13 +37,16 @@ namespace margelo::nitro::rive {
   /**
    * A struct which can be represented as a JavaScript object (DataBindByName).
    */
-  struct DataBindByName {
+  struct DataBindByName final {
   public:
     std::string byName     SWIFT_PRIVATE;
 
   public:
     DataBindByName() = default;
     explicit DataBindByName(std::string byName): byName(byName) {}
+
+  public:
+    friend bool operator==(const DataBindByName& lhs, const DataBindByName& rhs) = default;
   };
 
 } // namespace margelo::nitro::rive
@@ -51,12 +59,12 @@ namespace margelo::nitro {
     static inline margelo::nitro::rive::DataBindByName fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::rive::DataBindByName(
-        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "byName"))
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "byName")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rive::DataBindByName& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "byName", JSIConverter<std::string>::toJSI(runtime, arg.byName));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "byName"), JSIConverter<std::string>::toJSI(runtime, arg.byName));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -67,7 +75,7 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "byName"))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "byName")))) return false;
       return true;
     }
   };
diff --git a/nitrogen/generated/shared/c++/DataBindMode.hpp b/nitrogen/generated/shared/c++/DataBindMode.hpp
index 49aee5c3..70482677 100644
--- a/nitrogen/generated/shared/c++/DataBindMode.hpp
+++ b/nitrogen/generated/shared/c++/DataBindMode.hpp
@@ -2,7 +2,7 @@
 /// DataBindMode.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/Fit.hpp b/nitrogen/generated/shared/c++/Fit.hpp
index be90501d..83b8406f 100644
--- a/nitrogen/generated/shared/c++/Fit.hpp
+++ b/nitrogen/generated/shared/c++/Fit.hpp
@@ -2,7 +2,7 @@
 /// Fit.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridBindableArtboardSpec.cpp b/nitrogen/generated/shared/c++/HybridBindableArtboardSpec.cpp
index 786b7e9b..cd45e51d 100644
--- a/nitrogen/generated/shared/c++/HybridBindableArtboardSpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridBindableArtboardSpec.cpp
@@ -2,7 +2,7 @@
 /// HybridBindableArtboardSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridBindableArtboardSpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridBindableArtboardSpec.hpp b/nitrogen/generated/shared/c++/HybridBindableArtboardSpec.hpp
index 59d5844c..17f35e29 100644
--- a/nitrogen/generated/shared/c++/HybridBindableArtboardSpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridBindableArtboardSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridBindableArtboardSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridRiveFileFactorySpec.cpp b/nitrogen/generated/shared/c++/HybridRiveFileFactorySpec.cpp
index 179acc1b..54d18fc5 100644
--- a/nitrogen/generated/shared/c++/HybridRiveFileFactorySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridRiveFileFactorySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileFactorySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveFileFactorySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridRiveFileFactorySpec.hpp b/nitrogen/generated/shared/c++/HybridRiveFileFactorySpec.hpp
index 156f36df..7814233f 100644
--- a/nitrogen/generated/shared/c++/HybridRiveFileFactorySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridRiveFileFactorySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileFactorySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridRiveFileSpec.cpp b/nitrogen/generated/shared/c++/HybridRiveFileSpec.cpp
index 9921df0e..2aae1434 100644
--- a/nitrogen/generated/shared/c++/HybridRiveFileSpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridRiveFileSpec.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveFileSpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridRiveFileSpec.hpp b/nitrogen/generated/shared/c++/HybridRiveFileSpec.hpp
index 45109b4d..30a466b1 100644
--- a/nitrogen/generated/shared/c++/HybridRiveFileSpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridRiveFileSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveFileSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridRiveImageFactorySpec.cpp b/nitrogen/generated/shared/c++/HybridRiveImageFactorySpec.cpp
index 113c97a6..3bac27ef 100644
--- a/nitrogen/generated/shared/c++/HybridRiveImageFactorySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridRiveImageFactorySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageFactorySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveImageFactorySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridRiveImageFactorySpec.hpp b/nitrogen/generated/shared/c++/HybridRiveImageFactorySpec.hpp
index 8440d726..0c1fb001 100644
--- a/nitrogen/generated/shared/c++/HybridRiveImageFactorySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridRiveImageFactorySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageFactorySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridRiveImageSpec.cpp b/nitrogen/generated/shared/c++/HybridRiveImageSpec.cpp
index 5ed87b1b..ee74e6cb 100644
--- a/nitrogen/generated/shared/c++/HybridRiveImageSpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridRiveImageSpec.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveImageSpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridRiveImageSpec.hpp b/nitrogen/generated/shared/c++/HybridRiveImageSpec.hpp
index a9e410cb..438bca3b 100644
--- a/nitrogen/generated/shared/c++/HybridRiveImageSpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridRiveImageSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveImageSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridRiveSpec.cpp b/nitrogen/generated/shared/c++/HybridRiveSpec.cpp
index ad6d24e7..9309c469 100644
--- a/nitrogen/generated/shared/c++/HybridRiveSpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridRiveSpec.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveSpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridRiveSpec.hpp b/nitrogen/generated/shared/c++/HybridRiveSpec.hpp
index 7eada081..8874aed1 100644
--- a/nitrogen/generated/shared/c++/HybridRiveSpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridRiveSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridRiveViewSpec.cpp b/nitrogen/generated/shared/c++/HybridRiveViewSpec.cpp
index 5429be76..5d1ee0fb 100644
--- a/nitrogen/generated/shared/c++/HybridRiveViewSpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridRiveViewSpec.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveViewSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveViewSpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridRiveViewSpec.hpp b/nitrogen/generated/shared/c++/HybridRiveViewSpec.hpp
index 31ff3493..1ec43b23 100644
--- a/nitrogen/generated/shared/c++/HybridRiveViewSpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridRiveViewSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveViewSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelArtboardPropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelArtboardPropertySpec.cpp
index 64127473..b26215ff 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelArtboardPropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelArtboardPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelArtboardPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelArtboardPropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelArtboardPropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelArtboardPropertySpec.hpp
index 532928d8..903dd206 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelArtboardPropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelArtboardPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelArtboardPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelBooleanPropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelBooleanPropertySpec.cpp
index 4066f1c2..5fb595e7 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelBooleanPropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelBooleanPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelBooleanPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelBooleanPropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelBooleanPropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelBooleanPropertySpec.hpp
index 0e11b5f9..cfb3500c 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelBooleanPropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelBooleanPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelBooleanPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelColorPropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelColorPropertySpec.cpp
index 7d77a712..60dbaaa8 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelColorPropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelColorPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelColorPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelColorPropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelColorPropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelColorPropertySpec.hpp
index 0945725d..4d4bb65f 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelColorPropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelColorPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelColorPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelEnumPropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelEnumPropertySpec.cpp
index 7731089c..ee1e984c 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelEnumPropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelEnumPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelEnumPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelEnumPropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelEnumPropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelEnumPropertySpec.hpp
index 0a526d93..56fd3969 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelEnumPropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelEnumPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelEnumPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelImagePropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelImagePropertySpec.cpp
index 2e14160c..4dab25f3 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelImagePropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelImagePropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelImagePropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelImagePropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelImagePropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelImagePropertySpec.hpp
index 46e70aa1..180cecdd 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelImagePropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelImagePropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelImagePropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelInstanceSpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelInstanceSpec.cpp
index 5f69efa2..abd989ef 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelInstanceSpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelInstanceSpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelInstanceSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelInstanceSpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelInstanceSpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelInstanceSpec.hpp
index e14e95d6..4b24d2ac 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelInstanceSpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelInstanceSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelInstanceSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelListPropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelListPropertySpec.cpp
index 1a2b5c69..ca384a8e 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelListPropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelListPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelListPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelListPropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelListPropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelListPropertySpec.hpp
index 78b222a6..d88e1fa4 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelListPropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelListPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelListPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelNumberPropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelNumberPropertySpec.cpp
index 4bdcda41..936a0fe9 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelNumberPropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelNumberPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelNumberPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelNumberPropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelNumberPropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelNumberPropertySpec.hpp
index 3f94a706..cb2d93b1 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelNumberPropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelNumberPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelNumberPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelPropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelPropertySpec.cpp
index dfe1e094..61f1cb8a 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelPropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelPropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelPropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelPropertySpec.hpp
index 1656048c..ba527d1e 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelPropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelSpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelSpec.cpp
index 7bac3d91..228daf38 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelSpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelSpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelSpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelSpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelSpec.hpp
index 887173b9..5ac8d4c2 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelSpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelSpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelStringPropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelStringPropertySpec.cpp
index 17d118c9..dee90bad 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelStringPropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelStringPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelStringPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelStringPropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelStringPropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelStringPropertySpec.hpp
index 769e74bc..3349551a 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelStringPropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelStringPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelStringPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/HybridViewModelTriggerPropertySpec.cpp b/nitrogen/generated/shared/c++/HybridViewModelTriggerPropertySpec.cpp
index 7bc54ceb..daf70624 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelTriggerPropertySpec.cpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelTriggerPropertySpec.cpp
@@ -2,7 +2,7 @@
 /// HybridViewModelTriggerPropertySpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridViewModelTriggerPropertySpec.hpp"
diff --git a/nitrogen/generated/shared/c++/HybridViewModelTriggerPropertySpec.hpp b/nitrogen/generated/shared/c++/HybridViewModelTriggerPropertySpec.hpp
index d3634c18..644c3808 100644
--- a/nitrogen/generated/shared/c++/HybridViewModelTriggerPropertySpec.hpp
+++ b/nitrogen/generated/shared/c++/HybridViewModelTriggerPropertySpec.hpp
@@ -2,7 +2,7 @@
 /// HybridViewModelTriggerPropertySpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/ReferencedAssetsType.hpp b/nitrogen/generated/shared/c++/ReferencedAssetsType.hpp
index d9d51e83..71ea53ef 100644
--- a/nitrogen/generated/shared/c++/ReferencedAssetsType.hpp
+++ b/nitrogen/generated/shared/c++/ReferencedAssetsType.hpp
@@ -2,7 +2,7 @@
 /// ReferencedAssetsType.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,6 +22,11 @@
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
 
 // Forward declaration of `ResolvedReferencedAsset` to properly resolve imports.
 namespace margelo::nitro::rive { struct ResolvedReferencedAsset; }
@@ -36,13 +41,16 @@ namespace margelo::nitro::rive {
   /**
    * A struct which can be represented as a JavaScript object (ReferencedAssetsType).
    */
-  struct ReferencedAssetsType {
+  struct ReferencedAssetsType final {
   public:
     std::optional<std::unordered_map<std::string, ResolvedReferencedAsset>> data     SWIFT_PRIVATE;
 
   public:
     ReferencedAssetsType() = default;
     explicit ReferencedAssetsType(std::optional<std::unordered_map<std::string, ResolvedReferencedAsset>> data): data(data) {}
+
+  public:
+    friend bool operator==(const ReferencedAssetsType& lhs, const ReferencedAssetsType& rhs) = default;
   };
 
 } // namespace margelo::nitro::rive
@@ -55,12 +63,12 @@ namespace margelo::nitro {
     static inline margelo::nitro::rive::ReferencedAssetsType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::rive::ReferencedAssetsType(
-        JSIConverter<std::optional<std::unordered_map<std::string, margelo::nitro::rive::ResolvedReferencedAsset>>>::fromJSI(runtime, obj.getProperty(runtime, "data"))
+        JSIConverter<std::optional<std::unordered_map<std::string, margelo::nitro::rive::ResolvedReferencedAsset>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "data")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rive::ReferencedAssetsType& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "data", JSIConverter<std::optional<std::unordered_map<std::string, margelo::nitro::rive::ResolvedReferencedAsset>>>::toJSI(runtime, arg.data));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "data"), JSIConverter<std::optional<std::unordered_map<std::string, margelo::nitro::rive::ResolvedReferencedAsset>>>::toJSI(runtime, arg.data));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -71,7 +79,7 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::optional<std::unordered_map<std::string, margelo::nitro::rive::ResolvedReferencedAsset>>>::canConvert(runtime, obj.getProperty(runtime, "data"))) return false;
+      if (!JSIConverter<std::optional<std::unordered_map<std::string, margelo::nitro::rive::ResolvedReferencedAsset>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "data")))) return false;
       return true;
     }
   };
diff --git a/nitrogen/generated/shared/c++/ResolvedReferencedAsset.hpp b/nitrogen/generated/shared/c++/ResolvedReferencedAsset.hpp
index 273ed49f..45606b63 100644
--- a/nitrogen/generated/shared/c++/ResolvedReferencedAsset.hpp
+++ b/nitrogen/generated/shared/c++/ResolvedReferencedAsset.hpp
@@ -2,7 +2,7 @@
 /// ResolvedReferencedAsset.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,6 +22,11 @@
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
 
 // Forward declaration of `HybridRiveImageSpec` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridRiveImageSpec; }
@@ -36,7 +41,7 @@ namespace margelo::nitro::rive {
   /**
    * A struct which can be represented as a JavaScript object (ResolvedReferencedAsset).
    */
-  struct ResolvedReferencedAsset {
+  struct ResolvedReferencedAsset final {
   public:
     std::optional<std::string> sourceUrl     SWIFT_PRIVATE;
     std::optional<std::string> sourceAsset     SWIFT_PRIVATE;
@@ -47,6 +52,9 @@ namespace margelo::nitro::rive {
   public:
     ResolvedReferencedAsset() = default;
     explicit ResolvedReferencedAsset(std::optional<std::string> sourceUrl, std::optional<std::string> sourceAsset, std::optional<std::string> sourceAssetId, std::optional<std::string> path, std::optional<std::shared_ptr<HybridRiveImageSpec>> image): sourceUrl(sourceUrl), sourceAsset(sourceAsset), sourceAssetId(sourceAssetId), path(path), image(image) {}
+
+  public:
+    friend bool operator==(const ResolvedReferencedAsset& lhs, const ResolvedReferencedAsset& rhs) = default;
   };
 
 } // namespace margelo::nitro::rive
@@ -59,20 +67,20 @@ namespace margelo::nitro {
     static inline margelo::nitro::rive::ResolvedReferencedAsset fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::rive::ResolvedReferencedAsset(
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "sourceUrl")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "sourceAsset")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "sourceAssetId")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "path")),
-        JSIConverter<std::optional<std::shared_ptr<margelo::nitro::rive::HybridRiveImageSpec>>>::fromJSI(runtime, obj.getProperty(runtime, "image"))
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "sourceUrl"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "sourceAsset"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "sourceAssetId"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "path"))),
+        JSIConverter<std::optional<std::shared_ptr<margelo::nitro::rive::HybridRiveImageSpec>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "image")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rive::ResolvedReferencedAsset& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "sourceUrl", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.sourceUrl));
-      obj.setProperty(runtime, "sourceAsset", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.sourceAsset));
-      obj.setProperty(runtime, "sourceAssetId", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.sourceAssetId));
-      obj.setProperty(runtime, "path", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.path));
-      obj.setProperty(runtime, "image", JSIConverter<std::optional<std::shared_ptr<margelo::nitro::rive::HybridRiveImageSpec>>>::toJSI(runtime, arg.image));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "sourceUrl"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.sourceUrl));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "sourceAsset"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.sourceAsset));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "sourceAssetId"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.sourceAssetId));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "path"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.path));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "image"), JSIConverter<std::optional<std::shared_ptr<margelo::nitro::rive::HybridRiveImageSpec>>>::toJSI(runtime, arg.image));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -83,11 +91,11 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "sourceUrl"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "sourceAsset"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "sourceAssetId"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "path"))) return false;
-      if (!JSIConverter<std::optional<std::shared_ptr<margelo::nitro::rive::HybridRiveImageSpec>>>::canConvert(runtime, obj.getProperty(runtime, "image"))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "sourceUrl")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "sourceAsset")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "sourceAssetId")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "path")))) return false;
+      if (!JSIConverter<std::optional<std::shared_ptr<margelo::nitro::rive::HybridRiveImageSpec>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "image")))) return false;
       return true;
     }
   };
diff --git a/nitrogen/generated/shared/c++/RiveError.hpp b/nitrogen/generated/shared/c++/RiveError.hpp
index 2cfb90c5..759e7a4b 100644
--- a/nitrogen/generated/shared/c++/RiveError.hpp
+++ b/nitrogen/generated/shared/c++/RiveError.hpp
@@ -2,7 +2,7 @@
 /// RiveError.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,6 +22,11 @@
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
 
 // Forward declaration of `RiveErrorType` to properly resolve imports.
 namespace margelo::nitro::rive { enum class RiveErrorType; }
@@ -34,7 +39,7 @@ namespace margelo::nitro::rive {
   /**
    * A struct which can be represented as a JavaScript object (RiveError).
    */
-  struct RiveError {
+  struct RiveError final {
   public:
     std::string message     SWIFT_PRIVATE;
     RiveErrorType type     SWIFT_PRIVATE;
@@ -42,6 +47,9 @@ namespace margelo::nitro::rive {
   public:
     RiveError() = default;
     explicit RiveError(std::string message, RiveErrorType type): message(message), type(type) {}
+
+  public:
+    friend bool operator==(const RiveError& lhs, const RiveError& rhs) = default;
   };
 
 } // namespace margelo::nitro::rive
@@ -54,14 +62,14 @@ namespace margelo::nitro {
     static inline margelo::nitro::rive::RiveError fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::rive::RiveError(
-        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "message")),
-        JSIConverter<margelo::nitro::rive::RiveErrorType>::fromJSI(runtime, obj.getProperty(runtime, "type"))
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "message"))),
+        JSIConverter<margelo::nitro::rive::RiveErrorType>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rive::RiveError& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "message", JSIConverter<std::string>::toJSI(runtime, arg.message));
-      obj.setProperty(runtime, "type", JSIConverter<margelo::nitro::rive::RiveErrorType>::toJSI(runtime, arg.type));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "message"), JSIConverter<std::string>::toJSI(runtime, arg.message));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "type"), JSIConverter<margelo::nitro::rive::RiveErrorType>::toJSI(runtime, arg.type));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -72,8 +80,8 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "message"))) return false;
-      if (!JSIConverter<margelo::nitro::rive::RiveErrorType>::canConvert(runtime, obj.getProperty(runtime, "type"))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "message")))) return false;
+      if (!JSIConverter<margelo::nitro::rive::RiveErrorType>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type")))) return false;
       return true;
     }
   };
diff --git a/nitrogen/generated/shared/c++/RiveErrorType.hpp b/nitrogen/generated/shared/c++/RiveErrorType.hpp
index 4d56fbcc..253b9141 100644
--- a/nitrogen/generated/shared/c++/RiveErrorType.hpp
+++ b/nitrogen/generated/shared/c++/RiveErrorType.hpp
@@ -2,7 +2,7 @@
 /// RiveErrorType.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/RiveEventType.hpp b/nitrogen/generated/shared/c++/RiveEventType.hpp
index 05669f51..07c74fd9 100644
--- a/nitrogen/generated/shared/c++/RiveEventType.hpp
+++ b/nitrogen/generated/shared/c++/RiveEventType.hpp
@@ -2,7 +2,7 @@
 /// RiveEventType.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/nitrogen/generated/shared/c++/UnifiedRiveEvent.hpp b/nitrogen/generated/shared/c++/UnifiedRiveEvent.hpp
index 4331baf1..ded81452 100644
--- a/nitrogen/generated/shared/c++/UnifiedRiveEvent.hpp
+++ b/nitrogen/generated/shared/c++/UnifiedRiveEvent.hpp
@@ -2,7 +2,7 @@
 /// UnifiedRiveEvent.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,6 +22,11 @@
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
 
 // Forward declaration of `RiveEventType` to properly resolve imports.
 namespace margelo::nitro::rive { enum class RiveEventType; }
@@ -37,7 +42,7 @@ namespace margelo::nitro::rive {
   /**
    * A struct which can be represented as a JavaScript object (UnifiedRiveEvent).
    */
-  struct UnifiedRiveEvent {
+  struct UnifiedRiveEvent final {
   public:
     std::string name     SWIFT_PRIVATE;
     RiveEventType type     SWIFT_PRIVATE;
@@ -49,6 +54,9 @@ namespace margelo::nitro::rive {
   public:
     UnifiedRiveEvent() = default;
     explicit UnifiedRiveEvent(std::string name, RiveEventType type, std::optional<double> delay, std::optional<std::unordered_map<std::string, std::variant<bool, std::string, double>>> properties, std::optional<std::string> url, std::optional<std::string> target): name(name), type(type), delay(delay), properties(properties), url(url), target(target) {}
+
+  public:
+    friend bool operator==(const UnifiedRiveEvent& lhs, const UnifiedRiveEvent& rhs) = default;
   };
 
 } // namespace margelo::nitro::rive
@@ -61,22 +69,22 @@ namespace margelo::nitro {
     static inline margelo::nitro::rive::UnifiedRiveEvent fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::rive::UnifiedRiveEvent(
-        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "name")),
-        JSIConverter<margelo::nitro::rive::RiveEventType>::fromJSI(runtime, obj.getProperty(runtime, "type")),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "delay")),
-        JSIConverter<std::optional<std::unordered_map<std::string, std::variant<bool, std::string, double>>>>::fromJSI(runtime, obj.getProperty(runtime, "properties")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "url")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "target"))
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name"))),
+        JSIConverter<margelo::nitro::rive::RiveEventType>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type"))),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "delay"))),
+        JSIConverter<std::optional<std::unordered_map<std::string, std::variant<bool, std::string, double>>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "properties"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "url"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "target")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rive::UnifiedRiveEvent& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "name", JSIConverter<std::string>::toJSI(runtime, arg.name));
-      obj.setProperty(runtime, "type", JSIConverter<margelo::nitro::rive::RiveEventType>::toJSI(runtime, arg.type));
-      obj.setProperty(runtime, "delay", JSIConverter<std::optional<double>>::toJSI(runtime, arg.delay));
-      obj.setProperty(runtime, "properties", JSIConverter<std::optional<std::unordered_map<std::string, std::variant<bool, std::string, double>>>>::toJSI(runtime, arg.properties));
-      obj.setProperty(runtime, "url", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.url));
-      obj.setProperty(runtime, "target", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.target));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "name"), JSIConverter<std::string>::toJSI(runtime, arg.name));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "type"), JSIConverter<margelo::nitro::rive::RiveEventType>::toJSI(runtime, arg.type));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "delay"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.delay));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "properties"), JSIConverter<std::optional<std::unordered_map<std::string, std::variant<bool, std::string, double>>>>::toJSI(runtime, arg.properties));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "url"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.url));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "target"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.target));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -87,12 +95,12 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "name"))) return false;
-      if (!JSIConverter<margelo::nitro::rive::RiveEventType>::canConvert(runtime, obj.getProperty(runtime, "type"))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "delay"))) return false;
-      if (!JSIConverter<std::optional<std::unordered_map<std::string, std::variant<bool, std::string, double>>>>::canConvert(runtime, obj.getProperty(runtime, "properties"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "url"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "target"))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name")))) return false;
+      if (!JSIConverter<margelo::nitro::rive::RiveEventType>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type")))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "delay")))) return false;
+      if (!JSIConverter<std::optional<std::unordered_map<std::string, std::variant<bool, std::string, double>>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "properties")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "url")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "target")))) return false;
       return true;
     }
   };
diff --git a/nitrogen/generated/shared/c++/views/HybridRiveViewComponent.cpp b/nitrogen/generated/shared/c++/views/HybridRiveViewComponent.cpp
index e4d39fc8..cec52808 100644
--- a/nitrogen/generated/shared/c++/views/HybridRiveViewComponent.cpp
+++ b/nitrogen/generated/shared/c++/views/HybridRiveViewComponent.cpp
@@ -2,7 +2,7 @@
 /// HybridRiveViewComponent.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridRiveViewComponent.hpp"
@@ -12,6 +12,7 @@
 #include <utility>
 #include <NitroModules/NitroDefines.hpp>
 #include <NitroModules/JSIConverter.hpp>
+#include <NitroModules/PropNameIDCache.hpp>
 #include <react/renderer/core/RawValue.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ComponentDescriptor.h>
@@ -110,7 +111,7 @@ namespace margelo::nitro::rive::views {
         const react::RawValue* rawValue = rawProps.at("onError", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onError;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::function<void(const RiveError& /* error */)>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onError);
+        return CachedProp<std::function<void(const RiveError& /* error */)>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.onError);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RiveView.onError: ") + exc.what());
       }
@@ -120,7 +121,7 @@ namespace margelo::nitro::rive::views {
         const react::RawValue* rawValue = rawProps.at("hybridRef", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.hybridRef;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridRiveViewSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.hybridRef);
+        return CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridRiveViewSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.hybridRef);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RiveView.hybridRef: ") + exc.what());
       }
diff --git a/nitrogen/generated/shared/c++/views/HybridRiveViewComponent.hpp b/nitrogen/generated/shared/c++/views/HybridRiveViewComponent.hpp
index 911eef8d..d523b563 100644
--- a/nitrogen/generated/shared/c++/views/HybridRiveViewComponent.hpp
+++ b/nitrogen/generated/shared/c++/views/HybridRiveViewComponent.hpp
@@ -2,7 +2,7 @@
 /// HybridRiveViewComponent.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
diff --git a/package.json b/package.json
index 36fa7869..bd7a813a 100644
--- a/package.json
+++ b/package.json
@@ -91,12 +91,12 @@
     "eslint-plugin-jest": "^29.1.0",
     "eslint-plugin-prettier": "^5.2.3",
     "jest": "^29.7.0",
-    "nitrogen": "0.31.10",
+    "nitrogen": "0.33.2",
     "prettier": "^3.0.3",
     "react": "19.0.0",
     "react-native": "0.79.2",
     "react-native-builder-bob": "^0.40.10",
-    "react-native-nitro-modules": "0.31.10",
+    "react-native-nitro-modules": "0.33.2",
     "react-test-renderer": "19.0.0",
     "release-it": "^17.10.0",
     "turbo": "^1.10.7",
@@ -105,7 +105,7 @@
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
-    "react-native-nitro-modules": ">=0.31.8"
+    "react-native-nitro-modules": ">=0.33.2"
   },
   "workspaces": [
     "example",
diff --git a/yarn.lock b/yarn.lock
index 88a85896..8592988a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4468,12 +4468,12 @@ __metadata:
     eslint-plugin-jest: ^29.1.0
     eslint-plugin-prettier: ^5.2.3
     jest: ^29.7.0
-    nitrogen: 0.31.10
+    nitrogen: 0.33.2
     prettier: ^3.0.3
     react: 19.0.0
     react-native: 0.79.2
     react-native-builder-bob: ^0.40.10
-    react-native-nitro-modules: 0.31.10
+    react-native-nitro-modules: 0.33.2
     react-test-renderer: 19.0.0
     release-it: ^17.10.0
     turbo: ^1.10.7
@@ -4481,7 +4481,7 @@ __metadata:
   peerDependencies:
     react: "*"
     react-native: "*"
-    react-native-nitro-modules: ">=0.31.8"
+    react-native-nitro-modules: ">=0.33.2"
   languageName: unknown
   linkType: soft
 
@@ -8633,7 +8633,7 @@ __metadata:
     react-dom: 19.1.0
     react-native: 0.81.5
     react-native-gesture-handler: 2.29.1
-    react-native-nitro-modules: 0.31.10
+    react-native-nitro-modules: 0.33.2
     react-native-reanimated: 4.1.5
     react-native-safe-area-context: ~5.6.0
     react-native-screens: ~4.16.0
@@ -13086,18 +13086,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nitrogen@npm:0.31.10":
-  version: 0.31.10
-  resolution: "nitrogen@npm:0.31.10"
+"nitrogen@npm:0.33.2":
+  version: 0.33.2
+  resolution: "nitrogen@npm:0.33.2"
   dependencies:
     chalk: ^5.3.0
-    react-native-nitro-modules: ^0.31.10
+    react-native-nitro-modules: ^0.33.2
     ts-morph: ^27.0.0
     yargs: ^18.0.0
     zod: ^4.0.5
   bin:
     nitrogen: lib/index.js
-  checksum: 6bba165b334172d6ea060affefc14aded38294cd9ef23f58a3aff9fc89f41d7b62e6ae9897bec5d8ce181bb9656d387c67f2649b91ad133041db0aa04826ff71
+  checksum: bf0572f1550e626971453396e6d50ceb182bcea12f741034aaa653bb0d7ffb8a3cd689d354dc370cf91ecdb8f8a600ef3c3211651268a2ecb301523d63455291
   languageName: node
   linkType: hard
 
@@ -14418,13 +14418,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-nitro-modules@npm:0.31.10, react-native-nitro-modules@npm:^0.31.10":
-  version: 0.31.10
-  resolution: "react-native-nitro-modules@npm:0.31.10"
+"react-native-nitro-modules@npm:0.33.2, react-native-nitro-modules@npm:^0.33.2":
+  version: 0.33.2
+  resolution: "react-native-nitro-modules@npm:0.33.2"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 1c8d2f12ff29b6733c784c5fd0dedcbec4ceec9f82eb49f49e7734f31b9367346938010dcacf69bf695a352e36fec5aa23fd57b8091f6acd78c3d9a61e14ea7f
+  checksum: 2c1f4d4d40172a3d756e71d7ecf61d754ed79a4fde102e24b953df980282096fb3a1e04381f9aaefa8c62dfc89b29f098cc22747786c3feddc0087721961b3dd
   languageName: node
   linkType: hard
 
@@ -14471,7 +14471,7 @@ __metadata:
     react-native-builder-bob: ^0.40.10
     react-native-gesture-handler: 2.29.1
     react-native-harness: ^1.0.0-alpha.20
-    react-native-nitro-modules: 0.31.10
+    react-native-nitro-modules: 0.33.2
     react-native-reanimated: 4.1.5
     react-native-safe-area-context: ^5.4.0
     react-native-worklets: 0.6.1