diff --git a/Engine/Source/Editor/EditorApp.cpp b/Engine/Source/Editor/EditorApp.cpp
index d065e41c..bba08d91 100644
--- a/Engine/Source/Editor/EditorApp.cpp
+++ b/Engine/Source/Editor/EditorApp.cpp
@@ -173,8 +173,8 @@ void EditorApp::InitEditorUILayers()
 	pSceneView->SetAABBRenderer(m_pAABBRenderer);
 	m_pEditorImGuiContext->AddDynamicLayer(cd::MoveTemp(pSceneView));
 
-	m_pEditorImGuiContext->AddDynamicLayer(std::make_unique<Inspector>("Inspector"));
 	m_pEditorImGuiContext->AddDynamicLayer(std::make_unique<SkeletonView>("SkeletonView"));
+	m_pEditorImGuiContext->AddDynamicLayer(std::make_unique<Inspector>("Inspector"));
 
 	auto pAssetBrowser = std::make_unique<AssetBrowser>("AssetBrowser");
 	pAssetBrowser->SetSceneRenderer(m_pSceneRenderer);
diff --git a/Engine/Source/Editor/UILayers/AssetBrowser.cpp b/Engine/Source/Editor/UILayers/AssetBrowser.cpp
index 7dd995f3..898b8c95 100644
--- a/Engine/Source/Editor/UILayers/AssetBrowser.cpp
+++ b/Engine/Source/Editor/UILayers/AssetBrowser.cpp
@@ -909,15 +909,15 @@ void AssetBrowser::ImportModelFile(const char* pFilePath)
 	if (0 == inputFileExtension.compare(".cdbin"))
 	{
 		cdtools::CDProducer cdProducer(pFilePath);
-		cdtools::Processor processor(&cdProducer, nullptr, pSceneDatabase);
+		cd::SceneDatabase newSceneDatabase;
+		cdtools::Processor processor(&cdProducer, nullptr, &newSceneDatabase);
 		processor.Run();
+		pSceneDatabase->Merge(cd::MoveTemp(newSceneDatabase));
 	}
 	else
 	{
 #ifdef ENABLE_GENERIC_PRODUCER
 		cdtools::GenericProducer genericProducer(pFilePath);
-		genericProducer.SetSceneDatabaseIDs(pSceneDatabase->GetNodeCount(), pSceneDatabase->GetMeshCount(),
-		pSceneDatabase->GetMaterialCount(), pSceneDatabase->GetTextureCount(), pSceneDatabase->GetLightCount());
 		genericProducer.ActivateBoundingBoxService();
 		genericProducer.ActivateCleanUnusedService();
 		genericProducer.ActivateTangentsSpaceService();
@@ -928,10 +928,12 @@ void AssetBrowser::ImportModelFile(const char* pFilePath)
 			genericProducer.ActivateFlattenHierarchyService();
 		}
 
-		cdtools::Processor processor(&genericProducer, nullptr, pSceneDatabase);
+		cd::SceneDatabase newSceneDatabase;
+		cdtools::Processor processor(&genericProducer, nullptr, &newSceneDatabase);
 		processor.SetDumpSceneDatabaseEnable(false);
 		//processor.SetFlattenSceneDatabaseEnable(true);
 		processor.Run();
+		pSceneDatabase->Merge(cd::MoveTemp(newSceneDatabase));
 #else
 		assert("Unable to import this file format.");
 #endif
diff --git a/Engine/Source/Editor/UILayers/Inspector.cpp b/Engine/Source/Editor/UILayers/Inspector.cpp
index adbce6e5..6a798860 100644
--- a/Engine/Source/Editor/UILayers/Inspector.cpp
+++ b/Engine/Source/Editor/UILayers/Inspector.cpp
@@ -146,12 +146,10 @@ void UpdateComponentWidget<engine::MaterialComponent>(engine::SceneWorld* pScene
 				ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2, 2));
 				ImGui::Separator();
 
-				std::string uvOffset = std::string(title) + std::string(" UVOffset");
-				std::string uvScale = std::string(title) + std::string(" UVScale");
 				if (isOpen)
 				{
-					ImGuiUtils::ImGuiVectorProperty(uvOffset.c_str(), pTextureInfo->GetUVOffset());
-					ImGuiUtils::ImGuiVectorProperty(uvScale.c_str(), pTextureInfo->GetUVScale());
+					ImGuiUtils::ImGuiVectorProperty("UVOffset", pTextureInfo->GetUVOffset());
+					ImGuiUtils::ImGuiVectorProperty("UVScale", pTextureInfo->GetUVScale());
 				}
 
 				ImGui::Separator();
diff --git a/Engine/Source/Runtime/ECWorld/TransformComponent.cpp b/Engine/Source/Runtime/ECWorld/TransformComponent.cpp
index 1a661120..1cc4d05e 100644
--- a/Engine/Source/Runtime/ECWorld/TransformComponent.cpp
+++ b/Engine/Source/Runtime/ECWorld/TransformComponent.cpp
@@ -19,7 +19,7 @@ void TransformComponent::Build()
 	}
 }
 #ifdef EDITOR_MODE
-bool TransformComponent::m_doUseUniformScale = false;
+bool TransformComponent::m_doUseUniformScale = true;
 #endif
 
 }
\ No newline at end of file
diff --git a/Engine/Source/Runtime/ImGui/ImGuiUtils.hpp b/Engine/Source/Runtime/ImGui/ImGuiUtils.hpp
index c74ab2dd..6004cce0 100644
--- a/Engine/Source/Runtime/ImGui/ImGuiUtils.hpp
+++ b/Engine/Source/Runtime/ImGui/ImGuiUtils.hpp
@@ -243,7 +243,7 @@ static void ColorPickerProperty(const char* Name, cd::Vec3f& veccolor)
 	ImGui::SameLine();
 	ImGui::NextColumn();
 	ImGui::PushID(Name);
-	if (ImGui::Button("Change"))
+	if (ImGui::Button("..."))
 	{
 		showMap[Name] = true;
 	}
diff --git a/Engine/Source/ThirdParty/AssetPipeline b/Engine/Source/ThirdParty/AssetPipeline
index 0b264e08..1e4b58f9 160000
--- a/Engine/Source/ThirdParty/AssetPipeline
+++ b/Engine/Source/ThirdParty/AssetPipeline
@@ -1 +1 @@
-Subproject commit 0b264e08618a3ff041a82603427279d2dc1f2ba0
+Subproject commit 1e4b58f964f8adeff84038fb4f3be89eb26e6514