diff --git a/src/ShaderNode/DataModels/Cast.inl b/src/ShaderNode/DataModels/Cast.inl
index 131544f33..82ba201e2 100644
--- a/src/ShaderNode/DataModels/Cast.inl
+++ b/src/ShaderNode/DataModels/Cast.inl
@@ -35,7 +35,7 @@ Nz::ShaderAst::NodePtr CastVec<ToComponentCount>::BuildNode(Nz::ShaderAst::Expre
 		for (std::size_t i = 0; i < overflowComponentCount; ++i)
 			params.emplace_back(Nz::ShaderBuilder::Constant(m_overflowComponents[i]));
 
-		return Nz::ShaderBuilder::Cast(Nz::ShaderAst::VectorType{ ToComponentCount, Nz::ShaderAst::PrimitiveType::Float32 }, std::move(params));
+		return Nz::ShaderBuilder::Cast(Nz::ShaderAst::ExpressionType{ Nz::ShaderAst::VectorType{ ToComponentCount, Nz::ShaderAst::PrimitiveType::Float32 } }, std::move(params));
 	}
 	else if (ToComponentCount < fromComponentCount)
 	{
diff --git a/src/ShaderNode/DataModels/VecComposition.inl b/src/ShaderNode/DataModels/VecComposition.inl
index 70e8c15a6..5cf98a037 100644
--- a/src/ShaderNode/DataModels/VecComposition.inl
+++ b/src/ShaderNode/DataModels/VecComposition.inl
@@ -23,7 +23,7 @@ Nz::ShaderAst::NodePtr VecComposition<ComponentCount>::BuildNode(Nz::ShaderAst::
 	for (std::size_t i = 0; i < count; ++i)
 		params.emplace_back(std::move(expressions[i]));
 
-	return Nz::ShaderBuilder::Cast(Nz::ShaderAst::VectorType{ ComponentCount, Nz::ShaderAst::PrimitiveType::Float32 }, std::move(params));
+	return Nz::ShaderBuilder::Cast(Nz::ShaderAst::ExpressionType{ Nz::ShaderAst::VectorType{ ComponentCount, Nz::ShaderAst::PrimitiveType::Float32 } }, std::move(params));
 }
 
 template<std::size_t ComponentCount>
diff --git a/src/ShaderNode/ShaderGraph.cpp b/src/ShaderNode/ShaderGraph.cpp
index 83be7a3fc..86db5af26 100644
--- a/src/ShaderNode/ShaderGraph.cpp
+++ b/src/ShaderNode/ShaderGraph.cpp
@@ -463,7 +463,7 @@ Nz::ShaderAst::StatementPtr ShaderGraph::ToAst() const
 
 	// Declare all options
 	for (const auto& option : m_options)
-		statements.push_back(Nz::ShaderBuilder::DeclareOption(option.name, Nz::ShaderAst::PrimitiveType::Boolean));
+		statements.push_back(Nz::ShaderBuilder::DeclareOption(option.name, Nz::ShaderAst::ExpressionType{ Nz::ShaderAst::PrimitiveType::Boolean }));
 
 	// Declare all structures
 	for (const auto& structInfo : m_structs)
@@ -496,7 +496,7 @@ Nz::ShaderAst::StatementPtr ShaderGraph::ToAst() const
 		extVar.bindingIndex = buffer.bindingIndex;
 		extVar.bindingSet = buffer.setIndex;
 		extVar.name = buffer.name;
-		extVar.type = Nz::ShaderAst::UniformType{ Nz::ShaderAst::IdentifierType{ structInfo.name } };
+		extVar.type = Nz::ShaderAst::ExpressionType{ Nz::ShaderAst::IdentifierType{ structInfo.name } };
 	}
 
 	for (const auto& texture : m_textures)
@@ -546,7 +546,7 @@ Nz::ShaderAst::StatementPtr ShaderGraph::ToAst() const
 			auto& position = structDesc.members.emplace_back();
 			position.builtin = Nz::ShaderAst::BuiltinEntry::VertexPosition;
 			position.name = "position";
-			position.type = Nz::ShaderAst::VectorType{ 4, Nz::ShaderAst::PrimitiveType::Float32 };
+			position.type = Nz::ShaderAst::ExpressionType{ Nz::ShaderAst::VectorType{ 4, Nz::ShaderAst::PrimitiveType::Float32 } };
 		}
 
 		statements.push_back(Nz::ShaderBuilder::DeclareStruct(std::move(structDesc)));
@@ -816,7 +816,7 @@ std::unique_ptr<Nz::ShaderAst::DeclareFunctionStatement> ShaderGraph::ToFunction
 	{
 		parameters.push_back({
 			"input",
-			Nz::ShaderAst::IdentifierType{ "InputData" }
+			Nz::ShaderAst::ExpressionType{ Nz::ShaderAst::IdentifierType{ "InputData" } }
 		});
 	}