diff --git a/engine/includes/components/actor.h b/engine/includes/components/actor.h
index 10c9815c0..d3f391ab1 100644
--- a/engine/includes/components/actor.h
+++ b/engine/includes/components/actor.h
@@ -122,6 +122,8 @@ class ENGINE_EXPORT Actor : public Object {
 
     bool m_static;
 
+    bool m_muteUpdates;
+
 };
 
 #endif // ACTOR_H
diff --git a/engine/includes/editor/converters/prefabconverter.h b/engine/includes/editor/converters/prefabconverter.h
index b289f4bce..d619ea54d 100644
--- a/engine/includes/editor/converters/prefabconverter.h
+++ b/engine/includes/editor/converters/prefabconverter.h
@@ -29,7 +29,7 @@ class PrefabConverter : public AssetConverter {
 
 protected:
     Variant readJson(const std::string &data, AssetConverterSettings *);
-    void injectResource(Variant &origin, Resource *resource);
+    void injectResource(Object *data, Resource *resource);
 
     virtual Resource *requestResource();
 
diff --git a/engine/includes/resources/map.h b/engine/includes/resources/map.h
index fd4f884e6..deb0cb505 100644
--- a/engine/includes/resources/map.h
+++ b/engine/includes/resources/map.h
@@ -15,7 +15,6 @@ class ENGINE_EXPORT Map : public Resource {
 
 public:
     Map();
-    ~Map();
 
     Scene *scene() const;
     void setScene(Scene *scene);
diff --git a/engine/includes/resources/prefab.h b/engine/includes/resources/prefab.h
index 8ad2ccbbf..b52c513a6 100644
--- a/engine/includes/resources/prefab.h
+++ b/engine/includes/resources/prefab.h
@@ -17,7 +17,6 @@ class ENGINE_EXPORT Prefab : public Resource {
 
 public:
     Prefab();
-    ~Prefab();
 
     Actor *actor() const;
     void setActor(Actor *actor);
@@ -28,11 +27,13 @@ class ENGINE_EXPORT Prefab : public Resource {
     ObjectList absentInCloned(const ConstObjectList &cloned);
 
 private:
+    void makeCache(Object *object);
+
+    void switchState(State state) override;
+
     void loadUserData(const VariantMap &data) override;
     VariantMap saveUserData() const override;
 
-    void makeCache(Object *object);
-
 private:
     friend class ActorTest;
 
diff --git a/engine/src/components/actor.cpp b/engine/src/components/actor.cpp
index bdb8821d4..32dddaaea 100644
--- a/engine/src/components/actor.cpp
+++ b/engine/src/components/actor.cpp
@@ -70,7 +70,8 @@ Actor::Actor() :
         m_layers(CommandBuffer::DEFAULT | CommandBuffer::RAYCAST | CommandBuffer::SHADOWCAST | CommandBuffer::TRANSLUCENT),
         m_flags(Actor::ENABLE | Actor::SELECTABLE),
         m_hierarchyEnable(m_flags & Actor::ENABLE),
-        m_static(false) {
+        m_static(false),
+        m_muteUpdates(false) {
 
 }
 
@@ -390,18 +391,34 @@ void Actor::setPrefab(Prefab *prefab) {
     if(m_prefab != prefab) {
         if(m_prefab) {
             m_prefab->unsubscribe(this);
-            m_prefab->decRef();
         }
 
         m_prefab = prefab;
         if(m_prefab) {
-            m_prefab->incRef();
+            m_muteUpdates = true;
             m_prefab->subscribe(&Actor::prefabUpdated, this);
+            m_muteUpdates = false;
         } else {
             clearCloneRef();
         }
     }
 }
+
+Object *findByClone(uint32_t uuid, Object *root) {
+    if(root) {
+        if(root->clonedFrom() == uuid) {
+            return root;
+        }
+        for(auto &it : root->getChildren()) {
+            Object *result = findByClone(uuid, it);
+            if(result) {
+                return result;
+            }
+        }
+    }
+    return nullptr;
+}
+
 /*!
     \internal
 */
@@ -419,7 +436,9 @@ void Actor::loadObjectData(const VariantMap &data) {
             if(it != data.end()) {
                 for(auto &item : (*it).second.toList()) {
                     uint32_t uuid = static_cast<uint32_t>(item.toInt());
-                    Object *result = ObjectSystem::findObject(uuid, actor);
+
+                    // Need to do dearch by cloneID!
+                    Object *result = findByClone(uuid, actor);
                     if(result && result != actor) {
                         delete result;
                     }
@@ -439,7 +458,8 @@ void Actor::loadObjectData(const VariantMap &data) {
                     VariantList array = item.toList();
 
                     uint32_t originID = static_cast<uint32_t>(array.front().toInt());
-                    Object *result = ObjectSystem::findObject(originID, this);
+                    // Need to do dearch by cloneID!
+                    Object *result = findByClone(originID, this);
                     if(result) {
                         uint32_t newID = static_cast<uint32_t>(array.back().toInt());
                         ObjectSystem::replaceUUID(result, newID);
@@ -462,51 +482,49 @@ void Actor::loadUserData(const VariantMap &data) {
         m_flags = it->second.toInt();
     }
 
-    if(m_prefab) {
-        it = data.find(gData);
-        if(it != data.end()) {
-            Object::ObjectList objects;
-            Object::enumObjects(this, objects);
-
-            std::unordered_map<uint32_t, Object *> cacheMap;
-            for(auto &object : objects) {
-                uint32_t clone = object->clonedFrom();
-                cacheMap[clone] = object;
-            }
+    it = data.find(gData);
+    if(it != data.end()) {
+        Object::ObjectList objects;
+        Object::enumObjects(this, objects);
 
-            const VariantList &list = (*it).second.toList();
-            for(auto &item : list) {
-                const VariantList &fields = item.toList();
-
-                uint32_t cloned = static_cast<uint32_t>(fields.front().toInt());
-                auto object = cacheMap.find(cloned);
-                if(object != cacheMap.end()) {
-                    const MetaObject *meta = (*object).second->metaObject();
-                    for(auto &property : fields.back().toMap()) {
-                        int32_t index = meta->indexOfProperty(property.first.c_str());
-                        if(index > -1) {
-                            MetaProperty prop = meta->property(index);
-                            bool isObject = prop.type().flags() & MetaType::BASE_OBJECT;
-                            Variant var(property.second);
-                            if(var.type() == MetaType::VARIANTLIST) {
-                                VariantList resultList;
-                                for(auto it : var.toList()) {
-                                    Variant result(Actor::loadObject(it));
-                                    if(!isObject) {
-                                        isObject = result.isValid();
-                                    }
-                                    resultList.push_back(result);
-                                }
-                                if(isObject) {
-                                    var = resultList;
-                                }
-                            } else {
-                                if(isObject) {
-                                    var = loadObject(var);
+        ObjectSystem::ObjectMap cacheMap;
+        for(auto &object : objects) {
+            uint32_t clone = object->clonedFrom();
+            cacheMap[clone] = object;
+        }
+
+        const VariantList &list = (*it).second.toList();
+        for(auto &item : list) {
+            const VariantList &fields = item.toList();
+
+            uint32_t cloned = static_cast<uint32_t>(fields.front().toInt());
+            auto object = cacheMap.find(cloned);
+            if(object != cacheMap.end()) {
+                const MetaObject *meta = (*object).second->metaObject();
+                for(auto &property : fields.back().toMap()) {
+                    int32_t index = meta->indexOfProperty(property.first.c_str());
+                    if(index > -1) {
+                        MetaProperty prop = meta->property(index);
+                        bool isObject = prop.type().flags() & MetaType::BASE_OBJECT;
+                        Variant var(property.second);
+                        if(var.type() == MetaType::VARIANTLIST) {
+                            VariantList resultList;
+                            for(auto it : var.toList()) {
+                                Variant result(Actor::loadObject(it));
+                                if(!isObject) {
+                                    isObject = result.isValid();
                                 }
+                                resultList.push_back(result);
+                            }
+                            if(isObject) {
+                                var = resultList;
+                            }
+                        } else {
+                            if(isObject) {
+                                var = loadObject(var);
                             }
-                            prop.write((*object).second, var);
                         }
+                        prop.write((*object).second, var);
                     }
                 }
             }
@@ -526,9 +544,9 @@ Variant Actor::loadObject(Variant &value) {
     } else if(value.type() == MetaType::INTEGER) { // Component
         uint32_t uuid = static_cast<uint32_t>(value.toInt());
 
-        Object *obj = Engine::findObject(uuid, this);
+        Object *obj = Engine::findObject(uuid);
         if(obj == nullptr) {
-            obj = Engine::findObject(uuid, Engine::findRoot(this));
+            obj = Engine::findObject(uuid);
         }
         if(obj) {
             const char *name = obj->metaObject()->name();
@@ -663,6 +681,10 @@ Variant Actor::saveObject(const Variant &lv, const Variant &rv) const {
 void Actor::prefabUpdated(int state, void *ptr) {
     Actor *p = static_cast<Actor *>(ptr);
 
+    if(p->m_muteUpdates) {
+        return;
+    }
+
     switch(state) {
         case Resource::Loading: {
             p->m_data = p->saveUserData();
diff --git a/engine/src/components/component.cpp b/engine/src/components/component.cpp
index 694aa94f6..3c19bd5f7 100644
--- a/engine/src/components/component.cpp
+++ b/engine/src/components/component.cpp
@@ -174,7 +174,7 @@ Object *loadObjectHelper(const Variant &value, const MetaObject *meta, Object *r
     } else {
         uint32_t uuid = value.toInt();
         if(uuid) {
-            object = Engine::findObject(uuid, root);
+            object = Engine::findObject(uuid);
         }
     }
 
diff --git a/engine/src/editor/assetmanager.cpp b/engine/src/editor/assetmanager.cpp
index cbb868f81..4d08a2052 100644
--- a/engine/src/editor/assetmanager.cpp
+++ b/engine/src/editor/assetmanager.cpp
@@ -425,7 +425,7 @@ void AssetManager::makePrefab(const QString &source, const QFileInfo &target) {
     int index = source.indexOf(':');
     QString id = source.left(index);
     QString name = source.mid(index + 1);
-    Actor *actor = dynamic_cast<Actor *>(Engine::findObject(id.toUInt(), Engine::world()));
+    Actor *actor = dynamic_cast<Actor *>(Engine::findObject(id.toUInt()));
     if(actor) {
         Actor *clone = static_cast<Actor *>(actor->clone(actor->parent()));
         QString path = m_projectManager->contentPath() + "/" + target.filePath() + "/" + name + ".fab";
diff --git a/engine/src/editor/converters/prefabconverter.cpp b/engine/src/editor/converters/prefabconverter.cpp
index 7c4dc5fa6..930fc1618 100644
--- a/engine/src/editor/converters/prefabconverter.cpp
+++ b/engine/src/editor/converters/prefabconverter.cpp
@@ -50,24 +50,33 @@ Actor *PrefabConverter::createActor(const AssetConverterSettings *settings, cons
 AssetConverter::ReturnCode PrefabConverter::convertFile(AssetConverterSettings *settings) {
     PROFILE_FUNCTION();
 
+    AssetConverter::ReturnCode result = InternalError;
+
     QFile src(settings->source());
     if(src.open(QIODevice::ReadOnly)) {
         std::string data = src.readAll().toStdString();
         src.close();
 
-        Variant actor = readJson(data, settings);
-        injectResource(actor, requestResource());
+        Resource *resource = requestResource();
+
+        Variant variant = readJson(data, settings);
+        Object *object = Engine::toObject(variant);
+        if(object) {
+            injectResource(object, resource);
 
-        QFile file(settings->absoluteDestination());
-        if(file.open(QIODevice::WriteOnly)) {
-            ByteArray data = Bson::save(actor);
-            file.write(reinterpret_cast<const char *>(data.data()), data.size());
-            file.close();
+            QFile file(settings->absoluteDestination());
+            if(file.open(QIODevice::WriteOnly)) {
+                ByteArray data = Bson::save(Engine::toVariant(resource));
+                file.write(reinterpret_cast<const char *>(data.data()), data.size());
+                file.close();
 
-            return Success;
+                result = Success;
+            }
         }
+
+        delete resource;
     }
-    return InternalError;
+    return result;
 }
 
 Variant PrefabConverter::readJson(const std::string &data, AssetConverterSettings *settings) {
@@ -96,33 +105,15 @@ Variant PrefabConverter::readJson(const std::string &data, AssetConverterSetting
     return result;
 }
 
-void PrefabConverter::injectResource(Variant &origin, Resource *resource) {
+void PrefabConverter::injectResource(Object *data, Resource *resource) {
     PROFILE_FUNCTION();
 
-    VariantList &objects = *(reinterpret_cast<VariantList *>(origin.data()));
-    VariantList &o = *(reinterpret_cast<VariantList *>(objects.front().data()));
-
-    auto i = o.begin(); // type
-    i++; // uuid
-    i++; // parent
-    *i = resource->uuid();
+    data->setParent(resource);
 
-    objects.push_front(Engine::toVariant(resource).toList().front());
-
-    QSet<QString> modules;
-    for(auto &it : objects) {
-        VariantList *object = reinterpret_cast<VariantList *>(it.data());
-        if(object) {
-            QString type = QString::fromStdString(object->begin()->toString());
-            QString module = PluginManager::instance()->getModuleName(type);
-            if(!module.isEmpty() && module != (QString("Module") + ProjectSettings::instance()->projectName())) {
-                modules.insert(module);
-            }
-        }
+    Prefab *prefab = dynamic_cast<Prefab *>(resource);
+    if(prefab) {
+        prefab->setActor(dynamic_cast<Actor *>(data));
     }
-    ProjectSettings::instance()->reportModules(modules);
-
-    Engine::unloadResource(resource);
 }
 
 Resource *PrefabConverter::requestResource() {
diff --git a/engine/src/resources/map.cpp b/engine/src/resources/map.cpp
index 4b4e7f43b..51c58a314 100644
--- a/engine/src/resources/map.cpp
+++ b/engine/src/resources/map.cpp
@@ -13,9 +13,6 @@ Map::Map() :
 
 }
 
-Map::~Map() {
-    delete m_scene;
-}
 /*!
     Returns a scene which can be added to the scene graph.
 */
diff --git a/engine/src/resources/prefab.cpp b/engine/src/resources/prefab.cpp
index d615dd73e..d5202f81e 100644
--- a/engine/src/resources/prefab.cpp
+++ b/engine/src/resources/prefab.cpp
@@ -17,9 +17,6 @@ Prefab::Prefab() :
 
 }
 
-Prefab::~Prefab() {
-
-}
 /*!
     Returns prototype Actor which will should be instanced
 */
@@ -50,7 +47,7 @@ void Prefab::setActor(Actor *actor) {
 */
 bool Prefab::contains(uint32_t uuid) {
     if(m_dictionary.empty()) {
-        makeCache(m_actor);
+        makeCache(actor());
     }
     return m_dictionary.find(uuid) != m_dictionary.end();
 }
@@ -59,7 +56,7 @@ bool Prefab::contains(uint32_t uuid) {
 */
 Object *Prefab::protoObject(uint32_t uuid) {
     if(m_dictionary.empty()) {
-        makeCache(m_actor);
+        makeCache(actor());
     }
 
     auto it = m_dictionary.find(uuid);
@@ -73,7 +70,7 @@ Object *Prefab::protoObject(uint32_t uuid) {
 */
 Object::ObjectList Prefab::absentInCloned(const ConstObjectList &cloned) {
     if(m_dictionary.empty()) {
-        makeCache(m_actor);
+        makeCache(actor());
     }
 
     ObjectList temp;
@@ -110,7 +107,7 @@ void Prefab::loadUserData(const VariantMap &data) {
     auto it = data.find(gActor);
     if(it != data.end()) {
         uint32_t uuid = uint32_t((*it).second.toInt());
-        Object *object = Engine::findObject(uuid, Engine::findRoot(this));
+        Object *object = Engine::findObject(uuid);
         setActor(dynamic_cast<Actor *>(object));
     }
 }
@@ -138,3 +135,12 @@ void Prefab::makeCache(Object *object) {
         makeCache(it);
     }
 }
+/*!
+    \internal
+*/
+void Prefab::switchState(State state) {
+    if(state == Ready) {
+        m_dictionary.clear();
+    }
+    Resource::switchState(state);
+}
diff --git a/engine/src/systems/resourcesystem.cpp b/engine/src/systems/resourcesystem.cpp
index 757f9d38d..5108ba4f6 100644
--- a/engine/src/systems/resourcesystem.cpp
+++ b/engine/src/systems/resourcesystem.cpp
@@ -235,7 +235,7 @@ void ResourceSystem::processState(Resource *resource) {
                             auto it = std::next(fields.begin(), 1);
                             Object *object = resource;
                             if(!first) {
-                                object = Engine::findObject(it->toInt(), resource);
+                                object = Engine::findObject(it->toInt());
                             } else {
                                 first = false;
                             }
diff --git a/engine/tests/tst_actor.h b/engine/tests/tst_actor.h
index 65ce84125..da67ee6a4 100644
--- a/engine/tests/tst_actor.h
+++ b/engine/tests/tst_actor.h
@@ -112,28 +112,30 @@ TEST_F(ActorTest, Prefab_serialization) {
     MeshRender::registerClassFactory(&system);
     RenderSystem render;
 
-    Actor *prefab = Engine::objectCreate<Actor>("Prefab");
-    prefab->addComponent("Transform");
-    ASSERT_TRUE(prefab != nullptr);
+    Actor *root = Engine::objectCreate<Actor>("Root");
+    root->addComponent("Transform");
+    ASSERT_TRUE(root != nullptr);
 
-    Transform *t0 = prefab->transform();
+    Transform *t0 = root->transform();
     ASSERT_TRUE(t0 != nullptr);
     t0->setPosition(Vector3(1.0f, 2.0f, 3.0f));
 
-    SkinnedMeshRender *prefabSkinned = dynamic_cast<SkinnedMeshRender *>(prefab->addComponent("SkinnedMeshRender"));
+    SkinnedMeshRender *prefabSkinned = dynamic_cast<SkinnedMeshRender *>(root->addComponent("SkinnedMeshRender"));
     ASSERT_TRUE(prefabSkinned != nullptr);
 
-    Actor *level1 = Engine::composeActor("", "Level1", prefab);
+    Actor *level1 = Engine::composeActor("", "Level1", root);
     Camera *prefabCamera = dynamic_cast<Camera *>(level1->addComponent("Camera"));
     ASSERT_TRUE(prefabCamera != nullptr);
     prefabCamera->setFocal(10.0f);
 
-    Prefab *fab = Engine::objectCreate<Prefab>("");
-    fab->setActor(prefab);
+    // Make a prefab
+    Prefab *prefab = Engine::objectCreate<Prefab>("");
+    prefab->setActor(root);
 
-    system.resourceSystem()->setResource(fab, "TestPrefab");
+    system.resourceSystem()->setResource(prefab, "TestPrefab");
 
-    Actor *clone = dynamic_cast<Actor *>(prefab->clone());
+    // Make a clone of prefab
+    Actor *clone = dynamic_cast<Actor *>(prefab->actor()->clone());
     ASSERT_TRUE(clone != nullptr);
 
     ASSERT_TRUE(clone->transform()->position() == t0->position());
@@ -142,17 +144,25 @@ TEST_F(ActorTest, Prefab_serialization) {
     ASSERT_TRUE(cloneCamera->focal() == 10.0f);
     ASSERT_TRUE(cloneCamera->actor()->name() == "Level1");
 
+    // Change a property of clone
     Transform *t1 = cloneCamera->transform();
     ASSERT_TRUE(t1 != nullptr);
     t1->setPosition(Vector3(3.0f, 2.0f, 1.0f));
 
+    // Add additional component to clone
     Actor *level2 = Engine::composeActor("", "Level2", cloneCamera->actor());
     MeshRender *cloneMesh = dynamic_cast<MeshRender *>(level2->addComponent("MeshRender"));
     ASSERT_TRUE(cloneMesh != nullptr);
 
+    // Serialize clone
     Variant data = Engine::toVariant(clone);
 
+    // Delete the original clone
+    delete clone;
+
+    // Deserialize clone
     Object *object = Engine::toObject(data);
+
     Actor *result = dynamic_cast<Actor *>(object);
     ASSERT_TRUE(result != nullptr);
 
@@ -161,7 +171,8 @@ TEST_F(ActorTest, Prefab_serialization) {
     ASSERT_TRUE(resultCamera != nullptr);
     ASSERT_TRUE(resultCamera->focal() == 10.0f);
     ASSERT_TRUE(resultCamera->actor()->name() == "Level1");
-    ASSERT_TRUE(resultCamera->transform()->position() == t1->position());
+    Transform *resultCameraTransform = resultCamera->transform();
+    ASSERT_TRUE(resultCameraTransform->position() == Vector3(3.0f, 2.0f, 1.0f));
 
     MeshRender *resultMesh = dynamic_cast<MeshRender *>(result->componentInChild("MeshRender"));
     ASSERT_TRUE(resultMesh != nullptr);
@@ -169,7 +180,6 @@ TEST_F(ActorTest, Prefab_serialization) {
 
     delete result;
 
-    delete clone;
     delete prefab;
 }
 
@@ -208,6 +218,8 @@ TEST_F(ActorTest, Cross_reference_prefab) {
 
     Variant data = Engine::toVariant(root);
 
+    delete root;
+
     Object *object = Engine::toObject(data);
     Actor *result = dynamic_cast<Actor *>(object);
     ASSERT_TRUE(result != nullptr);
@@ -220,13 +232,10 @@ TEST_F(ActorTest, Cross_reference_prefab) {
 
     ASSERT_TRUE(referenceTestComponent != resultTestComponent);
     ASSERT_TRUE(resultTestComponent->reference() == referenceTestComponent);
-    //QSKIP("Temporary disabled");
     //ASSERT_TRUE(referenceTestComponent->reference() == resultTestComponent);
 
     delete result;
 
-    delete clone2;
-    delete clone1;
     delete prefab;
 }
 
@@ -234,29 +243,38 @@ TEST_F(ActorTest, Remove_component_from_prefab_instance) {
     Engine system(nullptr, "");
     TestComponent::registerClassFactory(&system);
 
-    Actor *prefab = Engine::objectCreate<Actor>("Prefab");
-    ASSERT_TRUE(prefab != nullptr);
+    // Create a root boject
+    Actor *root = Engine::objectCreate<Actor>("Root");
+    ASSERT_TRUE(root != nullptr);
 
-    Actor *level1 = Engine::objectCreate<Actor>("Level1", prefab);
+    Actor *level1 = Engine::objectCreate<Actor>("Level1", root);
     TestComponent *prefabTestComponent = dynamic_cast<TestComponent *>(level1->addComponent("TestComponent"));
     ASSERT_TRUE(prefabTestComponent != nullptr);
 
-    Prefab *fab = Engine::objectCreate<Prefab>("");
-    fab->setActor(prefab);
+    // Create prefab
+    Prefab *prefab = Engine::objectCreate<Prefab>("");
+    prefab->setActor(root);
 
-    system.resourceSystem()->setResource(fab, "TestPrefab");
+    system.resourceSystem()->setResource(prefab, "TestPrefab");
 
-    Actor *clone = dynamic_cast<Actor *>(prefab->clone());
+    // Instantiate a prefab
+    Actor *clone = dynamic_cast<Actor *>(prefab->actor()->clone());
     ASSERT_TRUE(clone != nullptr);
     ASSERT_TRUE(clone->isInstance());
 
+    // Delete a component from instantiated hierarchy
     TestComponent *cloneTestComponent = dynamic_cast<TestComponent *>(clone->componentInChild("TestComponent"));
     ASSERT_TRUE(cloneTestComponent != nullptr);
 
     delete cloneTestComponent;
 
+    // Serialize instantiated hierarchy
     Variant data = Engine::toVariant(clone);
 
+    // Delete a clone
+    delete clone;
+
+    // Deserialize instantiated hierarchy
     Object *object = Engine::toObject(data);
     Actor *result = dynamic_cast<Actor *>(object);
     ASSERT_TRUE(result != nullptr);
@@ -266,7 +284,6 @@ TEST_F(ActorTest, Remove_component_from_prefab_instance) {
 
     delete result;
 
-    delete clone;
     delete prefab;
 }
 
@@ -274,29 +291,29 @@ TEST_F(ActorTest, Update_prefab_instance) {
     Engine system(nullptr, "");
     TestComponent::registerClassFactory(&system);
 
-    Actor *prefab = Engine::objectCreate<Actor>("Prefab");
-    ASSERT_TRUE(prefab != nullptr);
+    Actor *root = Engine::objectCreate<Actor>("Root");
+    ASSERT_TRUE(root != nullptr);
 
-    Actor *level1 = Engine::composeActor("TestComponent", "Level1", prefab);
+    Actor *level1 = Engine::composeActor("TestComponent", "Level1", root);
 
     uint32_t uuidLevel1 = level1->uuid();
 
-    Actor *level2 = Engine::composeActor("", "Level2", prefab);
+    Actor *level2 = Engine::composeActor("", "Level2", root);
 
-    Prefab *fab = Engine::objectCreate<Prefab>("");
-    fab->setActor(prefab);
+    Prefab *prefab = Engine::objectCreate<Prefab>("");
+    prefab->setActor(root);
 
-    system.resourceSystem()->setResource(fab, "TestPrefab");
+    system.resourceSystem()->setResource(prefab, "TestPrefab");
 
     // Create an instance before do changes in prefab
-    Actor *clone = dynamic_cast<Actor *>(prefab->clone());
+    Actor *clone = dynamic_cast<Actor *>(root->clone());
     ASSERT_TRUE(clone != nullptr);
     ASSERT_TRUE(clone->isInstance());
 
-    switchStatePrefab(*fab, Resource::Loading);
+    switchStatePrefab(*prefab, Resource::Loading);
 
     // Step 1 - Add item to prefab
-    TestComponent *prefabTestComponent = dynamic_cast<TestComponent *>(prefab->addComponent("TestComponent"));
+    TestComponent *prefabTestComponent = dynamic_cast<TestComponent *>(root->addComponent("TestComponent"));
     ASSERT_TRUE(prefabTestComponent != nullptr);
 
     // Step 2 - Delete item from prefab
@@ -307,23 +324,24 @@ TEST_F(ActorTest, Update_prefab_instance) {
     level2->transform()->setPosition(value);
 
     // Sync instance with prefab
-    switchStatePrefab(*fab, Resource::Ready);
+    switchStatePrefab(*prefab, Resource::Ready);
 
     // Check instance state from Step 1
     TestComponent *resultTestComponent = dynamic_cast<TestComponent *>(clone->component("TestComponent"));
     ASSERT_TRUE(resultTestComponent != nullptr);
-    ASSERT_TRUE(resultTestComponent->parent()->name() == "Prefab");
+    ASSERT_TRUE(resultTestComponent->parent()->name() == "Root");
 
     // Check instance state from Step 2
-    Actor *cloneLevel1 = dynamic_cast<Actor *>(Engine::findObject(uuidLevel1, clone));
+    Actor *cloneLevel1 = dynamic_cast<Actor *>(Engine::findObject(uuidLevel1));
     ASSERT_TRUE(cloneLevel1 == nullptr);
 
     // Check instance state from Step 3
-    Actor *cloneLevel2 = dynamic_cast<Actor *>(Engine::findObject(level2->uuid(), clone));
+    Actor *cloneLevel2 = dynamic_cast<Actor *>(Engine::findObject(level2->uuid()));
     ASSERT_TRUE(cloneLevel2 != nullptr);
     ASSERT_TRUE(cloneLevel2->name() == level2->name());
     ASSERT_TRUE(cloneLevel2->transform() != nullptr);
     ASSERT_TRUE(cloneLevel2->transform()->position() == value);
 
+    delete clone;
     delete prefab;
 }
diff --git a/modules/editor/motiontools/converter/animationcontrollergraph.cpp b/modules/editor/motiontools/converter/animationcontrollergraph.cpp
index bb04206b3..ad485563e 100644
--- a/modules/editor/motiontools/converter/animationcontrollergraph.cpp
+++ b/modules/editor/motiontools/converter/animationcontrollergraph.cpp
@@ -130,7 +130,7 @@ Variant AnimationControllerGraph::object() const {
     VariantList object;
 
     object.push_back(AnimationStateMachine::metaClass()->name()); // type
-    object.push_back(0); // id
+    object.push_back(Engine::generateUUID()); // id
     object.push_back(0); // parent
     object.push_back(""); // name
 
diff --git a/modules/editor/shadertools/converter/shaderbuilder.cpp b/modules/editor/shadertools/converter/shaderbuilder.cpp
index 5cea645ee..bcfb69546 100644
--- a/modules/editor/shadertools/converter/shaderbuilder.cpp
+++ b/modules/editor/shadertools/converter/shaderbuilder.cpp
@@ -300,7 +300,7 @@ AssetConverter::ReturnCode ShaderBuilder::convertFile(AssetConverterSettings *se
     VariantList object;
 
     object.push_back(Material::metaClass()->name()); // type
-    object.push_back(0); // id
+    object.push_back(Engine::generateUUID()); // id
     object.push_back(0); // parent
     object.push_back(builderSettings->destination().toStdString()); // name
 
diff --git a/modules/uikit/includes/editor/widgetcontroller.h b/modules/uikit/includes/editor/widgetcontroller.h
index ab06b19ce..dd90fb77f 100644
--- a/modules/uikit/includes/editor/widgetcontroller.h
+++ b/modules/uikit/includes/editor/widgetcontroller.h
@@ -23,8 +23,6 @@ class WidgetController : public CameraController {
 
     void selectActors(const std::list<uint32_t> &list);
 
-    Object *findObject(uint32_t id, Object *parent = nullptr);
-
     bool isDrag() const { return m_drag; }
     void setDrag(bool drag);
 
diff --git a/modules/uikit/src/components/abstractbutton.cpp b/modules/uikit/src/components/abstractbutton.cpp
index a45dc5993..da4d8c861 100644
--- a/modules/uikit/src/components/abstractbutton.cpp
+++ b/modules/uikit/src/components/abstractbutton.cpp
@@ -343,19 +343,19 @@ void AbstractButton::loadUserData(const VariantMap &data) {
         auto it = data.find(gTarget);
         if(it != data.end()) {
             uint32_t uuid = uint32_t((*it).second.toInt());
-            Object *object = Engine::findObject(uuid, Engine::findRoot(this));
+            Object *object = Engine::findObject(uuid);
             setBackground(dynamic_cast<Frame *>(object));
         }
         it = data.find(gLabel);
         if(it != data.end()) {
             uint32_t uuid = uint32_t((*it).second.toInt());
-            Object *object = Engine::findObject(uuid, Engine::findRoot(this));
+            Object *object = Engine::findObject(uuid);
             setLabel(dynamic_cast<Label *>(object));
         }
         it = data.find(gIcon);
         if(it != data.end()) {
             uint32_t uuid = uint32_t((*it).second.toInt());
-            Object *object = Engine::findObject(uuid, Engine::findRoot(this));
+            Object *object = Engine::findObject(uuid);
             setIcon(dynamic_cast<Image *>(object));
         }
     }
diff --git a/modules/uikit/src/components/checkbox.cpp b/modules/uikit/src/components/checkbox.cpp
index ca39b6adb..0a252d980 100644
--- a/modules/uikit/src/components/checkbox.cpp
+++ b/modules/uikit/src/components/checkbox.cpp
@@ -73,8 +73,7 @@ void CheckBox::loadUserData(const VariantMap &data) {
 
     auto it = data.find(gKnob);
     if(it != data.end()) {
-        uint32_t uuid = uint32_t((*it).second.toInt());
-        Object *object = Engine::findObject(uuid, Engine::findRoot(this));
+        Object *object = Engine::findObject(uint32_t((*it).second.toInt()));
         setKnobGraphic(dynamic_cast<Image *>(object));
     }
 }
diff --git a/modules/uikit/src/components/progressbar.cpp b/modules/uikit/src/components/progressbar.cpp
index cc87d68d7..f9d8591aa 100644
--- a/modules/uikit/src/components/progressbar.cpp
+++ b/modules/uikit/src/components/progressbar.cpp
@@ -152,14 +152,14 @@ void ProgressBar::loadUserData(const VariantMap &data) {
     auto it = data.find(gProgress);
     if(it != data.end()) {
         uint32_t uuid = uint32_t((*it).second.toInt());
-        Object *object = Engine::findObject(uuid, Engine::findRoot(this));
+        Object *object = Engine::findObject(uuid);
         setProgress(dynamic_cast<Frame *>(object));
     }
 
     it = data.find(gBackground);
     if(it != data.end()) {
         uint32_t uuid = uint32_t((*it).second.toInt());
-        Object *object = Engine::findObject(uuid, Engine::findRoot(this));
+        Object *object = Engine::findObject(uuid);
         setBackground(dynamic_cast<Frame *>(object));
     }
 }
diff --git a/modules/uikit/src/components/switch.cpp b/modules/uikit/src/components/switch.cpp
index a8bf7df2c..69117643f 100644
--- a/modules/uikit/src/components/switch.cpp
+++ b/modules/uikit/src/components/switch.cpp
@@ -118,7 +118,7 @@ void Switch::loadUserData(const VariantMap &data) {
     auto it = data.find(gKnob);
     if(it != data.end()) {
         uint32_t uuid = uint32_t((*it).second.toInt());
-        Object *object = Engine::findObject(uuid, Engine::findRoot(this));
+        Object *object = Engine::findObject(uuid);
         setKnobGraphic(dynamic_cast<Frame *>(object));
     }
 }
diff --git a/modules/uikit/src/editor/widgetcontroller.cpp b/modules/uikit/src/editor/widgetcontroller.cpp
index 346048c24..f2587aa7c 100644
--- a/modules/uikit/src/editor/widgetcontroller.cpp
+++ b/modules/uikit/src/editor/widgetcontroller.cpp
@@ -61,7 +61,7 @@ void WidgetController::select(Object &object) {
 
 void WidgetController::selectActors(const std::list<uint32_t> &list) {
     for(auto it : list) {
-        Actor *actor = dynamic_cast<Actor *>(findObject(it));
+        Actor *actor = dynamic_cast<Actor *>(Engine::findObject(it));
         if(actor) {
             WidgetTool::Select data;
             data.object = actor;
@@ -209,18 +209,6 @@ void WidgetController::update() {
 
 }
 
-Object *WidgetController::findObject(uint32_t id, Object *parent) {
-    Object *result = nullptr;
-
-    Object *p = parent;
-    if(p == nullptr) {
-        p = m_rootObject;
-    }
-    result = ObjectSystem::findObject(id, p);
-
-    return result;
-}
-
 void WidgetController::setDrag(bool drag) {
     if(drag) {
         m_widgetTool->beginControl();
@@ -283,7 +271,7 @@ void ChangeProperty::redo() {
     Variant value(m_value);
 
     for(auto it : m_objects) {
-        Object *object = m_controller->findObject(it);
+        Object *object = Engine::findObject(it);
         if(object) {
             m_value = object->property(qPrintable(m_property));
             object->setProperty(qPrintable(m_property), value);
@@ -306,7 +294,7 @@ void CreateObject::undo() {
     QSet<Scene *> scenes;
 
     for(auto uuid : m_objects) {
-        Object *object = m_controller->findObject(uuid);
+        Object *object = Engine::findObject(uuid);
         if(object) {
             Actor *actor = dynamic_cast<Actor *>(object);
             if(actor) {
@@ -351,7 +339,7 @@ void DeleteObject::undo() {
     auto it = m_parents.begin();
     auto index = m_indices.begin();
     for(auto &ref : m_dump) {
-        Object *parent = m_controller->findObject(*it);
+        Object *parent = Engine::findObject(*it);
         Object *object = Engine::toObject(ref, parent);
         if(object) {
             object->setParent(parent, *index);
@@ -366,7 +354,7 @@ void DeleteObject::undo() {
     if(!m_objects.empty()) {
         auto it = m_objects.begin();
         while(it != m_objects.end()) {
-            Component *comp = dynamic_cast<Component *>(m_controller->findObject(*it));
+            Component *comp = dynamic_cast<Component *>(Engine::findObject(*it));
             if(comp) {
                 *it = comp->parent()->uuid();
             }
@@ -380,7 +368,7 @@ void DeleteObject::redo() {
     m_parents.clear();
     m_dump.clear();
     for(auto it : m_objects)  {
-        Object *object = m_controller->findObject(it);
+        Object *object = Engine::findObject(it);
         if(object) {
             m_dump.push_back(Engine::toVariant(object));
             m_parents.push_back(object->parent()->uuid());
@@ -390,7 +378,7 @@ void DeleteObject::redo() {
         }
     }
     for(auto it : m_objects) {
-        Object *object = m_controller->findObject(it);
+        Object *object = Engine::findObject(it);
         if(object) {
             delete object;
         }
diff --git a/modules/vms/angel/src/components/angelbehaviour.cpp b/modules/vms/angel/src/components/angelbehaviour.cpp
index 8bf928a98..ea4e4ddac 100644
--- a/modules/vms/angel/src/components/angelbehaviour.cpp
+++ b/modules/vms/angel/src/components/angelbehaviour.cpp
@@ -319,7 +319,7 @@ void AngelBehaviour::loadUserData(const VariantMap &data) {
                     } else {
                         uint32_t uuid = property->second.toInt();
                         if(uuid) {
-                            object = Engine::findObject(uuid, Engine::findRoot(this));
+                            object = Engine::findObject(uuid);
                         }
                     }
                     if(object) {
@@ -398,9 +398,9 @@ void AngelBehaviour::writeProperty(const MetaProperty &property, const Variant v
         if(it->second.isObject) {
             Object *object = nullptr;
             if(value.type() == MetaType::INTEGER) {
-                uint32_t uuid = value.toInt();
+                uint32_t uuid = static_cast<uint32_t>(value.toInt());
                 if(uuid) {
-                    object = Engine::findObject(uuid, Engine::findRoot(this));
+                    object = Engine::findObject(uuid);
                 }
             } else {
                 object = (value.data() == nullptr) ? nullptr : *(reinterpret_cast<Object **>(value.data()));
diff --git a/thirdparty/next/inc/core/object.h b/thirdparty/next/inc/core/object.h
index 632249355..aab815435 100644
--- a/thirdparty/next/inc/core/object.h
+++ b/thirdparty/next/inc/core/object.h
@@ -251,9 +251,6 @@ class NEXT_LIBRARY_EXPORT Object {
     friend class ObjectSystem;
 
 private:
-    void setUUID(uint32_t id);
-    void setClonedUUID(uint32_t id);
-
     bool isLinkExist(const Object::Link &link) const;
 
 };
diff --git a/thirdparty/next/inc/core/objectsystem.h b/thirdparty/next/inc/core/objectsystem.h
index ecfd7f4f2..8b75c4d0d 100644
--- a/thirdparty/next/inc/core/objectsystem.h
+++ b/thirdparty/next/inc/core/objectsystem.h
@@ -34,6 +34,7 @@ class NEXT_LIBRARY_EXPORT ObjectSystem : public Object {
     typedef std::pair<const MetaObject *, ObjectSystem *> FactoryPair;
     typedef std::unordered_map<std::string, FactoryPair> FactoryMap;
     typedef std::unordered_map<std::string, std::string> GroupMap;
+    typedef std::unordered_map<uint32_t, Object *> ObjectMap;
 
 public:
     ObjectSystem();
@@ -79,7 +80,9 @@ class NEXT_LIBRARY_EXPORT ObjectSystem : public Object {
 
     static Object *findRoot(Object *object);
 
-    static Object *findObject(uint32_t uuid, Object *root);
+    static Object *findObject(uint32_t uuid);
+
+    static void unregisterObject(Object *object);
 
 protected:
     void factoryAdd(const std::string &name, const std::string &uri, const MetaObject *meta);
diff --git a/thirdparty/next/src/core/object.cpp b/thirdparty/next/src/core/object.cpp
index b1a4cc2c5..1afa5c9e1 100644
--- a/thirdparty/next/src/core/object.cpp
+++ b/thirdparty/next/src/core/object.cpp
@@ -259,7 +259,7 @@ Object::Object() :
         m_blockSignals(false) {
     PROFILE_FUNCTION();
 
-    setUUID(ObjectSystem::generateUUID());
+    ObjectSystem::replaceUUID(this, ObjectSystem::generateUUID());
 }
 
 Object::Object(const Object &origin) :
@@ -285,6 +285,8 @@ Object::~Object() {
 
     if(m_system) {
          m_system->removeObject(this);
+    } else {
+        ObjectSystem::unregisterObject(this);
     }
     {
         std::lock_guard<std::mutex> locker(m_mutex);
@@ -1017,20 +1019,6 @@ void Object::clearCloneRef() {
 /*!
     \internal
 */
-void Object::setUUID(uint32_t id) {
-    PROFILE_FUNCTION();
-    m_uuid = id;
-}
-/*!
-    \internal
-*/
-void Object::setClonedUUID(uint32_t id) {
-    PROFILE_FUNCTION();
-    m_cloned = id;
-}
-/*!
-    \internal
-*/
 void Object::setSystem(ObjectSystem *system) {
     PROFILE_FUNCTION();
     m_system = system;
@@ -1120,8 +1108,10 @@ bool Object::isLinkExist(const Object::Link &link) const {
     \internal
 */
 void Object::enumObjects(Object *object, Object::ObjectList &list) {
-    list.push_back(object);
     PROFILE_FUNCTION();
+
+    list.push_back(object);
+
     for(const auto &it : object->getChildren()) {
         enumObjects(it, list);
     }
diff --git a/thirdparty/next/src/core/objectsystem.cpp b/thirdparty/next/src/core/objectsystem.cpp
index 4bd6697f9..7c0765541 100644
--- a/thirdparty/next/src/core/objectsystem.cpp
+++ b/thirdparty/next/src/core/objectsystem.cpp
@@ -28,6 +28,7 @@
 
 static ObjectSystem::FactoryMap s_Factories;
 static ObjectSystem::GroupMap   s_Groups;
+static ObjectSystem::ObjectMap  s_Objects;
 
 /*!
     \class ObjectSystem
@@ -256,9 +257,7 @@ Variant ObjectSystem::toVariant(const Object *object, bool force) {
 */
 Object *ObjectSystem::toObject(const Variant &variant, Object *parent, const std::string &name) {
     PROFILE_FUNCTION();
-    Object *result  = nullptr;
-
-    std::unordered_map<uint32_t, Object *> array;
+    Object *result = nullptr;
 
     bool first = true;
 
@@ -272,25 +271,7 @@ Object *ObjectSystem::toObject(const Variant &variant, Object *parent, const std
             i++;
             uint32_t uuid = static_cast<uint32_t>((*i).toInt());
             i++;
-
             uint32_t parentUuid = static_cast<uint32_t>((*i).toInt());
-            Object *p = parent;
-            Object *obj = nullptr;
-            if(p) {
-                obj = findObject(parentUuid, p);
-            }
-            if(obj == nullptr) {
-                for(auto item : array) {
-                    obj = findObject(parentUuid, item.second);
-                    if(obj) {
-                        p = obj;
-                        break;
-                    }
-                }
-            } else {
-                p = obj;
-            }
-
             i++;
 
             std::string n = (*i).toString();
@@ -300,16 +281,18 @@ Object *ObjectSystem::toObject(const Variant &variant, Object *parent, const std
             }
             i++;
 
-            Object *object = findObject(uuid, p);
-            if(object) {
-                array[uuid] = object;
-                continue;
-            } else {
+            Object *p = parent;
+            Object *obj = findObject(parentUuid);
+            if(obj != nullptr) {
+                p = obj;
+            }
+
+            Object *object = findObject(uuid);
+            if(object == nullptr) {
                 object = objectCreate(type, n, p);
 
-                if(object) {
-                    object->setUUID(uuid);
-                    array[uuid] = object;
+                if(object && uuid != 0) {
+                    replaceUUID(object, uuid);
                 }
             }
 
@@ -321,11 +304,11 @@ Object *ObjectSystem::toObject(const Variant &variant, Object *parent, const std
                 if(p) {
                     object->setSystem(p->system());
                 }
-                object->setUUID(uuid);
+                if(uuid != 0) {
+                    replaceUUID(object, uuid);
+                }
                 object->setName(n);
                 object->setParent(p);
-
-                array[uuid] = object;
             }
 
             i++;
@@ -350,11 +333,8 @@ Object *ObjectSystem::toObject(const Variant &variant, Object *parent, const std
             i++;
             i++;
 
-            Object *object = nullptr;
-            auto ot  = array.find(uuid);
-            if(ot != array.end()) {
-                object = (*ot).second;
-            } else {
+            Object *object = findObject(uuid);
+            if(object == nullptr) {
                 return nullptr;
             }
 
@@ -375,20 +355,14 @@ Object *ObjectSystem::toObject(const Variant &variant, Object *parent, const std
                 Object *sender = nullptr;
                 Object *receiver = nullptr;
                 if(list.size() == 4) {
-                    auto l  = list.begin();
-                    auto s  = array.find(static_cast<uint32_t>((*l).toInt()));
-                    if(s != array.end()) {
-                        sender  = (*s).second;
-                    }
+                    auto l = list.begin();
+                    sender = findObject(static_cast<uint32_t>((*l).toInt()));
                     l++;
 
                     std::string signal = (*l).toString();
                     l++;
 
-                    s = array.find(static_cast<uint32_t>((*l).toInt()));
-                    if(s != array.end()) {
-                        receiver  = (*s).second;
-                    }
+                    receiver = findObject(static_cast<uint32_t>((*l).toInt()));
                     l++;
 
                     std::string method = (*l).toString();
@@ -422,7 +396,11 @@ Object *ObjectSystem::toObject(const Variant &variant, Object *parent, const std
 */
 uint32_t ObjectSystem::generateUUID() {
     PROFILE_FUNCTION();
-    return dist(mt);
+    uint32_t result = dist(mt);
+    while(s_Objects.find(result) != s_Objects.end()) {
+        result = dist(mt);
+    }
+    return result;
 }
 /*!
     Replaces current \a uuid of the \a object with the new one.
@@ -430,7 +408,14 @@ uint32_t ObjectSystem::generateUUID() {
 void ObjectSystem::replaceUUID(Object *object, uint32_t uuid) {
     PROFILE_FUNCTION();
     if(object) {
-        object->setUUID(uuid);
+        uint32_t old = object->uuid();
+        auto it = s_Objects.find(old);
+        if(it != s_Objects.end()) {
+            s_Objects.erase(it);
+        }
+
+        object->m_uuid = uuid;
+        s_Objects[uuid] = object;
     }
 }
 /*!
@@ -440,7 +425,7 @@ void ObjectSystem::replaceUUID(Object *object, uint32_t uuid) {
 void ObjectSystem::replaceClonedUUID(Object *object, uint32_t uuid) {
     PROFILE_FUNCTION();
     if(object) {
-        object->setClonedUUID(uuid);
+        object->m_cloned = uuid;
     }
 }
 /*!
@@ -459,21 +444,13 @@ Object *ObjectSystem::findRoot(Object *object) {
     return root;
 }
 /*!
-    Returns object with \a uuid or which was clonned from this.
-    This algorithm recursively going down from the \a root object
+    Returns object with \a uuid.
     If the object doesn't exist in the hierarchy this method returns nullptr.
 */
-Object *ObjectSystem::findObject(uint32_t uuid, Object *root) {
-    if(root) {
-        if(root->clonedFrom() == uuid || root->uuid() == uuid) {
-            return root;
-        }
-        for(auto &it : root->getChildren()) {
-            Object *result = findObject(uuid, it);
-            if(result) {
-                return result;
-            }
-        }
+Object *ObjectSystem::findObject(uint32_t uuid) {
+    auto it = s_Objects.find(uuid);
+    if(it != s_Objects.end()) {
+        return it->second;
     }
     return nullptr;
 }
@@ -487,12 +464,25 @@ void ObjectSystem::addObject(Object *object) {
 /*!
     \internal
     Removes an \a object from operation lists.
+    Also removes from global search dictionary.
 */
 void ObjectSystem::removeObject(Object *object) {
     PROFILE_FUNCTION();
 
+    unregisterObject(object);
+
     m_objectToRemove.push_back(object);
 }
+/*!
+    \internal
+    Removes an \a object from global search dictionary.
+*/
+void ObjectSystem::unregisterObject(Object *object) {
+    auto it = s_Objects.find(object->uuid());
+    if(it != s_Objects.end()) {
+        s_Objects.erase(it);
+    }
+}
 /*!
     Returns a list of objects with specified \a type.
     \warning This is very small function!
diff --git a/thirdparty/next/tests/tst_objectsystem.h b/thirdparty/next/tests/tst_objectsystem.h
index f6398a418..2e1a3035c 100644
--- a/thirdparty/next/tests/tst_objectsystem.h
+++ b/thirdparty/next/tests/tst_objectsystem.h
@@ -101,20 +101,25 @@ TEST_F(ObjectSystemTest, Serialize_Desirialize_Object) {
     ASSERT_TRUE(Object::connect(obj2, _SIGNAL(signal(int)), obj3, _SLOT(setSlot(int))));
 
     ByteArray bytes = Bson::save(ObjectSystem::toVariant(obj1));
+    Object *clone = obj1->clone();
+
+    int id = obj1->uuid();
+    int recv = obj1->getReceivers().size();
+
+    delete obj3;
+    delete obj2;
+    delete obj1;
+
     Object *result  = ObjectSystem::toObject(Bson::load(bytes));
-    Object *object  = dynamic_cast<Object*>(obj1);
 
     ASSERT_TRUE(result != nullptr);
-    ASSERT_TRUE(object != nullptr);
-    ASSERT_TRUE(compare(*object, *result));
+    ASSERT_TRUE(compare(*clone, *result));
 
-    ASSERT_TRUE(object->getReceivers().size() == result->getReceivers().size());
+    ASSERT_TRUE(result->getReceivers().size() == recv);
 
-    ASSERT_TRUE(object->uuid() == result->uuid());
+    ASSERT_TRUE(result->uuid() == id);
 
     delete result;
 
-    delete obj3;
-    delete obj2;
-    delete obj1;
+    delete clone;
 }
diff --git a/worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp b/worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp
index 69ce86438..522b262d4 100644
--- a/worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp
+++ b/worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp
@@ -155,12 +155,6 @@ void HierarchyBrowser::setCurrentEditor(AssetEditor *editor) {
     connect(m_currentEditor, &AssetEditor::objectsHierarchyChanged, this, &HierarchyBrowser::onObjectsHierarchyChanged, Qt::DirectConnection);
 }
 
-Object *HierarchyBrowser::findObject(uint32_t id) {
-    ObjectHierarchyModel *model = static_cast<ObjectHierarchyModel *>(m_filter->sourceModel());
-
-    return ObjectSystem::findObject(id, model->root());
-}
-
 void HierarchyBrowser::onObjectsHierarchyChanged(Object *object) {
     ObjectHierarchyModel *model = static_cast<ObjectHierarchyModel *>(m_filter->sourceModel());
     model->setRoot(object);
@@ -289,7 +283,7 @@ void HierarchyBrowser::onDrop(QDropEvent *e) {
         QString path(e->mimeData()->data(gMimeObject));
         foreach(const QString &it, path.split(";")) {
             QString id = it.left(it.indexOf(':'));
-            Object *item = Engine::findObject(id.toUInt(), model->root());
+            Object *item = Engine::findObject(id.toUInt());
             if(item) {
                 QModelIndex origin = ui->treeView->indexAt(e->pos());
                 QModelIndex index = m_filter->mapToSource(origin);
@@ -309,7 +303,7 @@ void HierarchyBrowser::onDrop(QDropEvent *e) {
                         index = index.parent();
                     }
 
-                    Object *indexObject = Engine::findObject(index.internalId(), model->root());
+                    Object *indexObject = Engine::findObject(index.internalId());
                     if(item != indexObject) {
                         objects.push_back(item);
                         parent = indexObject;
@@ -340,7 +334,7 @@ void HierarchyBrowser::onDragStarted(Qt::DropActions supportedActions) {
     foreach(const QModelIndex &it, ui->treeView->selectionModel()->selectedIndexes()) {
         QModelIndex index = m_filter->mapToSource(it);
         if(index.column() == 0) {
-            Object *object = Engine::findObject(index.internalId(), model->root());
+            Object *object = Engine::findObject(index.internalId());
             list.push_back(QString::number(object->uuid()) + ":" + object->name().c_str());
         }
     }
@@ -360,7 +354,7 @@ void HierarchyBrowser::onSelectionChanged(const QItemSelection &selected, const
 void HierarchyBrowser::on_treeView_clicked(const QModelIndex &index) {
     ObjectHierarchyModel *model = static_cast<ObjectHierarchyModel *>(m_filter->sourceModel());
 
-    Object *object = Engine::findObject(m_filter->mapToSource(index).internalId(), model->root());
+    Object *object = Engine::findObject(m_filter->mapToSource(index).internalId());
     Actor *actor = dynamic_cast<Actor *>(object);
     if(actor) {
         if(index.column() == 0) {
@@ -368,7 +362,7 @@ void HierarchyBrowser::on_treeView_clicked(const QModelIndex &index) {
 
             QItemSelectionModel *selectionModel = ui->treeView->selectionModel();
             for(auto it : selectionModel->selectedIndexes()) {
-                Object *object = Engine::findObject(m_filter->mapToSource(it).internalId(), model->root());
+                Object *object = Engine::findObject(m_filter->mapToSource(it).internalId());
 
                 set.insert(object);
             }
@@ -387,7 +381,7 @@ void HierarchyBrowser::on_treeView_clicked(const QModelIndex &index) {
 void HierarchyBrowser::on_treeView_doubleClicked(const QModelIndex &index) {
     ObjectHierarchyModel *model = static_cast<ObjectHierarchyModel *>(m_filter->sourceModel());
 
-    Object *object = Engine::findObject(m_filter->mapToSource(index).internalId(), model->root());
+    Object *object = Engine::findObject(m_filter->mapToSource(index).internalId());
 
     emit objectsSelected({object}, true);
 }
@@ -403,7 +397,7 @@ void HierarchyBrowser::on_treeView_customContextMenuRequested(const QPoint &pos)
 
     QList<Object *> list;
     foreach(QModelIndex it, select->selectedRows()) {
-        Object *object = Engine::findObject(m_filter->mapToSource(it).internalId(), model->root());
+        Object *object = Engine::findObject(m_filter->mapToSource(it).internalId());
         Actor *actor = dynamic_cast<Actor *>(object);
         if(actor) {
             list.push_back(actor);
@@ -416,7 +410,7 @@ void HierarchyBrowser::on_treeView_customContextMenuRequested(const QPoint &pos)
     QPoint point = static_cast<QWidget*>(QObject::sender())->mapToGlobal(pos);
 
     QModelIndex index = ui->treeView->indexAt(pos);
-    Object *object = Engine::findObject(m_filter->mapToSource(index).internalId(), model->root());
+    Object *object = Engine::findObject(m_filter->mapToSource(index).internalId());
 
     if(m_currentEditor) {
         QMenu *menu = m_currentEditor->objectContextMenu(object);
@@ -456,7 +450,7 @@ bool HierarchyBrowser::eventFilter(QObject *obj, QEvent *event) {
                     QList<Object *> list;
                     QItemSelectionModel *select = ui->treeView->selectionModel();
                     foreach(QModelIndex it, select->selectedRows()) {
-                        list.push_back(Engine::findObject(m_filter->mapToSource(it).internalId(), model->root()));
+                        list.push_back(Engine::findObject(m_filter->mapToSource(it).internalId()));
                     }
 
                     m_currentEditor->onObjectsDeleted(list);
@@ -485,10 +479,10 @@ void ParentingObjects::undo() {
 
     auto ref = m_dump.begin();
     for(auto it : m_objects) {
-        Object *object = browser->findObject(it);
+        Object *object = Engine::findObject(it);
         if(object) {
             if(object->uuid() == ref->first) {
-                object->setParent(browser->findObject(ref->second));
+                object->setParent(Engine::findObject(ref->second));
             }
         }
         ++ref;
@@ -501,14 +495,14 @@ void ParentingObjects::redo() {
 
     m_dump.clear();
     for(auto it : m_objects) {
-        Object *object = browser->findObject(it);
+        Object *object = Engine::findObject(it);
         if(object) {
             ParentPair pair;
             pair.first =  object->uuid();
             pair.second = object->parent()->uuid();
             m_dump.push_back(pair);
 
-            Object *parent = browser->findObject(m_parent);
+            Object *parent = Engine::findObject(m_parent);
             object->setParent(parent, m_position);
         }
     }
diff --git a/worldeditor/src/screens/objecthierarchy/hierarchybrowser.h b/worldeditor/src/screens/objecthierarchy/hierarchybrowser.h
index de1f4c839..9060243d0 100644
--- a/worldeditor/src/screens/objecthierarchy/hierarchybrowser.h
+++ b/worldeditor/src/screens/objecthierarchy/hierarchybrowser.h
@@ -50,8 +50,6 @@ class HierarchyBrowser : public EditorGadget {
     HierarchyBrowser(QWidget *parent = 0);
     ~HierarchyBrowser();
 
-    Object *findObject(uint32_t id);
-
 public slots:
     void onUpdated() override;
 
diff --git a/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.cpp b/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.cpp
index 9721446ff..7efe90a1b 100644
--- a/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.cpp
+++ b/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.cpp
@@ -37,7 +37,7 @@ void ObjectHierarchyModel::showNone() {
 }
 
 Object *ObjectHierarchyModel::getObject(const QModelIndex &index) const {
-    return Engine::findObject(index.internalId(), m_rootItem);
+    return Engine::findObject(index.internalId());
 }
 
 QVariant ObjectHierarchyModel::data(const QModelIndex &index, int role) const {
@@ -110,7 +110,7 @@ QVariant ObjectHierarchyModel::data(const QModelIndex &index, int role) const {
 
 bool ObjectHierarchyModel::setData(const QModelIndex &index, const QVariant &value, int role) {
     Q_UNUSED(role)
-    Object *item = Engine::findObject(index.internalId(), m_rootItem);
+    Object *item = Engine::findObject(index.internalId());
     if(item) {
         item->setName(value.toString().toStdString());
     }
@@ -139,7 +139,7 @@ int ObjectHierarchyModel::rowCount(const QModelIndex &parent) const {
     if(m_rootItem) {
         Object *parentItem = m_rootItem;
         if(parent.isValid()) {
-            parentItem = Engine::findObject(parent.internalId(), m_rootItem);
+            parentItem = Engine::findObject(parent.internalId());
         }
 
         if(parentItem) {
@@ -159,7 +159,7 @@ QModelIndex ObjectHierarchyModel::index(int row, int column, const QModelIndex &
         Object *ptr = nullptr;
         Object *parentItem = m_rootItem;
         if(parent.isValid()) {
-            parentItem = Engine::findObject(parent.internalId(), m_rootItem);
+            parentItem = Engine::findObject(parent.internalId());
         }
 
         if(parentItem) {
@@ -190,7 +190,7 @@ QModelIndex ObjectHierarchyModel::parent(const QModelIndex &index) const {
         return QModelIndex();
     }
 
-    Object *childItem = Engine::findObject(index.internalId(), m_rootItem);
+    Object *childItem = Engine::findObject(index.internalId());
     if(childItem == nullptr) {
         return QModelIndex();
     }
diff --git a/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.h b/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.h
index cb1195216..5b305a71c 100644
--- a/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.h
+++ b/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.h
@@ -77,7 +77,7 @@ class ObjectsFilter : public QSortFilterProxyModel {
 
         ObjectHierarchyModel *model = static_cast<ObjectHierarchyModel *>(sourceModel());
 
-        Object *object = Engine::findObject(sourceModel()->index(sourceRow, 1, sourceParent).internalId(), model->root());
+        Object *object = Engine::findObject(sourceModel()->index(sourceRow, 1, sourceParent).internalId());
 
         if(!m_filter.isEmpty()) {
             result &= checkClassTypeFilter(sourceRow, sourceParent);
diff --git a/worldeditor/src/screens/propertyedit/custom/objectselect/objectselectbrowser.cpp b/worldeditor/src/screens/propertyedit/custom/objectselect/objectselectbrowser.cpp
index 29195932e..89fbb941e 100644
--- a/worldeditor/src/screens/propertyedit/custom/objectselect/objectselectbrowser.cpp
+++ b/worldeditor/src/screens/propertyedit/custom/objectselect/objectselectbrowser.cpp
@@ -42,7 +42,7 @@ void ObjectSelectBrowser::setTypeFilter(const QString &filter) {
 
 Object *ObjectSelectBrowser::findObject(uint32_t id) {
     ObjectHierarchyModel *model = static_cast<ObjectHierarchyModel *>(m_componentProxy->sourceModel());
-    return Engine::findObject(id, model->root());
+    return Engine::findObject(id);
 }
 
 void ObjectSelectBrowser::expandToIndex(const QModelIndex &index, QTreeView *view) {
diff --git a/worldeditor/src/screens/scenecomposer/objectcontroller.cpp b/worldeditor/src/screens/scenecomposer/objectcontroller.cpp
index 3f3feb61b..ebd49b403 100644
--- a/worldeditor/src/screens/scenecomposer/objectcontroller.cpp
+++ b/worldeditor/src/screens/scenecomposer/objectcontroller.cpp
@@ -370,7 +370,7 @@ void ObjectController::onPrefabCreated(uint32_t uuid, uint32_t clone) {
     bool swapped = false;
     for(auto &it : m_selected) {
         if(it.uuid == uuid) {
-            Object *object = findObject(clone);
+            Object *object = Engine::findObject(clone);
             if(object) {
                 it.object = static_cast<Actor *>(object);
                 it.uuid = object->uuid();
@@ -426,7 +426,7 @@ void ObjectController::setIsolatedActor(Actor *actor) {
 
 void ObjectController::selectActors(const std::list<uint32_t> &list) {
     for(auto it : list) {
-        Actor *actor = dynamic_cast<Actor *>(findObject(it));
+        Actor *actor = dynamic_cast<Actor *>(Engine::findObject(it));
         if(actor) {
             SelectTool::Select data;
             data.object = actor;
@@ -628,18 +628,6 @@ void ObjectController::onDragLeave(QDragLeaveEvent * /*event*/) {
     m_dragObjects.clear();
 }
 
-Object *ObjectController::findObject(uint32_t id, Object *parent) {
-    Object *result = nullptr;
-
-    Object *p = parent;
-    if(p == nullptr) {
-        p = m_isolatedActor ? m_isolatedActor : static_cast<Object *>(m_world);
-    }
-    result = ObjectSystem::findObject(id, p);
-
-    return result;
-}
-
 SelectObjects::SelectObjects(const std::list<uint32_t> &objects, ObjectController *ctrl, const QString &name, QUndoCommand *group) :
         UndoObject(ctrl, name, group),
         m_objects(objects) {
@@ -670,7 +658,7 @@ void CreateObject::undo() {
     QSet<Scene *> scenes;
 
     for(auto uuid : m_objects) {
-        Object *object = m_controller->findObject(uuid);
+        Object *object = Engine::findObject(uuid);
         if(object) {
             Actor *actor = dynamic_cast<Actor *>(object);
             if(actor) {
@@ -693,7 +681,7 @@ void CreateObject::redo() {
 
     auto list = m_controller->selected();
     if(list.empty()) {
-        Object *object = m_controller->findObject(m_scene);
+        Object *object = Engine::findObject(m_scene);
         list.push_back(object);
     }
 
@@ -727,7 +715,7 @@ void DuplicateObjects::undo() {
     Scene *scene = nullptr;
     m_dump.clear();
     for(auto it : m_objects) {
-        Actor *actor = dynamic_cast<Actor *>(m_controller->findObject(it));
+        Actor *actor = dynamic_cast<Actor *>(Engine::findObject(it));
         if(actor) {
             VariantList pair;
             scene = actor->scene();
@@ -762,7 +750,7 @@ void DuplicateObjects::redo() {
         for(auto &it : m_dump) {
             VariantList pair = it.toList();
 
-            scene = dynamic_cast<Scene *>(m_controller->findObject(pair.front().toInt()));
+            scene = dynamic_cast<Scene *>(Engine::findObject(pair.front().toInt()));
             Object *obj = ObjectSystem::toObject(pair.back(), scene);
             if(obj) {
                 m_objects.push_back(obj->uuid());
@@ -815,7 +803,7 @@ void CreateObjectSerial::redo() {
     for(auto &ref : m_dump) {
         Object *object = Engine::toObject(ref);
         if(object) {
-            object->setParent(m_controller->findObject(*it));
+            object->setParent(Engine::findObject(*it));
             objects.push_back(object->uuid());
             Actor *actor = dynamic_cast<Actor *>(object);
             if(actor) {
@@ -846,7 +834,7 @@ void DeleteActors::undo() {
     auto it = m_parents.begin();
     auto index = m_indices.begin();
     for(auto &ref : m_dump) {
-        Object *parent = m_controller->findObject(*it);
+        Object *parent = Engine::findObject(*it);
         Object *object = Engine::toObject(ref, parent);
         if(object) {
             object->setParent(parent, *index);
@@ -863,7 +851,7 @@ void DeleteActors::undo() {
     if(!m_objects.empty()) {
         auto it = m_objects.begin();
         while(it != m_objects.end()) {
-            Component *comp = dynamic_cast<Component *>(m_controller->findObject(*it));
+            Component *comp = dynamic_cast<Component *>(Engine::findObject(*it));
             if(comp) {
                 *it = comp->parent()->uuid();
             }
@@ -883,7 +871,7 @@ void DeleteActors::redo() {
     m_parents.clear();
     m_dump.clear();
     for(auto it : m_objects)  {
-        Object *object = m_controller->findObject(it);
+        Object *object = Engine::findObject(it);
         if(object) {
             m_dump.push_back(Engine::toVariant(object));
             m_parents.push_back(object->parent()->uuid());
@@ -893,7 +881,7 @@ void DeleteActors::redo() {
         }
     }
     for(auto it : m_objects) {
-        Object *object = m_controller->findObject(it);
+        Object *object = Engine::findObject(it);
         if(object) {
             Actor *actor = dynamic_cast<Actor *>(object);
             if(actor) {
@@ -922,7 +910,7 @@ void SelectScene::undo() {
 void SelectScene::redo() {
     uint32_t back = m_controller->world()->activeScene()->uuid();
 
-    Object *object = m_controller->findObject(m_object);
+    Object *object = Engine::findObject(m_object);
     if(object && dynamic_cast<Scene *>(object)) {
         m_controller->world()->setActiveScene(static_cast<Scene *>(object));
         m_object = back;
@@ -949,7 +937,7 @@ void ChangeProperty::redo() {
     Variant value(m_value);
 
     for(auto it : m_objects) {
-        Object *object = m_controller->findObject(it);
+        Object *object = Engine::findObject(it);
         if(object) {
             m_value = object->property(qPrintable(m_property));
             object->setProperty(qPrintable(m_property), value);
@@ -985,16 +973,16 @@ CreateComponent::CreateComponent(const QString &type, Object *object, ObjectCont
 }
 void CreateComponent::undo() {
     for(auto uuid : m_objects) {
-        Object *object = m_controller->findObject(uuid);
+        Object *object = Engine::findObject(uuid);
         if(object) {
             delete object;
 
-            emit m_controller->objectsSelected({m_controller->findObject(m_object)});
+            emit m_controller->objectsSelected({Engine::findObject(m_object)});
         }
     }
 }
 void CreateComponent::redo() {
-    Object *parent = m_controller->findObject(m_object);
+    Object *parent = Engine::findObject(m_object);
 
     if(parent) {
         Component *component = dynamic_cast<Component *>(Engine::objectCreate(qPrintable(m_type), qPrintable(m_type), parent));
@@ -1002,7 +990,7 @@ void CreateComponent::redo() {
             component->composeComponent();
             m_objects.push_back(component->uuid());
 
-            emit m_controller->objectsSelected({m_controller->findObject(m_object)});
+            emit m_controller->objectsSelected({Engine::findObject(m_object)});
         }
     }
 }
@@ -1026,7 +1014,7 @@ RemoveComponent::RemoveComponent(const std::string &component, ObjectController
 void RemoveComponent::undo() {
     Scene *scene = nullptr;
 
-    Object *parent = m_controller->findObject(m_parent);
+    Object *parent = Engine::findObject(m_parent);
     Object *object = Engine::toObject(m_dump, parent);
     if(object) {
         object->setParent(parent, m_index);
@@ -1039,7 +1027,7 @@ void RemoveComponent::redo() {
 
     m_dump = Variant();
     m_parent = 0;
-    Object *object = m_controller->findObject(m_uuid);
+    Object *object = Engine::findObject(m_uuid);
     if(object) {
         m_dump = Engine::toVariant(object, true);
 
diff --git a/worldeditor/src/screens/scenecomposer/objectcontroller.h b/worldeditor/src/screens/scenecomposer/objectcontroller.h
index f1c2f45a7..b817efd91 100644
--- a/worldeditor/src/screens/scenecomposer/objectcontroller.h
+++ b/worldeditor/src/screens/scenecomposer/objectcontroller.h
@@ -36,8 +36,6 @@ class ObjectController : public CameraController {
 
     QList<Object *> selected() override;
 
-    Object *findObject(uint32_t id, Object *parent = nullptr);
-
     void setIsolatedActor(Actor *actor);
     Actor *isolatedActor() const { return m_isolatedActor; }
 
diff --git a/worldeditor/src/screens/scenecomposer/scenecomposer.cpp b/worldeditor/src/screens/scenecomposer/scenecomposer.cpp
index 78f7755a6..ffa403855 100644
--- a/worldeditor/src/screens/scenecomposer/scenecomposer.cpp
+++ b/worldeditor/src/screens/scenecomposer/scenecomposer.cpp
@@ -384,7 +384,7 @@ void SceneComposer::restoreBackupScenes() {
         bool first = true;
         SelectTool::SelectList &list = m_controller->selectList();
         for(auto &it : list) {
-            Actor *actor = dynamic_cast<Actor *>(ObjectSystem::findObject(it.uuid, Engine::world()));
+            Actor *actor = dynamic_cast<Actor *>(Engine::findObject(it.uuid));
             if(actor) {
                 it.object = actor;
             } else { // Object was deleted