diff --git a/Source/Engine/Scripting/ScriptingObject.cpp b/Source/Engine/Scripting/ScriptingObject.cpp
index e00694ee4..7766e0492 100644
--- a/Source/Engine/Scripting/ScriptingObject.cpp
+++ b/Source/Engine/Scripting/ScriptingObject.cpp
@@ -517,7 +517,7 @@ public:
             obj->RegisterObject();
     }
 
-    static void Destroy(ManagedScriptingObject* obj, float timeLeft)
+    static void Destroy(ScriptingObject* obj, float timeLeft)
     {
         // Use scaled game time for removing actors/scripts by the user (maybe expose it to the api?)
         const bool useGameTime = timeLeft > ZeroTolerance;
@@ -526,7 +526,7 @@ public:
             obj->DeleteObject(timeLeft, useGameTime);
     }
 
-    static MonoString* GetTypeName(ManagedScriptingObject* obj)
+    static MonoString* GetTypeName(ScriptingObject* obj)
     {
         INTERNAL_CALL_CHECK_RETURN(obj, nullptr);
         return MUtils::ToString(obj->GetType().Fullname);
@@ -569,7 +569,7 @@ public:
         return obj ? obj->GetOrCreateManagedInstance() : nullptr;
     }
 
-    static void ChangeID(ManagedScriptingObject* obj, Guid* id)
+    static void ChangeID(ScriptingObject* obj, Guid* id)
     {
         INTERNAL_CALL_CHECK(obj);
         obj->ChangeID(*id);
@@ -586,7 +586,11 @@ public:
         ADD_INTERNAL_CALL("FlaxEngine.Object::Internal_FindObject", &FindObject);
         ADD_INTERNAL_CALL("FlaxEngine.Object::Internal_TryFindObject", &TryFindObject);
         ADD_INTERNAL_CALL("FlaxEngine.Object::Internal_ChangeID", &ChangeID);
+
+    static ScriptingObject* Spawn(const ScriptingObjectSpawnParams& params)
+    {
+        return New<PersistentScriptingObject>(params);
     }
 };
 
-IMPLEMENT_SCRIPTING_TYPE_NO_SPAWN(ScriptingObject, FlaxEngine, "FlaxEngine.Object", nullptr, nullptr);
+ScriptingTypeInitializer ScriptingObject::TypeInitializer(GetBinaryModuleFlaxEngine(), StringAnsiView("FlaxEngine.Object", ARRAY_COUNT("FlaxEngine.Object") - 1), sizeof(ScriptingObject), &ScriptingObjectInternal::InitRuntime, &ScriptingObjectInternal::Spawn);
diff --git a/Source/Engine/Scripting/ScriptingObjectReference.h b/Source/Engine/Scripting/ScriptingObjectReference.h
index fd132d308..937e92ce1 100644
--- a/Source/Engine/Scripting/ScriptingObjectReference.h
+++ b/Source/Engine/Scripting/ScriptingObjectReference.h
@@ -10,6 +10,7 @@ extern FLAXENGINE_API ScriptingObject* FindObject(const Guid& id, MClass* type);
 /// <summary>
 /// The scripting object reference.
 /// </summary>
