diff --git a/Source/Engine/Content/AssetReference.h b/Source/Engine/Content/AssetReference.h
index 658545d1a..40f57337d 100644
--- a/Source/Engine/Content/AssetReference.h
+++ b/Source/Engine/Content/AssetReference.h
@@ -193,7 +193,7 @@ public:
 
     FORCE_INLINE AssetReference& operator=(const Guid& id)
     {
-        OnSet((T*)LoadAsset(id, T::TypeInitializer));
+        OnSet((T*)::LoadAsset(id, T::TypeInitializer));
         return *this;
     }
 
diff --git a/Source/Engine/Content/Assets/VisualScript.cpp b/Source/Engine/Content/Assets/VisualScript.cpp
index 414d66870..5fd9d6f3f 100644
--- a/Source/Engine/Content/Assets/VisualScript.cpp
+++ b/Source/Engine/Content/Assets/VisualScript.cpp
@@ -3,6 +3,7 @@
 #include "VisualScript.h"
 #include "Engine/Core/Log.h"
 #include "Engine/Core/Types/DataContainer.h"
+#include "Engine/Content/Content.h"
 #include "Engine/Content/Factories/BinaryAssetFactory.h"
 #include "Engine/Scripting/MException.h"
 #include "Engine/Scripting/Scripting.h"
diff --git a/Source/Engine/Content/Utilities/AssetsContainer.h b/Source/Engine/Content/AssetsContainer.h
similarity index 87%
rename from Source/Engine/Content/Utilities/AssetsContainer.h
rename to Source/Engine/Content/AssetsContainer.h
index f2c56d747..aefaec8d8 100644
--- a/Source/Engine/Content/Utilities/AssetsContainer.h
+++ b/Source/Engine/Content/AssetsContainer.h
@@ -2,10 +2,9 @@
 
 #pragma once
 
-#include "Engine/Content/Content.h"
 #include "Engine/Core/Collections/Array.h"
 #include "Engine/Content/AssetReference.h"
-#include "../Asset.h"
+#include "Asset.h"
 
 /// <summary>
 /// Assets Container allows to load collection of assets and keep references to them.
@@ -27,13 +26,9 @@ public:
             if (e.GetID() == id)
                 return (T*)e.Get();
         }
-
-        auto asset = Content::LoadAsync<T>(id);
+        auto asset = (T*)::LoadAsset(id, T::TypeInitializer);
         if (asset)
-        {
             Add(asset);
-        }
-
         return asset;
     }
 
diff --git a/Source/Engine/Content/WeakAssetReference.h b/Source/Engine/Content/WeakAssetReference.h
index 76f6b1fff..4943fd0b5 100644
--- a/Source/Engine/Content/WeakAssetReference.h
+++ b/Source/Engine/Content/WeakAssetReference.h
@@ -158,7 +158,7 @@ public:
 
     FORCE_INLINE WeakAssetReference& operator=(const Guid& id)
     {
-        OnSet((T*)LoadAsset(id, T::TypeInitializer));
+        OnSet((T*)::LoadAsset(id, T::TypeInitializer));
         return *this;
     }
 
diff --git a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layer.cpp b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layer.cpp
index 36accc384..8f01ef271 100644
--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layer.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layer.cpp
@@ -271,7 +271,7 @@ void MaterialGenerator::prepareLayer(MaterialLayer* layer, bool allowVisiblePara
                 mp.Type = MaterialParameterType::Texture;
 
                 // Special case for Normal Maps
-                auto asset = Content::LoadAsync<Texture>((Guid)param->Value);
+                auto asset = (Texture*)::LoadAsset((Guid)param->Value, Texture::TypeInitializer);
                 if (asset && !asset->WaitForLoaded() && asset->IsNormalMap())
                     mp.Type = MaterialParameterType::NormalMap;
             }
diff --git a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h
index bee1efca4..157502224 100644
--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h
@@ -6,7 +6,7 @@
 
 #include "Engine/Graphics/Materials/MaterialInfo.h"
 #include "Engine/Graphics/Materials/MaterialParams.h"
-#include "Engine/Content/Utilities/AssetsContainer.h"
+#include "Engine/Content/AssetsContainer.h"
 #include "MaterialLayer.h"
 #include "Types.h"
 
diff --git a/Source/Engine/Visject/ShaderGraph.h b/Source/Engine/Visject/ShaderGraph.h
index 1ed95918a..fe24602cc 100644
--- a/Source/Engine/Visject/ShaderGraph.h
+++ b/Source/Engine/Visject/ShaderGraph.h
@@ -10,7 +10,7 @@
 #include "Engine/Core/Collections/HashSet.h"
 #include "Engine/Utilities/TextWriter.h"
 #include "Engine/Graphics/Materials/MaterialParams.h"
-#include "Engine/Content/Utilities/AssetsContainer.h"
+#include "Engine/Content/AssetsContainer.h"
 #include "Engine/Animations/Curve.h"
 
 #define SHADER_GRAPH_MAX_CALL_STACK 100
diff --git a/Source/Engine/Visject/VisjectGraph.cpp b/Source/Engine/Visject/VisjectGraph.cpp
index aafc4e9c9..abe4436dd 100644
--- a/Source/Engine/Visject/VisjectGraph.cpp
+++ b/Source/Engine/Visject/VisjectGraph.cpp
@@ -723,7 +723,7 @@ void VisjectExecutor::ProcessGroupTools(Box* box, Node* node, Value& value)
         // Asset Reference
     case 18:
     {
-        value = Content::LoadAsync<Asset>((Guid)node->Values[0]);
+        value = ::LoadAsset((Guid)node->Values[0], Asset::TypeInitializer);
         break;
     }
         // To String
diff --git a/Source/Engine/Visject/VisjectGraph.h b/Source/Engine/Visject/VisjectGraph.h
index 79c923871..7be06566e 100644
--- a/Source/Engine/Visject/VisjectGraph.h
+++ b/Source/Engine/Visject/VisjectGraph.h
@@ -8,7 +8,7 @@
 #include "Engine/Core/Math/Vector4.h"
 #include "Engine/Content/Asset.h"
 #include "Engine/Content/AssetReference.h"
-#include "Engine/Content/Utilities/AssetsContainer.h"
+#include "Engine/Content/AssetsContainer.h"
 #include "Engine/Animations/Curve.h"
 
 #define VISJECT_GRAPH_NODE_MAX_ASSETS 14
@@ -204,7 +204,7 @@ public:
                 // Get Gameplay Global
             case 16:
             {
-                n->Assets[0] = Content::LoadAsync<Asset>((Guid)n->Values[0]);
+                n->Assets[0] = ::LoadAsset((Guid)n->Values[0], Asset::TypeInitializer);
                 break;
             }
             }