diff --git a/engine/includes/editor/asseteditor.h b/engine/includes/editor/asseteditor.h
index c409380fd..3994aa253 100644
--- a/engine/includes/editor/asseteditor.h
+++ b/engine/includes/editor/asseteditor.h
@@ -53,10 +53,10 @@ class ENGINE_EXPORT AssetEditor : public QWidget {
     void objectsHierarchyChanged(Object *root);
 
     void itemsSelected(std::list<QObject *> items);
-    void objectsSelected(std::list<Object *> objects);
+    void objectsSelected(Object::ObjectList objects);
 
     void itemsChanged(const std::list<QObject *> &objects, QString property, const QVariant &value);
-    void objectsChanged(const std::list<Object *> &objects, QString property, const Variant &value);
+    void objectsChanged(const Object::ObjectList &objects, QString property, const Variant &value);
 
     void copyPasteChanged();
 
@@ -76,15 +76,15 @@ public slots:
     virtual void onUpdated();
 
     virtual void onObjectCreate(QString type);
-    virtual void onObjectsSelected(std::list<Object *> objects, bool force);
-    virtual void onObjectsDeleted(std::list<Object *> objects);
+    virtual void onObjectsSelected(Object::ObjectList objects, bool force);
+    virtual void onObjectsDeleted(Object::ObjectList objects);
 
     virtual void onDrop(QDropEvent *event);
     virtual void onDragEnter(QDragEnterEvent *event);
     virtual void onDragMove(QDragMoveEvent *event);
     virtual void onDragLeave(QDragLeaveEvent *event);
 
-    virtual void onObjectsChanged(const std::list<Object *> &objects, QString property, const Variant &value);
+    virtual void onObjectsChanged(const Object::ObjectList &objects, QString property, const Variant &value);
 
 protected:
     virtual void setModified(bool flag);
diff --git a/engine/includes/editor/editorgadget.h b/engine/includes/editor/editorgadget.h
index e6d3e5217..25bba010a 100644
--- a/engine/includes/editor/editorgadget.h
+++ b/engine/includes/editor/editorgadget.h
@@ -18,16 +18,16 @@ class ENGINE_EXPORT EditorGadget : public QWidget {
 signals:
     void updated();
 
-    void objectsSelected(std::list<Object *> objects, bool force);
-    void objectsChanged(std::list<Object *> objects, const QString property);
+    void objectsSelected(Object::ObjectList objects, bool force);
+    void objectsChanged(Object::ObjectList objects, const QString property);
 
 public slots:
     virtual void onUpdated() = 0;
 
     virtual void onItemsSelected(std::list<QObject *> items) = 0;
 
-    virtual void onObjectsSelected(std::list<Object *> objects) = 0;
-    virtual void onObjectsChanged(std::list<Object *> objects, const QString property, Variant value) = 0;
+    virtual void onObjectsSelected(Object::ObjectList objects) = 0;
+    virtual void onObjectsChanged(Object::ObjectList objects, const QString property, Variant value) = 0;
 
 };
 
diff --git a/engine/includes/editor/viewport/cameracontroller.h b/engine/includes/editor/viewport/cameracontroller.h
index 282990631..8c66cad43 100644
--- a/engine/includes/editor/viewport/cameracontroller.h
+++ b/engine/includes/editor/viewport/cameracontroller.h
@@ -36,7 +36,7 @@ class ENGINE_EXPORT CameraController : public QObject {
 
     virtual void resize(int32_t width, int32_t height);
 
-    virtual std::list<Object *> selected();
+    virtual Object::ObjectList selected();
     virtual void select(Object &object);
 
     virtual void update();
diff --git a/engine/src/editor/asseteditor.cpp b/engine/src/editor/asseteditor.cpp
index f7104a6ec..5cc0f07e4 100644
--- a/engine/src/editor/asseteditor.cpp
+++ b/engine/src/editor/asseteditor.cpp
@@ -152,12 +152,12 @@ void AssetEditor::onObjectCreate(QString type) {
     A_UNUSED(type);
 }
 
-void AssetEditor::onObjectsSelected(std::list<Object *> objects, bool force) {
+void AssetEditor::onObjectsSelected(Object::ObjectList objects, bool force) {
     A_UNUSED(objects);
     A_UNUSED(force);
 }
 
-void AssetEditor::onObjectsDeleted(std::list<Object *> objects) {
+void AssetEditor::onObjectsDeleted(Object::ObjectList objects) {
     A_UNUSED(objects);
 }
 
@@ -178,7 +178,7 @@ void AssetEditor::onDragLeave(QDragLeaveEvent *event) {
     A_UNUSED(event);
 }
 
-void AssetEditor::onObjectsChanged(const std::list<Object *> &objects, QString property, const Variant &value) {
+void AssetEditor::onObjectsChanged(const Object::ObjectList &objects, QString property, const Variant &value) {
     A_UNUSED(objects);
     A_UNUSED(property);
     A_UNUSED(value);
diff --git a/engine/src/editor/viewport/cameracontroller.cpp b/engine/src/editor/viewport/cameracontroller.cpp
index 679e2dbc4..5b0454153 100644
--- a/engine/src/editor/viewport/cameracontroller.cpp
+++ b/engine/src/editor/viewport/cameracontroller.cpp
@@ -66,8 +66,8 @@ void CameraController::resize(int32_t width, int32_t height) {
     m_screenSize = Vector2(width, height);
 }
 
-std::list<Object *> CameraController::selected() {
-    return std::list<Object *>();
+Object::ObjectList CameraController::selected() {
+    return Object::ObjectList();
 }
 
 void CameraController::select(Object &object) {
diff --git a/worldeditor/src/screens/scenecomposer/objectcontroller.cpp b/worldeditor/src/screens/scenecomposer/objectcontroller.cpp
index c5346b7ce..f93359b4e 100644
--- a/worldeditor/src/screens/scenecomposer/objectcontroller.cpp
+++ b/worldeditor/src/screens/scenecomposer/objectcontroller.cpp
@@ -364,7 +364,7 @@ void ObjectController::onPrefabCreated(uint32_t uuid, uint32_t clone) {
     }
 }
 
-std::list<Object *> ObjectController::selected() {
+Object::ObjectList ObjectController::selected() {
     std::list<Object *> result;
     for(auto &it : m_selected) {
         if(it.object) {
diff --git a/worldeditor/src/screens/scenecomposer/objectcontroller.h b/worldeditor/src/screens/scenecomposer/objectcontroller.h
index 1a034fd6a..2f7fea691 100644
--- a/worldeditor/src/screens/scenecomposer/objectcontroller.h
+++ b/worldeditor/src/screens/scenecomposer/objectcontroller.h
@@ -33,7 +33,7 @@ class ObjectController : public CameraController {
 
     void selectActors(const std::list<uint32_t> &list);
 
-    std::list<Object *> selected() override;
+    Object::ObjectList selected() override;
 
     bool setIsolatedPrefab(Prefab *prefab);
     Prefab *isolatedPrefab() const { return m_isolatedPrefab; }