diff --git a/Source/Engine/Graphics/GPUBuffer.cpp b/Source/Engine/Graphics/GPUBuffer.cpp
index 4900e73e2..e927904dd 100644
--- a/Source/Engine/Graphics/GPUBuffer.cpp
+++ b/Source/Engine/Graphics/GPUBuffer.cpp
@@ -137,6 +137,7 @@ GPUBuffer* GPUBuffer::New()
 }
 
 GPUBuffer::GPUBuffer()
+    : GPUResource(SpawnParams(Guid::New(), TypeInitializer))
 {
     // Buffer with size 0 is considered to be invalid
     _desc.Size = 0;
diff --git a/Source/Engine/Graphics/GPUDevice.cpp b/Source/Engine/Graphics/GPUDevice.cpp
index 14d8ff63a..d82900c1b 100644
--- a/Source/Engine/Graphics/GPUDevice.cpp
+++ b/Source/Engine/Graphics/GPUDevice.cpp
@@ -35,6 +35,11 @@ GPUPipelineState* GPUPipelineState::New()
     return GPUDevice::Instance->CreatePipelineState();
 }
 
+GPUPipelineState::GPUPipelineState()
+    : GPUResource(SpawnParams(Guid::New(), TypeInitializer))
+{
+}
+
 bool GPUPipelineState::Init(const Description& desc)
 {
     // Cache description in debug builds
@@ -177,7 +182,7 @@ GPUPipelineState::Description GPUPipelineState::Description::DefaultFullscreenTr
 };
 
 GPUResource::GPUResource()
-    : ScriptingObject(SpawnParams(Guid::New(), GPUResource::TypeInitializer))
+    : ScriptingObject(SpawnParams(Guid::New(), TypeInitializer))
 {
 }
 
diff --git a/Source/Engine/Graphics/GPUPipelineState.h b/Source/Engine/Graphics/GPUPipelineState.h
index 538c83a10..b73e070f2 100644
--- a/Source/Engine/Graphics/GPUPipelineState.h
+++ b/Source/Engine/Graphics/GPUPipelineState.h
@@ -109,6 +109,8 @@ public:
 protected:
     ShaderBindings _meta;
 
+    GPUPipelineState();
+
 public:
 #if BUILD_DEBUG
     /// <summary>
diff --git a/Source/Engine/Graphics/GPUResource.h b/Source/Engine/Graphics/GPUResource.h
index 94265a7b3..5e27d679b 100644
--- a/Source/Engine/Graphics/GPUResource.h
+++ b/Source/Engine/Graphics/GPUResource.h
@@ -144,7 +144,8 @@ public:
     /// <param name="device">The graphics device.</param>
     /// <param name="name">The resource name.</param>
     GPUResourceBase(DeviceType* device, const StringView& name) noexcept
-        : _device(device)
+        : BaseType()
+        , _device(device)
     {
 #if GPU_ENABLE_RESOURCE_NAMING
         if (name.HasChars())
diff --git a/Source/Engine/Graphics/Shaders/GPUShader.cpp b/Source/Engine/Graphics/Shaders/GPUShader.cpp
index 4f3428510..9905bae16 100644
--- a/Source/Engine/Graphics/Shaders/GPUShader.cpp
+++ b/Source/Engine/Graphics/Shaders/GPUShader.cpp
@@ -59,6 +59,7 @@ uint32 GPUShaderProgramsContainer::CalculateHash(const StringAnsiView& name, int
 }
 
 GPUShader::GPUShader()
+    : GPUResource(SpawnParams(Guid::New(), TypeInitializer))
 {
     Platform::MemoryClear(_constantBuffers, sizeof(_constantBuffers));
 }
diff --git a/Source/Engine/Graphics/Shaders/GPUShader.h b/Source/Engine/Graphics/Shaders/GPUShader.h
index 610f09d18..435f196ce 100644
--- a/Source/Engine/Graphics/Shaders/GPUShader.h
+++ b/Source/Engine/Graphics/Shaders/GPUShader.h
@@ -74,9 +74,6 @@ protected:
     GPUShaderProgramsContainer _shaders;
     GPUConstantBuffer* _constantBuffers[MAX_CONSTANT_BUFFER_SLOTS];
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="GPUShader"/> class.
-    /// </summary>
     GPUShader();
 
 public:
diff --git a/Source/Engine/Graphics/Textures/GPUSampler.cpp b/Source/Engine/Graphics/Textures/GPUSampler.cpp
index 6eb61ec33..490b01121 100644
--- a/Source/Engine/Graphics/Textures/GPUSampler.cpp
+++ b/Source/Engine/Graphics/Textures/GPUSampler.cpp
@@ -76,6 +76,7 @@ GPUSampler* GPUSampler::New()
 }
 
 GPUSampler::GPUSampler()
+    : GPUResource(SpawnParams(Guid::New(), TypeInitializer))
 {
 }
 
diff --git a/Source/Engine/Graphics/Textures/GPUTexture.cpp b/Source/Engine/Graphics/Textures/GPUTexture.cpp
index d9112ffc6..4c819fea0 100644
--- a/Source/Engine/Graphics/Textures/GPUTexture.cpp
+++ b/Source/Engine/Graphics/Textures/GPUTexture.cpp
@@ -220,7 +220,7 @@ GPUTexture* GPUTexture::New()
 }
 
 GPUTexture::GPUTexture()
-    : GPUResource(SpawnParams(Guid::New(), GPUTexture::TypeInitializer))
+    : GPUResource(SpawnParams(Guid::New(), TypeInitializer))
     , _residentMipLevels(0)
     , _sRGB(false)
     , _isBlockCompressed(false)
@@ -423,7 +423,6 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
 
         break;
     }
-
     case TextureDimensions::VolumeTexture:
     {
         if (desc.IsDepthStencil())
@@ -461,7 +460,6 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
 
         break;
     }
-
     case TextureDimensions::CubeTexture:
     {
         if (desc.HasPerSliceViews())
diff --git a/Source/Engine/Graphics/Textures/GPUTexture.h b/Source/Engine/Graphics/Textures/GPUTexture.h
index f15607567..7485a51e8 100644
--- a/Source/Engine/Graphics/Textures/GPUTexture.h
+++ b/Source/Engine/Graphics/Textures/GPUTexture.h
@@ -79,9 +79,6 @@ protected:
     bool _sRGB, _isBlockCompressed;
     GPUTextureDescription _desc;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="GPUTexture"/> class.
-    /// </summary>
     GPUTexture();
 
 public:
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.h b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.h
index eb8a73af5..3592ba8d1 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.h
+++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.h
@@ -128,7 +128,7 @@ public:
     /// <param name="device">The graphics device.</param>
     /// <param name="name">The resource name.</param>
     GPUResourceDX11(GPUDeviceDX11* device, const StringView& name) noexcept
-        : GPUResourceBase(device, name)
+        : GPUResourceBase<GPUDeviceDX11, BaseType>(device, name)
     {
     }
 };