diff --git a/XUSG-EZ/XUSG-EZ_DX12.cpp b/XUSG-EZ/XUSG-EZ_DX12.cpp
index d27adfe..957a79b 100644
--- a/XUSG-EZ/XUSG-EZ_DX12.cpp
+++ b/XUSG-EZ/XUSG-EZ_DX12.cpp
@@ -346,7 +346,7 @@ void EZ::CommandList_DX12::SetGraphicsPipelineState(const Pipeline& pipelineStat
 		if (pipelineState && pipeline != pipelineState)
 		{
 			pipeline = pipelineState;
-			m_graphicsPipelineLib->SetPipeline(pState->GetKey(), pipeline);
+			m_graphicsPipelineLib->SetPipeline(pState, pipeline);
 		}
 	}
 	else pipeline = pipelineState;
@@ -373,7 +373,7 @@ void EZ::CommandList_DX12::SetComputePipelineState(const Pipeline& pipelineState
 		if (pipelineState && pipeline != pipelineState)
 		{
 			pipeline = pipelineState;
-			m_computePipelineLib->SetPipeline(pState->GetKey(), pipeline);
+			m_computePipelineLib->SetPipeline(pState, pipeline);
 		}
 	}
 	else pipeline = pipelineState;
diff --git a/XUSG-EZ/XUSGUltimate-EZ.h b/XUSG-EZ/XUSGUltimate-EZ.h
index 1263736..2221af0 100644
--- a/XUSG-EZ/XUSGUltimate-EZ.h
+++ b/XUSG-EZ/XUSGUltimate-EZ.h
@@ -60,10 +60,10 @@ namespace XUSG
 				virtual void RSSetShadingRateImage(Resource* pShadingRateImage) = 0;
 
 				virtual void MSSetPipelineState(const Pipeline& pipelineState, const State* pState = nullptr) = 0;
-				virtual void MSSetBlendState(BlendPreset preset, uint8_t numColorRTs = 1, uint32_t sampleMask = UINT_MAX) = 0;
+				virtual void MSSetBlendState(Graphics::BlendPreset preset, uint8_t numColorRTs = 1, uint32_t sampleMask = UINT_MAX) = 0;
 				virtual void MSSetSample(uint8_t count, uint8_t quality = 0) = 0;
-				virtual void MSSetRasterizerState(RasterizerPreset preset) = 0;
-				virtual void MSSetDepthStencilState(DepthStencilPreset preset) = 0;
+				virtual void MSSetRasterizerState(Graphics::RasterizerPreset preset) = 0;
+				virtual void MSSetDepthStencilState(Graphics::DepthStencilPreset preset) = 0;
 				virtual void MSSetShader(Shader::Stage stage, const Blob& shader) = 0;
 				virtual void MSSetNodeMask(uint32_t nodeMask) = 0;
 				virtual void DispatchMesh(uint32_t ThreadGroupCountX, uint32_t ThreadGroupCountY, uint32_t ThreadGroupCountZ) = 0;
diff --git a/XUSG-EZ/XUSGUltimate-EZ_DX12.cpp b/XUSG-EZ/XUSGUltimate-EZ_DX12.cpp
index ace1e5e..d7ac1e2 100644
--- a/XUSG-EZ/XUSGUltimate-EZ_DX12.cpp
+++ b/XUSG-EZ/XUSGUltimate-EZ_DX12.cpp
@@ -138,7 +138,7 @@ void EZ::CommandList_DX12::MSSetPipelineState(const Pipeline& pipelineState, con
 		if (pipelineState && pipeline != pipelineState)
 		{
 			pipeline = pipelineState;
-			m_meshShaderPipelineLib->SetPipeline(pState->GetKey(), pipeline);
+			m_meshShaderPipelineLib->SetPipeline(pState, pipeline);
 		}
 	}
 	else pipeline = pipelineState;
@@ -154,7 +154,7 @@ void EZ::CommandList_DX12::MSSetPipelineState(const Pipeline& pipelineState, con
 	}
 }
 
