diff --git a/sources/engine/Xenko.Assets/Materials/MaterialAssetCompiler.cs b/sources/engine/Xenko.Assets/Materials/MaterialAssetCompiler.cs
index dfa365a9ee..fd7306ed91 100644
--- a/sources/engine/Xenko.Assets/Materials/MaterialAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets/Materials/MaterialAssetCompiler.cs
@@ -53,7 +53,7 @@ private class MaterialCompileCommand : AssetCommand<MaterialAsset>
             public MaterialCompileCommand(string url, AssetItem assetItem, MaterialAsset value, AssetCompilerContext context)
                 : base(url, value, assetItem.Package)
             {
-                Version = 4;
+                Version = 5;
                 this.assetItem = assetItem;
                 colorSpace = context.GetColorSpace();
                 assetUrl = new UFile(url);
diff --git a/sources/engine/Xenko.Assets/XenkoPackageUpgrader.cs b/sources/engine/Xenko.Assets/XenkoPackageUpgrader.cs
index 4b0ed7c086..3b7d26c98a 100644
--- a/sources/engine/Xenko.Assets/XenkoPackageUpgrader.cs
+++ b/sources/engine/Xenko.Assets/XenkoPackageUpgrader.cs
@@ -40,6 +40,24 @@ public partial class XenkoPackageUpgrader : PackageUpgrader
 
         public override bool Upgrade(PackageLoadParameters loadParameters, PackageSession session, ILogger log, Package dependentPackage, PackageDependency dependency, Package dependencyPackage, IList<PackageLoadingAssetFile> assetFiles)
         {
+            if (dependency.Version.MinVersion < new PackageVersion("3.1.0.2-beta01"))
+            {
+                foreach (var assetFile in assetFiles)
+                {
+                    // Add new generic parameter to ShadowMapReceiverDirectional in effect log
+                    if (assetFile.FilePath.GetFileExtension() == ".xkeffectlog")
+                    {
+                        var assetContent = assetFile.AssetContent ?? File.ReadAllBytes(assetFile.FilePath.FullPath);
+                        var assetContentString = System.Text.Encoding.UTF8.GetString(assetContent);
+                        var newAssetContentString = System.Text.RegularExpressions.Regex.Replace(assetContentString, @"([ ]*)-   ClassName:", "$1- !ShaderClassSource\r\n$1    ClassName:");
+                        if (assetContentString != newAssetContentString)
+                        {
+                            // Need replacement, update with replaced text
+                            assetFile.AssetContent = System.Text.Encoding.UTF8.GetBytes(newAssetContentString);
+                        }
+                    }
+                }
+            }
             return true;
         }
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeBinaryBase.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeBinaryBase.cs
index 06c31be030..dc0fc3bd8e 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeBinaryBase.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeBinaryBase.cs
@@ -82,8 +82,8 @@ public override IEnumerable<IComputeNode> GetChildren(object context = null)
 
         public override ShaderSource GenerateShaderSource(ShaderGeneratorContext context, MaterialComputeColorKeys baseKeys)
         {
-            var leftShaderSource = LeftChild.GenerateShaderSource(context, baseKeys);
-            var rightShaderSource = RightChild.GenerateShaderSource(context, baseKeys);
+            var leftShaderSource = LeftChild?.GenerateShaderSource(context, baseKeys);
+            var rightShaderSource = RightChild?.GenerateShaderSource(context, baseKeys);
 
             var shaderSource = new ShaderClassSource(GetCorrespondingShaderSourceName(Operator));
             var mixin = new ShaderMixinSource();
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColors.cd b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColors.cd
index 7b8d1a84f7..bd0e0d1fd7 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColors.cd
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColors.cd
@@ -17,7 +17,7 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeBinaryColor" Collapsed="true">
     <Position X="8" Y="5.75" Width="2.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAQAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeBinaryColor.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -33,7 +33,7 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeColor" Collapsed="true">
     <Position X="2" Y="7" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAEAAAAAAAEAAAAAAAAAAAAAAAAAAIAAAAAAAA=</HashCode>
+      <HashCode>IAAAAAAEAAAAAIAEIAAAAAAABAAAAAAAAAIAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeColor.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -49,7 +49,7 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeFloat4" Collapsed="true">
     <Position X="2" Y="8.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAEAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>IAAAAAAEAAQAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeFloat4.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -72,14 +72,14 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeShaderClassBase&lt;T&gt;" Collapsed="true">
     <Position X="9.75" Y="4.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>AACAAAAGAACIAAAEACAAAAAAAQAQQAAAAAAEgAAAgAA=</HashCode>
+      <HashCode>AAAAAAAGAAAAAAAEACAAAAAAAAAAQAAAAAAEAAAAgAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeShaderClassBase.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeShaderClassColor" Collapsed="true">
     <Position X="12" Y="5.75" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAgAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeShaderClassColor.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -95,14 +95,14 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeTextureBase" Collapsed="true">
     <Position X="4.25" Y="5.75" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAEAAAQAAAEAAIAAAAAAAACAAAQAAIAIAIAgAA=</HashCode>
+      <HashCode>AAAAAAAUAAAQAIAEAAIgAAAAAAACAAAQAAIAIAIAgAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeTextureBase.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeTextureColor" Collapsed="true">
     <Position X="5.5" Y="7" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>IAAIAAAQAgAQAAAAIAAAAAAAAAAAAAAAAAAAAAEAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeTextureColor.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -110,24 +110,24 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeTextureScalar" Collapsed="true">
     <Position X="5.5" Y="8.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAIAAAwAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeTextureScalar.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeStreamBase" Collapsed="true">
+  <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeVertexStreamBase" Collapsed="true">
     <Position X="14.25" Y="4.25" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAEAAAEAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Rendering\Materials\ComputeColors\ComputeStreamBase.cs</FileName>
+      <FileName>Rendering\Materials\ComputeColors\ComputeVertexStreamBase.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeStreamColor" Collapsed="true">
+  <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeVertexStreamScalar" Collapsed="true">
     <Position X="16" Y="5.75" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Rendering\Materials\ComputeColors\ComputeStreamColor.cs</FileName>
+      <HashCode>AAAEAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Rendering\Materials\ComputeColors\ComputeVertexStreamScalar.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
@@ -156,15 +156,15 @@
   <Interface Name="Xenko.Rendering.Materials.IComputeColor" Collapsed="true">
     <Position X="2.75" Y="1.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\IComputeColor.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Xenko.Rendering.Materials.ComputeColors.IComputeStream" Collapsed="true">
-    <Position X="5" Y="1.75" Width="1.5" />
+  <Interface Name="Xenko.Rendering.Materials.ComputeColors.IComputeVertexStream" Collapsed="true">
+    <Position X="5" Y="1.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Rendering\Materials\ComputeColors\IComputeStream.cs</FileName>
+      <FileName>Rendering\Materials\ComputeColors\IComputeVertexStream.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Font Name="Segoe UI" Size="9" />
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayerContext.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayerContext.cs
index b269797d5b..ac2f1d0abc 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayerContext.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayerContext.cs
@@ -155,14 +155,14 @@ public ShaderSource GenerateStreamInitializers(MaterialShaderStage stage)
             // the streams coming from the material layers
             foreach (var streamInitializer in stageContext.StreamInitializers)
             {
-                mixin.Mixins.Add(streamInitializer);
+                mixin.Mixins.Add(new ShaderClassSource(streamInitializer));
             }
             stageContext.StreamInitializers.Clear();
 
             // the streams specific to a stage
             // TODO: Use StreamInitializers instead of streams initializers hardcoded in MaterialPixelShadingStream.ResetStream
             if (stage == MaterialShaderStage.Pixel)
-                mixin.Mixins.Add("MaterialPixelShadingStream");
+                mixin.Mixins.Add(new ShaderClassSource("MaterialPixelShadingStream"));
 
             return mixin;
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Materials.cd b/sources/engine/Xenko.Rendering/Rendering/Materials/Materials.cd
index b609febb56..981c2f4410 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/Materials.cd
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/Materials.cd
@@ -6,92 +6,15 @@
       <Method Name="MaterialAttributes" Hidden="true" />
       <Method Name="Visit" Hidden="true" />
     </Members>
-    <AssociationLine Name="Tessellation" Type="Xenko.Rendering.Materials.IMaterialTessellationFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.438" Y="4.812" />
-        <Point X="2.438" Y="11.596" />
-        <Point X="3.5" Y="11.596" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Displacement" Type="Xenko.Rendering.Materials.IMaterialDisplacementFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.562" Y="4.812" />
-        <Point X="2.562" Y="10.096" />
-        <Point X="3.5" Y="10.096" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Surface" Type="Xenko.Rendering.Materials.IMaterialSurfaceFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.812" Y="4.812" />
-        <Point X="2.812" Y="7.096" />
-        <Point X="3.5" Y="7.096" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="MicroSurface" Type="Xenko.Rendering.Materials.IMaterialMicroSurfaceFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.688" Y="4.812" />
-        <Point X="2.688" Y="8.596" />
-        <Point X="3.5" Y="8.596" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Diffuse" Type="Xenko.Rendering.Materials.IMaterialDiffuseFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.312" Y="4.812" />
-        <Point X="2.312" Y="14.346" />
-        <Point X="3.5" Y="14.346" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="DiffuseModel" Type="Xenko.Rendering.Materials.IMaterialDiffuseModelFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.062" Y="4.812" />
-        <Point X="2.062" Y="19.096" />
-        <Point X="3.5" Y="19.096" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Specular" Type="Xenko.Rendering.Materials.IMaterialSpecularFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.188" Y="4.812" />
-        <Point X="2.188" Y="15.846" />
-        <Point X="3.5" Y="15.846" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="SpecularModel" Type="Xenko.Rendering.Materials.IMaterialSpecularModelFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="1.812" Y="4.812" />
-        <Point X="1.812" Y="22.346" />
-        <Point X="3.25" Y="22.346" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Occlusion" Type="Xenko.Rendering.Materials.IMaterialOcclusionFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="1.688" Y="4.812" />
-        <Point X="1.688" Y="23.596" />
-        <Point X="3.25" Y="23.596" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Emissive" Type="Xenko.Rendering.Materials.IMaterialEmissiveFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="1.938" Y="4.812" />
-        <Point X="1.938" Y="20.596" />
-        <Point X="3.5" Y="20.596" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Transparency" Type="Xenko.Rendering.Materials.IMaterialTransparencyFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="1.562" Y="4.812" />
-        <Point X="1.562" Y="25.096" />
-        <Point X="3.25" Y="25.096" />
-      </Path>
-    </AssociationLine>
     <AssociationLine Name="Overrides" Type="Xenko.Rendering.Materials.MaterialOverrides" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="3" Y="4.75" />
-        <Point X="4" Y="4.75" />
+        <Point X="3" Y="4.656" />
+        <Point X="4" Y="4.656" />
         <Point X="4" Y="5.5" />
       </Path>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>BEAACABAAQgAAAQAAgAAAAAEAACgAAAAAAAAACABAAA=</HashCode>
+      <HashCode>BEAACEBAAQgAAIQAAgBAAAAEAADgAAAAAAAAACABAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialAttributes.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -113,7 +36,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialBlendLayer" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="8.5" Y="5.5" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AEAAAAAAAQAAAIQAAAAAAAQAQACAAAAAAAAAAEAAAAA=</HashCode>
+      <HashCode>AEAAAAAAAQAAAIQAAAAAAAQAQACAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialBlendLayer.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -127,7 +50,7 @@
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialBlendLayers.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -135,7 +58,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialDiffuseLambertModelFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.25" Y="18.75" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAABAAAQAgAAAAAAAAAAgAIAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAABAAAAAAgAAAAAAAAAAgAIAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialDiffuseLambertModelFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -143,7 +66,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialDiffuseMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="14" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAEAAAAAAAAAAAQAAAABAAAAAAAAABAAAAAAAAAAQAA=</HashCode>
+      <HashCode>AAEAAAAAAAAAAAAAAAABAAAAAAAAABAAAAAAAABAQAA=</HashCode>
       <FileName>Rendering\Materials\MaterialDiffuseMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -151,7 +74,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialDisplacementMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="9.75" Width="2.5" />
     <TypeIdentifier>
-      <HashCode>AAAQAAAAAAAAAAQAAAAAAAAIAAAAAgAAAAgACAAAAAA=</HashCode>
+      <HashCode>AAAQAAAAAAAAAAAAAAAAAAAIAAAAAgAAAAgACABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialDisplacementMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -159,7 +82,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialEmissiveMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.25" Y="20.25" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAQAAAAAAABAAAQAgQgBAAAIAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAQAAAAAAAAAAAAAgQgBAAAIAAAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialEmissiveMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -167,7 +90,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialGlossinessMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="8.5" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAEAAAAAAAAQAAAABAAEAAAAABAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAEAAAAAAAAAAAAABAAEAAAAABAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialGlossinessMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -175,7 +98,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialMetalnessMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="9.25" Y="15.5" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AACAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialMetalnessMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -183,7 +106,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialNormalMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="7" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAIABQAQAABAAAAAAAAAAAAAAAACAAAAAA=</HashCode>
+      <HashCode>ABAAAQAAAAAIABAAQAABAAAAAAAAAAAAAAAACABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialNormalMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -191,7 +114,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialOcclusionMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.25" Y="23.75" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AFAAAAAAAAAAAAQAAACBAAAAAABAAAAAAECQAAAAAAA=</HashCode>
+      <HashCode>AFAAAAAAAAAAAAAAAACBAAAAAABAAAAAAECQAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialOcclusionMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -206,7 +129,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialSpecularMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="15.5" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAABgAAIAAAgAAAABAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAABgAAIAAAgAAAABAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialSpecularMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -233,22 +156,8 @@
       <Compartment Name="Properties" Collapsed="true" />
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
-    <AssociationLine Name="Visibility" Type="Xenko.Rendering.Materials.IMaterialSpecularMicrofacetVisibilityFunction" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="13.625" Y="22.562" />
-        <Point X="13.625" Y="27.346" />
-        <Point X="15.25" Y="27.346" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="NormalDistribution" Type="Xenko.Rendering.Materials.IMaterialSpecularMicrofacetNormalDistributionFunction" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="13.938" Y="22.562" />
-        <Point X="13.938" Y="25.096" />
-        <Point X="15.25" Y="25.096" />
-      </Path>
-    </AssociationLine>
     <TypeIdentifier>
-      <HashCode>AEAAAAAAAABAAAQAgAAAAAAAAAAAAIAAAAACAAAAAAI=</HashCode>
+      <HashCode>AEAAAAACABAAAAAAgAAAAAAAAAAAAIAAAAACAABAAAI=</HashCode>
       <FileName>Rendering\Materials\MaterialSpecularMicroFacetModelFeature.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -349,29 +258,29 @@
   <Class Name="Xenko.Rendering.Materials.MaterialTessellationBaseFeature" Collapsed="true">
     <Position X="6.75" Y="11.25" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AACAAAAACAAAAIQAAAAAAAQAAAAAAAQCAAAAAAAAAAA=</HashCode>
-      <FileName>Rendering\Materials\MaterialTesselationBaseFeature.cs</FileName>
+      <HashCode>AACEAAAACAAAAIAAAAAAAAQAAAAAAAACAAAAAABAAAA=</HashCode>
+      <FileName>Rendering\Materials\MaterialTessellationBaseFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="Xenko.Rendering.Materials.MaterialTessellationFlatFeature" Collapsed="true">
     <Position X="5" Y="12.5" Width="2.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialTessellationFlatFeature.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.MaterialTessellationPNFeature" Collapsed="true">
     <Position X="8.25" Y="12.5" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialTessellationPNFeature.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.MaterialTransparencyAdditiveFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.25" Y="25.25" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAEAAAAQABAAAAASAAAAAABAAAAAAAAIAAAA=</HashCode>
+      <HashCode>AAAAAAAAAEAAAAAABAAAAASAAAAAABAAAAAAAAJAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialTransparencyAdditiveFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -379,7 +288,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialTransparencyCutoffFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="9.25" Y="25.25" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAACAAAQABAAAAAQAAAAAABEAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAACAAAAABAAAAAQAAAAAABEAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialTransparencyCutoffFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -387,14 +296,14 @@
   <Class Name="Xenko.Rendering.Material" Collapsed="true">
     <Position X="13.75" Y="5.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAgAABEAAgCAAAAAAAAAAAAAAAAAAAIAAEAAAAAA=</HashCode>
+      <HashCode>AAAgAAAAAEAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Material.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.MaterialDescriptor" Collapsed="true">
     <Position X="5" Y="4.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAAAAAAQAAAAAAAEAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAQAAAQAAAAQAAAAAAAEAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialDescriptor.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -429,7 +338,7 @@
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAEAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAQAAAAQAAAAAAAEAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\IMaterialDescriptor.cs</FileName>
     </TypeIdentifier>
   </Interface>
@@ -488,7 +397,7 @@
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\IMaterialFeature.cs</FileName>
     </TypeIdentifier>
   </Interface>
@@ -539,7 +448,7 @@
   <Interface Name="Xenko.Rendering.Materials.IMaterialShadingModelFeature" Collapsed="true">
     <Position X="9" Y="17" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\IMaterialShadingModelFeature.cs</FileName>
     </TypeIdentifier>
   </Interface>
@@ -556,6 +465,8 @@
       <Path>
         <Point X="28.375" Y="22.562" />
         <Point X="28.375" Y="23.125" />
+        <Point X="18.708" Y="23.125" Type="JumpStart" />
+        <Point X="18.542" Y="23.125" Type="JumpEnd" />
         <Point X="16.875" Y="23.125" />
         <Point X="16.875" Y="23.5" />
       </Path>
@@ -578,6 +489,8 @@
       <Path>
         <Point X="28.375" Y="22.562" />
         <Point X="28.375" Y="24.45" />
+        <Point X="18.708" Y="24.45" Type="JumpStart" />
+        <Point X="18.542" Y="24.45" Type="JumpEnd" />
         <Point X="17.25" Y="24.45" />
         <Point X="17.25" Y="24.75" />
       </Path>
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ShadingModelShaderBuilder.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ShadingModelShaderBuilder.cs
index d88af0fc7b..89e8b66729 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ShadingModelShaderBuilder.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ShadingModelShaderBuilder.cs
@@ -20,4 +20,4 @@ public class ShadingModelShaderBuilder
 
         public ShaderSource LightDependentSurface { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.Shaders.Compiler/ShaderSourceComparer.cs b/sources/engine/Xenko.Shaders.Compiler/ShaderSourceComparer.cs
index 65966bc5ce..f5dc44062e 100644
--- a/sources/engine/Xenko.Shaders.Compiler/ShaderSourceComparer.cs
+++ b/sources/engine/Xenko.Shaders.Compiler/ShaderSourceComparer.cs
@@ -28,10 +28,10 @@ public override bool Equals(ShaderSource x, ShaderSource y)
             if (x.GetType() != y.GetType())
                 return false;
 
-            if (x is ShaderClassSource)
+            if (x is ShaderClassCode)
             {
-                var x1 = (ShaderClassSource)x;
-                var y1 = (ShaderClassSource)y;
+                var x1 = (ShaderClassCode)x;
+                var y1 = (ShaderClassCode)y;
                 return x1.ClassName == y1.ClassName
                        && ArrayExtensions.ArraysEqual(x1.GenericArguments, y1.GenericArguments);
             }
@@ -59,9 +59,9 @@ public override int GetHashCode(ShaderSource obj)
 
             unchecked
             {
-                if (obj is ShaderClassSource)
+                if (obj is ShaderClassCode)
                 {
-                    var obj1 = (ShaderClassSource)obj;
+                    var obj1 = (ShaderClassCode)obj;
                     return obj1.ClassName.GetHashCode()
                            ^ ArrayExtensions.ComputeHash(obj1.GenericArguments);
                 }
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/ModuleMixinInfo.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/ModuleMixinInfo.cs
index 98b3094add..a428103476 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/ModuleMixinInfo.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/ModuleMixinInfo.cs
@@ -67,13 +67,13 @@ public ShaderClassType MixinAst
         }
 
         /// <summary>
-        /// Tests if this instance is a <see cref="ShaderClassSource"/> of the specified type name 
+        /// Tests if this instance is a <see cref="ShaderClassCode"/> of the specified type name 
         /// </summary>
         /// <param name="typeName">The type name to test</param>
         /// <returns><c>true</c> if same type name</returns>
         public bool IsShaderClass(string typeName)
         {
-            var classSource = ShaderSource as ShaderClassSource;
+            var classSource = ShaderSource as ShaderClassCode;
             if (classSource == null)
             {
                 return false;
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderLoader.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderLoader.cs
index a7b836decf..8309639820 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderLoader.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderLoader.cs
@@ -92,7 +92,7 @@ public class LoadedShaderClassType
         /// <param name="autoGenericInstances"></param>
         /// <returns>A ShaderClassType or null if there was some errors.</returns>
         /// <exception cref="System.ArgumentNullException">shaderClassSource</exception>
-        public LoadedShaderClassType LoadClassSource(ShaderClassSource shaderClassSource, Xenko.Core.Shaders.Parser.ShaderMacro[] shaderMacros, LoggerResult log, bool autoGenericInstances)
+        public LoadedShaderClassType LoadClassSource(ShaderClassCode shaderClassSource, Xenko.Core.Shaders.Parser.ShaderMacro[] shaderMacros, LoggerResult log, bool autoGenericInstances)
         {
             if (shaderClassSource == null) throw new ArgumentNullException("shaderClassSource");
 
@@ -103,7 +103,7 @@ public LoadedShaderClassType LoadClassSource(ShaderClassSource shaderClassSource
                 foreach (var gen in shaderClassSource.GenericArguments)
                     generics += "___" + gen;
             }
-            var shaderClassType = LoadShaderClass(shaderClassSource.ClassName, generics, log, shaderMacros);
+            var shaderClassType = LoadShaderClass(shaderClassSource, generics, log, shaderMacros);
 
             if (shaderClassType == null)
                 return null;
@@ -275,7 +275,7 @@ Expression CreateExpressionFromString(string name)
             return (Expression)result.Root.AstNode;
         }
 
-        private LoadedShaderClassType LoadShaderClass(ShaderClassSource classSource, string generics, LoggerResult log, Xenko.Core.Shaders.Parser.ShaderMacro[] macros = null)
+        private LoadedShaderClassType LoadShaderClass(ShaderClassCode classSource, string generics, LoggerResult log, Xenko.Core.Shaders.Parser.ShaderMacro[] macros = null)
         {
             var type = classSource.ClassName;
             if (type == null) throw new ArgumentNullException("type");
@@ -291,8 +291,14 @@ private LoadedShaderClassType LoadShaderClass(ShaderClassSource classSource, str
                     return shaderClass;
                 }
 
-                // Load file
-                var shaderSource = SourceManager.LoadShaderSource(type);
+                ShaderSourceManager.ShaderSourceWithHash shaderSource;
+
+                // Load shader source code
+                if (classSource is ShaderClassString shaderClassString)
+                    shaderSource = SourceManager.LoadShaderSource(type, shaderClassString.ShaderSourceCode);
+                else
+                    shaderSource = SourceManager.LoadShaderSource(type);
+
                 string preprocessedSource;
                 try
                 {
@@ -405,7 +411,7 @@ private static string GenerateGenericClassName(ShaderClassType shaderClassType)
             return shaderClassType.Name.Text + (shaderClassType.GenericParameters == null ? string.Empty : "_" + string.Join("_", shaderClassType.GenericParameters.Select(x => x.ToString().Replace('.', '_'))));
         }
 
-        private static string GenerateGenericClassName(ShaderClassSource source)
+        private static string GenerateGenericClassName(ShaderClassCode source)
         {
             // Generate class name
             if (source.GenericArguments != null && source.GenericArguments.Length > 0)
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderSourceManager.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderSourceManager.cs
index f7c922fc84..ef5825a03f 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderSourceManager.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderSourceManager.cs
@@ -112,16 +112,21 @@ public static ShaderSourceWithHash CreateShaderSourceWithHash(string type, strin
         /// Loads the shader source with the specified type name.
         /// </summary>
         /// <param name="type">The typeName.</param>
+        /// <param name="shaderSourceCode">Optional shader source code. Can be use for shaders that don't have a source file</param>
         /// <returns>ShaderSourceWithHash.</returns>
         /// <exception cref="System.IO.FileNotFoundException">If the file was not found</exception>
-        public ShaderSourceWithHash LoadShaderSource(string type)
+        public ShaderSourceWithHash LoadShaderSource(string type, string shaderSourceCode = null)
         {
             lock (locker)
             {
-                // Load file
                 ShaderSourceWithHash shaderSource;
                 if (!loadedShaderSources.TryGetValue(type, out shaderSource))
                 {
+                    // Load from string
+                    if (!string.IsNullOrWhiteSpace(shaderSourceCode))
+                        return CreateShaderSourceWithHash(type, shaderSourceCode);
+
+                    // Load file
                     var sourceUrl = FindFilePath(type);
                     if (sourceUrl != null)
                     {
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoShaderLibrary.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoShaderLibrary.cs
index 99baf94d34..244fe2009c 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoShaderLibrary.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoShaderLibrary.cs
@@ -148,7 +148,7 @@ private void ExtendLibrary(ShaderSource shaderSource, Xenko.Core.Shaders.Parser.
                 foreach (var composition in ((ShaderMixinSource)shaderSource).Compositions)
                     ExtendLibrary(composition.Value, newMacros, mixinToAnalyze);
             }
-            else if (shaderSource is ShaderClassSource)
+            else if (shaderSource is ShaderClassCode)
                 mixinToAnalyze.Add(GetModuleMixinInfo(shaderSource, macros));
             else if (shaderSource is ShaderArraySource)
             {
@@ -261,9 +261,9 @@ private ModuleMixinInfo BuildMixinInfo(ShaderSource shaderSource, Xenko.Core.Sha
         {
             ModuleMixinInfo mixinInfo = null;
             
-            if (shaderSource is ShaderClassSource)
+            if (shaderSource is ShaderClassCode)
             {
-                var shaderClassSource = shaderSource as ShaderClassSource;
+                var shaderClassSource = shaderSource as ShaderClassCode;
                 mixinInfo = new ModuleMixinInfo { ShaderSource = shaderClassSource, Macros = macros };
                 LoadMixinFromClassSource(mixinInfo);
             }
@@ -305,7 +305,7 @@ private ModuleMixinInfo BuildMixinInfo(ShaderSource shaderSource, Xenko.Core.Sha
         /// <param name="mixinInfo">the ModuleMixinInfo</param>
         private void LoadMixinFromClassSource(ModuleMixinInfo mixinInfo)
         {
-            var classSource = (ShaderClassSource)mixinInfo.ShaderSource;
+            var classSource = (ShaderClassCode)mixinInfo.ShaderSource;
 
             // If we allow to parse non instantiated generics, put empty generic arguments to let the ShaderLoader correctly expand the class
             var shaderClass = ShaderLoader.LoadClassSource(classSource, mixinInfo.Macros, mixinInfo.Log, AllowNonInstantiatedGenerics);
diff --git a/sources/engine/Xenko.Shaders.Parser/ShaderMixinParser.cs b/sources/engine/Xenko.Shaders.Parser/ShaderMixinParser.cs
index 775566779e..589dd9d232 100644
--- a/sources/engine/Xenko.Shaders.Parser/ShaderMixinParser.cs
+++ b/sources/engine/Xenko.Shaders.Parser/ShaderMixinParser.cs
@@ -135,7 +135,7 @@ internal ShaderCompilationContext ParseAndAnalyze(ShaderMixinSource shaderMixinS
                 moduleMixinInfo.Log.CopyTo(parsingResult);
 
                 var ast = moduleMixinInfo.MixinAst;
-                var shaderClassSource = moduleMixinInfo.ShaderSource as ShaderClassSource;
+                var shaderClassSource = moduleMixinInfo.ShaderSource as ShaderClassCode;
                 // If we have a ShaderClassSource and it is not an inline one, then we can store the hash sources
                 if (ast != null && shaderClassSource != null)
                 {
@@ -362,7 +362,7 @@ private static List<ModuleMixin> BuildCompositionsDictionary(ShaderSource shader
             }
 
 
-            if (shaderSource is ShaderClassSource)
+            if (shaderSource is ShaderClassCode)
             {
                 var finalModule = compilationContext.GetModuleMixinFromShaderSource(shaderSource);
 
diff --git a/sources/engine/Xenko.Shaders.Tests/TestMixinGenerator.Extensions.cs b/sources/engine/Xenko.Shaders.Tests/TestMixinGenerator.Extensions.cs
index 89b7befad6..e565b1dbab 100644
--- a/sources/engine/Xenko.Shaders.Tests/TestMixinGenerator.Extensions.cs
+++ b/sources/engine/Xenko.Shaders.Tests/TestMixinGenerator.Extensions.cs
@@ -39,7 +39,7 @@ public static void CheckComposition(this ShaderMixinSource mixin, string key, st
 
             Assert.True(source != null, $"Source composition for key [{key}] cannot be null");
 
-            var classSource = source as ShaderClassSource;
+            var classSource = source as ShaderClassCode;
             if (classSource != null)
             {
                 var sourceString = classSource.ToClassName();
diff --git a/sources/engine/Xenko.Shaders.Tests/TestShaderLoadingString.cs b/sources/engine/Xenko.Shaders.Tests/TestShaderLoadingString.cs
new file mode 100644
index 0000000000..d1dea31165
--- /dev/null
+++ b/sources/engine/Xenko.Shaders.Tests/TestShaderLoadingString.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.IO;
+
+using Xunit;
+
+using Xenko.Core.Diagnostics;
+using Xenko.Core.IO;
+using Xenko.Core.Serialization.Contents;
+using Xenko.Core.Storage;
+using Xenko.Core.Mathematics;
+using Xenko.Games;
+using Xenko.Shaders.Parser.Mixins;
+
+using LoggerResult = Xenko.Core.Shaders.Utility.LoggerResult;
+
+namespace Xenko.Shaders.Tests
+{
+    public class TestShaderLoadingString
+    {
+        private ShaderSourceManager sourceManager;
+        private ShaderLoader shaderLoader;
+
+
+        const string ShaderSourceName = "ConstantCol";
+        const string ShaderSourceCode =
+@"shader ConstantCol<float4 Value> : ComputeColor
+{
+    override float4 Compute()
+    {
+        return Value;
+    }
+};";
+
+        public TestShaderLoadingString()
+        {
+            // Create and mount database file system
+            var objDatabase = ObjectDatabase.CreateDefaultDatabase();
+            var databaseFileProvider = new DatabaseFileProvider(objDatabase);
+
+            sourceManager = new ShaderSourceManager(databaseFileProvider);
+            sourceManager.LookupDirectoryList.Add(@"shaders");
+            shaderLoader = new ShaderLoader(sourceManager);
+        }
+
+        [Fact]
+        public void TestSimple()
+        {
+            var simple = sourceManager.LoadShaderSource(ShaderSourceName, ShaderSourceCode);
+
+            // Make sure that SourceManager will fail if type is not found
+            Assert.Throws<FileNotFoundException>(() => sourceManager.LoadShaderSource("BiduleNotFound"));
+
+            // Reload it and check that it is not loaded twice
+            var simple2 = sourceManager.LoadShaderSource(ShaderSourceName, ShaderSourceCode);
+
+            //TODO: cannot compare structure references
+            //Assert.That(ReferenceEquals(simple, simple2), Is.True);
+            Assert.Equal(simple, simple2);
+        }
+
+        [Fact]
+        public void TestLoadAst()
+        {
+            var log = new LoggerResult();
+
+            var shaderClassString = new ShaderClassString(ShaderSourceName, ShaderSourceCode, new Vector4(1, 1, 1, 1));
+
+            var simple = shaderLoader.LoadClassSource(shaderClassString, new Xenko.Core.Shaders.Parser.ShaderMacro[0], log, false)?.Type;
+
+            Assert.Single(simple.Members);
+
+            var shaderClassString2 = new ShaderClassString(ShaderSourceName, ShaderSourceCode, new Vector4(1, 1, 1, 1));
+
+            var simple2 = shaderLoader.LoadClassSource(shaderClassString2, new Xenko.Core.Shaders.Parser.ShaderMacro[0], log, false)?.Type;
+
+            // Make sure that a class is not duplicated in memory
+            Assert.True(ReferenceEquals(simple, simple2));
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Shaders/Compiler/EffectCompilerBase.cs b/sources/engine/Xenko.Shaders/Compiler/EffectCompilerBase.cs
index d2de78f0c5..d5abe84b72 100644
--- a/sources/engine/Xenko.Shaders/Compiler/EffectCompilerBase.cs
+++ b/sources/engine/Xenko.Shaders/Compiler/EffectCompilerBase.cs
@@ -47,7 +47,7 @@ public CompilerResults Compile(ShaderSource shaderSource, CompilerParameters com
             else
             {
                 mixinToCompile = shaderSource as ShaderMixinSource;
-                var shaderClassSource = shaderSource as ShaderClassSource;
+                var shaderClassSource = shaderSource as ShaderClassCode;
 
                 if (shaderClassSource != null)
                 {
diff --git a/sources/engine/Xenko.Shaders/ShaderClassCode.cs b/sources/engine/Xenko.Shaders/ShaderClassCode.cs
new file mode 100644
index 0000000000..02c99528b4
--- /dev/null
+++ b/sources/engine/Xenko.Shaders/ShaderClassCode.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Serialization;
+
+namespace Xenko.Shaders
+{
+    /// <summary>
+    /// A common base class for shader classes with source code.
+    /// </summary>
+    [DataContract("ShaderClassCode")]
+    public abstract class ShaderClassCode : ShaderSource
+    {
+        /// <summary>
+        /// Gets the name of the class.
+        /// </summary>
+        /// <value>The name of the class.</value>
+        [DataMember(10)]
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// Gets the generic parameters.
+        /// </summary>
+        /// <value>The generic parameters.</value>
+        [DefaultValue(null), DataStyle(DataStyle.Compact)]
+        [DataMember(20)]
+        public string[] GenericArguments { get; set; }
+
+        [DefaultValue(null)]
+        [DataMember(30)]
+        public Dictionary<string, string> GenericParametersArguments { get; set; }
+
+        /// <summary>
+        /// Returns a class name as a <see cref="System.String" /> that represents this instance.
+        /// </summary>
+        /// <returns>A class name as a <see cref="System.String" /> that represents this instance.</returns>
+        public string ToClassName()
+        {
+            if (GenericArguments == null)
+                return ClassName;
+
+            var result = new StringBuilder();
+            result.Append(ClassName);
+            if (GenericArguments != null && GenericArguments.Length > 0)
+            {
+                result.Append('<');
+                result.Append(string.Join(",", GenericArguments));
+                result.Append('>');
+            }
+
+            return result.ToString();
+        }
+        
+        public override string ToString()
+        {
+            return ToClassName();
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Shaders/ShaderClassSource.cs b/sources/engine/Xenko.Shaders/ShaderClassSource.cs
index 2a514b6861..a8ce1f5182 100644
--- a/sources/engine/Xenko.Shaders/ShaderClassSource.cs
+++ b/sources/engine/Xenko.Shaders/ShaderClassSource.cs
@@ -13,29 +13,11 @@
 namespace Xenko.Shaders
 {
     /// <summary>
-    /// A shader class used for mixin.
+    /// A shader class based on .xksl file, used for mixin.
     /// </summary>
     [DataContract("ShaderClassSource")]
-    public sealed class ShaderClassSource : ShaderSource, IEquatable<ShaderClassSource>
+    public sealed class ShaderClassSource : ShaderClassCode, IEquatable<ShaderClassSource>
     {
-        /// <summary>
-        /// Gets the name of the class.
-        /// </summary>
-        /// <value>The name of the class.</value>
-        [DataMember(10)]
-        public string ClassName { get; set; }
-
-        /// <summary>
-        /// Gets the generic parameters.
-        /// </summary>
-        /// <value>The generic parameters.</value>
-        [DefaultValue(null), DataStyle(DataStyle.Compact)]
-        [DataMember(20)]
-        public string[] GenericArguments { get; set; }
-
-        [DefaultValue(null)]
-        [DataMember(30)]
-        public Dictionary<string, string> GenericParametersArguments { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ShaderClassSource"/> class.
@@ -86,27 +68,6 @@ public ShaderClassSource(string className, params object[] genericArguments)
             }
         }
 
-        /// <summary>
-        /// Returns a class name as a <see cref="System.String" /> that represents this instance.
-        /// </summary>
-        /// <returns>A class name as a <see cref="System.String" /> that represents this instance.</returns>
-        public string ToClassName()
-        {
-            if (GenericArguments == null)
-                return ClassName;
-
-            var result = new StringBuilder();
-            result.Append(ClassName);
-            if (GenericArguments != null && GenericArguments.Length > 0)
-            {
-                result.Append('<');
-                result.Append(string.Join(",", GenericArguments));
-                result.Append('>');
-            }
-
-            return result.ToString();
-        }
-
         public bool Equals(ShaderClassSource shaderClassSource)
         {
             if (ReferenceEquals(null, shaderClassSource)) return false;
diff --git a/sources/engine/Xenko.Shaders/ShaderClassString.cs b/sources/engine/Xenko.Shaders/ShaderClassString.cs
new file mode 100644
index 0000000000..68c52dc341
--- /dev/null
+++ b/sources/engine/Xenko.Shaders/ShaderClassString.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Serialization;
+
+namespace Xenko.Shaders
+{
+    /// <summary>
+    /// A shader class based on source code string, used for mixin.
+    /// </summary>
+    [DataContract("ShaderClassString")]
+    public sealed class ShaderClassString : ShaderClassCode, IEquatable<ShaderClassString>
+    {
+        /// <summary>
+        /// Gets the source code of this shader class as string, XKSL syntax.
+        /// </summary>
+        /// <value>The source code of the shader class.</value>
+        public string ShaderSourceCode { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShaderClassString"/> class.
+        /// </summary>
+        public ShaderClassString()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShaderClassString"/> class.
+        /// </summary>
+        /// <param name="className">Name of the class.</param>
+        public ShaderClassString(string className, string shaderSourceCode)
+            : this(className, shaderSourceCode, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShaderClassString"/> class.
+        /// </summary>
+        /// <param name="className">Name of the class.</param>
+        /// <param name="genericArguments">The generic parameters.</param>
+        public ShaderClassString(string className, string shaderSourceCode, params string[] genericArguments)
+        {
+            ClassName = className;
+            ShaderSourceCode = shaderSourceCode;
+            GenericArguments = genericArguments;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShaderClassString"/> class.
+        /// </summary>
+        /// <param name="className">Name of the class.</param>
+        /// <param name="genericArguments">The generic parameters.</param>
+        public ShaderClassString(string className, string shaderSourceCode, params object[] genericArguments)
+        {
+            ClassName = className;
+            ShaderSourceCode = shaderSourceCode;
+
+            if (genericArguments != null)
+            {
+                GenericArguments = new string[genericArguments.Length];
+                for (int i = 0; i < genericArguments.Length; ++i)
+                {
+                    var genArg = genericArguments[i];
+                    if (genArg is bool boolArg)
+                        GenericArguments[i] = boolArg ? "true" : "false";
+                    else
+                        GenericArguments[i] = genArg == null ? "null" : Convert.ToString(genArg, CultureInfo.InvariantCulture);
+                }
+            }
+        }
+
+        public bool Equals(ShaderClassString shaderClassString)
+        {
+            if (ReferenceEquals(null, shaderClassString)) return false;
+            if (ReferenceEquals(this, shaderClassString)) return true;
+            return string.Equals(ClassName, shaderClassString.ClassName) && Utilities.Compare(GenericArguments, shaderClassString.GenericArguments);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((ShaderClassString)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = ClassName?.GetHashCode() ?? 0;
+                if (GenericArguments != null)
+                {
+                    foreach (var current in GenericArguments)
+                        hashCode = (hashCode * 397) ^ (current?.GetHashCode() ?? 0);
+                }
+
+                return hashCode;
+            }
+        }
+
+        public override object Clone()
+        {
+            return new ShaderClassString(ClassName, ShaderSourceCode, GenericArguments = GenericArguments != null ? GenericArguments.ToArray() : null);
+        }
+        
+        public override string ToString()
+        {
+            return ToClassName();
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Shaders/ShaderMixinContext.cs b/sources/engine/Xenko.Shaders/ShaderMixinContext.cs
index ab2ac8956a..5417e0d4e0 100644
--- a/sources/engine/Xenko.Shaders/ShaderMixinContext.cs
+++ b/sources/engine/Xenko.Shaders/ShaderMixinContext.cs
@@ -288,18 +288,17 @@ public void Mixin(ShaderMixinSource mixinTree, ShaderSource shaderSource)
                 return;
             }
 
-            var shaderMixinSource = shaderSource as ShaderMixinSource;
-            if (shaderMixinSource != null)
+            if (shaderSource is ShaderMixinSource shaderMixinSource)
             {
                 mixinTree.CloneFrom(shaderMixinSource);
             }
-            else if (shaderSource is ShaderClassSource)
+            else if (shaderSource is ShaderClassCode shaderClassCode)
             {
-                mixinTree.Mixins.Add((ShaderClassSource)shaderSource);
+                mixinTree.Mixins.Add(shaderClassCode);
             }
-            else if (shaderSource is ShaderMixinGeneratorSource)
+            else if (shaderSource is ShaderMixinGeneratorSource mixinGeneratorSource)
             {
-                Mixin(mixinTree, ((ShaderMixinGeneratorSource)shaderSource).Name);
+                Mixin(mixinTree, mixinGeneratorSource.Name);
             }
             else
             {
diff --git a/sources/engine/Xenko.Shaders/ShaderMixinSource.cs b/sources/engine/Xenko.Shaders/ShaderMixinSource.cs
index caa6da3470..312ac062ea 100644
--- a/sources/engine/Xenko.Shaders/ShaderMixinSource.cs
+++ b/sources/engine/Xenko.Shaders/ShaderMixinSource.cs
@@ -12,7 +12,7 @@
 namespace Xenko.Shaders
 {
     /// <summary>
-    /// A mixin performing a combination of <see cref="ShaderClassSource"/> and other mixins.
+    /// A mixin performing a combination of <see cref="ShaderClassCode"/> and other mixins.
     /// </summary>
     [DataContract("ShaderMixinSource")]
     [NonIdentifiableCollectionItems]
@@ -23,7 +23,7 @@ public sealed class ShaderMixinSource : ShaderSource, IEquatable<ShaderMixinSour
         /// </summary>
         public ShaderMixinSource()
         {
-            Mixins = new List<ShaderClassSource>();
+            Mixins = new List<ShaderClassCode>();
             Compositions = new Core.Collections.SortedList<string, ShaderSource>();
             Macros = new List<ShaderMacro>();
         }
@@ -51,7 +51,7 @@ public ShaderMixinSource()
         /// </summary>
         /// <value>The mixins.</value>
         [DataMember(10)]
-        public List<ShaderClassSource> Mixins { get; set; }
+        public List<ShaderClassCode> Mixins { get; set; }
 
         /// <summary>
         /// Gets or sets the compositions.
@@ -133,7 +133,7 @@ public void DeepCloneFrom(ShaderMixinSource parent)
                 throw new ArgumentNullException("parent", $"Cannot deep clone mixin [{Name}] from a null parent");
 
             foreach (var mixin in parent.Mixins)
-                Mixins.Add((ShaderClassSource)mixin.Clone());
+                Mixins.Add((ShaderClassCode)mixin.Clone());
             Macros.AddRange(parent.Macros);
             foreach (var shaderBasic in parent.Compositions)
             {
@@ -176,7 +176,7 @@ public override object Clone()
         {
             var newMixin = (ShaderMixinSource)MemberwiseClone();
             newMixin.Compositions = Compositions == null ? null : ToSortedList(Compositions.Select(x => new KeyValuePair<string, ShaderSource>(x.Key, (ShaderSource)x.Value.Clone())));
-            newMixin.Mixins = Mixins == null ? null : Mixins.Select(x => (ShaderClassSource)x.Clone()).ToList();
+            newMixin.Mixins = Mixins == null ? null : Mixins.Select(x => (ShaderClassCode)x.Clone()).ToList();
             newMixin.Macros = Macros == null ? null : new List<ShaderMacro>(Macros.ToArray());
             return newMixin;
         }
diff --git a/sources/shared/SharedAssemblyInfo.cs b/sources/shared/SharedAssemblyInfo.cs
index b2a7851c8e..ea3a4d0158 100644
--- a/sources/shared/SharedAssemblyInfo.cs
+++ b/sources/shared/SharedAssemblyInfo.cs
@@ -49,7 +49,7 @@ internal class XenkoVersion
         /// - -betaXX: development version (XX should corespond to development asset versioning)
         /// - -betaXX-YYYY: beta release (YYYY is the git height since current version has been bumped)
         /// </summary>
-        public const string NuGetVersionSuffix = "-beta02";
+        public const string NuGetVersionSuffix = "-sfx";
 
         /// <summary>
         /// The build metadata, usually +g[git_hash] during package. Automatically set by Xenko.GitVersioning.GenerateVersionFile.