diff --git a/include/Nazara/Graphics/ForwardFramePipeline.hpp b/include/Nazara/Graphics/ForwardFramePipeline.hpp
index 3df743ace..719b80c5d 100644
--- a/include/Nazara/Graphics/ForwardFramePipeline.hpp
+++ b/include/Nazara/Graphics/ForwardFramePipeline.hpp
@@ -74,7 +74,7 @@ namespace Nz
 			void UpdateRenderableRenderMask(std::size_t renderableIndex, UInt32 renderMask) override;
 			void UpdateRenderableScissorBox(std::size_t renderableIndex, const Recti& scissorBox) override;
 			void UpdateRenderableSkeletonInstance(std::size_t renderableIndex, std::size_t skeletonIndex) override;
-			void UpdateViewerRenderMask(std::size_t viewerIndex, Int32 renderOrder) override;
+			void UpdateViewerRenderOrder(std::size_t viewerIndex, Int32 renderOrder) override;
 
 			ForwardFramePipeline& operator=(const ForwardFramePipeline&) = delete;
 			ForwardFramePipeline& operator=(ForwardFramePipeline&&) = delete;
diff --git a/include/Nazara/Graphics/FramePipeline.hpp b/include/Nazara/Graphics/FramePipeline.hpp
index 54894d041..f49715e11 100644
--- a/include/Nazara/Graphics/FramePipeline.hpp
+++ b/include/Nazara/Graphics/FramePipeline.hpp
@@ -50,7 +50,8 @@ namespace Nz
 			virtual std::size_t RegisterWorldInstance(WorldInstancePtr worldInstance) = 0;
 
 			virtual const Light* RetrieveLight(std::size_t lightIndex) const = 0;
-			virtual const Texture* RetrieveLightShadowmap(std::size_t lightIndex) const = 0;
+			virtual const LightShadowData* RetrieveLightShadowData(std::size_t lightIndex) const = 0;
+			virtual const Texture* RetrieveLightShadowmap(std::size_t lightIndex, const AbstractViewer* viewer) const = 0;
 
 			virtual void Render(RenderFrame& renderFrame) = 0;
 
@@ -64,7 +65,7 @@ namespace Nz
 			virtual void UpdateRenderableRenderMask(std::size_t renderableIndex, UInt32 renderMask) = 0;
 			virtual void UpdateRenderableScissorBox(std::size_t renderableIndex, const Recti& scissorBox) = 0;
 			virtual void UpdateRenderableSkeletonInstance(std::size_t renderableIndex, std::size_t skeletonIndex) = 0;
-			virtual void UpdateViewerRenderMask(std::size_t viewerIndex, Int32 renderOrder) = 0;
+			virtual void UpdateViewerRenderOrder(std::size_t viewerIndex, Int32 renderOrder) = 0;
 
 			FramePipeline& operator=(const FramePipeline&) = delete;
 			FramePipeline& operator=(FramePipeline&&) = delete;
diff --git a/src/Nazara/Graphics/ForwardFramePipeline.cpp b/src/Nazara/Graphics/ForwardFramePipeline.cpp
index f01379699..a45426dce 100644
--- a/src/Nazara/Graphics/ForwardFramePipeline.cpp
+++ b/src/Nazara/Graphics/ForwardFramePipeline.cpp
@@ -682,7 +682,7 @@ namespace Nz
 		}
 	}
 
-	void ForwardFramePipeline::UpdateViewerRenderMask(std::size_t viewerIndex, Int32 renderOrder)
+	void ForwardFramePipeline::UpdateViewerRenderOrder(std::size_t viewerIndex, Int32 renderOrder)
 	{
 		ViewerData* viewerData = m_viewerPool.RetrieveFromIndex(viewerIndex);
 		assert(!viewerData->pendingDestruction);