+/// <typeparam name="T">The type of the scripting object.</typeparam>
 class FLAXENGINE_API ScriptingObjectReferenceBase
 {
 public:
@@ -59,7 +60,6 @@ public:
     /// <summary>
     /// Gets the object ID.
     /// </summary>
-    /// <returns>The object ID or Guid::Empty if nothing assigned.</returns>
     FORCE_INLINE Guid GetID() const
     {
         return _object ? _object->GetID() : Guid::Empty;
@@ -68,7 +68,6 @@ public:
     /// <summary>
     /// Gets managed instance object (or null if no object linked).
     /// </summary>
-    /// <returns>The managed object instance.</returns>
     FORCE_INLINE MonoObject* GetManagedInstance() const
     {
         return _object ? _object->GetOrCreateManagedInstance() : nullptr;
@@ -77,7 +76,6 @@ public:
     /// <summary>
     /// Determines whether object is assigned and managed instance of the object is alive.
     /// </summary>
-    /// <returns>True if managed object has been created and exists, otherwise false.</returns>
     FORCE_INLINE bool HasManagedInstance() const
     {
         return _object && _object->HasManagedInstance();
@@ -86,7 +84,6 @@ public:
     /// <summary>
     /// Gets the managed instance object or creates it if missing or null if not assigned.
     /// </summary>
-    /// <returns>The Mono managed object.</returns>
     FORCE_INLINE MonoObject* GetOrCreateManagedInstance() const
     {
         return _object ? _object->GetOrCreateManagedInstance() : nullptr;
@@ -167,95 +164,42 @@ public:
 
 public:
 
-    /// <summary>
-    /// Compares the property value with the given object.
-    /// </summary>
-    /// <param name="other">The other.</param>
-    /// <returns>True if property object equals the given value.</returns>
     FORCE_INLINE bool operator==(T* other)
     {
         return _object == other;
     }
-
-    /// <summary>
-    /// Compares the property value with the other property value.
-    /// </summary>
-    /// <param name="other">The other property.</param>
-    /// <returns>True if properties are equal.</returns>
-    FORCE_INLINE bool operator==(const ScriptingObjectReference& other)
-    {
-        return _object == other._object;
-    }
-
-    /// <summary>
-    /// Compares the property value with the given object.
-    /// </summary>
-    /// <param name="other">The other.</param>
-    /// <returns>True if property object not equals the given value.</returns>
     FORCE_INLINE bool operator!=(T* other)
     {
         return _object != other;
     }
-
-    /// <summary>
-    /// Compares the property value with the other property value.
-    /// </summary>
-    /// <param name="other">The other property.</param>
-    /// <returns>True if properties are not equal.</returns>
+    FORCE_INLINE bool operator==(const ScriptingObjectReference& other)
+    {
+        return _object == other._object;
+    }
     FORCE_INLINE bool operator!=(const ScriptingObjectReference& other)
     {
         return _object != other._object;
     }
 
-    /// <summary>
-    /// Sets the property to the given property value.
-    /// </summary>
-    /// <param name="other">The other property.</param>
-    /// <returns>The reference to this property.</returns>
-    ScriptingObjectReference& operator=(const ScriptingObjectReference& other)
-    {
-        if (this != &other)
-            OnSet(other.Get());
-        return *this;
-    }
-
-    /// <summary>
-    /// Sets the property to the given value.
-    /// </summary>
-    /// <param name="other">The object.</param>
-    /// <returns>The reference to this property.</returns>
-    FORCE_INLINE ScriptingObjectReference& operator=(const T& other)
-    {
-        OnSet(&other);
-        return *this;
-    }
-
-    /// <summary>
-    /// Sets the property to the given value.
-    /// </summary>
-    /// <param name="other">The object.</param>
-    /// <returns>The reference to this property.</returns>
     FORCE_INLINE ScriptingObjectReference& operator=(T* other)
     {
         OnSet(other);
         return *this;
     }
-
-    /// <summary>
-    /// Sets the property to the object of the given ID.
-    /// </summary>
-    /// <param name="id">The object ID.</param>
-    /// <returns>The reference to this property.</returns>
+    ScriptingObjectReference& operator=(const ScriptingObjectReference& other)
+    {
+        OnSet(other.Get());
+        return *this;
+    }
     FORCE_INLINE ScriptingObjectReference& operator=(const Guid& id)
     {
-        Set(id);
+        OnSet(static_cast<T*>(FindObject(id, T::GetStaticClass())));
         return *this;
     }
 
     /// <summary>
     /// Implicit conversion to the object.
     /// </summary>
-    /// <returns>The object reference.</returns>
     FORCE_INLINE operator T*() const
     {
         return (T*)_object;
@@ -264,7 +208,6 @@ public:
     /// <summary>
     /// Implicit conversion to boolean value.
     /// </summary>
-    /// <returns>True if object has been assigned, otherwise false</returns>
     FORCE_INLINE operator bool() const
     {
         return _object != nullptr;
@@ -273,7 +216,6 @@ public:
     /// <summary>
     /// Object accessor.
     /// </summary>
-    /// <returns>The object reference.</returns>
     FORCE_INLINE T* operator->() const
     {
         return (T*)_object;
@@ -282,7 +224,6 @@ public:
     /// <summary>
     /// Gets the object pointer.
     /// </summary>
-    /// <returns>The object reference.</returns>
     FORCE_INLINE T* Get() const
     {
         return (T*)_object;
@@ -291,32 +232,11 @@ public:
     /// <summary>
     /// Gets the object as a given type (static cast).
     /// </summary>
-    /// <returns>Asset</returns>
     template<typename U>
     FORCE_INLINE U* As() const
     {
         return static_cast<U*>(_object);
     }
-
-public:
-
-    /// <summary>
-    /// Sets the object.
-    /// </summary>
-    /// <param name="id">The object ID. Uses Scripting to find the registered object of the given ID.</param>
-    FORCE_INLINE void Set(const Guid& id)
-    {
-        Set(static_cast<T*>(FindObject(id, T::GetStaticClass())));
-    }
-
-    /// <summary>
-    /// Sets the object.
-    /// </summary>
-    /// <param name="object">The object.</param>
-    FORCE_INLINE void Set(T* object)
-    {
-        OnSet(object);
-    }
 };
 
 template<typename T>