-void EZ::CommandList_DX12::MSSetBlendState(BlendPreset preset, uint8_t numColorRTs, uint32_t sampleMask)
+void EZ::CommandList_DX12::MSSetBlendState(Graphics::BlendPreset preset, uint8_t numColorRTs, uint32_t sampleMask)
 {
 	assert(m_meshShaderState);
 	m_meshShaderState->OMSetBlendState(preset, m_meshShaderPipelineLib.get(), numColorRTs, sampleMask);
@@ -168,14 +168,14 @@ void EZ::CommandList_DX12::MSSetSample(uint8_t count, uint8_t quality)
 	m_isMSStateDirty = true;
 }
 
-void EZ::CommandList_DX12::MSSetRasterizerState(RasterizerPreset preset)
+void EZ::CommandList_DX12::MSSetRasterizerState(Graphics::RasterizerPreset preset)
 {
 	assert(m_meshShaderState);
 	m_meshShaderState->RSSetState(preset, m_meshShaderPipelineLib.get());
 	m_isMSStateDirty = true;
 }
 
-void EZ::CommandList_DX12::MSSetDepthStencilState(DepthStencilPreset preset)
+void EZ::CommandList_DX12::MSSetDepthStencilState(Graphics::DepthStencilPreset preset)
 {
 	assert(m_meshShaderState);
 	m_meshShaderState->DSSetState(preset, m_meshShaderPipelineLib.get());
diff --git a/XUSG-EZ/XUSGUltimate-EZ_DX12.h b/XUSG-EZ/XUSGUltimate-EZ_DX12.h
index b586ae5..db22451 100644
--- a/XUSG-EZ/XUSGUltimate-EZ_DX12.h
+++ b/XUSG-EZ/XUSGUltimate-EZ_DX12.h
@@ -70,10 +70,10 @@ namespace XUSG
 				void RSSetShadingRateImage(Resource* pShadingRateImage);
 
 				void MSSetPipelineState(const Pipeline& pipelineState, const State* pState = nullptr);
-				void MSSetBlendState(BlendPreset preset, uint8_t numColorRTs = 1, uint32_t sampleMask = UINT_MAX);
+				void MSSetBlendState(Graphics::BlendPreset preset, uint8_t numColorRTs = 1, uint32_t sampleMask = UINT_MAX);
 				void MSSetSample(uint8_t count, uint8_t quality = 0);
-				void MSSetRasterizerState(RasterizerPreset preset);
-				void MSSetDepthStencilState(DepthStencilPreset preset);
+				void MSSetRasterizerState(Graphics::RasterizerPreset preset);
+				void MSSetDepthStencilState(Graphics::DepthStencilPreset preset);
 				void MSSetShader(Shader::Stage stage, const Blob& shader);
 				void MSSetNodeMask(uint32_t nodeMask);
 				void DispatchMesh(uint32_t ThreadGroupCountX, uint32_t ThreadGroupCountY, uint32_t ThreadGroupCountZ);
diff --git a/XUSGRayTracing-EZ/XUSGRayTracing-EZ_DX12.cpp b/XUSGRayTracing-EZ/XUSGRayTracing-EZ_DX12.cpp
index 4e78673..7001cad 100644
--- a/XUSGRayTracing-EZ/XUSGRayTracing-EZ_DX12.cpp
+++ b/XUSGRayTracing-EZ/XUSGRayTracing-EZ_DX12.cpp
@@ -317,7 +317,7 @@ void EZ::CommandList_DXR::RTSetPipelineState(const Pipeline& pipelineState, RayT
 		if (pipelineState && pipeline != pipelineState)
 		{
 			pipeline = pipelineState;
-			m_rayTracingPipelineLib->SetPipeline(pState->GetKey(), pipeline);
+			m_rayTracingPipelineLib->SetPipeline(pState, pipeline);
 		}
 	}
 	else pipeline = pipelineState;