Introduce WiX Intermediate Representation

200 files changed, 19297 insertions, 0 deletions

diff --git a/src/WixToolset.Data/Tuples/ActionTextTuple.cs b/src/WixToolset.Data/Tuples/ActionTextTuple.cs
new file mode 100644
index 00000000..771a8b02
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ActionTextTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ActionText = new IntermediateTupleDefinition(
+            TupleDefinitionType.ActionText,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ActionTextTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ActionTextTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ActionTextTupleFields.Template), IntermediateFieldType.String),
+            },
+            typeof(ActionTextTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ActionTextTupleFields
+    {
+        Action,
+        Description,
+        Template,
+    }
+
+    public class ActionTextTuple : IntermediateTuple
+    {
+        public ActionTextTuple() : base(TupleDefinitions.ActionText, null, null)
+        {
+        }
+
+        public ActionTextTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ActionText, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ActionTextTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)ActionTextTupleFields.Action]?.Value;
+            set => this.Set((int)ActionTextTupleFields.Action, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)ActionTextTupleFields.Description]?.Value;
+            set => this.Set((int)ActionTextTupleFields.Description, value);
+        }
+
+        public string Template
+        {
+            get => (string)this.Fields[(int)ActionTextTupleFields.Template]?.Value;
+            set => this.Set((int)ActionTextTupleFields.Template, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/AdminExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/AdminExecuteSequenceTuple.cs
new file mode 100644
index 00000000..25c717e0
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/AdminExecuteSequenceTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition AdminExecuteSequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.AdminExecuteSequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(AdminExecuteSequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AdminExecuteSequenceTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AdminExecuteSequenceTupleFields.Sequence), IntermediateFieldType.Number),
+            },
+            typeof(AdminExecuteSequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum AdminExecuteSequenceTupleFields
+    {
+        Action,
+        Condition,
+        Sequence,
+    }
+
+    public class AdminExecuteSequenceTuple : IntermediateTuple
+    {
+        public AdminExecuteSequenceTuple() : base(TupleDefinitions.AdminExecuteSequence, null, null)
+        {
+        }
+
+        public AdminExecuteSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.AdminExecuteSequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[AdminExecuteSequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)AdminExecuteSequenceTupleFields.Action]?.Value;
+            set => this.Set((int)AdminExecuteSequenceTupleFields.Action, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)AdminExecuteSequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)AdminExecuteSequenceTupleFields.Condition, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)AdminExecuteSequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)AdminExecuteSequenceTupleFields.Sequence, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/AdminUISequenceTuple.cs b/src/WixToolset.Data/Tuples/AdminUISequenceTuple.cs
new file mode 100644
index 00000000..d4681bb9
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/AdminUISequenceTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition AdminUISequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.AdminUISequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(AdminUISequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AdminUISequenceTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AdminUISequenceTupleFields.Sequence), IntermediateFieldType.Number),
+            },
+            typeof(AdminUISequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum AdminUISequenceTupleFields
+    {
+        Action,
+        Condition,
+        Sequence,
+    }
+
+    public class AdminUISequenceTuple : IntermediateTuple
+    {
+        public AdminUISequenceTuple() : base(TupleDefinitions.AdminUISequence, null, null)
+        {
+        }
+
+        public AdminUISequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.AdminUISequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[AdminUISequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)AdminUISequenceTupleFields.Action]?.Value;
+            set => this.Set((int)AdminUISequenceTupleFields.Action, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)AdminUISequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)AdminUISequenceTupleFields.Condition, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)AdminUISequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)AdminUISequenceTupleFields.Sequence, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/AdvtExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/AdvtExecuteSequenceTuple.cs
new file mode 100644
index 00000000..36a53af2
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/AdvtExecuteSequenceTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition AdvtExecuteSequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.AdvtExecuteSequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(AdvtExecuteSequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AdvtExecuteSequenceTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AdvtExecuteSequenceTupleFields.Sequence), IntermediateFieldType.Number),
+            },
+            typeof(AdvtExecuteSequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum AdvtExecuteSequenceTupleFields
+    {
+        Action,
+        Condition,
+        Sequence,
+    }
+
+    public class AdvtExecuteSequenceTuple : IntermediateTuple
+    {
+        public AdvtExecuteSequenceTuple() : base(TupleDefinitions.AdvtExecuteSequence, null, null)
+        {
+        }
+
+        public AdvtExecuteSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.AdvtExecuteSequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[AdvtExecuteSequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)AdvtExecuteSequenceTupleFields.Action]?.Value;
+            set => this.Set((int)AdvtExecuteSequenceTupleFields.Action, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)AdvtExecuteSequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)AdvtExecuteSequenceTupleFields.Condition, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)AdvtExecuteSequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)AdvtExecuteSequenceTupleFields.Sequence, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/AppIdTuple.cs b/src/WixToolset.Data/Tuples/AppIdTuple.cs
new file mode 100644
index 00000000..7816e4c3
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/AppIdTuple.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition AppId = new IntermediateTupleDefinition(
+            TupleDefinitionType.AppId,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(AppIdTupleFields.AppId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdTupleFields.RemoteServerName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdTupleFields.LocalService), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdTupleFields.ServiceParameters), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdTupleFields.DllSurrogate), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdTupleFields.ActivateAtStorage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(AppIdTupleFields.RunAsInteractiveUser), IntermediateFieldType.Number),
+            },
+            typeof(AppIdTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum AppIdTupleFields
+    {
+        AppId,
+        RemoteServerName,
+        LocalService,
+        ServiceParameters,
+        DllSurrogate,
+        ActivateAtStorage,
+        RunAsInteractiveUser,
+    }
+
+    public class AppIdTuple : IntermediateTuple
+    {
+        public AppIdTuple() : base(TupleDefinitions.AppId, null, null)
+        {
+        }
+
+        public AppIdTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.AppId, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[AppIdTupleFields index] => this.Fields[(int)index];
+
+        public string AppId
+        {
+            get => (string)this.Fields[(int)AppIdTupleFields.AppId]?.Value;
+            set => this.Set((int)AppIdTupleFields.AppId, value);
+        }
+
+        public string RemoteServerName
+        {
+            get => (string)this.Fields[(int)AppIdTupleFields.RemoteServerName]?.Value;
+            set => this.Set((int)AppIdTupleFields.RemoteServerName, value);
+        }
+
+        public string LocalService
+        {
+            get => (string)this.Fields[(int)AppIdTupleFields.LocalService]?.Value;
+            set => this.Set((int)AppIdTupleFields.LocalService, value);
+        }
+
+        public string ServiceParameters
+        {
+            get => (string)this.Fields[(int)AppIdTupleFields.ServiceParameters]?.Value;
+            set => this.Set((int)AppIdTupleFields.ServiceParameters, value);
+        }
+
+        public string DllSurrogate
+        {
+            get => (string)this.Fields[(int)AppIdTupleFields.DllSurrogate]?.Value;
+            set => this.Set((int)AppIdTupleFields.DllSurrogate, value);
+        }
+
+        public int ActivateAtStorage
+        {
+            get => (int)this.Fields[(int)AppIdTupleFields.ActivateAtStorage]?.Value;
+            set => this.Set((int)AppIdTupleFields.ActivateAtStorage, value);
+        }
+
+        public int RunAsInteractiveUser
+        {
+            get => (int)this.Fields[(int)AppIdTupleFields.RunAsInteractiveUser]?.Value;
+            set => this.Set((int)AppIdTupleFields.RunAsInteractiveUser, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/AppSearchTuple.cs b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
new file mode 100644
index 00000000..e32064b8
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition AppSearch = new IntermediateTupleDefinition(
+            TupleDefinitionType.AppSearch,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(AppSearchTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppSearchTupleFields.Signature_), IntermediateFieldType.String),
+            },
+            typeof(AppSearchTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum AppSearchTupleFields
+    {
+        Property,
+        Signature_,
+    }
+
+    public class AppSearchTuple : IntermediateTuple
+    {
+        public AppSearchTuple() : base(TupleDefinitions.AppSearch, null, null)
+        {
+        }
+
+        public AppSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.AppSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[AppSearchTupleFields index] => this.Fields[(int)index];
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)AppSearchTupleFields.Property]?.Value;
+            set => this.Set((int)AppSearchTupleFields.Property, value);
+        }
+
+        public string Signature_
+        {
+            get => (string)this.Fields[(int)AppSearchTupleFields.Signature_]?.Value;
+            set => this.Set((int)AppSearchTupleFields.Signature_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/BBControlTuple.cs b/src/WixToolset.Data/Tuples/BBControlTuple.cs
new file mode 100644
index 00000000..dae041d4
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/BBControlTuple.cs
@@ -0,0 +1,108 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition BBControl = new IntermediateTupleDefinition(
+            TupleDefinitionType.BBControl,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Billboard_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.BBControl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.X), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Y), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Width), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Height), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Text), IntermediateFieldType.String),
+            },
+            typeof(BBControlTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum BBControlTupleFields
+    {
+        Billboard_,
+        BBControl,
+        Type,
+        X,
+        Y,
+        Width,
+        Height,
+        Attributes,
+        Text,
+    }
+
+    public class BBControlTuple : IntermediateTuple
+    {
+        public BBControlTuple() : base(TupleDefinitions.BBControl, null, null)
+        {
+        }
+
+        public BBControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.BBControl, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[BBControlTupleFields index] => this.Fields[(int)index];
+
+        public string Billboard_
+        {
+            get => (string)this.Fields[(int)BBControlTupleFields.Billboard_]?.Value;
+            set => this.Set((int)BBControlTupleFields.Billboard_, value);
+        }
+
+        public string BBControl
+        {
+            get => (string)this.Fields[(int)BBControlTupleFields.BBControl]?.Value;
+            set => this.Set((int)BBControlTupleFields.BBControl, value);
+        }
+
+        public string Type
+        {
+            get => (string)this.Fields[(int)BBControlTupleFields.Type]?.Value;
+            set => this.Set((int)BBControlTupleFields.Type, value);
+        }
+
+        public int X
+        {
+            get => (int)this.Fields[(int)BBControlTupleFields.X]?.Value;
+            set => this.Set((int)BBControlTupleFields.X, value);
+        }
+
+        public int Y
+        {
+            get => (int)this.Fields[(int)BBControlTupleFields.Y]?.Value;
+            set => this.Set((int)BBControlTupleFields.Y, value);
+        }
+
+        public int Width
+        {
+            get => (int)this.Fields[(int)BBControlTupleFields.Width]?.Value;
+            set => this.Set((int)BBControlTupleFields.Width, value);
+        }
+
+        public int Height
+        {
+            get => (int)this.Fields[(int)BBControlTupleFields.Height]?.Value;
+            set => this.Set((int)BBControlTupleFields.Height, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)BBControlTupleFields.Attributes]?.Value;
+            set => this.Set((int)BBControlTupleFields.Attributes, value);
+        }
+
+        public string Text
+        {
+            get => (string)this.Fields[(int)BBControlTupleFields.Text]?.Value;
+            set => this.Set((int)BBControlTupleFields.Text, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/BillboardTuple.cs b/src/WixToolset.Data/Tuples/BillboardTuple.cs
new file mode 100644
index 00000000..43e2ace7
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/BillboardTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Billboard = new IntermediateTupleDefinition(
+            TupleDefinitionType.Billboard,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(BillboardTupleFields.Billboard), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BillboardTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BillboardTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BillboardTupleFields.Ordering), IntermediateFieldType.Number),
+            },
+            typeof(BillboardTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum BillboardTupleFields
+    {
+        Billboard,
+        Feature_,
+        Action,
+        Ordering,
+    }
+
+    public class BillboardTuple : IntermediateTuple
+    {
+        public BillboardTuple() : base(TupleDefinitions.Billboard, null, null)
+        {
+        }
+
+        public BillboardTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Billboard, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[BillboardTupleFields index] => this.Fields[(int)index];
+
+        public string Billboard
+        {
+            get => (string)this.Fields[(int)BillboardTupleFields.Billboard]?.Value;
+            set => this.Set((int)BillboardTupleFields.Billboard, value);
+        }
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)BillboardTupleFields.Feature_]?.Value;
+            set => this.Set((int)BillboardTupleFields.Feature_, value);
+        }
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)BillboardTupleFields.Action]?.Value;
+            set => this.Set((int)BillboardTupleFields.Action, value);
+        }
+
+        public int Ordering
+        {
+            get => (int)this.Fields[(int)BillboardTupleFields.Ordering]?.Value;
+            set => this.Set((int)BillboardTupleFields.Ordering, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/BinaryTuple.cs b/src/WixToolset.Data/Tuples/BinaryTuple.cs
new file mode 100644
index 00000000..8134167b
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/BinaryTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Binary = new IntermediateTupleDefinition(
+            TupleDefinitionType.Binary,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(BinaryTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BinaryTupleFields.Data), IntermediateFieldType.Path),
+            },
+            typeof(BinaryTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum BinaryTupleFields
+    {
+        Name,
+        Data,
+    }
+
+    public class BinaryTuple : IntermediateTuple
+    {
+        public BinaryTuple() : base(TupleDefinitions.Binary, null, null)
+        {
+        }
+
+        public BinaryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Binary, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[BinaryTupleFields index] => this.Fields[(int)index];
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)BinaryTupleFields.Name]?.Value;
+            set => this.Set((int)BinaryTupleFields.Name, value);
+        }
+
+        public string Data
+        {
+            get => (string)this.Fields[(int)BinaryTupleFields.Data]?.Value;
+            set => this.Set((int)BinaryTupleFields.Data, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/BindImageTuple.cs b/src/WixToolset.Data/Tuples/BindImageTuple.cs
new file mode 100644
index 00000000..fefafa2d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/BindImageTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition BindImage = new IntermediateTupleDefinition(
+            TupleDefinitionType.BindImage,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(BindImageTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BindImageTupleFields.Path), IntermediateFieldType.String),
+            },
+            typeof(BindImageTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum BindImageTupleFields
+    {
+        File_,
+        Path,
+    }
+
+    public class BindImageTuple : IntermediateTuple
+    {
+        public BindImageTuple() : base(TupleDefinitions.BindImage, null, null)
+        {
+        }
+
+        public BindImageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.BindImage, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[BindImageTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)BindImageTupleFields.File_]?.Value;
+            set => this.Set((int)BindImageTupleFields.File_, value);
+        }
+
+        public string Path
+        {
+            get => (string)this.Fields[(int)BindImageTupleFields.Path]?.Value;
+            set => this.Set((int)BindImageTupleFields.Path, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/CCPSearchTuple.cs b/src/WixToolset.Data/Tuples/CCPSearchTuple.cs
new file mode 100644
index 00000000..d1ca8458
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/CCPSearchTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition CCPSearch = new IntermediateTupleDefinition(
+            TupleDefinitionType.CCPSearch,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(CCPSearchTupleFields.Signature_), IntermediateFieldType.String),
+            },
+            typeof(CCPSearchTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum CCPSearchTupleFields
+    {
+        Signature_,
+    }
+
+    public class CCPSearchTuple : IntermediateTuple
+    {
+        public CCPSearchTuple() : base(TupleDefinitions.CCPSearch, null, null)
+        {
+        }
+
+        public CCPSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CCPSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[CCPSearchTupleFields index] => this.Fields[(int)index];
+
+        public string Signature_
+        {
+            get => (string)this.Fields[(int)CCPSearchTupleFields.Signature_]?.Value;
+            set => this.Set((int)CCPSearchTupleFields.Signature_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/CheckBoxTuple.cs b/src/WixToolset.Data/Tuples/CheckBoxTuple.cs
new file mode 100644
index 00000000..d76609f2
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/CheckBoxTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition CheckBox = new IntermediateTupleDefinition(
+            TupleDefinitionType.CheckBox,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(CheckBoxTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CheckBoxTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(CheckBoxTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum CheckBoxTupleFields
+    {
+        Property,
+        Value,
+    }
+
+    public class CheckBoxTuple : IntermediateTuple
+    {
+        public CheckBoxTuple() : base(TupleDefinitions.CheckBox, null, null)
+        {
+        }
+
+        public CheckBoxTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CheckBox, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[CheckBoxTupleFields index] => this.Fields[(int)index];
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)CheckBoxTupleFields.Property]?.Value;
+            set => this.Set((int)CheckBoxTupleFields.Property, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)CheckBoxTupleFields.Value]?.Value;
+            set => this.Set((int)CheckBoxTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ClassTuple.cs b/src/WixToolset.Data/Tuples/ClassTuple.cs
new file mode 100644
index 00000000..a9bb3b95
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ClassTuple.cs
@@ -0,0 +1,140 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Class = new IntermediateTupleDefinition(
+            TupleDefinitionType.Class,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.CLSID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.Context), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.ProgId_Default), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.AppId_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.FileTypeMask), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.Icon_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.IconIndex), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.DefInprocHandler), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.Argument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(ClassTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ClassTupleFields
+    {
+        CLSID,
+        Context,
+        Component_,
+        ProgId_Default,
+        Description,
+        AppId_,
+        FileTypeMask,
+        Icon_,
+        IconIndex,
+        DefInprocHandler,
+        Argument,
+        Feature_,
+        Attributes,
+    }
+
+    public class ClassTuple : IntermediateTuple
+    {
+        public ClassTuple() : base(TupleDefinitions.Class, null, null)
+        {
+        }
+
+        public ClassTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Class, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ClassTupleFields index] => this.Fields[(int)index];
+
+        public string CLSID
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.CLSID]?.Value;
+            set => this.Set((int)ClassTupleFields.CLSID, value);
+        }
+
+        public string Context
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.Context]?.Value;
+            set => this.Set((int)ClassTupleFields.Context, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.Component_]?.Value;
+            set => this.Set((int)ClassTupleFields.Component_, value);
+        }
+
+        public string ProgId_Default
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.ProgId_Default]?.Value;
+            set => this.Set((int)ClassTupleFields.ProgId_Default, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.Description]?.Value;
+            set => this.Set((int)ClassTupleFields.Description, value);
+        }
+
+        public string AppId_
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.AppId_]?.Value;
+            set => this.Set((int)ClassTupleFields.AppId_, value);
+        }
+
+        public string FileTypeMask
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.FileTypeMask]?.Value;
+            set => this.Set((int)ClassTupleFields.FileTypeMask, value);
+        }
+
+        public string Icon_
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.Icon_]?.Value;
+            set => this.Set((int)ClassTupleFields.Icon_, value);
+        }
+
+        public int IconIndex
+        {
+            get => (int)this.Fields[(int)ClassTupleFields.IconIndex]?.Value;
+            set => this.Set((int)ClassTupleFields.IconIndex, value);
+        }
+
+        public string DefInprocHandler
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.DefInprocHandler]?.Value;
+            set => this.Set((int)ClassTupleFields.DefInprocHandler, value);
+        }
+
+        public string Argument
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.Argument]?.Value;
+            set => this.Set((int)ClassTupleFields.Argument, value);
+        }
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)ClassTupleFields.Feature_]?.Value;
+            set => this.Set((int)ClassTupleFields.Feature_, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)ClassTupleFields.Attributes]?.Value;
+            set => this.Set((int)ClassTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ComboBoxTuple.cs b/src/WixToolset.Data/Tuples/ComboBoxTuple.cs
new file mode 100644
index 00000000..67acc30c
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ComboBoxTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComboBox = new IntermediateTupleDefinition(
+            TupleDefinitionType.ComboBox,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Text), IntermediateFieldType.String),
+            },
+            typeof(ComboBoxTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ComboBoxTupleFields
+    {
+        Property,
+        Order,
+        Value,
+        Text,
+    }
+
+    public class ComboBoxTuple : IntermediateTuple
+    {
+        public ComboBoxTuple() : base(TupleDefinitions.ComboBox, null, null)
+        {
+        }
+
+        public ComboBoxTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ComboBox, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComboBoxTupleFields index] => this.Fields[(int)index];
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)ComboBoxTupleFields.Property]?.Value;
+            set => this.Set((int)ComboBoxTupleFields.Property, value);
+        }
+
+        public int Order
+        {
+            get => (int)this.Fields[(int)ComboBoxTupleFields.Order]?.Value;
+            set => this.Set((int)ComboBoxTupleFields.Order, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)ComboBoxTupleFields.Value]?.Value;
+            set => this.Set((int)ComboBoxTupleFields.Value, value);
+        }
+
+        public string Text
+        {
+            get => (string)this.Fields[(int)ComboBoxTupleFields.Text]?.Value;
+            set => this.Set((int)ComboBoxTupleFields.Text, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/CompLocatorTuple.cs b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
new file mode 100644
index 00000000..e8560711
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition CompLocator = new IntermediateTupleDefinition(
+            TupleDefinitionType.CompLocator,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.Signature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.ComponentId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.Type), IntermediateFieldType.Number),
+            },
+            typeof(CompLocatorTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum CompLocatorTupleFields
+    {
+        Signature_,
+        ComponentId,
+        Type,
+    }
+
+    public class CompLocatorTuple : IntermediateTuple
+    {
+        public CompLocatorTuple() : base(TupleDefinitions.CompLocator, null, null)
+        {
+        }
+
+        public CompLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CompLocator, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[CompLocatorTupleFields index] => this.Fields[(int)index];
+
+        public string Signature_
+        {
+            get => (string)this.Fields[(int)CompLocatorTupleFields.Signature_]?.Value;
+            set => this.Set((int)CompLocatorTupleFields.Signature_, value);
+        }
+
+        public string ComponentId
+        {
+            get => (string)this.Fields[(int)CompLocatorTupleFields.ComponentId]?.Value;
+            set => this.Set((int)CompLocatorTupleFields.ComponentId, value);
+        }
+
+        public int Type
+        {
+            get => (int)this.Fields[(int)CompLocatorTupleFields.Type]?.Value;
+            set => this.Set((int)CompLocatorTupleFields.Type, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ComplusTuple.cs b/src/WixToolset.Data/Tuples/ComplusTuple.cs
new file mode 100644
index 00000000..0287c689
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ComplusTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Complus = new IntermediateTupleDefinition(
+            TupleDefinitionType.Complus,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComplusTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComplusTupleFields.ExpType), IntermediateFieldType.Number),
+            },
+            typeof(ComplusTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ComplusTupleFields
+    {
+        Component_,
+        ExpType,
+    }
+
+    public class ComplusTuple : IntermediateTuple
+    {
+        public ComplusTuple() : base(TupleDefinitions.Complus, null, null)
+        {
+        }
+
+        public ComplusTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Complus, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComplusTupleFields index] => this.Fields[(int)index];
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ComplusTupleFields.Component_]?.Value;
+            set => this.Set((int)ComplusTupleFields.Component_, value);
+        }
+
+        public int ExpType
+        {
+            get => (int)this.Fields[(int)ComplusTupleFields.ExpType]?.Value;
+            set => this.Set((int)ComplusTupleFields.ExpType, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ComponentTuple.cs b/src/WixToolset.Data/Tuples/ComponentTuple.cs
new file mode 100644
index 00000000..8d679609
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ComponentTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Component = new IntermediateTupleDefinition(
+            TupleDefinitionType.Component,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Component), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComponentTupleFields.ComponentId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComponentTupleFields.KeyPath), IntermediateFieldType.String),
+            },
+            typeof(ComponentTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ComponentTupleFields
+    {
+        Component,
+        ComponentId,
+        Directory_,
+        Attributes,
+        Condition,
+        KeyPath,
+    }
+
+    public class ComponentTuple : IntermediateTuple
+    {
+        public ComponentTuple() : base(TupleDefinitions.Component, null, null)
+        {
+        }
+
+        public ComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Component, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComponentTupleFields index] => this.Fields[(int)index];
+
+        public string Component
+        {
+            get => (string)this.Fields[(int)ComponentTupleFields.Component]?.Value;
+            set => this.Set((int)ComponentTupleFields.Component, value);
+        }
+
+        public string ComponentId
+        {
+            get => (string)this.Fields[(int)ComponentTupleFields.ComponentId]?.Value;
+            set => this.Set((int)ComponentTupleFields.ComponentId, value);
+        }
+
+        public string Directory_
+        {
+            get => (string)this.Fields[(int)ComponentTupleFields.Directory_]?.Value;
+            set => this.Set((int)ComponentTupleFields.Directory_, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)ComponentTupleFields.Attributes]?.Value;
+            set => this.Set((int)ComponentTupleFields.Attributes, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)ComponentTupleFields.Condition]?.Value;
+            set => this.Set((int)ComponentTupleFields.Condition, value);
+        }
+
+        public string KeyPath
+        {
+            get => (string)this.Fields[(int)ComponentTupleFields.KeyPath]?.Value;
+            set => this.Set((int)ComponentTupleFields.KeyPath, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ConditionTuple.cs b/src/WixToolset.Data/Tuples/ConditionTuple.cs
new file mode 100644
index 00000000..534f4cae
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ConditionTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Condition = new IntermediateTupleDefinition(
+            TupleDefinitionType.Condition,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ConditionTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ConditionTupleFields.Level), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ConditionTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(ConditionTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ConditionTupleFields
+    {
+        Feature_,
+        Level,
+        Condition,
+    }
+
+    public class ConditionTuple : IntermediateTuple
+    {
+        public ConditionTuple() : base(TupleDefinitions.Condition, null, null)
+        {
+        }
+
+        public ConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Condition, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ConditionTupleFields index] => this.Fields[(int)index];
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)ConditionTupleFields.Feature_]?.Value;
+            set => this.Set((int)ConditionTupleFields.Feature_, value);
+        }
+
+        public int Level
+        {
+            get => (int)this.Fields[(int)ConditionTupleFields.Level]?.Value;
+            set => this.Set((int)ConditionTupleFields.Level, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)ConditionTupleFields.Condition]?.Value;
+            set => this.Set((int)ConditionTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ControlConditionTuple.cs b/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
new file mode 100644
index 00000000..0b18dac1
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ControlCondition = new IntermediateTupleDefinition(
+            TupleDefinitionType.ControlCondition,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Dialog_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Control_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(ControlConditionTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ControlConditionTupleFields
+    {
+        Dialog_,
+        Control_,
+        Action,
+        Condition,
+    }
+
+    public class ControlConditionTuple : IntermediateTuple
+    {
+        public ControlConditionTuple() : base(TupleDefinitions.ControlCondition, null, null)
+        {
+        }
+
+        public ControlConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ControlCondition, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ControlConditionTupleFields index] => this.Fields[(int)index];
+
+        public string Dialog_
+        {
+            get => (string)this.Fields[(int)ControlConditionTupleFields.Dialog_]?.Value;
+            set => this.Set((int)ControlConditionTupleFields.Dialog_, value);
+        }
+
+        public string Control_
+        {
+            get => (string)this.Fields[(int)ControlConditionTupleFields.Control_]?.Value;
+            set => this.Set((int)ControlConditionTupleFields.Control_, value);
+        }
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)ControlConditionTupleFields.Action]?.Value;
+            set => this.Set((int)ControlConditionTupleFields.Action, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)ControlConditionTupleFields.Condition]?.Value;
+            set => this.Set((int)ControlConditionTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ControlEventTuple.cs b/src/WixToolset.Data/Tuples/ControlEventTuple.cs
new file mode 100644
index 00000000..b44cd19e
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ControlEventTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ControlEvent = new IntermediateTupleDefinition(
+            TupleDefinitionType.ControlEvent,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Dialog_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Control_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Event), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Argument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Ordering), IntermediateFieldType.Number),
+            },
+            typeof(ControlEventTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ControlEventTupleFields
+    {
+        Dialog_,
+        Control_,
+        Event,
+        Argument,
+        Condition,
+        Ordering,
+    }
+
+    public class ControlEventTuple : IntermediateTuple
+    {
+        public ControlEventTuple() : base(TupleDefinitions.ControlEvent, null, null)
+        {
+        }
+
+        public ControlEventTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ControlEvent, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ControlEventTupleFields index] => this.Fields[(int)index];
+
+        public string Dialog_
+        {
+            get => (string)this.Fields[(int)ControlEventTupleFields.Dialog_]?.Value;
+            set => this.Set((int)ControlEventTupleFields.Dialog_, value);
+        }
+
+        public string Control_
+        {
+            get => (string)this.Fields[(int)ControlEventTupleFields.Control_]?.Value;
+            set => this.Set((int)ControlEventTupleFields.Control_, value);
+        }
+
+        public string Event
+        {
+            get => (string)this.Fields[(int)ControlEventTupleFields.Event]?.Value;
+            set => this.Set((int)ControlEventTupleFields.Event, value);
+        }
+
+        public string Argument
+        {
+            get => (string)this.Fields[(int)ControlEventTupleFields.Argument]?.Value;
+            set => this.Set((int)ControlEventTupleFields.Argument, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)ControlEventTupleFields.Condition]?.Value;
+            set => this.Set((int)ControlEventTupleFields.Condition, value);
+        }
+
+        public int Ordering
+        {
+            get => (int)this.Fields[(int)ControlEventTupleFields.Ordering]?.Value;
+            set => this.Set((int)ControlEventTupleFields.Ordering, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ControlTuple.cs b/src/WixToolset.Data/Tuples/ControlTuple.cs
new file mode 100644
index 00000000..82de917c
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ControlTuple.cs
@@ -0,0 +1,132 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Control = new IntermediateTupleDefinition(
+            TupleDefinitionType.Control,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Dialog_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Control), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.X), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Y), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Width), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Height), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Control_Next), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.Help), IntermediateFieldType.String),
+            },
+            typeof(ControlTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ControlTupleFields
+    {
+        Dialog_,
+        Control,
+        Type,
+        X,
+        Y,
+        Width,
+        Height,
+        Attributes,
+        Property,
+        Text,
+        Control_Next,
+        Help,
+    }
+
+    public class ControlTuple : IntermediateTuple
+    {
+        public ControlTuple() : base(TupleDefinitions.Control, null, null)
+        {
+        }
+
+        public ControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Control, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ControlTupleFields index] => this.Fields[(int)index];
+
+        public string Dialog_
+        {
+            get => (string)this.Fields[(int)ControlTupleFields.Dialog_]?.Value;
+            set => this.Set((int)ControlTupleFields.Dialog_, value);
+        }
+
+        public string Control
+        {
+            get => (string)this.Fields[(int)ControlTupleFields.Control]?.Value;
+            set => this.Set((int)ControlTupleFields.Control, value);
+        }
+
+        public string Type
+        {
+            get => (string)this.Fields[(int)ControlTupleFields.Type]?.Value;
+            set => this.Set((int)ControlTupleFields.Type, value);
+        }
+
+        public int X
+        {
+            get => (int)this.Fields[(int)ControlTupleFields.X]?.Value;
+            set => this.Set((int)ControlTupleFields.X, value);
+        }
+
+        public int Y
+        {
+            get => (int)this.Fields[(int)ControlTupleFields.Y]?.Value;
+            set => this.Set((int)ControlTupleFields.Y, value);
+        }
+
+        public int Width
+        {
+            get => (int)this.Fields[(int)ControlTupleFields.Width]?.Value;
+            set => this.Set((int)ControlTupleFields.Width, value);
+        }
+
+        public int Height
+        {
+            get => (int)this.Fields[(int)ControlTupleFields.Height]?.Value;
+            set => this.Set((int)ControlTupleFields.Height, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)ControlTupleFields.Attributes]?.Value;
+            set => this.Set((int)ControlTupleFields.Attributes, value);
+        }
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)ControlTupleFields.Property]?.Value;
+            set => this.Set((int)ControlTupleFields.Property, value);
+        }
+
+        public string Text
+        {
+            get => (string)this.Fields[(int)ControlTupleFields.Text]?.Value;
+            set => this.Set((int)ControlTupleFields.Text, value);
+        }
+
+        public string Control_Next
+        {
+            get => (string)this.Fields[(int)ControlTupleFields.Control_Next]?.Value;
+            set => this.Set((int)ControlTupleFields.Control_Next, value);
+        }
+
+        public string Help
+        {
+            get => (string)this.Fields[(int)ControlTupleFields.Help]?.Value;
+            set => this.Set((int)ControlTupleFields.Help, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/CreateFolderTuple.cs b/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
new file mode 100644
index 00000000..05b50a8b
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition CreateFolder = new IntermediateTupleDefinition(
+            TupleDefinitionType.CreateFolder,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(CreateFolderTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum CreateFolderTupleFields
+    {
+        Directory_,
+        Component_,
+    }
+
+    public class CreateFolderTuple : IntermediateTuple
+    {
+        public CreateFolderTuple() : base(TupleDefinitions.CreateFolder, null, null)
+        {
+        }
+
+        public CreateFolderTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CreateFolder, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[CreateFolderTupleFields index] => this.Fields[(int)index];
+
+        public string Directory_
+        {
+            get => (string)this.Fields[(int)CreateFolderTupleFields.Directory_]?.Value;
+            set => this.Set((int)CreateFolderTupleFields.Directory_, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)CreateFolderTupleFields.Component_]?.Value;
+            set => this.Set((int)CreateFolderTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/CustomActionTuple.cs b/src/WixToolset.Data/Tuples/CustomActionTuple.cs
new file mode 100644
index 00000000..a5d8fd46
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/CustomActionTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition CustomAction = new IntermediateTupleDefinition(
+            TupleDefinitionType.CustomAction,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Type), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Source), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.ExtendedType), IntermediateFieldType.Number),
+            },
+            typeof(CustomActionTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum CustomActionTupleFields
+    {
+        Action,
+        Type,
+        Source,
+        Target,
+        ExtendedType,
+    }
+
+    public class CustomActionTuple : IntermediateTuple
+    {
+        public CustomActionTuple() : base(TupleDefinitions.CustomAction, null, null)
+        {
+        }
+
+        public CustomActionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CustomAction, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[CustomActionTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)CustomActionTupleFields.Action]?.Value;
+            set => this.Set((int)CustomActionTupleFields.Action, value);
+        }
+
+        public int Type
+        {
+            get => (int)this.Fields[(int)CustomActionTupleFields.Type]?.Value;
+            set => this.Set((int)CustomActionTupleFields.Type, value);
+        }
+
+        public string Source
+        {
+            get => (string)this.Fields[(int)CustomActionTupleFields.Source]?.Value;
+            set => this.Set((int)CustomActionTupleFields.Source, value);
+        }
+
+        public string Target
+        {
+            get => (string)this.Fields[(int)CustomActionTupleFields.Target]?.Value;
+            set => this.Set((int)CustomActionTupleFields.Target, value);
+        }
+
+        public int ExtendedType
+        {
+            get => (int)this.Fields[(int)CustomActionTupleFields.ExtendedType]?.Value;
+            set => this.Set((int)CustomActionTupleFields.ExtendedType, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/DialogTuple.cs b/src/WixToolset.Data/Tuples/DialogTuple.cs
new file mode 100644
index 00000000..b8bb2361
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/DialogTuple.cs
@@ -0,0 +1,116 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Dialog = new IntermediateTupleDefinition(
+            TupleDefinitionType.Dialog,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.Dialog), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.HCentering), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.VCentering), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.Width), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.Height), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.Title), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.Control_First), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.Control_Default), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.Control_Cancel), IntermediateFieldType.String),
+            },
+            typeof(DialogTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum DialogTupleFields
+    {
+        Dialog,
+        HCentering,
+        VCentering,
+        Width,
+        Height,
+        Attributes,
+        Title,
+        Control_First,
+        Control_Default,
+        Control_Cancel,
+    }
+
+    public class DialogTuple : IntermediateTuple
+    {
+        public DialogTuple() : base(TupleDefinitions.Dialog, null, null)
+        {
+        }
+
+        public DialogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Dialog, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[DialogTupleFields index] => this.Fields[(int)index];
+
+        public string Dialog
+        {
+            get => (string)this.Fields[(int)DialogTupleFields.Dialog]?.Value;
+            set => this.Set((int)DialogTupleFields.Dialog, value);
+        }
+
+        public int HCentering
+        {
+            get => (int)this.Fields[(int)DialogTupleFields.HCentering]?.Value;
+            set => this.Set((int)DialogTupleFields.HCentering, value);
+        }
+
+        public int VCentering
+        {
+            get => (int)this.Fields[(int)DialogTupleFields.VCentering]?.Value;
+            set => this.Set((int)DialogTupleFields.VCentering, value);
+        }
+
+        public int Width
+        {
+            get => (int)this.Fields[(int)DialogTupleFields.Width]?.Value;
+            set => this.Set((int)DialogTupleFields.Width, value);
+        }
+
+        public int Height
+        {
+            get => (int)this.Fields[(int)DialogTupleFields.Height]?.Value;
+            set => this.Set((int)DialogTupleFields.Height, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)DialogTupleFields.Attributes]?.Value;
+            set => this.Set((int)DialogTupleFields.Attributes, value);
+        }
+
+        public string Title
+        {
+            get => (string)this.Fields[(int)DialogTupleFields.Title]?.Value;
+            set => this.Set((int)DialogTupleFields.Title, value);
+        }
+
+        public string Control_First
+        {
+            get => (string)this.Fields[(int)DialogTupleFields.Control_First]?.Value;
+            set => this.Set((int)DialogTupleFields.Control_First, value);
+        }
+
+        public string Control_Default
+        {
+            get => (string)this.Fields[(int)DialogTupleFields.Control_Default]?.Value;
+            set => this.Set((int)DialogTupleFields.Control_Default, value);
+        }
+
+        public string Control_Cancel
+        {
+            get => (string)this.Fields[(int)DialogTupleFields.Control_Cancel]?.Value;
+            set => this.Set((int)DialogTupleFields.Control_Cancel, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/DirectoryTuple.cs b/src/WixToolset.Data/Tuples/DirectoryTuple.cs
new file mode 100644
index 00000000..b36345c7
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/DirectoryTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Directory = new IntermediateTupleDefinition(
+            TupleDefinitionType.Directory,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Directory), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Directory_Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.DefaultDir), IntermediateFieldType.String),
+            },
+            typeof(DirectoryTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum DirectoryTupleFields
+    {
+        Directory,
+        Directory_Parent,
+        DefaultDir,
+    }
+
+    public class DirectoryTuple : IntermediateTuple
+    {
+        public DirectoryTuple() : base(TupleDefinitions.Directory, null, null)
+        {
+        }
+
+        public DirectoryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Directory, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[DirectoryTupleFields index] => this.Fields[(int)index];
+
+        public string Directory
+        {
+            get => (string)this.Fields[(int)DirectoryTupleFields.Directory]?.Value;
+            set => this.Set((int)DirectoryTupleFields.Directory, value);
+        }
+
+        public string Directory_Parent
+        {
+            get => (string)this.Fields[(int)DirectoryTupleFields.Directory_Parent]?.Value;
+            set => this.Set((int)DirectoryTupleFields.Directory_Parent, value);
+        }
+
+        public string DefaultDir
+        {
+            get => (string)this.Fields[(int)DirectoryTupleFields.DefaultDir]?.Value;
+            set => this.Set((int)DirectoryTupleFields.DefaultDir, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/DrLocatorTuple.cs b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
new file mode 100644
index 00000000..38910333
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition DrLocator = new IntermediateTupleDefinition(
+            TupleDefinitionType.DrLocator,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Signature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Path), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Depth), IntermediateFieldType.Number),
+            },
+            typeof(DrLocatorTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum DrLocatorTupleFields
+    {
+        Signature_,
+        Parent,
+        Path,
+        Depth,
+    }
+
+    public class DrLocatorTuple : IntermediateTuple
+    {
+        public DrLocatorTuple() : base(TupleDefinitions.DrLocator, null, null)
+        {
+        }
+
+        public DrLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.DrLocator, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[DrLocatorTupleFields index] => this.Fields[(int)index];
+
+        public string Signature_
+        {
+            get => (string)this.Fields[(int)DrLocatorTupleFields.Signature_]?.Value;
+            set => this.Set((int)DrLocatorTupleFields.Signature_, value);
+        }
+
+        public string Parent
+        {
+            get => (string)this.Fields[(int)DrLocatorTupleFields.Parent]?.Value;
+            set => this.Set((int)DrLocatorTupleFields.Parent, value);
+        }
+
+        public string Path
+        {
+            get => (string)this.Fields[(int)DrLocatorTupleFields.Path]?.Value;
+            set => this.Set((int)DrLocatorTupleFields.Path, value);
+        }
+
+        public int Depth
+        {
+            get => (int)this.Fields[(int)DrLocatorTupleFields.Depth]?.Value;
+            set => this.Set((int)DrLocatorTupleFields.Depth, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs b/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
new file mode 100644
index 00000000..b489025c
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition DuplicateFile = new IntermediateTupleDefinition(
+            TupleDefinitionType.DuplicateFile,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.FileKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestFolder), IntermediateFieldType.String),
+            },
+            typeof(DuplicateFileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum DuplicateFileTupleFields
+    {
+        FileKey,
+        Component_,
+        File_,
+        DestName,
+        DestFolder,
+    }
+
+    public class DuplicateFileTuple : IntermediateTuple
+    {
+        public DuplicateFileTuple() : base(TupleDefinitions.DuplicateFile, null, null)
+        {
+        }
+
+        public DuplicateFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.DuplicateFile, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[DuplicateFileTupleFields index] => this.Fields[(int)index];
+
+        public string FileKey
+        {
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.FileKey]?.Value;
+            set => this.Set((int)DuplicateFileTupleFields.FileKey, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.Component_]?.Value;
+            set => this.Set((int)DuplicateFileTupleFields.Component_, value);
+        }
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.File_]?.Value;
+            set => this.Set((int)DuplicateFileTupleFields.File_, value);
+        }
+
+        public string DestName
+        {
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestName]?.Value;
+            set => this.Set((int)DuplicateFileTupleFields.DestName, value);
+        }
+
+        public string DestFolder
+        {
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestFolder]?.Value;
+            set => this.Set((int)DuplicateFileTupleFields.DestFolder, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/EnvironmentTuple.cs b/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
new file mode 100644
index 00000000..9ee05a19
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Environment = new IntermediateTupleDefinition(
+            TupleDefinitionType.Environment,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Environment), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(EnvironmentTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum EnvironmentTupleFields
+    {
+        Environment,
+        Name,
+        Value,
+        Component_,
+    }
+
+    public class EnvironmentTuple : IntermediateTuple
+    {
+        public EnvironmentTuple() : base(TupleDefinitions.Environment, null, null)
+        {
+        }
+
+        public EnvironmentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Environment, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[EnvironmentTupleFields index] => this.Fields[(int)index];
+
+        public string Environment
+        {
+            get => (string)this.Fields[(int)EnvironmentTupleFields.Environment]?.Value;
+            set => this.Set((int)EnvironmentTupleFields.Environment, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)EnvironmentTupleFields.Name]?.Value;
+            set => this.Set((int)EnvironmentTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)EnvironmentTupleFields.Value]?.Value;
+            set => this.Set((int)EnvironmentTupleFields.Value, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)EnvironmentTupleFields.Component_]?.Value;
+            set => this.Set((int)EnvironmentTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ErrorTuple.cs b/src/WixToolset.Data/Tuples/ErrorTuple.cs
new file mode 100644
index 00000000..393d2d29
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ErrorTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Error = new IntermediateTupleDefinition(
+            TupleDefinitionType.Error,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ErrorTupleFields.Error), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ErrorTupleFields.Message), IntermediateFieldType.String),
+            },
+            typeof(ErrorTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ErrorTupleFields
+    {
+        Error,
+        Message,
+    }
+
+    public class ErrorTuple : IntermediateTuple
+    {
+        public ErrorTuple() : base(TupleDefinitions.Error, null, null)
+        {
+        }
+
+        public ErrorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Error, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ErrorTupleFields index] => this.Fields[(int)index];
+
+        public int Error
+        {
+            get => (int)this.Fields[(int)ErrorTupleFields.Error]?.Value;
+            set => this.Set((int)ErrorTupleFields.Error, value);
+        }
+
+        public string Message
+        {
+            get => (string)this.Fields[(int)ErrorTupleFields.Message]?.Value;
+            set => this.Set((int)ErrorTupleFields.Message, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/EventMappingTuple.cs b/src/WixToolset.Data/Tuples/EventMappingTuple.cs
new file mode 100644
index 00000000..e0e8da71
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/EventMappingTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition EventMapping = new IntermediateTupleDefinition(
+            TupleDefinitionType.EventMapping,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Dialog_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Control_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Event), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Attribute), IntermediateFieldType.String),
+            },
+            typeof(EventMappingTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum EventMappingTupleFields
+    {
+        Dialog_,
+        Control_,
+        Event,
+        Attribute,
+    }
+
+    public class EventMappingTuple : IntermediateTuple
+    {
+        public EventMappingTuple() : base(TupleDefinitions.EventMapping, null, null)
+        {
+        }
+
+        public EventMappingTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.EventMapping, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[EventMappingTupleFields index] => this.Fields[(int)index];
+
+        public string Dialog_
+        {
+            get => (string)this.Fields[(int)EventMappingTupleFields.Dialog_]?.Value;
+            set => this.Set((int)EventMappingTupleFields.Dialog_, value);
+        }
+
+        public string Control_
+        {
+            get => (string)this.Fields[(int)EventMappingTupleFields.Control_]?.Value;
+            set => this.Set((int)EventMappingTupleFields.Control_, value);
+        }
+
+        public string Event
+        {
+            get => (string)this.Fields[(int)EventMappingTupleFields.Event]?.Value;
+            set => this.Set((int)EventMappingTupleFields.Event, value);
+        }
+
+        public string Attribute
+        {
+            get => (string)this.Fields[(int)EventMappingTupleFields.Attribute]?.Value;
+            set => this.Set((int)EventMappingTupleFields.Attribute, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ExtensionTuple.cs b/src/WixToolset.Data/Tuples/ExtensionTuple.cs
new file mode 100644
index 00000000..e3ef1675
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ExtensionTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Extension = new IntermediateTupleDefinition(
+            TupleDefinitionType.Extension,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Extension), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ProgId_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.MIME_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Feature_), IntermediateFieldType.String),
+            },
+            typeof(ExtensionTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ExtensionTupleFields
+    {
+        Extension,
+        Component_,
+        ProgId_,
+        MIME_,
+        Feature_,
+    }
+
+    public class ExtensionTuple : IntermediateTuple
+    {
+        public ExtensionTuple() : base(TupleDefinitions.Extension, null, null)
+        {
+        }
+
+        public ExtensionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Extension, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ExtensionTupleFields index] => this.Fields[(int)index];
+
+        public string Extension
+        {
+            get => (string)this.Fields[(int)ExtensionTupleFields.Extension]?.Value;
+            set => this.Set((int)ExtensionTupleFields.Extension, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ExtensionTupleFields.Component_]?.Value;
+            set => this.Set((int)ExtensionTupleFields.Component_, value);
+        }
+
+        public string ProgId_
+        {
+            get => (string)this.Fields[(int)ExtensionTupleFields.ProgId_]?.Value;
+            set => this.Set((int)ExtensionTupleFields.ProgId_, value);
+        }
+
+        public string MIME_
+        {
+            get => (string)this.Fields[(int)ExtensionTupleFields.MIME_]?.Value;
+            set => this.Set((int)ExtensionTupleFields.MIME_, value);
+        }
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)ExtensionTupleFields.Feature_]?.Value;
+            set => this.Set((int)ExtensionTupleFields.Feature_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs b/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs
new file mode 100644
index 00000000..06e6d4ae
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ExternalFiles = new IntermediateTupleDefinition(
+            TupleDefinitionType.ExternalFiles,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.Family), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.FilePath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.IgnoreOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.IgnoreLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.RetainOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.Order), IntermediateFieldType.Number),
+            },
+            typeof(ExternalFilesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ExternalFilesTupleFields
+    {
+        Family,
+        FTK,
+        FilePath,
+        SymbolPaths,
+        IgnoreOffsets,
+        IgnoreLengths,
+        RetainOffsets,
+        Order,
+    }
+
+    public class ExternalFilesTuple : IntermediateTuple
+    {
+        public ExternalFilesTuple() : base(TupleDefinitions.ExternalFiles, null, null)
+        {
+        }
+
+        public ExternalFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ExternalFiles, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ExternalFilesTupleFields index] => this.Fields[(int)index];
+
+        public string Family
+        {
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.Family]?.Value;
+            set => this.Set((int)ExternalFilesTupleFields.Family, value);
+        }
+
+        public string FTK
+        {
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.FTK]?.Value;
+            set => this.Set((int)ExternalFilesTupleFields.FTK, value);
+        }
+
+        public string FilePath
+        {
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.FilePath]?.Value;
+            set => this.Set((int)ExternalFilesTupleFields.FilePath, value);
+        }
+
+        public string SymbolPaths
+        {
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.SymbolPaths]?.Value;
+            set => this.Set((int)ExternalFilesTupleFields.SymbolPaths, value);
+        }
+
+        public string IgnoreOffsets
+        {
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreOffsets]?.Value;
+            set => this.Set((int)ExternalFilesTupleFields.IgnoreOffsets, value);
+        }
+
+        public string IgnoreLengths
+        {
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreLengths]?.Value;
+            set => this.Set((int)ExternalFilesTupleFields.IgnoreLengths, value);
+        }
+
+        public string RetainOffsets
+        {
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.RetainOffsets]?.Value;
+            set => this.Set((int)ExternalFilesTupleFields.RetainOffsets, value);
+        }
+
+        public int Order
+        {
+            get => (int)this.Fields[(int)ExternalFilesTupleFields.Order]?.Value;
+            set => this.Set((int)ExternalFilesTupleFields.Order, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs b/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs
new file mode 100644
index 00000000..5065c389
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition FamilyFileRanges = new IntermediateTupleDefinition(
+            TupleDefinitionType.FamilyFileRanges,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.Family), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.RetainOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.RetainLengths), IntermediateFieldType.String),
+            },
+            typeof(FamilyFileRangesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum FamilyFileRangesTupleFields
+    {
+        Family,
+        FTK,
+        RetainOffsets,
+        RetainLengths,
+    }
+
+    public class FamilyFileRangesTuple : IntermediateTuple
+    {
+        public FamilyFileRangesTuple() : base(TupleDefinitions.FamilyFileRanges, null, null)
+        {
+        }
+
+        public FamilyFileRangesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.FamilyFileRanges, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[FamilyFileRangesTupleFields index] => this.Fields[(int)index];
+
+        public string Family
+        {
+            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.Family]?.Value;
+            set => this.Set((int)FamilyFileRangesTupleFields.Family, value);
+        }
+
+        public string FTK
+        {
+            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.FTK]?.Value;
+            set => this.Set((int)FamilyFileRangesTupleFields.FTK, value);
+        }
+
+        public string RetainOffsets
+        {
+            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainOffsets]?.Value;
+            set => this.Set((int)FamilyFileRangesTupleFields.RetainOffsets, value);
+        }
+
+        public string RetainLengths
+        {
+            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainLengths]?.Value;
+            set => this.Set((int)FamilyFileRangesTupleFields.RetainLengths, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs b/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
new file mode 100644
index 00000000..e9d54c37
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition FeatureComponents = new IntermediateTupleDefinition(
+            TupleDefinitionType.FeatureComponents,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(FeatureComponentsTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum FeatureComponentsTupleFields
+    {
+        Feature_,
+        Component_,
+    }
+
+    public class FeatureComponentsTuple : IntermediateTuple
+    {
+        public FeatureComponentsTuple() : base(TupleDefinitions.FeatureComponents, null, null)
+        {
+        }
+
+        public FeatureComponentsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.FeatureComponents, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[FeatureComponentsTupleFields index] => this.Fields[(int)index];
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)FeatureComponentsTupleFields.Feature_]?.Value;
+            set => this.Set((int)FeatureComponentsTupleFields.Feature_, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)FeatureComponentsTupleFields.Component_]?.Value;
+            set => this.Set((int)FeatureComponentsTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FeatureTuple.cs b/src/WixToolset.Data/Tuples/FeatureTuple.cs
new file mode 100644
index 00000000..a04c339b
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/FeatureTuple.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Feature = new IntermediateTupleDefinition(
+            TupleDefinitionType.Feature,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Feature), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Feature_Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Title), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Display), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Level), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(FeatureTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum FeatureTupleFields
+    {
+        Feature,
+        Feature_Parent,
+        Title,
+        Description,
+        Display,
+        Level,
+        Directory_,
+        Attributes,
+    }
+
+    public class FeatureTuple : IntermediateTuple
+    {
+        public FeatureTuple() : base(TupleDefinitions.Feature, null, null)
+        {
+        }
+
+        public FeatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Feature, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[FeatureTupleFields index] => this.Fields[(int)index];
+
+        public string Feature
+        {
+            get => (string)this.Fields[(int)FeatureTupleFields.Feature]?.Value;
+            set => this.Set((int)FeatureTupleFields.Feature, value);
+        }
+
+        public string Feature_Parent
+        {
+            get => (string)this.Fields[(int)FeatureTupleFields.Feature_Parent]?.Value;
+            set => this.Set((int)FeatureTupleFields.Feature_Parent, value);
+        }
+
+        public string Title
+        {
+            get => (string)this.Fields[(int)FeatureTupleFields.Title]?.Value;
+            set => this.Set((int)FeatureTupleFields.Title, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)FeatureTupleFields.Description]?.Value;
+            set => this.Set((int)FeatureTupleFields.Description, value);
+        }
+
+        public int Display
+        {
+            get => (int)this.Fields[(int)FeatureTupleFields.Display]?.Value;
+            set => this.Set((int)FeatureTupleFields.Display, value);
+        }
+
+        public int Level
+        {
+            get => (int)this.Fields[(int)FeatureTupleFields.Level]?.Value;
+            set => this.Set((int)FeatureTupleFields.Level, value);
+        }
+
+        public string Directory_
+        {
+            get => (string)this.Fields[(int)FeatureTupleFields.Directory_]?.Value;
+            set => this.Set((int)FeatureTupleFields.Directory_, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)FeatureTupleFields.Attributes]?.Value;
+            set => this.Set((int)FeatureTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs b/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
new file mode 100644
index 00000000..7409577f
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition FileSFPCatalog = new IntermediateTupleDefinition(
+            TupleDefinitionType.FileSFPCatalog,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.SFPCatalog_), IntermediateFieldType.String),
+            },
+            typeof(FileSFPCatalogTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum FileSFPCatalogTupleFields
+    {
+        File_,
+        SFPCatalog_,
+    }
+
+    public class FileSFPCatalogTuple : IntermediateTuple
+    {
+        public FileSFPCatalogTuple() : base(TupleDefinitions.FileSFPCatalog, null, null)
+        {
+        }
+
+        public FileSFPCatalogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.FileSFPCatalog, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[FileSFPCatalogTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.File_]?.Value;
+            set => this.Set((int)FileSFPCatalogTupleFields.File_, value);
+        }
+
+        public string SFPCatalog_
+        {
+            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.SFPCatalog_]?.Value;
+            set => this.Set((int)FileSFPCatalogTupleFields.SFPCatalog_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FileTuple.cs b/src/WixToolset.Data/Tuples/FileTuple.cs
new file mode 100644
index 00000000..6c184b63
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/FileTuple.cs
@@ -0,0 +1,140 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition File = new IntermediateTupleDefinition(
+            TupleDefinitionType.File,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(FileTupleFields.File), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.ShortFileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.LongFileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.ReadOnly), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Hidden), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.System), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Vital), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Checksum), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Compressed), IntermediateFieldType.Bool),
+            },
+            typeof(FileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum FileTupleFields
+    {
+        File,
+        Component_,
+        ShortFileName,
+        LongFileName,
+        FileSize,
+        Version,
+        Language,
+        ReadOnly,
+        Hidden,
+        System,
+        Vital,
+        Checksum,
+        Compressed,
+    }
+
+    public class FileTuple : IntermediateTuple
+    {
+        public FileTuple() : base(TupleDefinitions.File, null, null)
+        {
+        }
+
+        public FileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.File, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[FileTupleFields index] => this.Fields[(int)index];
+
+        public string File
+        {
+            get => (string)this.Fields[(int)FileTupleFields.File]?.Value;
+            set => this.Set((int)FileTupleFields.File, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)FileTupleFields.Component_]?.Value;
+            set => this.Set((int)FileTupleFields.Component_, value);
+        }
+
+        public string ShortFileName
+        {
+            get => (string)this.Fields[(int)FileTupleFields.ShortFileName]?.Value;
+            set => this.Set((int)FileTupleFields.ShortFileName, value);
+        }
+
+        public string LongFileName
+        {
+            get => (string)this.Fields[(int)FileTupleFields.LongFileName]?.Value;
+            set => this.Set((int)FileTupleFields.LongFileName, value);
+        }
+
+        public int FileSize
+        {
+            get => (int)this.Fields[(int)FileTupleFields.FileSize]?.Value;
+            set => this.Set((int)FileTupleFields.FileSize, value);
+        }
+
+        public string Version
+        {
+            get => (string)this.Fields[(int)FileTupleFields.Version]?.Value;
+            set => this.Set((int)FileTupleFields.Version, value);
+        }
+
+        public string Language
+        {
+            get => (string)this.Fields[(int)FileTupleFields.Language]?.Value;
+            set => this.Set((int)FileTupleFields.Language, value);
+        }
+
+        public bool ReadOnly
+        {
+            get => (bool)this.Fields[(int)FileTupleFields.ReadOnly]?.Value;
+            set => this.Set((int)FileTupleFields.ReadOnly, value);
+        }
+
+        public bool Hidden
+        {
+            get => (bool)this.Fields[(int)FileTupleFields.Hidden]?.Value;
+            set => this.Set((int)FileTupleFields.Hidden, value);
+        }
+
+        public bool System
+        {
+            get => (bool)this.Fields[(int)FileTupleFields.System]?.Value;
+            set => this.Set((int)FileTupleFields.System, value);
+        }
+
+        public bool Vital
+        {
+            get => (bool)this.Fields[(int)FileTupleFields.Vital]?.Value;
+            set => this.Set((int)FileTupleFields.Vital, value);
+        }
+
+        public bool Checksum
+        {
+            get => (bool)this.Fields[(int)FileTupleFields.Checksum]?.Value;
+            set => this.Set((int)FileTupleFields.Checksum, value);
+        }
+
+        public bool? Compressed
+        {
+            get => (bool?)this.Fields[(int)FileTupleFields.Compressed]?.Value;
+            set => this.Set((int)FileTupleFields.Compressed, value);
+        }
+    }
+}
diff --git a/src/WixToolset.Data/Tuples/FontTuple.cs b/src/WixToolset.Data/Tuples/FontTuple.cs
new file mode 100644
index 00000000..97550148
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/FontTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Font = new IntermediateTupleDefinition(
+            TupleDefinitionType.Font,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(FontTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FontTupleFields.FontTitle), IntermediateFieldType.String),
+            },
+            typeof(FontTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum FontTupleFields
+    {
+        File_,
+        FontTitle,
+    }
+
+    public class FontTuple : IntermediateTuple
+    {
+        public FontTuple() : base(TupleDefinitions.Font, null, null)
+        {
+        }
+
+        public FontTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Font, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[FontTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)FontTupleFields.File_]?.Value;
+            set => this.Set((int)FontTupleFields.File_, value);
+        }
+
+        public string FontTitle
+        {
+            get => (string)this.Fields[(int)FontTupleFields.FontTitle]?.Value;
+            set => this.Set((int)FontTupleFields.FontTitle, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/IconTuple.cs b/src/WixToolset.Data/Tuples/IconTuple.cs
new file mode 100644
index 00000000..0ccd9a53
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/IconTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Icon = new IntermediateTupleDefinition(
+            TupleDefinitionType.Icon,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(IconTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IconTupleFields.Data), IntermediateFieldType.Path),
+            },
+            typeof(IconTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum IconTupleFields
+    {
+        Name,
+        Data,
+    }
+
+    public class IconTuple : IntermediateTuple
+    {
+        public IconTuple() : base(TupleDefinitions.Icon, null, null)
+        {
+        }
+
+        public IconTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Icon, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[IconTupleFields index] => this.Fields[(int)index];
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)IconTupleFields.Name]?.Value;
+            set => this.Set((int)IconTupleFields.Name, value);
+        }
+
+        public string Data
+        {
+            get => (string)this.Fields[(int)IconTupleFields.Data]?.Value;
+            set => this.Set((int)IconTupleFields.Data, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs b/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
new file mode 100644
index 00000000..7ce884ca
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ImageFamilies = new IntermediateTupleDefinition(
+            TupleDefinitionType.ImageFamilies,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.Family), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.MediaSrcPropName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.MediaDiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.FileSequenceStart), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.DiskPrompt), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.VolumeLabel), IntermediateFieldType.String),
+            },
+            typeof(ImageFamiliesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ImageFamiliesTupleFields
+    {
+        Family,
+        MediaSrcPropName,
+        MediaDiskId,
+        FileSequenceStart,
+        DiskPrompt,
+        VolumeLabel,
+    }
+
+    public class ImageFamiliesTuple : IntermediateTuple
+    {
+        public ImageFamiliesTuple() : base(TupleDefinitions.ImageFamilies, null, null)
+        {
+        }
+
+        public ImageFamiliesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ImageFamilies, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ImageFamiliesTupleFields index] => this.Fields[(int)index];
+
+        public string Family
+        {
+            get => (string)this.Fields[(int)ImageFamiliesTupleFields.Family]?.Value;
+            set => this.Set((int)ImageFamiliesTupleFields.Family, value);
+        }
+
+        public string MediaSrcPropName
+        {
+            get => (string)this.Fields[(int)ImageFamiliesTupleFields.MediaSrcPropName]?.Value;
+            set => this.Set((int)ImageFamiliesTupleFields.MediaSrcPropName, value);
+        }
+
+        public int MediaDiskId
+        {
+            get => (int)this.Fields[(int)ImageFamiliesTupleFields.MediaDiskId]?.Value;
+            set => this.Set((int)ImageFamiliesTupleFields.MediaDiskId, value);
+        }
+
+        public int FileSequenceStart
+        {
+            get => (int)this.Fields[(int)ImageFamiliesTupleFields.FileSequenceStart]?.Value;
+            set => this.Set((int)ImageFamiliesTupleFields.FileSequenceStart, value);
+        }
+
+        public string DiskPrompt
+        {
+            get => (string)this.Fields[(int)ImageFamiliesTupleFields.DiskPrompt]?.Value;
+            set => this.Set((int)ImageFamiliesTupleFields.DiskPrompt, value);
+        }
+
+        public string VolumeLabel
+        {
+            get => (string)this.Fields[(int)ImageFamiliesTupleFields.VolumeLabel]?.Value;
+            set => this.Set((int)ImageFamiliesTupleFields.VolumeLabel, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/IniFileTuple.cs b/src/WixToolset.Data/Tuples/IniFileTuple.cs
new file mode 100644
index 00000000..29fb3264
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/IniFileTuple.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition IniFile = new IntermediateTupleDefinition(
+            TupleDefinitionType.IniFile,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(IniFileTupleFields.IniFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileTupleFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileTupleFields.DirProperty), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Section), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Action), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(IniFileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum IniFileTupleFields
+    {
+        IniFile,
+        FileName,
+        DirProperty,
+        Section,
+        Key,
+        Value,
+        Action,
+        Component_,
+    }
+
+    public class IniFileTuple : IntermediateTuple
+    {
+        public IniFileTuple() : base(TupleDefinitions.IniFile, null, null)
+        {
+        }
+
+        public IniFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.IniFile, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[IniFileTupleFields index] => this.Fields[(int)index];
+
+        public string IniFile
+        {
+            get => (string)this.Fields[(int)IniFileTupleFields.IniFile]?.Value;
+            set => this.Set((int)IniFileTupleFields.IniFile, value);
+        }
+
+        public string FileName
+        {
+            get => (string)this.Fields[(int)IniFileTupleFields.FileName]?.Value;
+            set => this.Set((int)IniFileTupleFields.FileName, value);
+        }
+
+        public string DirProperty
+        {
+            get => (string)this.Fields[(int)IniFileTupleFields.DirProperty]?.Value;
+            set => this.Set((int)IniFileTupleFields.DirProperty, value);
+        }
+
+        public string Section
+        {
+            get => (string)this.Fields[(int)IniFileTupleFields.Section]?.Value;
+            set => this.Set((int)IniFileTupleFields.Section, value);
+        }
+
+        public string Key
+        {
+            get => (string)this.Fields[(int)IniFileTupleFields.Key]?.Value;
+            set => this.Set((int)IniFileTupleFields.Key, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)IniFileTupleFields.Value]?.Value;
+            set => this.Set((int)IniFileTupleFields.Value, value);
+        }
+
+        public int Action
+        {
+            get => (int)this.Fields[(int)IniFileTupleFields.Action]?.Value;
+            set => this.Set((int)IniFileTupleFields.Action, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)IniFileTupleFields.Component_]?.Value;
+            set => this.Set((int)IniFileTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
new file mode 100644
index 00000000..f956ee5f
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition IniLocator = new IntermediateTupleDefinition(
+            TupleDefinitionType.IniLocator,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Signature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Section), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Field), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Type), IntermediateFieldType.Number),
+            },
+            typeof(IniLocatorTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum IniLocatorTupleFields
+    {
+        Signature_,
+        FileName,
+        Section,
+        Key,
+        Field,
+        Type,
+    }
+
+    public class IniLocatorTuple : IntermediateTuple
+    {
+        public IniLocatorTuple() : base(TupleDefinitions.IniLocator, null, null)
+        {
+        }
+
+        public IniLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.IniLocator, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[IniLocatorTupleFields index] => this.Fields[(int)index];
+
+        public string Signature_
+        {
+            get => (string)this.Fields[(int)IniLocatorTupleFields.Signature_]?.Value;
+            set => this.Set((int)IniLocatorTupleFields.Signature_, value);
+        }
+
+        public string FileName
+        {
+            get => (string)this.Fields[(int)IniLocatorTupleFields.FileName]?.Value;
+            set => this.Set((int)IniLocatorTupleFields.FileName, value);
+        }
+
+        public string Section
+        {
+            get => (string)this.Fields[(int)IniLocatorTupleFields.Section]?.Value;
+            set => this.Set((int)IniLocatorTupleFields.Section, value);
+        }
+
+        public string Key
+        {
+            get => (string)this.Fields[(int)IniLocatorTupleFields.Key]?.Value;
+            set => this.Set((int)IniLocatorTupleFields.Key, value);
+        }
+
+        public int Field
+        {
+            get => (int)this.Fields[(int)IniLocatorTupleFields.Field]?.Value;
+            set => this.Set((int)IniLocatorTupleFields.Field, value);
+        }
+
+        public int Type
+        {
+            get => (int)this.Fields[(int)IniLocatorTupleFields.Type]?.Value;
+            set => this.Set((int)IniLocatorTupleFields.Type, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/InstallExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/InstallExecuteSequenceTuple.cs
new file mode 100644
index 00000000..390faf9d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/InstallExecuteSequenceTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition InstallExecuteSequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.InstallExecuteSequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(InstallExecuteSequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(InstallExecuteSequenceTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(InstallExecuteSequenceTupleFields.Sequence), IntermediateFieldType.Number),
+            },
+            typeof(InstallExecuteSequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum InstallExecuteSequenceTupleFields
+    {
+        Action,
+        Condition,
+        Sequence,
+    }
+
+    public class InstallExecuteSequenceTuple : IntermediateTuple
+    {
+        public InstallExecuteSequenceTuple() : base(TupleDefinitions.InstallExecuteSequence, null, null)
+        {
+        }
+
+        public InstallExecuteSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.InstallExecuteSequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[InstallExecuteSequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)InstallExecuteSequenceTupleFields.Action]?.Value;
+            set => this.Set((int)InstallExecuteSequenceTupleFields.Action, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)InstallExecuteSequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)InstallExecuteSequenceTupleFields.Condition, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)InstallExecuteSequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)InstallExecuteSequenceTupleFields.Sequence, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/InstallUISequenceTuple.cs b/src/WixToolset.Data/Tuples/InstallUISequenceTuple.cs
new file mode 100644
index 00000000..07409c37
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/InstallUISequenceTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition InstallUISequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.InstallUISequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(InstallUISequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(InstallUISequenceTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(InstallUISequenceTupleFields.Sequence), IntermediateFieldType.Number),
+            },
+            typeof(InstallUISequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum InstallUISequenceTupleFields
+    {
+        Action,
+        Condition,
+        Sequence,
+    }
+
+    public class InstallUISequenceTuple : IntermediateTuple
+    {
+        public InstallUISequenceTuple() : base(TupleDefinitions.InstallUISequence, null, null)
+        {
+        }
+
+        public InstallUISequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.InstallUISequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[InstallUISequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)InstallUISequenceTupleFields.Action]?.Value;
+            set => this.Set((int)InstallUISequenceTupleFields.Action, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)InstallUISequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)InstallUISequenceTupleFields.Condition, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)InstallUISequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)InstallUISequenceTupleFields.Sequence, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs b/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
new file mode 100644
index 00000000..5fb4f8aa
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition IsolatedComponent = new IntermediateTupleDefinition(
+            TupleDefinitionType.IsolatedComponent,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.Component_Shared), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.Component_Application), IntermediateFieldType.String),
+            },
+            typeof(IsolatedComponentTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum IsolatedComponentTupleFields
+    {
+        Component_Shared,
+        Component_Application,
+    }
+
+    public class IsolatedComponentTuple : IntermediateTuple
+    {
+        public IsolatedComponentTuple() : base(TupleDefinitions.IsolatedComponent, null, null)
+        {
+        }
+
+        public IsolatedComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.IsolatedComponent, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[IsolatedComponentTupleFields index] => this.Fields[(int)index];
+
+        public string Component_Shared
+        {
+            get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Shared]?.Value;
+            set => this.Set((int)IsolatedComponentTupleFields.Component_Shared, value);
+        }
+
+        public string Component_Application
+        {
+            get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Application]?.Value;
+            set => this.Set((int)IsolatedComponentTupleFields.Component_Application, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs b/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs
new file mode 100644
index 00000000..f5718607
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition LaunchCondition = new IntermediateTupleDefinition(
+            TupleDefinitionType.LaunchCondition,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(LaunchConditionTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LaunchConditionTupleFields.Description), IntermediateFieldType.String),
+            },
+            typeof(LaunchConditionTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum LaunchConditionTupleFields
+    {
+        Condition,
+        Description,
+    }
+
+    public class LaunchConditionTuple : IntermediateTuple
+    {
+        public LaunchConditionTuple() : base(TupleDefinitions.LaunchCondition, null, null)
+        {
+        }
+
+        public LaunchConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.LaunchCondition, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[LaunchConditionTupleFields index] => this.Fields[(int)index];
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)LaunchConditionTupleFields.Condition]?.Value;
+            set => this.Set((int)LaunchConditionTupleFields.Condition, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)LaunchConditionTupleFields.Description]?.Value;
+            set => this.Set((int)LaunchConditionTupleFields.Description, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ListBoxTuple.cs b/src/WixToolset.Data/Tuples/ListBoxTuple.cs
new file mode 100644
index 00000000..71702c07
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ListBoxTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ListBox = new IntermediateTupleDefinition(
+            TupleDefinitionType.ListBox,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Text), IntermediateFieldType.String),
+            },
+            typeof(ListBoxTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ListBoxTupleFields
+    {
+        Property,
+        Order,
+        Value,
+        Text,
+    }
+
+    public class ListBoxTuple : IntermediateTuple
+    {
+        public ListBoxTuple() : base(TupleDefinitions.ListBox, null, null)
+        {
+        }
+
+        public ListBoxTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ListBox, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ListBoxTupleFields index] => this.Fields[(int)index];
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)ListBoxTupleFields.Property]?.Value;
+            set => this.Set((int)ListBoxTupleFields.Property, value);
+        }
+
+        public int Order
+        {
+            get => (int)this.Fields[(int)ListBoxTupleFields.Order]?.Value;
+            set => this.Set((int)ListBoxTupleFields.Order, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)ListBoxTupleFields.Value]?.Value;
+            set => this.Set((int)ListBoxTupleFields.Value, value);
+        }
+
+        public string Text
+        {
+            get => (string)this.Fields[(int)ListBoxTupleFields.Text]?.Value;
+            set => this.Set((int)ListBoxTupleFields.Text, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ListViewTuple.cs b/src/WixToolset.Data/Tuples/ListViewTuple.cs
new file mode 100644
index 00000000..3b1f4c88
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ListViewTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ListView = new IntermediateTupleDefinition(
+            TupleDefinitionType.ListView,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Binary_), IntermediateFieldType.String),
+            },
+            typeof(ListViewTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ListViewTupleFields
+    {
+        Property,
+        Order,
+        Value,
+        Text,
+        Binary_,
+    }
+
+    public class ListViewTuple : IntermediateTuple
+    {
+        public ListViewTuple() : base(TupleDefinitions.ListView, null, null)
+        {
+        }
+
+        public ListViewTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ListView, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ListViewTupleFields index] => this.Fields[(int)index];
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)ListViewTupleFields.Property]?.Value;
+            set => this.Set((int)ListViewTupleFields.Property, value);
+        }
+
+        public int Order
+        {
+            get => (int)this.Fields[(int)ListViewTupleFields.Order]?.Value;
+            set => this.Set((int)ListViewTupleFields.Order, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)ListViewTupleFields.Value]?.Value;
+            set => this.Set((int)ListViewTupleFields.Value, value);
+        }
+
+        public string Text
+        {
+            get => (string)this.Fields[(int)ListViewTupleFields.Text]?.Value;
+            set => this.Set((int)ListViewTupleFields.Text, value);
+        }
+
+        public string Binary_
+        {
+            get => (string)this.Fields[(int)ListViewTupleFields.Binary_]?.Value;
+            set => this.Set((int)ListViewTupleFields.Binary_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs b/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs
new file mode 100644
index 00000000..cff4aaa0
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition LockPermissions = new IntermediateTupleDefinition(
+            TupleDefinitionType.LockPermissions,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.LockObject), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.Domain), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.User), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.Permission), IntermediateFieldType.Number),
+            },
+            typeof(LockPermissionsTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum LockPermissionsTupleFields
+    {
+        LockObject,
+        Table,
+        Domain,
+        User,
+        Permission,
+    }
+
+    public class LockPermissionsTuple : IntermediateTuple
+    {
+        public LockPermissionsTuple() : base(TupleDefinitions.LockPermissions, null, null)
+        {
+        }
+
+        public LockPermissionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.LockPermissions, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[LockPermissionsTupleFields index] => this.Fields[(int)index];
+
+        public string LockObject
+        {
+            get => (string)this.Fields[(int)LockPermissionsTupleFields.LockObject]?.Value;
+            set => this.Set((int)LockPermissionsTupleFields.LockObject, value);
+        }
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)LockPermissionsTupleFields.Table]?.Value;
+            set => this.Set((int)LockPermissionsTupleFields.Table, value);
+        }
+
+        public string Domain
+        {
+            get => (string)this.Fields[(int)LockPermissionsTupleFields.Domain]?.Value;
+            set => this.Set((int)LockPermissionsTupleFields.Domain, value);
+        }
+
+        public string User
+        {
+            get => (string)this.Fields[(int)LockPermissionsTupleFields.User]?.Value;
+            set => this.Set((int)LockPermissionsTupleFields.User, value);
+        }
+
+        public int Permission
+        {
+            get => (int)this.Fields[(int)LockPermissionsTupleFields.Permission]?.Value;
+            set => this.Set((int)LockPermissionsTupleFields.Permission, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MIMETuple.cs b/src/WixToolset.Data/Tuples/MIMETuple.cs
new file mode 100644
index 00000000..8453275e
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MIMETuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MIME = new IntermediateTupleDefinition(
+            TupleDefinitionType.MIME,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MIMETupleFields.ContentType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MIMETupleFields.Extension_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MIMETupleFields.CLSID), IntermediateFieldType.String),
+            },
+            typeof(MIMETuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MIMETupleFields
+    {
+        ContentType,
+        Extension_,
+        CLSID,
+    }
+
+    public class MIMETuple : IntermediateTuple
+    {
+        public MIMETuple() : base(TupleDefinitions.MIME, null, null)
+        {
+        }
+
+        public MIMETuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MIME, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MIMETupleFields index] => this.Fields[(int)index];
+
+        public string ContentType
+        {
+            get => (string)this.Fields[(int)MIMETupleFields.ContentType]?.Value;
+            set => this.Set((int)MIMETupleFields.ContentType, value);
+        }
+
+        public string Extension_
+        {
+            get => (string)this.Fields[(int)MIMETupleFields.Extension_]?.Value;
+            set => this.Set((int)MIMETupleFields.Extension_, value);
+        }
+
+        public string CLSID
+        {
+            get => (string)this.Fields[(int)MIMETupleFields.CLSID]?.Value;
+            set => this.Set((int)MIMETupleFields.CLSID, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MediaTuple.cs b/src/WixToolset.Data/Tuples/MediaTuple.cs
new file mode 100644
index 00000000..305080c3
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MediaTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Media = new IntermediateTupleDefinition(
+            TupleDefinitionType.Media,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MediaTupleFields.DiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MediaTupleFields.LastSequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MediaTupleFields.DiskPrompt), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MediaTupleFields.Cabinet), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MediaTupleFields.VolumeLabel), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MediaTupleFields.Source), IntermediateFieldType.String),
+            },
+            typeof(MediaTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MediaTupleFields
+    {
+        DiskId,
+        LastSequence,
+        DiskPrompt,
+        Cabinet,
+        VolumeLabel,
+        Source,
+    }
+
+    public class MediaTuple : IntermediateTuple
+    {
+        public MediaTuple() : base(TupleDefinitions.Media, null, null)
+        {
+        }
+
+        public MediaTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Media, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MediaTupleFields index] => this.Fields[(int)index];
+
+        public int DiskId
+        {
+            get => (int)this.Fields[(int)MediaTupleFields.DiskId]?.Value;
+            set => this.Set((int)MediaTupleFields.DiskId, value);
+        }
+
+        public int LastSequence
+        {
+            get => (int)this.Fields[(int)MediaTupleFields.LastSequence]?.Value;
+            set => this.Set((int)MediaTupleFields.LastSequence, value);
+        }
+
+        public string DiskPrompt
+        {
+            get => (string)this.Fields[(int)MediaTupleFields.DiskPrompt]?.Value;
+            set => this.Set((int)MediaTupleFields.DiskPrompt, value);
+        }
+
+        public string Cabinet
+        {
+            get => (string)this.Fields[(int)MediaTupleFields.Cabinet]?.Value;
+            set => this.Set((int)MediaTupleFields.Cabinet, value);
+        }
+
+        public string VolumeLabel
+        {
+            get => (string)this.Fields[(int)MediaTupleFields.VolumeLabel]?.Value;
+            set => this.Set((int)MediaTupleFields.VolumeLabel, value);
+        }
+
+        public string Source
+        {
+            get => (string)this.Fields[(int)MediaTupleFields.Source]?.Value;
+            set => this.Set((int)MediaTupleFields.Source, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleAdminExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleAdminExecuteSequenceTuple.cs
new file mode 100644
index 00000000..4f762214
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleAdminExecuteSequenceTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleAdminExecuteSequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleAdminExecuteSequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleAdminExecuteSequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleAdminExecuteSequenceTupleFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleAdminExecuteSequenceTupleFields.BaseAction), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleAdminExecuteSequenceTupleFields.After), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleAdminExecuteSequenceTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(ModuleAdminExecuteSequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleAdminExecuteSequenceTupleFields
+    {
+        Action,
+        Sequence,
+        BaseAction,
+        After,
+        Condition,
+    }
+
+    public class ModuleAdminExecuteSequenceTuple : IntermediateTuple
+    {
+        public ModuleAdminExecuteSequenceTuple() : base(TupleDefinitions.ModuleAdminExecuteSequence, null, null)
+        {
+        }
+
+        public ModuleAdminExecuteSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleAdminExecuteSequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleAdminExecuteSequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.Action]?.Value;
+            set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.Action, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.Sequence, value);
+        }
+
+        public string BaseAction
+        {
+            get => (string)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.BaseAction]?.Value;
+            set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.BaseAction, value);
+        }
+
+        public int After
+        {
+            get => (int)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.After]?.Value;
+            set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.After, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleAdminUISequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleAdminUISequenceTuple.cs
new file mode 100644
index 00000000..bc873b72
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleAdminUISequenceTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleAdminUISequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleAdminUISequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleAdminUISequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleAdminUISequenceTupleFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleAdminUISequenceTupleFields.BaseAction), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleAdminUISequenceTupleFields.After), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleAdminUISequenceTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(ModuleAdminUISequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleAdminUISequenceTupleFields
+    {
+        Action,
+        Sequence,
+        BaseAction,
+        After,
+        Condition,
+    }
+
+    public class ModuleAdminUISequenceTuple : IntermediateTuple
+    {
+        public ModuleAdminUISequenceTuple() : base(TupleDefinitions.ModuleAdminUISequence, null, null)
+        {
+        }
+
+        public ModuleAdminUISequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleAdminUISequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleAdminUISequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)ModuleAdminUISequenceTupleFields.Action]?.Value;
+            set => this.Set((int)ModuleAdminUISequenceTupleFields.Action, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)ModuleAdminUISequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)ModuleAdminUISequenceTupleFields.Sequence, value);
+        }
+
+        public string BaseAction
+        {
+            get => (string)this.Fields[(int)ModuleAdminUISequenceTupleFields.BaseAction]?.Value;
+            set => this.Set((int)ModuleAdminUISequenceTupleFields.BaseAction, value);
+        }
+
+        public int After
+        {
+            get => (int)this.Fields[(int)ModuleAdminUISequenceTupleFields.After]?.Value;
+            set => this.Set((int)ModuleAdminUISequenceTupleFields.After, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)ModuleAdminUISequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)ModuleAdminUISequenceTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleAdvtExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleAdvtExecuteSequenceTuple.cs
new file mode 100644
index 00000000..2864be7e
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleAdvtExecuteSequenceTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleAdvtExecuteSequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleAdvtExecuteSequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleAdvtExecuteSequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleAdvtExecuteSequenceTupleFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleAdvtExecuteSequenceTupleFields.BaseAction), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleAdvtExecuteSequenceTupleFields.After), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleAdvtExecuteSequenceTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(ModuleAdvtExecuteSequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleAdvtExecuteSequenceTupleFields
+    {
+        Action,
+        Sequence,
+        BaseAction,
+        After,
+        Condition,
+    }
+
+    public class ModuleAdvtExecuteSequenceTuple : IntermediateTuple
+    {
+        public ModuleAdvtExecuteSequenceTuple() : base(TupleDefinitions.ModuleAdvtExecuteSequence, null, null)
+        {
+        }
+
+        public ModuleAdvtExecuteSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleAdvtExecuteSequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleAdvtExecuteSequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.Action]?.Value;
+            set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.Action, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.Sequence, value);
+        }
+
+        public string BaseAction
+        {
+            get => (string)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.BaseAction]?.Value;
+            set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.BaseAction, value);
+        }
+
+        public int After
+        {
+            get => (int)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.After]?.Value;
+            set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.After, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs b/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs
new file mode 100644
index 00000000..24b9aab4
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleComponents = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleComponents,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleComponentsTupleFields.Component), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleComponentsTupleFields.ModuleID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleComponentsTupleFields.Language), IntermediateFieldType.Number),
+            },
+            typeof(ModuleComponentsTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleComponentsTupleFields
+    {
+        Component,
+        ModuleID,
+        Language,
+    }
+
+    public class ModuleComponentsTuple : IntermediateTuple
+    {
+        public ModuleComponentsTuple() : base(TupleDefinitions.ModuleComponents, null, null)
+        {
+        }
+
+        public ModuleComponentsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleComponents, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleComponentsTupleFields index] => this.Fields[(int)index];
+
+        public string Component
+        {
+            get => (string)this.Fields[(int)ModuleComponentsTupleFields.Component]?.Value;
+            set => this.Set((int)ModuleComponentsTupleFields.Component, value);
+        }
+
+        public string ModuleID
+        {
+            get => (string)this.Fields[(int)ModuleComponentsTupleFields.ModuleID]?.Value;
+            set => this.Set((int)ModuleComponentsTupleFields.ModuleID, value);
+        }
+
+        public int Language
+        {
+            get => (int)this.Fields[(int)ModuleComponentsTupleFields.Language]?.Value;
+            set => this.Set((int)ModuleComponentsTupleFields.Language, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs b/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs
new file mode 100644
index 00000000..b3c4cd7f
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs
@@ -0,0 +1,116 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleConfiguration = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleConfiguration,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Format), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.ContextData), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.DefaultValue), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.HelpLocation), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.HelpKeyword), IntermediateFieldType.String),
+            },
+            typeof(ModuleConfigurationTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleConfigurationTupleFields
+    {
+        Name,
+        Format,
+        Type,
+        ContextData,
+        DefaultValue,
+        Attributes,
+        DisplayName,
+        Description,
+        HelpLocation,
+        HelpKeyword,
+    }
+
+    public class ModuleConfigurationTuple : IntermediateTuple
+    {
+        public ModuleConfigurationTuple() : base(TupleDefinitions.ModuleConfiguration, null, null)
+        {
+        }
+
+        public ModuleConfigurationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleConfiguration, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleConfigurationTupleFields index] => this.Fields[(int)index];
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Name]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.Name, value);
+        }
+
+        public int Format
+        {
+            get => (int)this.Fields[(int)ModuleConfigurationTupleFields.Format]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.Format, value);
+        }
+
+        public string Type
+        {
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Type]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.Type, value);
+        }
+
+        public string ContextData
+        {
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.ContextData]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.ContextData, value);
+        }
+
+        public string DefaultValue
+        {
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DefaultValue]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.DefaultValue, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)ModuleConfigurationTupleFields.Attributes]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.Attributes, value);
+        }
+
+        public string DisplayName
+        {
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DisplayName]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.DisplayName, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Description]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.Description, value);
+        }
+
+        public string HelpLocation
+        {
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpLocation]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.HelpLocation, value);
+        }
+
+        public string HelpKeyword
+        {
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpKeyword]?.Value;
+            set => this.Set((int)ModuleConfigurationTupleFields.HelpKeyword, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs b/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs
new file mode 100644
index 00000000..ed887207
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleDependency = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleDependency,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.ModuleID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.ModuleLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.RequiredID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.RequiredLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.RequiredVersion), IntermediateFieldType.String),
+            },
+            typeof(ModuleDependencyTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleDependencyTupleFields
+    {
+        ModuleID,
+        ModuleLanguage,
+        RequiredID,
+        RequiredLanguage,
+        RequiredVersion,
+    }
+
+    public class ModuleDependencyTuple : IntermediateTuple
+    {
+        public ModuleDependencyTuple() : base(TupleDefinitions.ModuleDependency, null, null)
+        {
+        }
+
+        public ModuleDependencyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleDependency, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleDependencyTupleFields index] => this.Fields[(int)index];
+
+        public string ModuleID
+        {
+            get => (string)this.Fields[(int)ModuleDependencyTupleFields.ModuleID]?.Value;
+            set => this.Set((int)ModuleDependencyTupleFields.ModuleID, value);
+        }
+
+        public int ModuleLanguage
+        {
+            get => (int)this.Fields[(int)ModuleDependencyTupleFields.ModuleLanguage]?.Value;
+            set => this.Set((int)ModuleDependencyTupleFields.ModuleLanguage, value);
+        }
+
+        public string RequiredID
+        {
+            get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredID]?.Value;
+            set => this.Set((int)ModuleDependencyTupleFields.RequiredID, value);
+        }
+
+        public int RequiredLanguage
+        {
+            get => (int)this.Fields[(int)ModuleDependencyTupleFields.RequiredLanguage]?.Value;
+            set => this.Set((int)ModuleDependencyTupleFields.RequiredLanguage, value);
+        }
+
+        public string RequiredVersion
+        {
+            get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredVersion]?.Value;
+            set => this.Set((int)ModuleDependencyTupleFields.RequiredVersion, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs b/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs
new file mode 100644
index 00000000..968fc2cd
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleExclusion = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleExclusion,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ModuleID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ModuleLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedMinVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedMaxVersion), IntermediateFieldType.String),
+            },
+            typeof(ModuleExclusionTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleExclusionTupleFields
+    {
+        ModuleID,
+        ModuleLanguage,
+        ExcludedID,
+        ExcludedLanguage,
+        ExcludedMinVersion,
+        ExcludedMaxVersion,
+    }
+
+    public class ModuleExclusionTuple : IntermediateTuple
+    {
+        public ModuleExclusionTuple() : base(TupleDefinitions.ModuleExclusion, null, null)
+        {
+        }
+
+        public ModuleExclusionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleExclusion, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleExclusionTupleFields index] => this.Fields[(int)index];
+
+        public string ModuleID
+        {
+            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ModuleID]?.Value;
+            set => this.Set((int)ModuleExclusionTupleFields.ModuleID, value);
+        }
+
+        public int ModuleLanguage
+        {
+            get => (int)this.Fields[(int)ModuleExclusionTupleFields.ModuleLanguage]?.Value;
+            set => this.Set((int)ModuleExclusionTupleFields.ModuleLanguage, value);
+        }
+
+        public string ExcludedID
+        {
+            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedID]?.Value;
+            set => this.Set((int)ModuleExclusionTupleFields.ExcludedID, value);
+        }
+
+        public int ExcludedLanguage
+        {
+            get => (int)this.Fields[(int)ModuleExclusionTupleFields.ExcludedLanguage]?.Value;
+            set => this.Set((int)ModuleExclusionTupleFields.ExcludedLanguage, value);
+        }
+
+        public string ExcludedMinVersion
+        {
+            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMinVersion]?.Value;
+            set => this.Set((int)ModuleExclusionTupleFields.ExcludedMinVersion, value);
+        }
+
+        public string ExcludedMaxVersion
+        {
+            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMaxVersion]?.Value;
+            set => this.Set((int)ModuleExclusionTupleFields.ExcludedMaxVersion, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs b/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
new file mode 100644
index 00000000..ec82c94b
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleIgnoreTable = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleIgnoreTable,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleIgnoreTableTupleFields.Table), IntermediateFieldType.String),
+            },
+            typeof(ModuleIgnoreTableTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleIgnoreTableTupleFields
+    {
+        Table,
+    }
+
+    public class ModuleIgnoreTableTuple : IntermediateTuple
+    {
+        public ModuleIgnoreTableTuple() : base(TupleDefinitions.ModuleIgnoreTable, null, null)
+        {
+        }
+
+        public ModuleIgnoreTableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleIgnoreTable, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleIgnoreTableTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)ModuleIgnoreTableTupleFields.Table]?.Value;
+            set => this.Set((int)ModuleIgnoreTableTupleFields.Table, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleInstallExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleInstallExecuteSequenceTuple.cs
new file mode 100644
index 00000000..22bb678c
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleInstallExecuteSequenceTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleInstallExecuteSequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleInstallExecuteSequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleInstallExecuteSequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleInstallExecuteSequenceTupleFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleInstallExecuteSequenceTupleFields.BaseAction), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleInstallExecuteSequenceTupleFields.After), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleInstallExecuteSequenceTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(ModuleInstallExecuteSequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleInstallExecuteSequenceTupleFields
+    {
+        Action,
+        Sequence,
+        BaseAction,
+        After,
+        Condition,
+    }
+
+    public class ModuleInstallExecuteSequenceTuple : IntermediateTuple
+    {
+        public ModuleInstallExecuteSequenceTuple() : base(TupleDefinitions.ModuleInstallExecuteSequence, null, null)
+        {
+        }
+
+        public ModuleInstallExecuteSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleInstallExecuteSequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleInstallExecuteSequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.Action]?.Value;
+            set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.Action, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.Sequence, value);
+        }
+
+        public string BaseAction
+        {
+            get => (string)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.BaseAction]?.Value;
+            set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.BaseAction, value);
+        }
+
+        public int After
+        {
+            get => (int)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.After]?.Value;
+            set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.After, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleInstallUISequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleInstallUISequenceTuple.cs
new file mode 100644
index 00000000..cc6e0c76
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleInstallUISequenceTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleInstallUISequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleInstallUISequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleInstallUISequenceTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleInstallUISequenceTupleFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleInstallUISequenceTupleFields.BaseAction), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleInstallUISequenceTupleFields.After), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleInstallUISequenceTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(ModuleInstallUISequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleInstallUISequenceTupleFields
+    {
+        Action,
+        Sequence,
+        BaseAction,
+        After,
+        Condition,
+    }
+
+    public class ModuleInstallUISequenceTuple : IntermediateTuple
+    {
+        public ModuleInstallUISequenceTuple() : base(TupleDefinitions.ModuleInstallUISequence, null, null)
+        {
+        }
+
+        public ModuleInstallUISequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleInstallUISequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleInstallUISequenceTupleFields index] => this.Fields[(int)index];
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)ModuleInstallUISequenceTupleFields.Action]?.Value;
+            set => this.Set((int)ModuleInstallUISequenceTupleFields.Action, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)ModuleInstallUISequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)ModuleInstallUISequenceTupleFields.Sequence, value);
+        }
+
+        public string BaseAction
+        {
+            get => (string)this.Fields[(int)ModuleInstallUISequenceTupleFields.BaseAction]?.Value;
+            set => this.Set((int)ModuleInstallUISequenceTupleFields.BaseAction, value);
+        }
+
+        public int After
+        {
+            get => (int)this.Fields[(int)ModuleInstallUISequenceTupleFields.After]?.Value;
+            set => this.Set((int)ModuleInstallUISequenceTupleFields.After, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)ModuleInstallUISequenceTupleFields.Condition]?.Value;
+            set => this.Set((int)ModuleInstallUISequenceTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs b/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs
new file mode 100644
index 00000000..836f769b
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleSignature = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleSignature,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleSignatureTupleFields.ModuleID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSignatureTupleFields.Language), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleSignatureTupleFields.Version), IntermediateFieldType.String),
+            },
+            typeof(ModuleSignatureTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleSignatureTupleFields
+    {
+        ModuleID,
+        Language,
+        Version,
+    }
+
+    public class ModuleSignatureTuple : IntermediateTuple
+    {
+        public ModuleSignatureTuple() : base(TupleDefinitions.ModuleSignature, null, null)
+        {
+        }
+
+        public ModuleSignatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleSignature, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleSignatureTupleFields index] => this.Fields[(int)index];
+
+        public string ModuleID
+        {
+            get => (string)this.Fields[(int)ModuleSignatureTupleFields.ModuleID]?.Value;
+            set => this.Set((int)ModuleSignatureTupleFields.ModuleID, value);
+        }
+
+        public int Language
+        {
+            get => (int)this.Fields[(int)ModuleSignatureTupleFields.Language]?.Value;
+            set => this.Set((int)ModuleSignatureTupleFields.Language, value);
+        }
+
+        public string Version
+        {
+            get => (string)this.Fields[(int)ModuleSignatureTupleFields.Version]?.Value;
+            set => this.Set((int)ModuleSignatureTupleFields.Version, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs b/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs
new file mode 100644
index 00000000..609670f0
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ModuleSubstitution = new IntermediateTupleDefinition(
+            TupleDefinitionType.ModuleSubstitution,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Row), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Column), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ModuleSubstitutionTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ModuleSubstitutionTupleFields
+    {
+        Table,
+        Row,
+        Column,
+        Value,
+    }
+
+    public class ModuleSubstitutionTuple : IntermediateTuple
+    {
+        public ModuleSubstitutionTuple() : base(TupleDefinitions.ModuleSubstitution, null, null)
+        {
+        }
+
+        public ModuleSubstitutionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleSubstitution, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ModuleSubstitutionTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Table]?.Value;
+            set => this.Set((int)ModuleSubstitutionTupleFields.Table, value);
+        }
+
+        public string Row
+        {
+            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Row]?.Value;
+            set => this.Set((int)ModuleSubstitutionTupleFields.Row, value);
+        }
+
+        public string Column
+        {
+            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Column]?.Value;
+            set => this.Set((int)ModuleSubstitutionTupleFields.Column, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Value]?.Value;
+            set => this.Set((int)ModuleSubstitutionTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MoveFileTuple.cs b/src/WixToolset.Data/Tuples/MoveFileTuple.cs
new file mode 100644
index 00000000..404d39b3
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MoveFileTuple.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MoveFile = new IntermediateTupleDefinition(
+            TupleDefinitionType.MoveFile,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.FileKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.DestName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceFolder), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.DestFolder), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.Options), IntermediateFieldType.Number),
+            },
+            typeof(MoveFileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MoveFileTupleFields
+    {
+        FileKey,
+        Component_,
+        SourceName,
+        DestName,
+        SourceFolder,
+        DestFolder,
+        Options,
+    }
+
+    public class MoveFileTuple : IntermediateTuple
+    {
+        public MoveFileTuple() : base(TupleDefinitions.MoveFile, null, null)
+        {
+        }
+
+        public MoveFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MoveFile, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MoveFileTupleFields index] => this.Fields[(int)index];
+
+        public string FileKey
+        {
+            get => (string)this.Fields[(int)MoveFileTupleFields.FileKey]?.Value;
+            set => this.Set((int)MoveFileTupleFields.FileKey, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)MoveFileTupleFields.Component_]?.Value;
+            set => this.Set((int)MoveFileTupleFields.Component_, value);
+        }
+
+        public string SourceName
+        {
+            get => (string)this.Fields[(int)MoveFileTupleFields.SourceName]?.Value;
+            set => this.Set((int)MoveFileTupleFields.SourceName, value);
+        }
+
+        public string DestName
+        {
+            get => (string)this.Fields[(int)MoveFileTupleFields.DestName]?.Value;
+            set => this.Set((int)MoveFileTupleFields.DestName, value);
+        }
+
+        public string SourceFolder
+        {
+            get => (string)this.Fields[(int)MoveFileTupleFields.SourceFolder]?.Value;
+            set => this.Set((int)MoveFileTupleFields.SourceFolder, value);
+        }
+
+        public string DestFolder
+        {
+            get => (string)this.Fields[(int)MoveFileTupleFields.DestFolder]?.Value;
+            set => this.Set((int)MoveFileTupleFields.DestFolder, value);
+        }
+
+        public int Options
+        {
+            get => (int)this.Fields[(int)MoveFileTupleFields.Options]?.Value;
+            set => this.Set((int)MoveFileTupleFields.Options, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
new file mode 100644
index 00000000..a8e97b00
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiAssemblyName = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiAssemblyName,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(MsiAssemblyNameTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiAssemblyNameTupleFields
+    {
+        Component_,
+        Name,
+        Value,
+    }
+
+    public class MsiAssemblyNameTuple : IntermediateTuple
+    {
+        public MsiAssemblyNameTuple() : base(TupleDefinitions.MsiAssemblyName, null, null)
+        {
+        }
+
+        public MsiAssemblyNameTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiAssemblyName, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiAssemblyNameTupleFields index] => this.Fields[(int)index];
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Component_]?.Value;
+            set => this.Set((int)MsiAssemblyNameTupleFields.Component_, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Name]?.Value;
+            set => this.Set((int)MsiAssemblyNameTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Value]?.Value;
+            set => this.Set((int)MsiAssemblyNameTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
new file mode 100644
index 00000000..0cd814d8
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiAssembly = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiAssembly,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.File_Manifest), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.File_Application), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(MsiAssemblyTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiAssemblyTupleFields
+    {
+        Component_,
+        Feature_,
+        File_Manifest,
+        File_Application,
+        Attributes,
+    }
+
+    public class MsiAssemblyTuple : IntermediateTuple
+    {
+        public MsiAssemblyTuple() : base(TupleDefinitions.MsiAssembly, null, null)
+        {
+        }
+
+        public MsiAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiAssembly, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiAssemblyTupleFields index] => this.Fields[(int)index];
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.Component_]?.Value;
+            set => this.Set((int)MsiAssemblyTupleFields.Component_, value);
+        }
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.Feature_]?.Value;
+            set => this.Set((int)MsiAssemblyTupleFields.Feature_, value);
+        }
+
+        public string File_Manifest
+        {
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Manifest]?.Value;
+            set => this.Set((int)MsiAssemblyTupleFields.File_Manifest, value);
+        }
+
+        public string File_Application
+        {
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Application]?.Value;
+            set => this.Set((int)MsiAssemblyTupleFields.File_Application, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)MsiAssemblyTupleFields.Attributes]?.Value;
+            set => this.Set((int)MsiAssemblyTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs
new file mode 100644
index 00000000..fb949afb
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiDigitalCertificate = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiDigitalCertificate,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiDigitalCertificateTupleFields.DigitalCertificate), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiDigitalCertificateTupleFields.CertData), IntermediateFieldType.Path),
+            },
+            typeof(MsiDigitalCertificateTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiDigitalCertificateTupleFields
+    {
+        DigitalCertificate,
+        CertData,
+    }
+
+    public class MsiDigitalCertificateTuple : IntermediateTuple
+    {
+        public MsiDigitalCertificateTuple() : base(TupleDefinitions.MsiDigitalCertificate, null, null)
+        {
+        }
+
+        public MsiDigitalCertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiDigitalCertificate, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiDigitalCertificateTupleFields index] => this.Fields[(int)index];
+
+        public string DigitalCertificate
+        {
+            get => (string)this.Fields[(int)MsiDigitalCertificateTupleFields.DigitalCertificate]?.Value;
+            set => this.Set((int)MsiDigitalCertificateTupleFields.DigitalCertificate, value);
+        }
+
+        public string CertData
+        {
+            get => (string)this.Fields[(int)MsiDigitalCertificateTupleFields.CertData]?.Value;
+            set => this.Set((int)MsiDigitalCertificateTupleFields.CertData, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs b/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
new file mode 100644
index 00000000..8b30c53c
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiDigitalSignature = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiDigitalSignature,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.SignObject), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.DigitalCertificate_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Hash), IntermediateFieldType.Path),
+            },
+            typeof(MsiDigitalSignatureTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiDigitalSignatureTupleFields
+    {
+        Table,
+        SignObject,
+        DigitalCertificate_,
+        Hash,
+    }
+
+    public class MsiDigitalSignatureTuple : IntermediateTuple
+    {
+        public MsiDigitalSignatureTuple() : base(TupleDefinitions.MsiDigitalSignature, null, null)
+        {
+        }
+
+        public MsiDigitalSignatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiDigitalSignature, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiDigitalSignatureTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Table]?.Value;
+            set => this.Set((int)MsiDigitalSignatureTupleFields.Table, value);
+        }
+
+        public string SignObject
+        {
+            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.SignObject]?.Value;
+            set => this.Set((int)MsiDigitalSignatureTupleFields.SignObject, value);
+        }
+
+        public string DigitalCertificate_
+        {
+            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.DigitalCertificate_]?.Value;
+            set => this.Set((int)MsiDigitalSignatureTupleFields.DigitalCertificate_, value);
+        }
+
+        public string Hash
+        {
+            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Hash]?.Value;
+            set => this.Set((int)MsiDigitalSignatureTupleFields.Hash, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs b/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs
new file mode 100644
index 00000000..7f1b7a2a
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiEmbeddedChainer = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiEmbeddedChainer,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.MsiEmbeddedChainer), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.CommandLine), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.Source), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.Type), IntermediateFieldType.Number),
+            },
+            typeof(MsiEmbeddedChainerTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiEmbeddedChainerTupleFields
+    {
+        MsiEmbeddedChainer,
+        Condition,
+        CommandLine,
+        Source,
+        Type,
+    }
+
+    public class MsiEmbeddedChainerTuple : IntermediateTuple
+    {
+        public MsiEmbeddedChainerTuple() : base(TupleDefinitions.MsiEmbeddedChainer, null, null)
+        {
+        }
+
+        public MsiEmbeddedChainerTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiEmbeddedChainer, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiEmbeddedChainerTupleFields index] => this.Fields[(int)index];
+
+        public string MsiEmbeddedChainer
+        {
+            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.MsiEmbeddedChainer]?.Value;
+            set => this.Set((int)MsiEmbeddedChainerTupleFields.MsiEmbeddedChainer, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Condition]?.Value;
+            set => this.Set((int)MsiEmbeddedChainerTupleFields.Condition, value);
+        }
+
+        public string CommandLine
+        {
+            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.CommandLine]?.Value;
+            set => this.Set((int)MsiEmbeddedChainerTupleFields.CommandLine, value);
+        }
+
+        public string Source
+        {
+            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Source]?.Value;
+            set => this.Set((int)MsiEmbeddedChainerTupleFields.Source, value);
+        }
+
+        public int Type
+        {
+            get => (int)this.Fields[(int)MsiEmbeddedChainerTupleFields.Type]?.Value;
+            set => this.Set((int)MsiEmbeddedChainerTupleFields.Type, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs b/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs
new file mode 100644
index 00000000..82deb53a
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiEmbeddedUI = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiEmbeddedUI,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.MsiEmbeddedUI), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.MessageFilter), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.Data), IntermediateFieldType.Path),
+            },
+            typeof(MsiEmbeddedUITuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiEmbeddedUITupleFields
+    {
+        MsiEmbeddedUI,
+        FileName,
+        Attributes,
+        MessageFilter,
+        Data,
+    }
+
+    public class MsiEmbeddedUITuple : IntermediateTuple
+    {
+        public MsiEmbeddedUITuple() : base(TupleDefinitions.MsiEmbeddedUI, null, null)
+        {
+        }
+
+        public MsiEmbeddedUITuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiEmbeddedUI, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiEmbeddedUITupleFields index] => this.Fields[(int)index];
+
+        public string MsiEmbeddedUI
+        {
+            get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.MsiEmbeddedUI]?.Value;
+            set => this.Set((int)MsiEmbeddedUITupleFields.MsiEmbeddedUI, value);
+        }
+
+        public string FileName
+        {
+            get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.FileName]?.Value;
+            set => this.Set((int)MsiEmbeddedUITupleFields.FileName, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)MsiEmbeddedUITupleFields.Attributes]?.Value;
+            set => this.Set((int)MsiEmbeddedUITupleFields.Attributes, value);
+        }
+
+        public int MessageFilter
+        {
+            get => (int)this.Fields[(int)MsiEmbeddedUITupleFields.MessageFilter]?.Value;
+            set => this.Set((int)MsiEmbeddedUITupleFields.MessageFilter, value);
+        }
+
+        public string Data
+        {
+            get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.Data]?.Value;
+            set => this.Set((int)MsiEmbeddedUITupleFields.Data, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs b/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
new file mode 100644
index 00000000..2850bc22
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiFileHash = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiFileHash,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.Options), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart1), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart2), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart3), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart4), IntermediateFieldType.Number),
+            },
+            typeof(MsiFileHashTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiFileHashTupleFields
+    {
+        File_,
+        Options,
+        HashPart1,
+        HashPart2,
+        HashPart3,
+        HashPart4,
+    }
+
+    public class MsiFileHashTuple : IntermediateTuple
+    {
+        public MsiFileHashTuple() : base(TupleDefinitions.MsiFileHash, null, null)
+        {
+        }
+
+        public MsiFileHashTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiFileHash, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiFileHashTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)MsiFileHashTupleFields.File_]?.Value;
+            set => this.Set((int)MsiFileHashTupleFields.File_, value);
+        }
+
+        public int Options
+        {
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.Options]?.Value;
+            set => this.Set((int)MsiFileHashTupleFields.Options, value);
+        }
+
+        public int HashPart1
+        {
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart1]?.Value;
+            set => this.Set((int)MsiFileHashTupleFields.HashPart1, value);
+        }
+
+        public int HashPart2
+        {
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart2]?.Value;
+            set => this.Set((int)MsiFileHashTupleFields.HashPart2, value);
+        }
+
+        public int HashPart3
+        {
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart3]?.Value;
+            set => this.Set((int)MsiFileHashTupleFields.HashPart3, value);
+        }
+
+        public int HashPart4
+        {
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart4]?.Value;
+            set => this.Set((int)MsiFileHashTupleFields.HashPart4, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs b/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
new file mode 100644
index 00000000..14fc62a3
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiLockPermissionsEx = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiLockPermissionsEx,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.MsiLockPermissionsEx), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.LockObject), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.SDDLText), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(MsiLockPermissionsExTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiLockPermissionsExTupleFields
+    {
+        MsiLockPermissionsEx,
+        LockObject,
+        Table,
+        SDDLText,
+        Condition,
+    }
+
+    public class MsiLockPermissionsExTuple : IntermediateTuple
+    {
+        public MsiLockPermissionsExTuple() : base(TupleDefinitions.MsiLockPermissionsEx, null, null)
+        {
+        }
+
+        public MsiLockPermissionsExTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiLockPermissionsEx, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiLockPermissionsExTupleFields index] => this.Fields[(int)index];
+
+        public string MsiLockPermissionsEx
+        {
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.MsiLockPermissionsEx]?.Value;
+            set => this.Set((int)MsiLockPermissionsExTupleFields.MsiLockPermissionsEx, value);
+        }
+
+        public string LockObject
+        {
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.LockObject]?.Value;
+            set => this.Set((int)MsiLockPermissionsExTupleFields.LockObject, value);
+        }
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Table]?.Value;
+            set => this.Set((int)MsiLockPermissionsExTupleFields.Table, value);
+        }
+
+        public string SDDLText
+        {
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.SDDLText]?.Value;
+            set => this.Set((int)MsiLockPermissionsExTupleFields.SDDLText, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Condition]?.Value;
+            set => this.Set((int)MsiLockPermissionsExTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
new file mode 100644
index 00000000..6eeb141c
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiPackageCertificate = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiPackageCertificate,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.PackageCertificate), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.DigitalCertificate_), IntermediateFieldType.String),
+            },
+            typeof(MsiPackageCertificateTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiPackageCertificateTupleFields
+    {
+        PackageCertificate,
+        DigitalCertificate_,
+    }
+
+    public class MsiPackageCertificateTuple : IntermediateTuple
+    {
+        public MsiPackageCertificateTuple() : base(TupleDefinitions.MsiPackageCertificate, null, null)
+        {
+        }
+
+        public MsiPackageCertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPackageCertificate, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiPackageCertificateTupleFields index] => this.Fields[(int)index];
+
+        public string PackageCertificate
+        {
+            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.PackageCertificate]?.Value;
+            set => this.Set((int)MsiPackageCertificateTupleFields.PackageCertificate, value);
+        }
+
+        public string DigitalCertificate_
+        {
+            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.DigitalCertificate_]?.Value;
+            set => this.Set((int)MsiPackageCertificateTupleFields.DigitalCertificate_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
new file mode 100644
index 00000000..1b02dca9
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiPatchCertificate = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiPatchCertificate,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.PatchCertificate), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.DigitalCertificate_), IntermediateFieldType.String),
+            },
+            typeof(MsiPatchCertificateTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiPatchCertificateTupleFields
+    {
+        PatchCertificate,
+        DigitalCertificate_,
+    }
+
+    public class MsiPatchCertificateTuple : IntermediateTuple
+    {
+        public MsiPatchCertificateTuple() : base(TupleDefinitions.MsiPatchCertificate, null, null)
+        {
+        }
+
+        public MsiPatchCertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchCertificate, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiPatchCertificateTupleFields index] => this.Fields[(int)index];
+
+        public string PatchCertificate
+        {
+            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.PatchCertificate]?.Value;
+            set => this.Set((int)MsiPatchCertificateTupleFields.PatchCertificate, value);
+        }
+
+        public string DigitalCertificate_
+        {
+            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.DigitalCertificate_]?.Value;
+            set => this.Set((int)MsiPatchCertificateTupleFields.DigitalCertificate_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs
new file mode 100644
index 00000000..6d99a9ae
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiPatchHeaders = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiPatchHeaders,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiPatchHeadersTupleFields.StreamRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchHeadersTupleFields.Header), IntermediateFieldType.Path),
+            },
+            typeof(MsiPatchHeadersTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiPatchHeadersTupleFields
+    {
+        StreamRef,
+        Header,
+    }
+
+    public class MsiPatchHeadersTuple : IntermediateTuple
+    {
+        public MsiPatchHeadersTuple() : base(TupleDefinitions.MsiPatchHeaders, null, null)
+        {
+        }
+
+        public MsiPatchHeadersTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchHeaders, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiPatchHeadersTupleFields index] => this.Fields[(int)index];
+
+        public string StreamRef
+        {
+            get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.StreamRef]?.Value;
+            set => this.Set((int)MsiPatchHeadersTupleFields.StreamRef, value);
+        }
+
+        public string Header
+        {
+            get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.Header]?.Value;
+            set => this.Set((int)MsiPatchHeadersTupleFields.Header, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs
new file mode 100644
index 00000000..f6a6fd7d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiPatchMetadata = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiPatchMetadata,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiPatchMetadataTupleFields.Company), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchMetadataTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchMetadataTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(MsiPatchMetadataTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiPatchMetadataTupleFields
+    {
+        Company,
+        Property,
+        Value,
+    }
+
+    public class MsiPatchMetadataTuple : IntermediateTuple
+    {
+        public MsiPatchMetadataTuple() : base(TupleDefinitions.MsiPatchMetadata, null, null)
+        {
+        }
+
+        public MsiPatchMetadataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchMetadata, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiPatchMetadataTupleFields index] => this.Fields[(int)index];
+
+        public string Company
+        {
+            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Company]?.Value;
+            set => this.Set((int)MsiPatchMetadataTupleFields.Company, value);
+        }
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Property]?.Value;
+            set => this.Set((int)MsiPatchMetadataTupleFields.Property, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Value]?.Value;
+            set => this.Set((int)MsiPatchMetadataTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
new file mode 100644
index 00000000..f23ace77
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiPatchOldAssemblyFile = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiPatchOldAssemblyFile,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.Assembly_), IntermediateFieldType.String),
+            },
+            typeof(MsiPatchOldAssemblyFileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiPatchOldAssemblyFileTupleFields
+    {
+        File_,
+        Assembly_,
+    }
+
+    public class MsiPatchOldAssemblyFileTuple : IntermediateTuple
+    {
+        public MsiPatchOldAssemblyFileTuple() : base(TupleDefinitions.MsiPatchOldAssemblyFile, null, null)
+        {
+        }
+
+        public MsiPatchOldAssemblyFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchOldAssemblyFile, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiPatchOldAssemblyFileTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.File_]?.Value;
+            set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.File_, value);
+        }
+
+        public string Assembly_
+        {
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.Assembly_]?.Value;
+            set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.Assembly_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs
new file mode 100644
index 00000000..77385f5f
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiPatchOldAssemblyName = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiPatchOldAssemblyName,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameTupleFields.Assembly), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(MsiPatchOldAssemblyNameTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiPatchOldAssemblyNameTupleFields
+    {
+        Assembly,
+        Name,
+        Value,
+    }
+
+    public class MsiPatchOldAssemblyNameTuple : IntermediateTuple
+    {
+        public MsiPatchOldAssemblyNameTuple() : base(TupleDefinitions.MsiPatchOldAssemblyName, null, null)
+        {
+        }
+
+        public MsiPatchOldAssemblyNameTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchOldAssemblyName, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiPatchOldAssemblyNameTupleFields index] => this.Fields[(int)index];
+
+        public string Assembly
+        {
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Assembly]?.Value;
+            set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Assembly, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Name]?.Value;
+            set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Value]?.Value;
+            set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
new file mode 100644
index 00000000..c48be28f
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiPatchSequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiPatchSequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.PatchFamily), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.Sequence), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(MsiPatchSequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiPatchSequenceTupleFields
+    {
+        PatchFamily,
+        ProductCode,
+        Sequence,
+        Attributes,
+    }
+
+    public class MsiPatchSequenceTuple : IntermediateTuple
+    {
+        public MsiPatchSequenceTuple() : base(TupleDefinitions.MsiPatchSequence, null, null)
+        {
+        }
+
+        public MsiPatchSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchSequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiPatchSequenceTupleFields index] => this.Fields[(int)index];
+
+        public string PatchFamily
+        {
+            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.PatchFamily]?.Value;
+            set => this.Set((int)MsiPatchSequenceTupleFields.PatchFamily, value);
+        }
+
+        public string ProductCode
+        {
+            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.ProductCode]?.Value;
+            set => this.Set((int)MsiPatchSequenceTupleFields.ProductCode, value);
+        }
+
+        public string Sequence
+        {
+            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)MsiPatchSequenceTupleFields.Sequence, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)MsiPatchSequenceTupleFields.Attributes]?.Value;
+            set => this.Set((int)MsiPatchSequenceTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
new file mode 100644
index 00000000..043be793
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
@@ -0,0 +1,108 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiServiceConfigFailureActions = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiServiceConfigFailureActions,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.MsiServiceConfigFailureActions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Event), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.ResetPeriod), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.RebootMessage), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Command), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Actions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.DelayActions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(MsiServiceConfigFailureActionsTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiServiceConfigFailureActionsTupleFields
+    {
+        MsiServiceConfigFailureActions,
+        Name,
+        Event,
+        ResetPeriod,
+        RebootMessage,
+        Command,
+        Actions,
+        DelayActions,
+        Component_,
+    }
+
+    public class MsiServiceConfigFailureActionsTuple : IntermediateTuple
+    {
+        public MsiServiceConfigFailureActionsTuple() : base(TupleDefinitions.MsiServiceConfigFailureActions, null, null)
+        {
+        }
+
+        public MsiServiceConfigFailureActionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiServiceConfigFailureActions, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiServiceConfigFailureActionsTupleFields index] => this.Fields[(int)index];
+
+        public string MsiServiceConfigFailureActions
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.MsiServiceConfigFailureActions]?.Value;
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.MsiServiceConfigFailureActions, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Name]?.Value;
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Name, value);
+        }
+
+        public int Event
+        {
+            get => (int)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Event]?.Value;
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Event, value);
+        }
+
+        public int ResetPeriod
+        {
+            get => (int)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod]?.Value;
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod, value);
+        }
+
+        public string RebootMessage
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.RebootMessage]?.Value;
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.RebootMessage, value);
+        }
+
+        public string Command
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Command]?.Value;
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Command, value);
+        }
+
+        public string Actions
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Actions]?.Value;
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Actions, value);
+        }
+
+        public string DelayActions
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.DelayActions]?.Value;
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.DelayActions, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Component_]?.Value;
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs b/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
new file mode 100644
index 00000000..701d85b4
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiServiceConfig = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiServiceConfig,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.MsiServiceConfig), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Event), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.ConfigType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Argument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(MsiServiceConfigTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiServiceConfigTupleFields
+    {
+        MsiServiceConfig,
+        Name,
+        Event,
+        ConfigType,
+        Argument,
+        Component_,
+    }
+
+    public class MsiServiceConfigTuple : IntermediateTuple
+    {
+        public MsiServiceConfigTuple() : base(TupleDefinitions.MsiServiceConfig, null, null)
+        {
+        }
+
+        public MsiServiceConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiServiceConfig, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiServiceConfigTupleFields index] => this.Fields[(int)index];
+
+        public string MsiServiceConfig
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.MsiServiceConfig]?.Value;
+            set => this.Set((int)MsiServiceConfigTupleFields.MsiServiceConfig, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Name]?.Value;
+            set => this.Set((int)MsiServiceConfigTupleFields.Name, value);
+        }
+
+        public int Event
+        {
+            get => (int)this.Fields[(int)MsiServiceConfigTupleFields.Event]?.Value;
+            set => this.Set((int)MsiServiceConfigTupleFields.Event, value);
+        }
+
+        public int ConfigType
+        {
+            get => (int)this.Fields[(int)MsiServiceConfigTupleFields.ConfigType]?.Value;
+            set => this.Set((int)MsiServiceConfigTupleFields.ConfigType, value);
+        }
+
+        public string Argument
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Argument]?.Value;
+            set => this.Set((int)MsiServiceConfigTupleFields.Argument, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Component_]?.Value;
+            set => this.Set((int)MsiServiceConfigTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs b/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
new file mode 100644
index 00000000..9ee6b2f2
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition MsiShortcutProperty = new IntermediateTupleDefinition(
+            TupleDefinitionType.MsiShortcutProperty,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.MsiShortcutProperty), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.Shortcut_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropertyKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropVariantValue), IntermediateFieldType.String),
+            },
+            typeof(MsiShortcutPropertyTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum MsiShortcutPropertyTupleFields
+    {
+        MsiShortcutProperty,
+        Shortcut_,
+        PropertyKey,
+        PropVariantValue,
+    }
+
+    public class MsiShortcutPropertyTuple : IntermediateTuple
+    {
+        public MsiShortcutPropertyTuple() : base(TupleDefinitions.MsiShortcutProperty, null, null)
+        {
+        }
+
+        public MsiShortcutPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiShortcutProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[MsiShortcutPropertyTupleFields index] => this.Fields[(int)index];
+
+        public string MsiShortcutProperty
+        {
+            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.MsiShortcutProperty]?.Value;
+            set => this.Set((int)MsiShortcutPropertyTupleFields.MsiShortcutProperty, value);
+        }
+
+        public string Shortcut_
+        {
+            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.Shortcut_]?.Value;
+            set => this.Set((int)MsiShortcutPropertyTupleFields.Shortcut_, value);
+        }
+
+        public string PropertyKey
+        {
+            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropertyKey]?.Value;
+            set => this.Set((int)MsiShortcutPropertyTupleFields.PropertyKey, value);
+        }
+
+        public string PropVariantValue
+        {
+            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropVariantValue]?.Value;
+            set => this.Set((int)MsiShortcutPropertyTupleFields.PropVariantValue, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs b/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
new file mode 100644
index 00000000..de4f88cd
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ODBCAttribute = new IntermediateTupleDefinition(
+            TupleDefinitionType.ODBCAttribute,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Driver_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Attribute), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ODBCAttributeTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ODBCAttributeTupleFields
+    {
+        Driver_,
+        Attribute,
+        Value,
+    }
+
+    public class ODBCAttributeTuple : IntermediateTuple
+    {
+        public ODBCAttributeTuple() : base(TupleDefinitions.ODBCAttribute, null, null)
+        {
+        }
+
+        public ODBCAttributeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCAttribute, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ODBCAttributeTupleFields index] => this.Fields[(int)index];
+
+        public string Driver_
+        {
+            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Driver_]?.Value;
+            set => this.Set((int)ODBCAttributeTupleFields.Driver_, value);
+        }
+
+        public string Attribute
+        {
+            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Attribute]?.Value;
+            set => this.Set((int)ODBCAttributeTupleFields.Attribute, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Value]?.Value;
+            set => this.Set((int)ODBCAttributeTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs b/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
new file mode 100644
index 00000000..c06b2da0
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ODBCDataSource = new IntermediateTupleDefinition(
+            TupleDefinitionType.ODBCDataSource,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.DataSource), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.DriverDescription), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Registration), IntermediateFieldType.Number),
+            },
+            typeof(ODBCDataSourceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ODBCDataSourceTupleFields
+    {
+        DataSource,
+        Component_,
+        Description,
+        DriverDescription,
+        Registration,
+    }
+
+    public class ODBCDataSourceTuple : IntermediateTuple
+    {
+        public ODBCDataSourceTuple() : base(TupleDefinitions.ODBCDataSource, null, null)
+        {
+        }
+
+        public ODBCDataSourceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCDataSource, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ODBCDataSourceTupleFields index] => this.Fields[(int)index];
+
+        public string DataSource
+        {
+            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.DataSource]?.Value;
+            set => this.Set((int)ODBCDataSourceTupleFields.DataSource, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Component_]?.Value;
+            set => this.Set((int)ODBCDataSourceTupleFields.Component_, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Description]?.Value;
+            set => this.Set((int)ODBCDataSourceTupleFields.Description, value);
+        }
+
+        public string DriverDescription
+        {
+            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.DriverDescription]?.Value;
+            set => this.Set((int)ODBCDataSourceTupleFields.DriverDescription, value);
+        }
+
+        public int Registration
+        {
+            get => (int)this.Fields[(int)ODBCDataSourceTupleFields.Registration]?.Value;
+            set => this.Set((int)ODBCDataSourceTupleFields.Registration, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs b/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
new file mode 100644
index 00000000..ab40ee88
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ODBCDriver = new IntermediateTupleDefinition(
+            TupleDefinitionType.ODBCDriver,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Driver), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.File_Setup), IntermediateFieldType.String),
+            },
+            typeof(ODBCDriverTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ODBCDriverTupleFields
+    {
+        Driver,
+        Component_,
+        Description,
+        File_,
+        File_Setup,
+    }
+
+    public class ODBCDriverTuple : IntermediateTuple
+    {
+        public ODBCDriverTuple() : base(TupleDefinitions.ODBCDriver, null, null)
+        {
+        }
+
+        public ODBCDriverTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCDriver, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ODBCDriverTupleFields index] => this.Fields[(int)index];
+
+        public string Driver
+        {
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.Driver]?.Value;
+            set => this.Set((int)ODBCDriverTupleFields.Driver, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.Component_]?.Value;
+            set => this.Set((int)ODBCDriverTupleFields.Component_, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.Description]?.Value;
+            set => this.Set((int)ODBCDriverTupleFields.Description, value);
+        }
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.File_]?.Value;
+            set => this.Set((int)ODBCDriverTupleFields.File_, value);
+        }
+
+        public string File_Setup
+        {
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.File_Setup]?.Value;
+            set => this.Set((int)ODBCDriverTupleFields.File_Setup, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs b/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
new file mode 100644
index 00000000..541eb532
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ODBCSourceAttribute = new IntermediateTupleDefinition(
+            TupleDefinitionType.ODBCSourceAttribute,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.DataSource_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Attribute), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ODBCSourceAttributeTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ODBCSourceAttributeTupleFields
+    {
+        DataSource_,
+        Attribute,
+        Value,
+    }
+
+    public class ODBCSourceAttributeTuple : IntermediateTuple
+    {
+        public ODBCSourceAttributeTuple() : base(TupleDefinitions.ODBCSourceAttribute, null, null)
+        {
+        }
+
+        public ODBCSourceAttributeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCSourceAttribute, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ODBCSourceAttributeTupleFields index] => this.Fields[(int)index];
+
+        public string DataSource_
+        {
+            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.DataSource_]?.Value;
+            set => this.Set((int)ODBCSourceAttributeTupleFields.DataSource_, value);
+        }
+
+        public string Attribute
+        {
+            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Attribute]?.Value;
+            set => this.Set((int)ODBCSourceAttributeTupleFields.Attribute, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Value]?.Value;
+            set => this.Set((int)ODBCSourceAttributeTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs b/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
new file mode 100644
index 00000000..ab1abbdc
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ODBCTranslator = new IntermediateTupleDefinition(
+            TupleDefinitionType.ODBCTranslator,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Translator), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.File_Setup), IntermediateFieldType.String),
+            },
+            typeof(ODBCTranslatorTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ODBCTranslatorTupleFields
+    {
+        Translator,
+        Component_,
+        Description,
+        File_,
+        File_Setup,
+    }
+
+    public class ODBCTranslatorTuple : IntermediateTuple
+    {
+        public ODBCTranslatorTuple() : base(TupleDefinitions.ODBCTranslator, null, null)
+        {
+        }
+
+        public ODBCTranslatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCTranslator, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ODBCTranslatorTupleFields index] => this.Fields[(int)index];
+
+        public string Translator
+        {
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Translator]?.Value;
+            set => this.Set((int)ODBCTranslatorTupleFields.Translator, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Component_]?.Value;
+            set => this.Set((int)ODBCTranslatorTupleFields.Component_, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Description]?.Value;
+            set => this.Set((int)ODBCTranslatorTupleFields.Description, value);
+        }
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_]?.Value;
+            set => this.Set((int)ODBCTranslatorTupleFields.File_, value);
+        }
+
+        public string File_Setup
+        {
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_Setup]?.Value;
+            set => this.Set((int)ODBCTranslatorTupleFields.File_Setup, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs b/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs
new file mode 100644
index 00000000..d596e58e
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition PatchMetadata = new IntermediateTupleDefinition(
+            TupleDefinitionType.PatchMetadata,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(PatchMetadataTupleFields.Company), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchMetadataTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchMetadataTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(PatchMetadataTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum PatchMetadataTupleFields
+    {
+        Company,
+        Property,
+        Value,
+    }
+
+    public class PatchMetadataTuple : IntermediateTuple
+    {
+        public PatchMetadataTuple() : base(TupleDefinitions.PatchMetadata, null, null)
+        {
+        }
+
+        public PatchMetadataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PatchMetadata, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[PatchMetadataTupleFields index] => this.Fields[(int)index];
+
+        public string Company
+        {
+            get => (string)this.Fields[(int)PatchMetadataTupleFields.Company]?.Value;
+            set => this.Set((int)PatchMetadataTupleFields.Company, value);
+        }
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)PatchMetadataTupleFields.Property]?.Value;
+            set => this.Set((int)PatchMetadataTupleFields.Property, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)PatchMetadataTupleFields.Value]?.Value;
+            set => this.Set((int)PatchMetadataTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PatchPackageTuple.cs b/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
new file mode 100644
index 00000000..276d00a2
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition PatchPackage = new IntermediateTupleDefinition(
+            TupleDefinitionType.PatchPackage,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.PatchId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.Media_), IntermediateFieldType.Number),
+            },
+            typeof(PatchPackageTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum PatchPackageTupleFields
+    {
+        PatchId,
+        Media_,
+    }
+
+    public class PatchPackageTuple : IntermediateTuple
+    {
+        public PatchPackageTuple() : base(TupleDefinitions.PatchPackage, null, null)
+        {
+        }
+
+        public PatchPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PatchPackage, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[PatchPackageTupleFields index] => this.Fields[(int)index];
+
+        public string PatchId
+        {
+            get => (string)this.Fields[(int)PatchPackageTupleFields.PatchId]?.Value;
+            set => this.Set((int)PatchPackageTupleFields.PatchId, value);
+        }
+
+        public int Media_
+        {
+            get => (int)this.Fields[(int)PatchPackageTupleFields.Media_]?.Value;
+            set => this.Set((int)PatchPackageTupleFields.Media_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs b/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
new file mode 100644
index 00000000..624054c1
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition PatchSequence = new IntermediateTupleDefinition(
+            TupleDefinitionType.PatchSequence,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.PatchFamily), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.Sequence), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.Supersede), IntermediateFieldType.Number),
+            },
+            typeof(PatchSequenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum PatchSequenceTupleFields
+    {
+        PatchFamily,
+        Target,
+        Sequence,
+        Supersede,
+    }
+
+    public class PatchSequenceTuple : IntermediateTuple
+    {
+        public PatchSequenceTuple() : base(TupleDefinitions.PatchSequence, null, null)
+        {
+        }
+
+        public PatchSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PatchSequence, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[PatchSequenceTupleFields index] => this.Fields[(int)index];
+
+        public string PatchFamily
+        {
+            get => (string)this.Fields[(int)PatchSequenceTupleFields.PatchFamily]?.Value;
+            set => this.Set((int)PatchSequenceTupleFields.PatchFamily, value);
+        }
+
+        public string Target
+        {
+            get => (string)this.Fields[(int)PatchSequenceTupleFields.Target]?.Value;
+            set => this.Set((int)PatchSequenceTupleFields.Target, value);
+        }
+
+        public string Sequence
+        {
+            get => (string)this.Fields[(int)PatchSequenceTupleFields.Sequence]?.Value;
+            set => this.Set((int)PatchSequenceTupleFields.Sequence, value);
+        }
+
+        public int Supersede
+        {
+            get => (int)this.Fields[(int)PatchSequenceTupleFields.Supersede]?.Value;
+            set => this.Set((int)PatchSequenceTupleFields.Supersede, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PatchTuple.cs b/src/WixToolset.Data/Tuples/PatchTuple.cs
new file mode 100644
index 00000000..268307c7
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/PatchTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Patch = new IntermediateTupleDefinition(
+            TupleDefinitionType.Patch,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(PatchTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchTupleFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(PatchTupleFields.PatchSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(PatchTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(PatchTupleFields.Header), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(PatchTupleFields.StreamRef_), IntermediateFieldType.String),
+            },
+            typeof(PatchTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum PatchTupleFields
+    {
+        File_,
+        Sequence,
+        PatchSize,
+        Attributes,
+        Header,
+        StreamRef_,
+    }
+
+    public class PatchTuple : IntermediateTuple
+    {
+        public PatchTuple() : base(TupleDefinitions.Patch, null, null)
+        {
+        }
+
+        public PatchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Patch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[PatchTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)PatchTupleFields.File_]?.Value;
+            set => this.Set((int)PatchTupleFields.File_, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)PatchTupleFields.Sequence]?.Value;
+            set => this.Set((int)PatchTupleFields.Sequence, value);
+        }
+
+        public int PatchSize
+        {
+            get => (int)this.Fields[(int)PatchTupleFields.PatchSize]?.Value;
+            set => this.Set((int)PatchTupleFields.PatchSize, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)PatchTupleFields.Attributes]?.Value;
+            set => this.Set((int)PatchTupleFields.Attributes, value);
+        }
+
+        public string Header
+        {
+            get => (string)this.Fields[(int)PatchTupleFields.Header]?.Value;
+            set => this.Set((int)PatchTupleFields.Header, value);
+        }
+
+        public string StreamRef_
+        {
+            get => (string)this.Fields[(int)PatchTupleFields.StreamRef_]?.Value;
+            set => this.Set((int)PatchTupleFields.StreamRef_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ProgIdTuple.cs b/src/WixToolset.Data/Tuples/ProgIdTuple.cs
new file mode 100644
index 00000000..a1713392
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ProgIdTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ProgId = new IntermediateTupleDefinition(
+            TupleDefinitionType.ProgId,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ProgId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ProgId_Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Class_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Icon_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.IconIndex), IntermediateFieldType.Number),
+            },
+            typeof(ProgIdTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ProgIdTupleFields
+    {
+        ProgId,
+        ProgId_Parent,
+        Class_,
+        Description,
+        Icon_,
+        IconIndex,
+    }
+
+    public class ProgIdTuple : IntermediateTuple
+    {
+        public ProgIdTuple() : base(TupleDefinitions.ProgId, null, null)
+        {
+        }
+
+        public ProgIdTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ProgId, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ProgIdTupleFields index] => this.Fields[(int)index];
+
+        public string ProgId
+        {
+            get => (string)this.Fields[(int)ProgIdTupleFields.ProgId]?.Value;
+            set => this.Set((int)ProgIdTupleFields.ProgId, value);
+        }
+
+        public string ProgId_Parent
+        {
+            get => (string)this.Fields[(int)ProgIdTupleFields.ProgId_Parent]?.Value;
+            set => this.Set((int)ProgIdTupleFields.ProgId_Parent, value);
+        }
+
+        public string Class_
+        {
+            get => (string)this.Fields[(int)ProgIdTupleFields.Class_]?.Value;
+            set => this.Set((int)ProgIdTupleFields.Class_, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)ProgIdTupleFields.Description]?.Value;
+            set => this.Set((int)ProgIdTupleFields.Description, value);
+        }
+
+        public string Icon_
+        {
+            get => (string)this.Fields[(int)ProgIdTupleFields.Icon_]?.Value;
+            set => this.Set((int)ProgIdTupleFields.Icon_, value);
+        }
+
+        public int IconIndex
+        {
+            get => (int)this.Fields[(int)ProgIdTupleFields.IconIndex]?.Value;
+            set => this.Set((int)ProgIdTupleFields.IconIndex, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PropertiesTuple.cs b/src/WixToolset.Data/Tuples/PropertiesTuple.cs
new file mode 100644
index 00000000..6aafaa51
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/PropertiesTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Properties = new IntermediateTupleDefinition(
+            TupleDefinitionType.Properties,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(PropertiesTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PropertiesTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(PropertiesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum PropertiesTupleFields
+    {
+        Name,
+        Value,
+    }
+
+    public class PropertiesTuple : IntermediateTuple
+    {
+        public PropertiesTuple() : base(TupleDefinitions.Properties, null, null)
+        {
+        }
+
+        public PropertiesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Properties, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[PropertiesTupleFields index] => this.Fields[(int)index];
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)PropertiesTupleFields.Name]?.Value;
+            set => this.Set((int)PropertiesTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)PropertiesTupleFields.Value]?.Value;
+            set => this.Set((int)PropertiesTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PropertyTuple.cs b/src/WixToolset.Data/Tuples/PropertyTuple.cs
new file mode 100644
index 00000000..120b01fb
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/PropertyTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Property = new IntermediateTupleDefinition(
+            TupleDefinitionType.Property,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(PropertyTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PropertyTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(PropertyTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum PropertyTupleFields
+    {
+        Property,
+        Value,
+    }
+
+    public class PropertyTuple : IntermediateTuple
+    {
+        public PropertyTuple() : base(TupleDefinitions.Property, null, null)
+        {
+        }
+
+        public PropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Property, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[PropertyTupleFields index] => this.Fields[(int)index];
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)PropertyTupleFields.Property]?.Value;
+            set => this.Set((int)PropertyTupleFields.Property, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)PropertyTupleFields.Value]?.Value;
+            set => this.Set((int)PropertyTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PublishComponentTuple.cs b/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
new file mode 100644
index 00000000..d17da1bb
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition PublishComponent = new IntermediateTupleDefinition(
+            TupleDefinitionType.PublishComponent,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.ComponentId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Qualifier), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.AppData), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Feature_), IntermediateFieldType.String),
+            },
+            typeof(PublishComponentTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum PublishComponentTupleFields
+    {
+        ComponentId,
+        Qualifier,
+        Component_,
+        AppData,
+        Feature_,
+    }
+
+    public class PublishComponentTuple : IntermediateTuple
+    {
+        public PublishComponentTuple() : base(TupleDefinitions.PublishComponent, null, null)
+        {
+        }
+
+        public PublishComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PublishComponent, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[PublishComponentTupleFields index] => this.Fields[(int)index];
+
+        public string ComponentId
+        {
+            get => (string)this.Fields[(int)PublishComponentTupleFields.ComponentId]?.Value;
+            set => this.Set((int)PublishComponentTupleFields.ComponentId, value);
+        }
+
+        public string Qualifier
+        {
+            get => (string)this.Fields[(int)PublishComponentTupleFields.Qualifier]?.Value;
+            set => this.Set((int)PublishComponentTupleFields.Qualifier, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)PublishComponentTupleFields.Component_]?.Value;
+            set => this.Set((int)PublishComponentTupleFields.Component_, value);
+        }
+
+        public string AppData
+        {
+            get => (string)this.Fields[(int)PublishComponentTupleFields.AppData]?.Value;
+            set => this.Set((int)PublishComponentTupleFields.AppData, value);
+        }
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)PublishComponentTupleFields.Feature_]?.Value;
+            set => this.Set((int)PublishComponentTupleFields.Feature_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RadioButtonTuple.cs b/src/WixToolset.Data/Tuples/RadioButtonTuple.cs
new file mode 100644
index 00000000..420577dc
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/RadioButtonTuple.cs
@@ -0,0 +1,108 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition RadioButton = new IntermediateTupleDefinition(
+            TupleDefinitionType.RadioButton,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.X), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Y), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Width), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Height), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Help), IntermediateFieldType.String),
+            },
+            typeof(RadioButtonTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum RadioButtonTupleFields
+    {
+        Property,
+        Order,
+        Value,
+        X,
+        Y,
+        Width,
+        Height,
+        Text,
+        Help,
+    }
+
+    public class RadioButtonTuple : IntermediateTuple
+    {
+        public RadioButtonTuple() : base(TupleDefinitions.RadioButton, null, null)
+        {
+        }
+
+        public RadioButtonTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RadioButton, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[RadioButtonTupleFields index] => this.Fields[(int)index];
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)RadioButtonTupleFields.Property]?.Value;
+            set => this.Set((int)RadioButtonTupleFields.Property, value);
+        }
+
+        public int Order
+        {
+            get => (int)this.Fields[(int)RadioButtonTupleFields.Order]?.Value;
+            set => this.Set((int)RadioButtonTupleFields.Order, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)RadioButtonTupleFields.Value]?.Value;
+            set => this.Set((int)RadioButtonTupleFields.Value, value);
+        }
+
+        public int X
+        {
+            get => (int)this.Fields[(int)RadioButtonTupleFields.X]?.Value;
+            set => this.Set((int)RadioButtonTupleFields.X, value);
+        }
+
+        public int Y
+        {
+            get => (int)this.Fields[(int)RadioButtonTupleFields.Y]?.Value;
+            set => this.Set((int)RadioButtonTupleFields.Y, value);
+        }
+
+        public int Width
+        {
+            get => (int)this.Fields[(int)RadioButtonTupleFields.Width]?.Value;
+            set => this.Set((int)RadioButtonTupleFields.Width, value);
+        }
+
+        public int Height
+        {
+            get => (int)this.Fields[(int)RadioButtonTupleFields.Height]?.Value;
+            set => this.Set((int)RadioButtonTupleFields.Height, value);
+        }
+
+        public string Text
+        {
+            get => (string)this.Fields[(int)RadioButtonTupleFields.Text]?.Value;
+            set => this.Set((int)RadioButtonTupleFields.Text, value);
+        }
+
+        public string Help
+        {
+            get => (string)this.Fields[(int)RadioButtonTupleFields.Help]?.Value;
+            set => this.Set((int)RadioButtonTupleFields.Help, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RegLocatorTuple.cs b/src/WixToolset.Data/Tuples/RegLocatorTuple.cs
new file mode 100644
index 00000000..b098e687
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/RegLocatorTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition RegLocator = new IntermediateTupleDefinition(
+            TupleDefinitionType.RegLocator,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Signature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Root), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Type), IntermediateFieldType.Number),
+            },
+            typeof(RegLocatorTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum RegLocatorTupleFields
+    {
+        Signature_,
+        Root,
+        Key,
+        Name,
+        Type,
+    }
+
+    public class RegLocatorTuple : IntermediateTuple
+    {
+        public RegLocatorTuple() : base(TupleDefinitions.RegLocator, null, null)
+        {
+        }
+
+        public RegLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RegLocator, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[RegLocatorTupleFields index] => this.Fields[(int)index];
+
+        public string Signature_
+        {
+            get => (string)this.Fields[(int)RegLocatorTupleFields.Signature_]?.Value;
+            set => this.Set((int)RegLocatorTupleFields.Signature_, value);
+        }
+
+        public int Root
+        {
+            get => (int)this.Fields[(int)RegLocatorTupleFields.Root]?.Value;
+            set => this.Set((int)RegLocatorTupleFields.Root, value);
+        }
+
+        public string Key
+        {
+            get => (string)this.Fields[(int)RegLocatorTupleFields.Key]?.Value;
+            set => this.Set((int)RegLocatorTupleFields.Key, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)RegLocatorTupleFields.Name]?.Value;
+            set => this.Set((int)RegLocatorTupleFields.Name, value);
+        }
+
+        public int Type
+        {
+            get => (int)this.Fields[(int)RegLocatorTupleFields.Type]?.Value;
+            set => this.Set((int)RegLocatorTupleFields.Type, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RegistryTuple.cs b/src/WixToolset.Data/Tuples/RegistryTuple.cs
new file mode 100644
index 00000000..a82cd5ee
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/RegistryTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Registry = new IntermediateTupleDefinition(
+            TupleDefinitionType.Registry,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Registry), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Root), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(RegistryTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum RegistryTupleFields
+    {
+        Registry,
+        Root,
+        Key,
+        Name,
+        Value,
+        Component_,
+    }
+
+    public class RegistryTuple : IntermediateTuple
+    {
+        public RegistryTuple() : base(TupleDefinitions.Registry, null, null)
+        {
+        }
+
+        public RegistryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Registry, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[RegistryTupleFields index] => this.Fields[(int)index];
+
+        public string Registry
+        {
+            get => (string)this.Fields[(int)RegistryTupleFields.Registry]?.Value;
+            set => this.Set((int)RegistryTupleFields.Registry, value);
+        }
+
+        public int Root
+        {
+            get => (int)this.Fields[(int)RegistryTupleFields.Root]?.Value;
+            set => this.Set((int)RegistryTupleFields.Root, value);
+        }
+
+        public string Key
+        {
+            get => (string)this.Fields[(int)RegistryTupleFields.Key]?.Value;
+            set => this.Set((int)RegistryTupleFields.Key, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)RegistryTupleFields.Name]?.Value;
+            set => this.Set((int)RegistryTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)RegistryTupleFields.Value]?.Value;
+            set => this.Set((int)RegistryTupleFields.Value, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)RegistryTupleFields.Component_]?.Value;
+            set => this.Set((int)RegistryTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RemoveFileTuple.cs b/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
new file mode 100644
index 00000000..1860172f
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition RemoveFile = new IntermediateTupleDefinition(
+            TupleDefinitionType.RemoveFile,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.FileKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.DirProperty), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.InstallMode), IntermediateFieldType.Number),
+            },
+            typeof(RemoveFileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum RemoveFileTupleFields
+    {
+        FileKey,
+        Component_,
+        FileName,
+        DirProperty,
+        InstallMode,
+    }
+
+    public class RemoveFileTuple : IntermediateTuple
+    {
+        public RemoveFileTuple() : base(TupleDefinitions.RemoveFile, null, null)
+        {
+        }
+
+        public RemoveFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RemoveFile, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[RemoveFileTupleFields index] => this.Fields[(int)index];
+
+        public string FileKey
+        {
+            get => (string)this.Fields[(int)RemoveFileTupleFields.FileKey]?.Value;
+            set => this.Set((int)RemoveFileTupleFields.FileKey, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)RemoveFileTupleFields.Component_]?.Value;
+            set => this.Set((int)RemoveFileTupleFields.Component_, value);
+        }
+
+        public string FileName
+        {
+            get => (string)this.Fields[(int)RemoveFileTupleFields.FileName]?.Value;
+            set => this.Set((int)RemoveFileTupleFields.FileName, value);
+        }
+
+        public string DirProperty
+        {
+            get => (string)this.Fields[(int)RemoveFileTupleFields.DirProperty]?.Value;
+            set => this.Set((int)RemoveFileTupleFields.DirProperty, value);
+        }
+
+        public int InstallMode
+        {
+            get => (int)this.Fields[(int)RemoveFileTupleFields.InstallMode]?.Value;
+            set => this.Set((int)RemoveFileTupleFields.InstallMode, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs b/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs
new file mode 100644
index 00000000..e2e79560
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition RemoveIniFile = new IntermediateTupleDefinition(
+            TupleDefinitionType.RemoveIniFile,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.RemoveIniFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.DirProperty), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Section), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Action), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(RemoveIniFileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum RemoveIniFileTupleFields
+    {
+        RemoveIniFile,
+        FileName,
+        DirProperty,
+        Section,
+        Key,
+        Value,
+        Action,
+        Component_,
+    }
+
+    public class RemoveIniFileTuple : IntermediateTuple
+    {
+        public RemoveIniFileTuple() : base(TupleDefinitions.RemoveIniFile, null, null)
+        {
+        }
+
+        public RemoveIniFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RemoveIniFile, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[RemoveIniFileTupleFields index] => this.Fields[(int)index];
+
+        public string RemoveIniFile
+        {
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.RemoveIniFile]?.Value;
+            set => this.Set((int)RemoveIniFileTupleFields.RemoveIniFile, value);
+        }
+
+        public string FileName
+        {
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.FileName]?.Value;
+            set => this.Set((int)RemoveIniFileTupleFields.FileName, value);
+        }
+
+        public string DirProperty
+        {
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.DirProperty]?.Value;
+            set => this.Set((int)RemoveIniFileTupleFields.DirProperty, value);
+        }
+
+        public string Section
+        {
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Section]?.Value;
+            set => this.Set((int)RemoveIniFileTupleFields.Section, value);
+        }
+
+        public string Key
+        {
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Key]?.Value;
+            set => this.Set((int)RemoveIniFileTupleFields.Key, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Value]?.Value;
+            set => this.Set((int)RemoveIniFileTupleFields.Value, value);
+        }
+
+        public int Action
+        {
+            get => (int)this.Fields[(int)RemoveIniFileTupleFields.Action]?.Value;
+            set => this.Set((int)RemoveIniFileTupleFields.Action, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Component_]?.Value;
+            set => this.Set((int)RemoveIniFileTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
new file mode 100644
index 00000000..154aad67
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition RemoveRegistry = new IntermediateTupleDefinition(
+            TupleDefinitionType.RemoveRegistry,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.RemoveRegistry), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Root), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(RemoveRegistryTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum RemoveRegistryTupleFields
+    {
+        RemoveRegistry,
+        Root,
+        Key,
+        Name,
+        Component_,
+    }
+
+    public class RemoveRegistryTuple : IntermediateTuple
+    {
+        public RemoveRegistryTuple() : base(TupleDefinitions.RemoveRegistry, null, null)
+        {
+        }
+
+        public RemoveRegistryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RemoveRegistry, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[RemoveRegistryTupleFields index] => this.Fields[(int)index];
+
+        public string RemoveRegistry
+        {
+            get => (string)this.Fields[(int)RemoveRegistryTupleFields.RemoveRegistry]?.Value;
+            set => this.Set((int)RemoveRegistryTupleFields.RemoveRegistry, value);
+        }
+
+        public int Root
+        {
+            get => (int)this.Fields[(int)RemoveRegistryTupleFields.Root]?.Value;
+            set => this.Set((int)RemoveRegistryTupleFields.Root, value);
+        }
+
+        public string Key
+        {
+            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Key]?.Value;
+            set => this.Set((int)RemoveRegistryTupleFields.Key, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Name]?.Value;
+            set => this.Set((int)RemoveRegistryTupleFields.Name, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Component_]?.Value;
+            set => this.Set((int)RemoveRegistryTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ReserveCostTuple.cs b/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
new file mode 100644
index 00000000..769ac4b2
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ReserveCost = new IntermediateTupleDefinition(
+            TupleDefinitionType.ReserveCost,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveFolder), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveLocal), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveSource), IntermediateFieldType.Number),
+            },
+            typeof(ReserveCostTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ReserveCostTupleFields
+    {
+        ReserveKey,
+        Component_,
+        ReserveFolder,
+        ReserveLocal,
+        ReserveSource,
+    }
+
+    public class ReserveCostTuple : IntermediateTuple
+    {
+        public ReserveCostTuple() : base(TupleDefinitions.ReserveCost, null, null)
+        {
+        }
+
+        public ReserveCostTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ReserveCost, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ReserveCostTupleFields index] => this.Fields[(int)index];
+
+        public string ReserveKey
+        {
+            get => (string)this.Fields[(int)ReserveCostTupleFields.ReserveKey]?.Value;
+            set => this.Set((int)ReserveCostTupleFields.ReserveKey, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ReserveCostTupleFields.Component_]?.Value;
+            set => this.Set((int)ReserveCostTupleFields.Component_, value);
+        }
+
+        public string ReserveFolder
+        {
+            get => (string)this.Fields[(int)ReserveCostTupleFields.ReserveFolder]?.Value;
+            set => this.Set((int)ReserveCostTupleFields.ReserveFolder, value);
+        }
+
+        public int ReserveLocal
+        {
+            get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveLocal]?.Value;
+            set => this.Set((int)ReserveCostTupleFields.ReserveLocal, value);
+        }
+
+        public int ReserveSource
+        {
+            get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveSource]?.Value;
+            set => this.Set((int)ReserveCostTupleFields.ReserveSource, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs b/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs
new file mode 100644
index 00000000..5db5f984
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition SFPCatalog = new IntermediateTupleDefinition(
+            TupleDefinitionType.SFPCatalog,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(SFPCatalogTupleFields.SFPCatalog), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SFPCatalogTupleFields.Catalog), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(SFPCatalogTupleFields.Dependency), IntermediateFieldType.String),
+            },
+            typeof(SFPCatalogTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum SFPCatalogTupleFields
+    {
+        SFPCatalog,
+        Catalog,
+        Dependency,
+    }
+
+    public class SFPCatalogTuple : IntermediateTuple
+    {
+        public SFPCatalogTuple() : base(TupleDefinitions.SFPCatalog, null, null)
+        {
+        }
+
+        public SFPCatalogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.SFPCatalog, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[SFPCatalogTupleFields index] => this.Fields[(int)index];
+
+        public string SFPCatalog
+        {
+            get => (string)this.Fields[(int)SFPCatalogTupleFields.SFPCatalog]?.Value;
+            set => this.Set((int)SFPCatalogTupleFields.SFPCatalog, value);
+        }
+
+        public string Catalog
+        {
+            get => (string)this.Fields[(int)SFPCatalogTupleFields.Catalog]?.Value;
+            set => this.Set((int)SFPCatalogTupleFields.Catalog, value);
+        }
+
+        public string Dependency
+        {
+            get => (string)this.Fields[(int)SFPCatalogTupleFields.Dependency]?.Value;
+            set => this.Set((int)SFPCatalogTupleFields.Dependency, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/SelfRegTuple.cs b/src/WixToolset.Data/Tuples/SelfRegTuple.cs
new file mode 100644
index 00000000..b32127f3
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/SelfRegTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition SelfReg = new IntermediateTupleDefinition(
+            TupleDefinitionType.SelfReg,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(SelfRegTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SelfRegTupleFields.Cost), IntermediateFieldType.Number),
+            },
+            typeof(SelfRegTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum SelfRegTupleFields
+    {
+        File_,
+        Cost,
+    }
+
+    public class SelfRegTuple : IntermediateTuple
+    {
+        public SelfRegTuple() : base(TupleDefinitions.SelfReg, null, null)
+        {
+        }
+
+        public SelfRegTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.SelfReg, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[SelfRegTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)SelfRegTupleFields.File_]?.Value;
+            set => this.Set((int)SelfRegTupleFields.File_, value);
+        }
+
+        public int Cost
+        {
+            get => (int)this.Fields[(int)SelfRegTupleFields.Cost]?.Value;
+            set => this.Set((int)SelfRegTupleFields.Cost, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ServiceControlTuple.cs b/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
new file mode 100644
index 00000000..a2cdc7a0
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ServiceControl = new IntermediateTupleDefinition(
+            TupleDefinitionType.ServiceControl,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.ServiceControl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Event), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Arguments), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Wait), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(ServiceControlTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ServiceControlTupleFields
+    {
+        ServiceControl,
+        Name,
+        Event,
+        Arguments,
+        Wait,
+        Component_,
+    }
+
+    public class ServiceControlTuple : IntermediateTuple
+    {
+        public ServiceControlTuple() : base(TupleDefinitions.ServiceControl, null, null)
+        {
+        }
+
+        public ServiceControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ServiceControl, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ServiceControlTupleFields index] => this.Fields[(int)index];
+
+        public string ServiceControl
+        {
+            get => (string)this.Fields[(int)ServiceControlTupleFields.ServiceControl]?.Value;
+            set => this.Set((int)ServiceControlTupleFields.ServiceControl, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)ServiceControlTupleFields.Name]?.Value;
+            set => this.Set((int)ServiceControlTupleFields.Name, value);
+        }
+
+        public int Event
+        {
+            get => (int)this.Fields[(int)ServiceControlTupleFields.Event]?.Value;
+            set => this.Set((int)ServiceControlTupleFields.Event, value);
+        }
+
+        public string Arguments
+        {
+            get => (string)this.Fields[(int)ServiceControlTupleFields.Arguments]?.Value;
+            set => this.Set((int)ServiceControlTupleFields.Arguments, value);
+        }
+
+        public int Wait
+        {
+            get => (int)this.Fields[(int)ServiceControlTupleFields.Wait]?.Value;
+            set => this.Set((int)ServiceControlTupleFields.Wait, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ServiceControlTupleFields.Component_]?.Value;
+            set => this.Set((int)ServiceControlTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
new file mode 100644
index 00000000..cd02d21e
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
@@ -0,0 +1,140 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ServiceInstall = new IntermediateTupleDefinition(
+            TupleDefinitionType.ServiceInstall,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ServiceInstall), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ServiceType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.StartType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ErrorControl), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.LoadOrderGroup), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Dependencies), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.StartName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Password), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Arguments), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Description), IntermediateFieldType.String),
+            },
+            typeof(ServiceInstallTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ServiceInstallTupleFields
+    {
+        ServiceInstall,
+        Name,
+        DisplayName,
+        ServiceType,
+        StartType,
+        ErrorControl,
+        LoadOrderGroup,
+        Dependencies,
+        StartName,
+        Password,
+        Arguments,
+        Component_,
+        Description,
+    }
+
+    public class ServiceInstallTuple : IntermediateTuple
+    {
+        public ServiceInstallTuple() : base(TupleDefinitions.ServiceInstall, null, null)
+        {
+        }
+
+        public ServiceInstallTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ServiceInstall, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ServiceInstallTupleFields index] => this.Fields[(int)index];
+
+        public string ServiceInstall
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.ServiceInstall]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.ServiceInstall, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Name]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.Name, value);
+        }
+
+        public string DisplayName
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.DisplayName]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.DisplayName, value);
+        }
+
+        public int ServiceType
+        {
+            get => (int)this.Fields[(int)ServiceInstallTupleFields.ServiceType]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.ServiceType, value);
+        }
+
+        public int StartType
+        {
+            get => (int)this.Fields[(int)ServiceInstallTupleFields.StartType]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.StartType, value);
+        }
+
+        public int ErrorControl
+        {
+            get => (int)this.Fields[(int)ServiceInstallTupleFields.ErrorControl]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.ErrorControl, value);
+        }
+
+        public string LoadOrderGroup
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.LoadOrderGroup]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.LoadOrderGroup, value);
+        }
+
+        public string Dependencies
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Dependencies]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.Dependencies, value);
+        }
+
+        public string StartName
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.StartName]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.StartName, value);
+        }
+
+        public string Password
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Password]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.Password, value);
+        }
+
+        public string Arguments
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Arguments]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.Arguments, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Component_]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.Component_, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Description]?.Value;
+            set => this.Set((int)ServiceInstallTupleFields.Description, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ShortcutTuple.cs b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
new file mode 100644
index 00000000..0591e7f4
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
@@ -0,0 +1,164 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Shortcut = new IntermediateTupleDefinition(
+            TupleDefinitionType.Shortcut,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Shortcut), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Arguments), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Hotkey), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Icon_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.IconIndex), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ShowCmd), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.WkDir), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DisplayResourceDLL), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DisplayResourceId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DescriptionResourceDLL), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DescriptionResourceId), IntermediateFieldType.Number),
+            },
+            typeof(ShortcutTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum ShortcutTupleFields
+    {
+        Shortcut,
+        Directory_,
+        Name,
+        Component_,
+        Target,
+        Arguments,
+        Description,
+        Hotkey,
+        Icon_,
+        IconIndex,
+        ShowCmd,
+        WkDir,
+        DisplayResourceDLL,
+        DisplayResourceId,
+        DescriptionResourceDLL,
+        DescriptionResourceId,
+    }
+
+    public class ShortcutTuple : IntermediateTuple
+    {
+        public ShortcutTuple() : base(TupleDefinitions.Shortcut, null, null)
+        {
+        }
+
+        public ShortcutTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Shortcut, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ShortcutTupleFields index] => this.Fields[(int)index];
+
+        public string Shortcut
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.Shortcut]?.Value;
+            set => this.Set((int)ShortcutTupleFields.Shortcut, value);
+        }
+
+        public string Directory_
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.Directory_]?.Value;
+            set => this.Set((int)ShortcutTupleFields.Directory_, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.Name]?.Value;
+            set => this.Set((int)ShortcutTupleFields.Name, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.Component_]?.Value;
+            set => this.Set((int)ShortcutTupleFields.Component_, value);
+        }
+
+        public string Target
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.Target]?.Value;
+            set => this.Set((int)ShortcutTupleFields.Target, value);
+        }
+
+        public string Arguments
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.Arguments]?.Value;
+            set => this.Set((int)ShortcutTupleFields.Arguments, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.Description]?.Value;
+            set => this.Set((int)ShortcutTupleFields.Description, value);
+        }
+
+        public int Hotkey
+        {
+            get => (int)this.Fields[(int)ShortcutTupleFields.Hotkey]?.Value;
+            set => this.Set((int)ShortcutTupleFields.Hotkey, value);
+        }
+
+        public string Icon_
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.Icon_]?.Value;
+            set => this.Set((int)ShortcutTupleFields.Icon_, value);
+        }
+
+        public int IconIndex
+        {
+            get => (int)this.Fields[(int)ShortcutTupleFields.IconIndex]?.Value;
+            set => this.Set((int)ShortcutTupleFields.IconIndex, value);
+        }
+
+        public int ShowCmd
+        {
+            get => (int)this.Fields[(int)ShortcutTupleFields.ShowCmd]?.Value;
+            set => this.Set((int)ShortcutTupleFields.ShowCmd, value);
+        }
+
+        public string WkDir
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.WkDir]?.Value;
+            set => this.Set((int)ShortcutTupleFields.WkDir, value);
+        }
+
+        public string DisplayResourceDLL
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.DisplayResourceDLL]?.Value;
+            set => this.Set((int)ShortcutTupleFields.DisplayResourceDLL, value);
+        }
+
+        public int DisplayResourceId
+        {
+            get => (int)this.Fields[(int)ShortcutTupleFields.DisplayResourceId]?.Value;
+            set => this.Set((int)ShortcutTupleFields.DisplayResourceId, value);
+        }
+
+        public string DescriptionResourceDLL
+        {
+            get => (string)this.Fields[(int)ShortcutTupleFields.DescriptionResourceDLL]?.Value;
+            set => this.Set((int)ShortcutTupleFields.DescriptionResourceDLL, value);
+        }
+
+        public int DescriptionResourceId
+        {
+            get => (int)this.Fields[(int)ShortcutTupleFields.DescriptionResourceId]?.Value;
+            set => this.Set((int)ShortcutTupleFields.DescriptionResourceId, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/SignatureTuple.cs b/src/WixToolset.Data/Tuples/SignatureTuple.cs
new file mode 100644
index 00000000..b8dbf308
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/SignatureTuple.cs
@@ -0,0 +1,108 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Signature = new IntermediateTupleDefinition(
+            TupleDefinitionType.Signature,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(SignatureTupleFields.Signature), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SignatureTupleFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinDate), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxDate), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(SignatureTupleFields.Languages), IntermediateFieldType.String),
+            },
+            typeof(SignatureTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum SignatureTupleFields
+    {
+        Signature,
+        FileName,
+        MinVersion,
+        MaxVersion,
+        MinSize,
+        MaxSize,
+        MinDate,
+        MaxDate,
+        Languages,
+    }
+
+    public class SignatureTuple : IntermediateTuple
+    {
+        public SignatureTuple() : base(TupleDefinitions.Signature, null, null)
+        {
+        }
+
+        public SignatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Signature, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[SignatureTupleFields index] => this.Fields[(int)index];
+
+        public string Signature
+        {
+            get => (string)this.Fields[(int)SignatureTupleFields.Signature]?.Value;
+            set => this.Set((int)SignatureTupleFields.Signature, value);
+        }
+
+        public string FileName
+        {
+            get => (string)this.Fields[(int)SignatureTupleFields.FileName]?.Value;
+            set => this.Set((int)SignatureTupleFields.FileName, value);
+        }
+
+        public string MinVersion
+        {
+            get => (string)this.Fields[(int)SignatureTupleFields.MinVersion]?.Value;
+            set => this.Set((int)SignatureTupleFields.MinVersion, value);
+        }
+
+        public string MaxVersion
+        {
+            get => (string)this.Fields[(int)SignatureTupleFields.MaxVersion]?.Value;
+            set => this.Set((int)SignatureTupleFields.MaxVersion, value);
+        }
+
+        public int MinSize
+        {
+            get => (int)this.Fields[(int)SignatureTupleFields.MinSize]?.Value;
+            set => this.Set((int)SignatureTupleFields.MinSize, value);
+        }
+
+        public int MaxSize
+        {
+            get => (int)this.Fields[(int)SignatureTupleFields.MaxSize]?.Value;
+            set => this.Set((int)SignatureTupleFields.MaxSize, value);
+        }
+
+        public int MinDate
+        {
+            get => (int)this.Fields[(int)SignatureTupleFields.MinDate]?.Value;
+            set => this.Set((int)SignatureTupleFields.MinDate, value);
+        }
+
+        public int MaxDate
+        {
+            get => (int)this.Fields[(int)SignatureTupleFields.MaxDate]?.Value;
+            set => this.Set((int)SignatureTupleFields.MaxDate, value);
+        }
+
+        public string Languages
+        {
+            get => (string)this.Fields[(int)SignatureTupleFields.Languages]?.Value;
+            set => this.Set((int)SignatureTupleFields.Languages, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs b/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs
new file mode 100644
index 00000000..449c4afe
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition TargetFiles_OptionalData = new IntermediateTupleDefinition(
+            TupleDefinitionType.TargetFiles_OptionalData,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.IgnoreOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.IgnoreLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.RetainOffsets), IntermediateFieldType.String),
+            },
+            typeof(TargetFiles_OptionalDataTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum TargetFiles_OptionalDataTupleFields
+    {
+        Target,
+        FTK,
+        SymbolPaths,
+        IgnoreOffsets,
+        IgnoreLengths,
+        RetainOffsets,
+    }
+
+    public class TargetFiles_OptionalDataTuple : IntermediateTuple
+    {
+        public TargetFiles_OptionalDataTuple() : base(TupleDefinitions.TargetFiles_OptionalData, null, null)
+        {
+        }
+
+        public TargetFiles_OptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetFiles_OptionalData, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[TargetFiles_OptionalDataTupleFields index] => this.Fields[(int)index];
+
+        public string Target
+        {
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.Target]?.Value;
+            set => this.Set((int)TargetFiles_OptionalDataTupleFields.Target, value);
+        }
+
+        public string FTK
+        {
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.FTK]?.Value;
+            set => this.Set((int)TargetFiles_OptionalDataTupleFields.FTK, value);
+        }
+
+        public string SymbolPaths
+        {
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.SymbolPaths]?.Value;
+            set => this.Set((int)TargetFiles_OptionalDataTupleFields.SymbolPaths, value);
+        }
+
+        public string IgnoreOffsets
+        {
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreOffsets]?.Value;
+            set => this.Set((int)TargetFiles_OptionalDataTupleFields.IgnoreOffsets, value);
+        }
+
+        public string IgnoreLengths
+        {
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreLengths]?.Value;
+            set => this.Set((int)TargetFiles_OptionalDataTupleFields.IgnoreLengths, value);
+        }
+
+        public string RetainOffsets
+        {
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.RetainOffsets]?.Value;
+            set => this.Set((int)TargetFiles_OptionalDataTupleFields.RetainOffsets, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/TargetImagesTuple.cs b/src/WixToolset.Data/Tuples/TargetImagesTuple.cs
new file mode 100644
index 00000000..0cb74ec9
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/TargetImagesTuple.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition TargetImages = new IntermediateTupleDefinition(
+            TupleDefinitionType.TargetImages,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.MsiPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Upgraded), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.ProductValidateFlags), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.IgnoreMissingSrcFiles), IntermediateFieldType.Number),
+            },
+            typeof(TargetImagesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum TargetImagesTupleFields
+    {
+        Target,
+        MsiPath,
+        SymbolPaths,
+        Upgraded,
+        Order,
+        ProductValidateFlags,
+        IgnoreMissingSrcFiles,
+    }
+
+    public class TargetImagesTuple : IntermediateTuple
+    {
+        public TargetImagesTuple() : base(TupleDefinitions.TargetImages, null, null)
+        {
+        }
+
+        public TargetImagesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetImages, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[TargetImagesTupleFields index] => this.Fields[(int)index];
+
+        public string Target
+        {
+            get => (string)this.Fields[(int)TargetImagesTupleFields.Target]?.Value;
+            set => this.Set((int)TargetImagesTupleFields.Target, value);
+        }
+
+        public string MsiPath
+        {
+            get => (string)this.Fields[(int)TargetImagesTupleFields.MsiPath]?.Value;
+            set => this.Set((int)TargetImagesTupleFields.MsiPath, value);
+        }
+
+        public string SymbolPaths
+        {
+            get => (string)this.Fields[(int)TargetImagesTupleFields.SymbolPaths]?.Value;
+            set => this.Set((int)TargetImagesTupleFields.SymbolPaths, value);
+        }
+
+        public string Upgraded
+        {
+            get => (string)this.Fields[(int)TargetImagesTupleFields.Upgraded]?.Value;
+            set => this.Set((int)TargetImagesTupleFields.Upgraded, value);
+        }
+
+        public int Order
+        {
+            get => (int)this.Fields[(int)TargetImagesTupleFields.Order]?.Value;
+            set => this.Set((int)TargetImagesTupleFields.Order, value);
+        }
+
+        public string ProductValidateFlags
+        {
+            get => (string)this.Fields[(int)TargetImagesTupleFields.ProductValidateFlags]?.Value;
+            set => this.Set((int)TargetImagesTupleFields.ProductValidateFlags, value);
+        }
+
+        public int IgnoreMissingSrcFiles
+        {
+            get => (int)this.Fields[(int)TargetImagesTupleFields.IgnoreMissingSrcFiles]?.Value;
+            set => this.Set((int)TargetImagesTupleFields.IgnoreMissingSrcFiles, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/TextStyleTuple.cs b/src/WixToolset.Data/Tuples/TextStyleTuple.cs
new file mode 100644
index 00000000..20ec878a
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/TextStyleTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition TextStyle = new IntermediateTupleDefinition(
+            TupleDefinitionType.TextStyle,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.TextStyle), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.FaceName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Size), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Color), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.StyleBits), IntermediateFieldType.Number),
+            },
+            typeof(TextStyleTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum TextStyleTupleFields
+    {
+        TextStyle,
+        FaceName,
+        Size,
+        Color,
+        StyleBits,
+    }
+
+    public class TextStyleTuple : IntermediateTuple
+    {
+        public TextStyleTuple() : base(TupleDefinitions.TextStyle, null, null)
+        {
+        }
+
+        public TextStyleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TextStyle, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[TextStyleTupleFields index] => this.Fields[(int)index];
+
+        public string TextStyle
+        {
+            get => (string)this.Fields[(int)TextStyleTupleFields.TextStyle]?.Value;
+            set => this.Set((int)TextStyleTupleFields.TextStyle, value);
+        }
+
+        public string FaceName
+        {
+            get => (string)this.Fields[(int)TextStyleTupleFields.FaceName]?.Value;
+            set => this.Set((int)TextStyleTupleFields.FaceName, value);
+        }
+
+        public int Size
+        {
+            get => (int)this.Fields[(int)TextStyleTupleFields.Size]?.Value;
+            set => this.Set((int)TextStyleTupleFields.Size, value);
+        }
+
+        public int Color
+        {
+            get => (int)this.Fields[(int)TextStyleTupleFields.Color]?.Value;
+            set => this.Set((int)TextStyleTupleFields.Color, value);
+        }
+
+        public int StyleBits
+        {
+            get => (int)this.Fields[(int)TextStyleTupleFields.StyleBits]?.Value;
+            set => this.Set((int)TextStyleTupleFields.StyleBits, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/TupleDefinitions.cs b/src/WixToolset.Data/Tuples/TupleDefinitions.cs
new file mode 100644
index 00000000..b9ab2042
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/TupleDefinitions.cs
@@ -0,0 +1,815 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using System;
+
+    public enum TupleDefinitionType
+    {
+        _Streams,
+        _SummaryInformation,
+        _TransformView,
+        _Validation,
+        ActionText,
+        AdminExecuteSequence,
+        AdminUISequence,
+        AdvtExecuteSequence,
+        AppId,
+        AppSearch,
+        BBControl,
+        Billboard,
+        Binary,
+        BindImage,
+        CCPSearch,
+        CheckBox,
+        Class,
+        ComboBox,
+        CompLocator,
+        Complus,
+        Component,
+        Condition,
+        Control,
+        ControlCondition,
+        ControlEvent,
+        CreateFolder,
+        CustomAction,
+        Dialog,
+        Directory,
+        DrLocator,
+        DuplicateFile,
+        Environment,
+        Error,
+        EventMapping,
+        Extension,
+        ExternalFiles,
+        FamilyFileRanges,
+        Feature,
+        FeatureComponents,
+        File,
+        FileSFPCatalog,
+        Font,
+        Icon,
+        ImageFamilies,
+        IniFile,
+        IniLocator,
+        InstallExecuteSequence,
+        InstallUISequence,
+        IsolatedComponent,
+        LaunchCondition,
+        ListBox,
+        ListView,
+        LockPermissions,
+        Media,
+        MIME,
+        ModuleAdminExecuteSequence,
+        ModuleAdminUISequence,
+        ModuleAdvtExecuteSequence,
+        ModuleComponents,
+        ModuleConfiguration,
+        ModuleDependency,
+        ModuleExclusion,
+        ModuleIgnoreTable,
+        ModuleInstallExecuteSequence,
+        ModuleInstallUISequence,
+        ModuleSignature,
+        ModuleSubstitution,
+        MoveFile,
+        MsiAssembly,
+        MsiAssemblyName,
+        MsiDigitalCertificate,
+        MsiDigitalSignature,
+        MsiEmbeddedChainer,
+        MsiEmbeddedUI,
+        MsiFileHash,
+        MsiLockPermissionsEx,
+        MsiPackageCertificate,
+        MsiPatchCertificate,
+        MsiPatchHeaders,
+        MsiPatchMetadata,
+        MsiPatchOldAssemblyFile,
+        MsiPatchOldAssemblyName,
+        MsiPatchSequence,
+        MsiServiceConfig,
+        MsiServiceConfigFailureActions,
+        MsiShortcutProperty,
+        ODBCAttribute,
+        ODBCDataSource,
+        ODBCDriver,
+        ODBCSourceAttribute,
+        ODBCTranslator,
+        Patch,
+        PatchMetadata,
+        PatchPackage,
+        PatchSequence,
+        ProgId,
+        Properties,
+        Property,
+        PublishComponent,
+        RadioButton,
+        Registry,
+        RegLocator,
+        RemoveFile,
+        RemoveIniFile,
+        RemoveRegistry,
+        ReserveCost,
+        SelfReg,
+        ServiceControl,
+        ServiceInstall,
+        SFPCatalog,
+        Shortcut,
+        Signature,
+        TargetFiles_OptionalData,
+        TargetImages,
+        TextStyle,
+        TypeLib,
+        UIText,
+        Upgrade,
+        UpgradedFiles_OptionalData,
+        UpgradedFilesToIgnore,
+        UpgradedImages,
+        Verb,
+        WixAction,
+        WixApprovedExeForElevation,
+        WixBBControl,
+        WixBindUpdatedFiles,
+        WixBootstrapperApplication,
+        WixBuildInfo,
+        WixBundle,
+        WixBundleCatalog,
+        WixBundleContainer,
+        WixBundleExePackage,
+        WixBundleMsiFeature,
+        WixBundleMsiPackage,
+        WixBundleMsiProperty,
+        WixBundleMspPackage,
+        WixBundleMsuPackage,
+        WixBundlePackage,
+        WixBundlePackageCommandLine,
+        WixBundlePackageExitCode,
+        WixBundlePackageGroup,
+        WixBundlePatchTargetCode,
+        WixBundlePayload,
+        WixBundlePayloadGroup,
+        WixBundleProperties,
+        WixBundleRelatedPackage,
+        WixBundleRollbackBoundary,
+        WixBundleSlipstreamMsp,
+        WixBundleUpdate,
+        WixBundleVariable,
+        WixChain,
+        WixChainItem,
+        WixComplexReference,
+        WixComponentGroup,
+        WixComponentSearch,
+        WixControl,
+        WixCustomRow,
+        WixCustomTable,
+        WixDeltaPatchFile,
+        WixDeltaPatchSymbolPaths,
+        WixDirectory,
+        WixEnsureTable,
+        WixFeatureGroup,
+        WixFeatureModules,
+        WixFile,
+        WixFileSearch,
+        WixFragment,
+        WixGroup,
+        WixInstanceComponent,
+        WixInstanceTransforms,
+        WixMedia,
+        WixMediaTemplate,
+        WixMerge,
+        WixOrdering,
+        WixPackageFeatureInfo,
+        WixPackageProperties,
+        WixPatchBaseline,
+        WixPatchFamilyGroup,
+        WixPatchId,
+        WixPatchMetadata,
+        WixPatchRef,
+        WixPatchTarget,
+        WixPayloadProperties,
+        WixProductSearch,
+        WixProperty,
+        WixRegistrySearch,
+        WixRelatedBundle,
+        WixSearch,
+        WixSearchRelation,
+        WixSimpleReference,
+        WixSuppressAction,
+        WixSuppressModularization,
+        WixUI,
+        WixUpdateRegistration,
+        WixVariable,
+        MustBeFromAnExtension,
+    }
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly Version Version = new Version("4.0.0");
+
+        public static IntermediateTupleDefinition ByName(string name)
+        {
+            if (!Enum.TryParse(name, out TupleDefinitionType type) || type == TupleDefinitionType.MustBeFromAnExtension)
+            {
+                return null;
+            }
+
+            return ByType(type);
+        }
+
+        public static IntermediateTupleDefinition ByType(TupleDefinitionType type)
+        {
+            switch (type)
+            {
+                case TupleDefinitionType._Streams:
+                    return TupleDefinitions._Streams;
+
+                case TupleDefinitionType._SummaryInformation:
+                    return TupleDefinitions._SummaryInformation;
+
+                case TupleDefinitionType._TransformView:
+                    return TupleDefinitions._TransformView;
+
+                case TupleDefinitionType._Validation:
+                    return TupleDefinitions._Validation;
+
+                case TupleDefinitionType.ActionText:
+                    return TupleDefinitions.ActionText;
+
+                case TupleDefinitionType.AdminExecuteSequence:
+                    return TupleDefinitions.AdminExecuteSequence;
+
+                case TupleDefinitionType.AdminUISequence:
+                    return TupleDefinitions.AdminUISequence;
+
+                case TupleDefinitionType.AdvtExecuteSequence:
+                    return TupleDefinitions.AdvtExecuteSequence;
+
+                case TupleDefinitionType.AppId:
+                    return TupleDefinitions.AppId;
+
+                case TupleDefinitionType.AppSearch:
+                    return TupleDefinitions.AppSearch;
+
+                case TupleDefinitionType.BBControl:
+                    return TupleDefinitions.BBControl;
+
+                case TupleDefinitionType.Billboard:
+                    return TupleDefinitions.Billboard;
+
+                case TupleDefinitionType.Binary:
+                    return TupleDefinitions.Binary;
+
+                case TupleDefinitionType.BindImage:
+                    return TupleDefinitions.BindImage;
+
+                case TupleDefinitionType.CCPSearch:
+                    return TupleDefinitions.CCPSearch;
+
+                case TupleDefinitionType.CheckBox:
+                    return TupleDefinitions.CheckBox;
+
+                case TupleDefinitionType.Class:
+                    return TupleDefinitions.Class;
+
+                case TupleDefinitionType.ComboBox:
+                    return TupleDefinitions.ComboBox;
+
+                case TupleDefinitionType.CompLocator:
+                    return TupleDefinitions.CompLocator;
+
+                case TupleDefinitionType.Complus:
+                    return TupleDefinitions.Complus;
+
+                case TupleDefinitionType.Component:
+                    return TupleDefinitions.Component;
+
+                case TupleDefinitionType.Condition:
+                    return TupleDefinitions.Condition;
+
+                case TupleDefinitionType.Control:
+                    return TupleDefinitions.Control;
+
+                case TupleDefinitionType.ControlCondition:
+                    return TupleDefinitions.ControlCondition;
+
+                case TupleDefinitionType.ControlEvent:
+                    return TupleDefinitions.ControlEvent;
+
+                case TupleDefinitionType.CreateFolder:
+                    return TupleDefinitions.CreateFolder;
+
+                case TupleDefinitionType.CustomAction:
+                    return TupleDefinitions.CustomAction;
+
+                case TupleDefinitionType.Dialog:
+                    return TupleDefinitions.Dialog;
+
+                case TupleDefinitionType.Directory:
+                    return TupleDefinitions.Directory;
+
+                case TupleDefinitionType.DrLocator:
+                    return TupleDefinitions.DrLocator;
+
+                case TupleDefinitionType.DuplicateFile:
+                    return TupleDefinitions.DuplicateFile;
+
+                case TupleDefinitionType.Environment:
+                    return TupleDefinitions.Environment;
+
+                case TupleDefinitionType.Error:
+                    return TupleDefinitions.Error;
+
+                case TupleDefinitionType.EventMapping:
+                    return TupleDefinitions.EventMapping;
+
+                case TupleDefinitionType.Extension:
+                    return TupleDefinitions.Extension;
+
+                case TupleDefinitionType.ExternalFiles:
+                    return TupleDefinitions.ExternalFiles;
+
+                case TupleDefinitionType.FamilyFileRanges:
+                    return TupleDefinitions.FamilyFileRanges;
+
+                case TupleDefinitionType.Feature:
+                    return TupleDefinitions.Feature;
+
+                case TupleDefinitionType.FeatureComponents:
+                    return TupleDefinitions.FeatureComponents;
+
+                case TupleDefinitionType.File:
+                    return TupleDefinitions.File;
+
+                case TupleDefinitionType.FileSFPCatalog:
+                    return TupleDefinitions.FileSFPCatalog;
+
+                case TupleDefinitionType.Font:
+                    return TupleDefinitions.Font;
+
+                case TupleDefinitionType.Icon:
+                    return TupleDefinitions.Icon;
+
+                case TupleDefinitionType.ImageFamilies:
+                    return TupleDefinitions.ImageFamilies;
+
+                case TupleDefinitionType.IniFile:
+                    return TupleDefinitions.IniFile;
+
+                case TupleDefinitionType.IniLocator:
+                    return TupleDefinitions.IniLocator;
+
+                case TupleDefinitionType.InstallExecuteSequence:
+                    return TupleDefinitions.InstallExecuteSequence;
+
+                case TupleDefinitionType.InstallUISequence:
+                    return TupleDefinitions.InstallUISequence;
+
+                case TupleDefinitionType.IsolatedComponent:
+                    return TupleDefinitions.IsolatedComponent;
+
+                case TupleDefinitionType.LaunchCondition:
+                    return TupleDefinitions.LaunchCondition;
+
+                case TupleDefinitionType.ListBox:
+                    return TupleDefinitions.ListBox;
+
+                case TupleDefinitionType.ListView:
+                    return TupleDefinitions.ListView;
+
+                case TupleDefinitionType.LockPermissions:
+                    return TupleDefinitions.LockPermissions;
+
+                case TupleDefinitionType.Media:
+                    return TupleDefinitions.Media;
+
+                case TupleDefinitionType.MIME:
+                    return TupleDefinitions.MIME;
+
+                case TupleDefinitionType.ModuleAdminExecuteSequence:
+                    return TupleDefinitions.ModuleAdminExecuteSequence;
+
+                case TupleDefinitionType.ModuleAdminUISequence:
+                    return TupleDefinitions.ModuleAdminUISequence;
+
+                case TupleDefinitionType.ModuleAdvtExecuteSequence:
+                    return TupleDefinitions.ModuleAdvtExecuteSequence;
+
+                case TupleDefinitionType.ModuleComponents:
+                    return TupleDefinitions.ModuleComponents;
+
+                case TupleDefinitionType.ModuleConfiguration:
+                    return TupleDefinitions.ModuleConfiguration;
+
+                case TupleDefinitionType.ModuleDependency:
+                    return TupleDefinitions.ModuleDependency;
+
+                case TupleDefinitionType.ModuleExclusion:
+                    return TupleDefinitions.ModuleExclusion;
+
+                case TupleDefinitionType.ModuleIgnoreTable:
+                    return TupleDefinitions.ModuleIgnoreTable;
+
+                case TupleDefinitionType.ModuleInstallExecuteSequence:
+                    return TupleDefinitions.ModuleInstallExecuteSequence;
+
+                case TupleDefinitionType.ModuleInstallUISequence:
+                    return TupleDefinitions.ModuleInstallUISequence;
+
+                case TupleDefinitionType.ModuleSignature:
+                    return TupleDefinitions.ModuleSignature;
+
+                case TupleDefinitionType.ModuleSubstitution:
+                    return TupleDefinitions.ModuleSubstitution;
+
+                case TupleDefinitionType.MoveFile:
+                    return TupleDefinitions.MoveFile;
+
+                case TupleDefinitionType.MsiAssembly:
+                    return TupleDefinitions.MsiAssembly;
+
+                case TupleDefinitionType.MsiAssemblyName:
+                    return TupleDefinitions.MsiAssemblyName;
+
+                case TupleDefinitionType.MsiDigitalCertificate:
+                    return TupleDefinitions.MsiDigitalCertificate;
+
+                case TupleDefinitionType.MsiDigitalSignature:
+                    return TupleDefinitions.MsiDigitalSignature;
+
+                case TupleDefinitionType.MsiEmbeddedChainer:
+                    return TupleDefinitions.MsiEmbeddedChainer;
+
+                case TupleDefinitionType.MsiEmbeddedUI:
+                    return TupleDefinitions.MsiEmbeddedUI;
+
+                case TupleDefinitionType.MsiFileHash:
+                    return TupleDefinitions.MsiFileHash;
+
+                case TupleDefinitionType.MsiLockPermissionsEx:
+                    return TupleDefinitions.MsiLockPermissionsEx;
+
+                case TupleDefinitionType.MsiPackageCertificate:
+                    return TupleDefinitions.MsiPackageCertificate;
+
+                case TupleDefinitionType.MsiPatchCertificate:
+                    return TupleDefinitions.MsiPatchCertificate;
+
+                case TupleDefinitionType.MsiPatchHeaders:
+                    return TupleDefinitions.MsiPatchHeaders;
+
+                case TupleDefinitionType.MsiPatchMetadata:
+                    return TupleDefinitions.MsiPatchMetadata;
+
+                case TupleDefinitionType.MsiPatchOldAssemblyFile:
+                    return TupleDefinitions.MsiPatchOldAssemblyFile;
+
+                case TupleDefinitionType.MsiPatchOldAssemblyName:
+                    return TupleDefinitions.MsiPatchOldAssemblyName;
+
+                case TupleDefinitionType.MsiPatchSequence:
+                    return TupleDefinitions.MsiPatchSequence;
+
+                case TupleDefinitionType.MsiServiceConfig:
+                    return TupleDefinitions.MsiServiceConfig;
+
+                case TupleDefinitionType.MsiServiceConfigFailureActions:
+                    return TupleDefinitions.MsiServiceConfigFailureActions;
+
+                case TupleDefinitionType.MsiShortcutProperty:
+                    return TupleDefinitions.MsiShortcutProperty;
+
+                case TupleDefinitionType.ODBCAttribute:
+                    return TupleDefinitions.ODBCAttribute;
+
+                case TupleDefinitionType.ODBCDataSource:
+                    return TupleDefinitions.ODBCDataSource;
+
+                case TupleDefinitionType.ODBCDriver:
+                    return TupleDefinitions.ODBCDriver;
+
+                case TupleDefinitionType.ODBCSourceAttribute:
+                    return TupleDefinitions.ODBCSourceAttribute;
+
+                case TupleDefinitionType.ODBCTranslator:
+                    return TupleDefinitions.ODBCTranslator;
+
+                case TupleDefinitionType.Patch:
+                    return TupleDefinitions.Patch;
+
+                case TupleDefinitionType.PatchMetadata:
+                    return TupleDefinitions.PatchMetadata;
+
+                case TupleDefinitionType.PatchPackage:
+                    return TupleDefinitions.PatchPackage;
+
+                case TupleDefinitionType.PatchSequence:
+                    return TupleDefinitions.PatchSequence;
+
+                case TupleDefinitionType.ProgId:
+                    return TupleDefinitions.ProgId;
+
+                case TupleDefinitionType.Properties:
+                    return TupleDefinitions.Properties;
+
+                case TupleDefinitionType.Property:
+                    return TupleDefinitions.Property;
+
+                case TupleDefinitionType.PublishComponent:
+                    return TupleDefinitions.PublishComponent;
+
+                case TupleDefinitionType.RadioButton:
+                    return TupleDefinitions.RadioButton;
+
+                case TupleDefinitionType.Registry:
+                    return TupleDefinitions.Registry;
+
+                case TupleDefinitionType.RegLocator:
+                    return TupleDefinitions.RegLocator;
+
+                case TupleDefinitionType.RemoveFile:
+                    return TupleDefinitions.RemoveFile;
+
+                case TupleDefinitionType.RemoveIniFile:
+                    return TupleDefinitions.RemoveIniFile;
+
+                case TupleDefinitionType.RemoveRegistry:
+                    return TupleDefinitions.RemoveRegistry;
+
+                case TupleDefinitionType.ReserveCost:
+                    return TupleDefinitions.ReserveCost;
+
+                case TupleDefinitionType.SelfReg:
+                    return TupleDefinitions.SelfReg;
+
+                case TupleDefinitionType.ServiceControl:
+                    return TupleDefinitions.ServiceControl;
+
+                case TupleDefinitionType.ServiceInstall:
+                    return TupleDefinitions.ServiceInstall;
+
+                case TupleDefinitionType.SFPCatalog:
+                    return TupleDefinitions.SFPCatalog;
+
+                case TupleDefinitionType.Shortcut:
+                    return TupleDefinitions.Shortcut;
+
+                case TupleDefinitionType.Signature:
+                    return TupleDefinitions.Signature;
+
+                case TupleDefinitionType.TargetFiles_OptionalData:
+                    return TupleDefinitions.TargetFiles_OptionalData;
+
+                case TupleDefinitionType.TargetImages:
+                    return TupleDefinitions.TargetImages;
+
+                case TupleDefinitionType.TextStyle:
+                    return TupleDefinitions.TextStyle;
+
+                case TupleDefinitionType.TypeLib:
+                    return TupleDefinitions.TypeLib;
+
+                case TupleDefinitionType.UIText:
+                    return TupleDefinitions.UIText;
+
+                case TupleDefinitionType.Upgrade:
+                    return TupleDefinitions.Upgrade;
+
+                case TupleDefinitionType.UpgradedFiles_OptionalData:
+                    return TupleDefinitions.UpgradedFiles_OptionalData;
+
+                case TupleDefinitionType.UpgradedFilesToIgnore:
+                    return TupleDefinitions.UpgradedFilesToIgnore;
+
+                case TupleDefinitionType.UpgradedImages:
+                    return TupleDefinitions.UpgradedImages;
+
+                case TupleDefinitionType.Verb:
+                    return TupleDefinitions.Verb;
+
+                case TupleDefinitionType.WixAction:
+                    return TupleDefinitions.WixAction;
+
+                case TupleDefinitionType.WixApprovedExeForElevation:
+                    return TupleDefinitions.WixApprovedExeForElevation;
+
+                case TupleDefinitionType.WixBBControl:
+                    return TupleDefinitions.WixBBControl;
+
+                case TupleDefinitionType.WixBindUpdatedFiles:
+                    return TupleDefinitions.WixBindUpdatedFiles;
+
+                case TupleDefinitionType.WixBootstrapperApplication:
+                    return TupleDefinitions.WixBootstrapperApplication;
+
+                case TupleDefinitionType.WixBuildInfo:
+                    return TupleDefinitions.WixBuildInfo;
+
+                case TupleDefinitionType.WixBundle:
+                    return TupleDefinitions.WixBundle;
+
+                case TupleDefinitionType.WixBundleCatalog:
+                    return TupleDefinitions.WixBundleCatalog;
+
+                case TupleDefinitionType.WixBundleContainer:
+                    return TupleDefinitions.WixBundleContainer;
+
+                case TupleDefinitionType.WixBundleExePackage:
+                    return TupleDefinitions.WixBundleExePackage;
+
+                case TupleDefinitionType.WixBundleMsiFeature:
+                    return TupleDefinitions.WixBundleMsiFeature;
+
+                case TupleDefinitionType.WixBundleMsiPackage:
+                    return TupleDefinitions.WixBundleMsiPackage;
+
+                case TupleDefinitionType.WixBundleMsiProperty:
+                    return TupleDefinitions.WixBundleMsiProperty;
+
+                case TupleDefinitionType.WixBundleMspPackage:
+                    return TupleDefinitions.WixBundleMspPackage;
+
+                case TupleDefinitionType.WixBundleMsuPackage:
+                    return TupleDefinitions.WixBundleMsuPackage;
+
+                case TupleDefinitionType.WixBundlePackage:
+                    return TupleDefinitions.WixBundlePackage;
+
+                case TupleDefinitionType.WixBundlePackageCommandLine:
+                    return TupleDefinitions.WixBundlePackageCommandLine;
+
+                case TupleDefinitionType.WixBundlePackageExitCode:
+                    return TupleDefinitions.WixBundlePackageExitCode;
+
+                case TupleDefinitionType.WixBundlePackageGroup:
+                    return TupleDefinitions.WixBundlePackageGroup;
+
+                case TupleDefinitionType.WixBundlePatchTargetCode:
+                    return TupleDefinitions.WixBundlePatchTargetCode;
+
+                case TupleDefinitionType.WixBundlePayload:
+                    return TupleDefinitions.WixBundlePayload;
+
+                case TupleDefinitionType.WixBundlePayloadGroup:
+                    return TupleDefinitions.WixBundlePayloadGroup;
+
+                case TupleDefinitionType.WixBundleProperties:
+                    return TupleDefinitions.WixBundleProperties;
+
+                case TupleDefinitionType.WixBundleRelatedPackage:
+                    return TupleDefinitions.WixBundleRelatedPackage;
+
+                case TupleDefinitionType.WixBundleRollbackBoundary:
+                    return TupleDefinitions.WixBundleRollbackBoundary;
+
+                case TupleDefinitionType.WixBundleSlipstreamMsp:
+                    return TupleDefinitions.WixBundleSlipstreamMsp;
+
+                case TupleDefinitionType.WixBundleUpdate:
+                    return TupleDefinitions.WixBundleUpdate;
+
+                case TupleDefinitionType.WixBundleVariable:
+                    return TupleDefinitions.WixBundleVariable;
+
+                case TupleDefinitionType.WixChain:
+                    return TupleDefinitions.WixChain;
+
+                case TupleDefinitionType.WixChainItem:
+                    return TupleDefinitions.WixChainItem;
+
+                case TupleDefinitionType.WixComplexReference:
+                    return TupleDefinitions.WixComplexReference;
+
+                case TupleDefinitionType.WixComponentGroup:
+                    return TupleDefinitions.WixComponentGroup;
+
+                case TupleDefinitionType.WixComponentSearch:
+                    return TupleDefinitions.WixComponentSearch;
+
+                case TupleDefinitionType.WixControl:
+                    return TupleDefinitions.WixControl;
+
+                case TupleDefinitionType.WixCustomRow:
+                    return TupleDefinitions.WixCustomRow;
+
+                case TupleDefinitionType.WixCustomTable:
+                    return TupleDefinitions.WixCustomTable;
+
+                case TupleDefinitionType.WixDeltaPatchFile:
+                    return TupleDefinitions.WixDeltaPatchFile;
+
+                case TupleDefinitionType.WixDeltaPatchSymbolPaths:
+                    return TupleDefinitions.WixDeltaPatchSymbolPaths;
+
+                case TupleDefinitionType.WixDirectory:
+                    return TupleDefinitions.WixDirectory;
+
+                case TupleDefinitionType.WixEnsureTable:
+                    return TupleDefinitions.WixEnsureTable;
+
+                case TupleDefinitionType.WixFeatureGroup:
+                    return TupleDefinitions.WixFeatureGroup;
+
+                case TupleDefinitionType.WixFeatureModules:
+                    return TupleDefinitions.WixFeatureModules;
+
+                case TupleDefinitionType.WixFile:
+                    return TupleDefinitions.WixFile;
+
+                case TupleDefinitionType.WixFileSearch:
+                    return TupleDefinitions.WixFileSearch;
+
+                case TupleDefinitionType.WixFragment:
+                    return TupleDefinitions.WixFragment;
+
+                case TupleDefinitionType.WixGroup:
+                    return TupleDefinitions.WixGroup;
+
+                case TupleDefinitionType.WixInstanceComponent:
+                    return TupleDefinitions.WixInstanceComponent;
+
+                case TupleDefinitionType.WixInstanceTransforms:
+                    return TupleDefinitions.WixInstanceTransforms;
+
+                case TupleDefinitionType.WixMedia:
+                    return TupleDefinitions.WixMedia;
+
+                case TupleDefinitionType.WixMediaTemplate:
+                    return TupleDefinitions.WixMediaTemplate;
+
+                case TupleDefinitionType.WixMerge:
+                    return TupleDefinitions.WixMerge;
+
+                case TupleDefinitionType.WixOrdering:
+                    return TupleDefinitions.WixOrdering;
+
+                case TupleDefinitionType.WixPackageFeatureInfo:
+                    return TupleDefinitions.WixPackageFeatureInfo;
+
+                case TupleDefinitionType.WixPackageProperties:
+                    return TupleDefinitions.WixPackageProperties;
+
+                case TupleDefinitionType.WixPatchBaseline:
+                    return TupleDefinitions.WixPatchBaseline;
+
+                case TupleDefinitionType.WixPatchFamilyGroup:
+                    return TupleDefinitions.WixPatchFamilyGroup;
+
+                case TupleDefinitionType.WixPatchId:
+                    return TupleDefinitions.WixPatchId;
+
+                case TupleDefinitionType.WixPatchMetadata:
+                    return TupleDefinitions.WixPatchMetadata;
+
+                case TupleDefinitionType.WixPatchRef:
+                    return TupleDefinitions.WixPatchRef;
+
+                case TupleDefinitionType.WixPatchTarget:
+                    return TupleDefinitions.WixPatchTarget;
+
+                case TupleDefinitionType.WixPayloadProperties:
+                    return TupleDefinitions.WixPayloadProperties;
+
+                case TupleDefinitionType.WixProductSearch:
+                    return TupleDefinitions.WixProductSearch;
+
+                case TupleDefinitionType.WixProperty:
+                    return TupleDefinitions.WixProperty;
+
+                case TupleDefinitionType.WixRegistrySearch:
+                    return TupleDefinitions.WixRegistrySearch;
+
+                case TupleDefinitionType.WixRelatedBundle:
+                    return TupleDefinitions.WixRelatedBundle;
+
+                case TupleDefinitionType.WixSearch:
+                    return TupleDefinitions.WixSearch;
+
+                case TupleDefinitionType.WixSearchRelation:
+                    return TupleDefinitions.WixSearchRelation;
+
+                case TupleDefinitionType.WixSimpleReference:
+                    return TupleDefinitions.WixSimpleReference;
+
+                case TupleDefinitionType.WixSuppressAction:
+                    return TupleDefinitions.WixSuppressAction;
+
+                case TupleDefinitionType.WixSuppressModularization:
+                    return TupleDefinitions.WixSuppressModularization;
+
+                case TupleDefinitionType.WixUI:
+                    return TupleDefinitions.WixUI;
+
+                case TupleDefinitionType.WixUpdateRegistration:
+                    return TupleDefinitions.WixUpdateRegistration;
+
+                case TupleDefinitionType.WixVariable:
+                    return TupleDefinitions.WixVariable;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type));
+            }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/Tuples/TypeLibTuple.cs b/src/WixToolset.Data/Tuples/TypeLibTuple.cs
new file mode 100644
index 00000000..7bd26bf3
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/TypeLibTuple.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition TypeLib = new IntermediateTupleDefinition(
+            TupleDefinitionType.TypeLib,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.LibID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Language), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Version), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Cost), IntermediateFieldType.Number),
+            },
+            typeof(TypeLibTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum TypeLibTupleFields
+    {
+        LibID,
+        Language,
+        Component_,
+        Version,
+        Description,
+        Directory_,
+        Feature_,
+        Cost,
+    }
+
+    public class TypeLibTuple : IntermediateTuple
+    {
+        public TypeLibTuple() : base(TupleDefinitions.TypeLib, null, null)
+        {
+        }
+
+        public TypeLibTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TypeLib, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[TypeLibTupleFields index] => this.Fields[(int)index];
+
+        public string LibID
+        {
+            get => (string)this.Fields[(int)TypeLibTupleFields.LibID]?.Value;
+            set => this.Set((int)TypeLibTupleFields.LibID, value);
+        }
+
+        public int Language
+        {
+            get => (int)this.Fields[(int)TypeLibTupleFields.Language]?.Value;
+            set => this.Set((int)TypeLibTupleFields.Language, value);
+        }
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)TypeLibTupleFields.Component_]?.Value;
+            set => this.Set((int)TypeLibTupleFields.Component_, value);
+        }
+
+        public int Version
+        {
+            get => (int)this.Fields[(int)TypeLibTupleFields.Version]?.Value;
+            set => this.Set((int)TypeLibTupleFields.Version, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)TypeLibTupleFields.Description]?.Value;
+            set => this.Set((int)TypeLibTupleFields.Description, value);
+        }
+
+        public string Directory_
+        {
+            get => (string)this.Fields[(int)TypeLibTupleFields.Directory_]?.Value;
+            set => this.Set((int)TypeLibTupleFields.Directory_, value);
+        }
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)TypeLibTupleFields.Feature_]?.Value;
+            set => this.Set((int)TypeLibTupleFields.Feature_, value);
+        }
+
+        public int Cost
+        {
+            get => (int)this.Fields[(int)TypeLibTupleFields.Cost]?.Value;
+            set => this.Set((int)TypeLibTupleFields.Cost, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/UITextTuple.cs b/src/WixToolset.Data/Tuples/UITextTuple.cs
new file mode 100644
index 00000000..3d5f2933
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/UITextTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition UIText = new IntermediateTupleDefinition(
+            TupleDefinitionType.UIText,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(UITextTupleFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UITextTupleFields.Text), IntermediateFieldType.String),
+            },
+            typeof(UITextTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum UITextTupleFields
+    {
+        Key,
+        Text,
+    }
+
+    public class UITextTuple : IntermediateTuple
+    {
+        public UITextTuple() : base(TupleDefinitions.UIText, null, null)
+        {
+        }
+
+        public UITextTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UIText, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[UITextTupleFields index] => this.Fields[(int)index];
+
+        public string Key
+        {
+            get => (string)this.Fields[(int)UITextTupleFields.Key]?.Value;
+            set => this.Set((int)UITextTupleFields.Key, value);
+        }
+
+        public string Text
+        {
+            get => (string)this.Fields[(int)UITextTupleFields.Text]?.Value;
+            set => this.Set((int)UITextTupleFields.Text, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/UpgradeTuple.cs b/src/WixToolset.Data/Tuples/UpgradeTuple.cs
new file mode 100644
index 00000000..94fe1231
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/UpgradeTuple.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Upgrade = new IntermediateTupleDefinition(
+            TupleDefinitionType.Upgrade,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.UpgradeCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMin), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMax), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.Language), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.Remove), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.ActionProperty), IntermediateFieldType.String),
+            },
+            typeof(UpgradeTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum UpgradeTupleFields
+    {
+        UpgradeCode,
+        VersionMin,
+        VersionMax,
+        Language,
+        Attributes,
+        Remove,
+        ActionProperty,
+    }
+
+    public class UpgradeTuple : IntermediateTuple
+    {
+        public UpgradeTuple() : base(TupleDefinitions.Upgrade, null, null)
+        {
+        }
+
+        public UpgradeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Upgrade, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[UpgradeTupleFields index] => this.Fields[(int)index];
+
+        public string UpgradeCode
+        {
+            get => (string)this.Fields[(int)UpgradeTupleFields.UpgradeCode]?.Value;
+            set => this.Set((int)UpgradeTupleFields.UpgradeCode, value);
+        }
+
+        public string VersionMin
+        {
+            get => (string)this.Fields[(int)UpgradeTupleFields.VersionMin]?.Value;
+            set => this.Set((int)UpgradeTupleFields.VersionMin, value);
+        }
+
+        public string VersionMax
+        {
+            get => (string)this.Fields[(int)UpgradeTupleFields.VersionMax]?.Value;
+            set => this.Set((int)UpgradeTupleFields.VersionMax, value);
+        }
+
+        public string Language
+        {
+            get => (string)this.Fields[(int)UpgradeTupleFields.Language]?.Value;
+            set => this.Set((int)UpgradeTupleFields.Language, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)UpgradeTupleFields.Attributes]?.Value;
+            set => this.Set((int)UpgradeTupleFields.Attributes, value);
+        }
+
+        public string Remove
+        {
+            get => (string)this.Fields[(int)UpgradeTupleFields.Remove]?.Value;
+            set => this.Set((int)UpgradeTupleFields.Remove, value);
+        }
+
+        public string ActionProperty
+        {
+            get => (string)this.Fields[(int)UpgradeTupleFields.ActionProperty]?.Value;
+            set => this.Set((int)UpgradeTupleFields.ActionProperty, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs b/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs
new file mode 100644
index 00000000..64ec9229
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition UpgradedFilesToIgnore = new IntermediateTupleDefinition(
+            TupleDefinitionType.UpgradedFilesToIgnore,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreTupleFields.Upgraded), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreTupleFields.FTK), IntermediateFieldType.String),
+            },
+            typeof(UpgradedFilesToIgnoreTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum UpgradedFilesToIgnoreTupleFields
+    {
+        Upgraded,
+        FTK,
+    }
+
+    public class UpgradedFilesToIgnoreTuple : IntermediateTuple
+    {
+        public UpgradedFilesToIgnoreTuple() : base(TupleDefinitions.UpgradedFilesToIgnore, null, null)
+        {
+        }
+
+        public UpgradedFilesToIgnoreTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFilesToIgnore, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[UpgradedFilesToIgnoreTupleFields index] => this.Fields[(int)index];
+
+        public string Upgraded
+        {
+            get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.Upgraded]?.Value;
+            set => this.Set((int)UpgradedFilesToIgnoreTupleFields.Upgraded, value);
+        }
+
+        public string FTK
+        {
+            get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.FTK]?.Value;
+            set => this.Set((int)UpgradedFilesToIgnoreTupleFields.FTK, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs b/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs
new file mode 100644
index 00000000..09b93fed
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition UpgradedFiles_OptionalData = new IntermediateTupleDefinition(
+            TupleDefinitionType.UpgradedFiles_OptionalData,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.Upgraded), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile), IntermediateFieldType.Number),
+            },
+            typeof(UpgradedFiles_OptionalDataTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum UpgradedFiles_OptionalDataTupleFields
+    {
+        Upgraded,
+        FTK,
+        SymbolPaths,
+        AllowIgnoreOnPatchError,
+        IncludeWholeFile,
+    }
+
+    public class UpgradedFiles_OptionalDataTuple : IntermediateTuple
+    {
+        public UpgradedFiles_OptionalDataTuple() : base(TupleDefinitions.UpgradedFiles_OptionalData, null, null)
+        {
+        }
+
+        public UpgradedFiles_OptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFiles_OptionalData, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[UpgradedFiles_OptionalDataTupleFields index] => this.Fields[(int)index];
+
+        public string Upgraded
+        {
+            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.Upgraded]?.Value;
+            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.Upgraded, value);
+        }
+
+        public string FTK
+        {
+            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.FTK]?.Value;
+            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.FTK, value);
+        }
+
+        public string SymbolPaths
+        {
+            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths]?.Value;
+            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths, value);
+        }
+
+        public int AllowIgnoreOnPatchError
+        {
+            get => (int)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError]?.Value;
+            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError, value);
+        }
+
+        public int IncludeWholeFile
+        {
+            get => (int)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile]?.Value;
+            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs b/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs
new file mode 100644
index 00000000..32170467
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition UpgradedImages = new IntermediateTupleDefinition(
+            TupleDefinitionType.UpgradedImages,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.Upgraded), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.MsiPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.PatchMsiPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.Family), IntermediateFieldType.String),
+            },
+            typeof(UpgradedImagesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum UpgradedImagesTupleFields
+    {
+        Upgraded,
+        MsiPath,
+        PatchMsiPath,
+        SymbolPaths,
+        Family,
+    }
+
+    public class UpgradedImagesTuple : IntermediateTuple
+    {
+        public UpgradedImagesTuple() : base(TupleDefinitions.UpgradedImages, null, null)
+        {
+        }
+
+        public UpgradedImagesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedImages, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[UpgradedImagesTupleFields index] => this.Fields[(int)index];
+
+        public string Upgraded
+        {
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.Upgraded]?.Value;
+            set => this.Set((int)UpgradedImagesTupleFields.Upgraded, value);
+        }
+
+        public string MsiPath
+        {
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.MsiPath]?.Value;
+            set => this.Set((int)UpgradedImagesTupleFields.MsiPath, value);
+        }
+
+        public string PatchMsiPath
+        {
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.PatchMsiPath]?.Value;
+            set => this.Set((int)UpgradedImagesTupleFields.PatchMsiPath, value);
+        }
+
+        public string SymbolPaths
+        {
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.SymbolPaths]?.Value;
+            set => this.Set((int)UpgradedImagesTupleFields.SymbolPaths, value);
+        }
+
+        public string Family
+        {
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.Family]?.Value;
+            set => this.Set((int)UpgradedImagesTupleFields.Family, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/VerbTuple.cs b/src/WixToolset.Data/Tuples/VerbTuple.cs
new file mode 100644
index 00000000..4d5c7c03
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/VerbTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition Verb = new IntermediateTupleDefinition(
+            TupleDefinitionType.Verb,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(VerbTupleFields.Extension_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(VerbTupleFields.Verb), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(VerbTupleFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(VerbTupleFields.Command), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(VerbTupleFields.Argument), IntermediateFieldType.String),
+            },
+            typeof(VerbTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum VerbTupleFields
+    {
+        Extension_,
+        Verb,
+        Sequence,
+        Command,
+        Argument,
+    }
+
+    public class VerbTuple : IntermediateTuple
+    {
+        public VerbTuple() : base(TupleDefinitions.Verb, null, null)
+        {
+        }
+
+        public VerbTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Verb, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[VerbTupleFields index] => this.Fields[(int)index];
+
+        public string Extension_
+        {
+            get => (string)this.Fields[(int)VerbTupleFields.Extension_]?.Value;
+            set => this.Set((int)VerbTupleFields.Extension_, value);
+        }
+
+        public string Verb
+        {
+            get => (string)this.Fields[(int)VerbTupleFields.Verb]?.Value;
+            set => this.Set((int)VerbTupleFields.Verb, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)VerbTupleFields.Sequence]?.Value;
+            set => this.Set((int)VerbTupleFields.Sequence, value);
+        }
+
+        public string Command
+        {
+            get => (string)this.Fields[(int)VerbTupleFields.Command]?.Value;
+            set => this.Set((int)VerbTupleFields.Command, value);
+        }
+
+        public string Argument
+        {
+            get => (string)this.Fields[(int)VerbTupleFields.Argument]?.Value;
+            set => this.Set((int)VerbTupleFields.Argument, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixActionTuple.cs b/src/WixToolset.Data/Tuples/WixActionTuple.cs
new file mode 100644
index 00000000..53ea52de
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixActionTuple.cs
@@ -0,0 +1,103 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixAction = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixAction,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixActionTupleFields.SequenceTable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Before), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixActionTupleFields.After), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Overridable), IntermediateFieldType.Bool),
+            },
+            typeof(WixActionTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixActionTupleFields
+    {
+        SequenceTable,
+        Action,
+        Condition,
+        Sequence,
+        Before,
+        After,
+        Overridable,
+    }
+
+    public enum SequenceTable
+    {
+        AdminUISequence,
+        AdminExecuteSequence,
+        AdvtExecuteSequence,
+        InstallUISequence,
+        InstallExecuteSequence
+    }
+
+    public class WixActionTuple : IntermediateTuple
+    {
+        public WixActionTuple() : base(TupleDefinitions.WixAction, null, null)
+        {
+        }
+
+        public WixActionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixAction, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixActionTupleFields index] => this.Fields[(int)index];
+
+        public SequenceTable SequenceTable
+        {
+            get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixActionTupleFields.SequenceTable]?.Value);
+            set => this.Set((int)WixActionTupleFields.SequenceTable, value.ToString());
+        }
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)WixActionTupleFields.Action]?.Value;
+            set => this.Set((int)WixActionTupleFields.Action, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)WixActionTupleFields.Condition]?.Value;
+            set => this.Set((int)WixActionTupleFields.Condition, value);
+        }
+
+        public int Sequence
+        {
+            get => (int)this.Fields[(int)WixActionTupleFields.Sequence]?.Value;
+            set => this.Set((int)WixActionTupleFields.Sequence, value);
+        }
+
+        public string Before
+        {
+            get => (string)this.Fields[(int)WixActionTupleFields.Before]?.Value;
+            set => this.Set((int)WixActionTupleFields.Before, value);
+        }
+
+        public string After
+        {
+            get => (string)this.Fields[(int)WixActionTupleFields.After]?.Value;
+            set => this.Set((int)WixActionTupleFields.After, value);
+        }
+
+        public bool Overridable
+        {
+            get => (bool)this.Fields[(int)WixActionTupleFields.Overridable]?.Value;
+            set => this.Set((int)WixActionTupleFields.Overridable, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs b/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs
new file mode 100644
index 00000000..e733e6ab
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixApprovedExeForElevation = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixApprovedExeForElevation,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Id), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixApprovedExeForElevationTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixApprovedExeForElevationTupleFields
+    {
+        Id,
+        Key,
+        Value,
+        Attributes,
+    }
+
+    public class WixApprovedExeForElevationTuple : IntermediateTuple
+    {
+        public WixApprovedExeForElevationTuple() : base(TupleDefinitions.WixApprovedExeForElevation, null, null)
+        {
+        }
+
+        public WixApprovedExeForElevationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixApprovedExeForElevation, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixApprovedExeForElevationTupleFields index] => this.Fields[(int)index];
+
+        public string Id
+        {
+            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Id]?.Value;
+            set => this.Set((int)WixApprovedExeForElevationTupleFields.Id, value);
+        }
+
+        public string Key
+        {
+            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Key]?.Value;
+            set => this.Set((int)WixApprovedExeForElevationTupleFields.Key, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Value]?.Value;
+            set => this.Set((int)WixApprovedExeForElevationTupleFields.Value, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixApprovedExeForElevationTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixApprovedExeForElevationTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBBControlTuple.cs b/src/WixToolset.Data/Tuples/WixBBControlTuple.cs
new file mode 100644
index 00000000..4d912c38
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBBControlTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBBControl = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBBControl,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBBControlTupleFields.Billboard_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBBControlTupleFields.BBControl_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBBControlTupleFields.SourceFile), IntermediateFieldType.Path),
+            },
+            typeof(WixBBControlTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBBControlTupleFields
+    {
+        Billboard_,
+        BBControl_,
+        SourceFile,
+    }
+
+    public class WixBBControlTuple : IntermediateTuple
+    {
+        public WixBBControlTuple() : base(TupleDefinitions.WixBBControl, null, null)
+        {
+        }
+
+        public WixBBControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBBControl, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBBControlTupleFields index] => this.Fields[(int)index];
+
+        public string Billboard_
+        {
+            get => (string)this.Fields[(int)WixBBControlTupleFields.Billboard_]?.Value;
+            set => this.Set((int)WixBBControlTupleFields.Billboard_, value);
+        }
+
+        public string BBControl_
+        {
+            get => (string)this.Fields[(int)WixBBControlTupleFields.BBControl_]?.Value;
+            set => this.Set((int)WixBBControlTupleFields.BBControl_, value);
+        }
+
+        public string SourceFile
+        {
+            get => (string)this.Fields[(int)WixBBControlTupleFields.SourceFile]?.Value;
+            set => this.Set((int)WixBBControlTupleFields.SourceFile, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs b/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
new file mode 100644
index 00000000..16a2a972
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBindUpdatedFiles = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBindUpdatedFiles,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBindUpdatedFilesTupleFields.File_), IntermediateFieldType.String),
+            },
+            typeof(WixBindUpdatedFilesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBindUpdatedFilesTupleFields
+    {
+        File_,
+    }
+
+    public class WixBindUpdatedFilesTuple : IntermediateTuple
+    {
+        public WixBindUpdatedFilesTuple() : base(TupleDefinitions.WixBindUpdatedFiles, null, null)
+        {
+        }
+
+        public WixBindUpdatedFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBindUpdatedFiles, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBindUpdatedFilesTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)WixBindUpdatedFilesTupleFields.File_]?.Value;
+            set => this.Set((int)WixBindUpdatedFilesTupleFields.File_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs b/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
new file mode 100644
index 00000000..00bf9dae
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBootstrapperApplication = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBootstrapperApplication,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBootstrapperApplicationTupleFields.Id), IntermediateFieldType.String),
+            },
+            typeof(WixBootstrapperApplicationTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBootstrapperApplicationTupleFields
+    {
+        Id,
+    }
+
+    public class WixBootstrapperApplicationTuple : IntermediateTuple
+    {
+        public WixBootstrapperApplicationTuple() : base(TupleDefinitions.WixBootstrapperApplication, null, null)
+        {
+        }
+
+        public WixBootstrapperApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBootstrapperApplication, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBootstrapperApplicationTupleFields index] => this.Fields[(int)index];
+
+        public string Id
+        {
+            get => (string)this.Fields[(int)WixBootstrapperApplicationTupleFields.Id]?.Value;
+            set => this.Set((int)WixBootstrapperApplicationTupleFields.Id, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs b/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs
new file mode 100644
index 00000000..d71cbbaf
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBuildInfo = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBuildInfo,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixOutputFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixProjectFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixPdbFile), IntermediateFieldType.String),
+            },
+            typeof(WixBuildInfoTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBuildInfoTupleFields
+    {
+        WixVersion,
+        WixOutputFile,
+        WixProjectFile,
+        WixPdbFile,
+    }
+
+    public class WixBuildInfoTuple : IntermediateTuple
+    {
+        public WixBuildInfoTuple() : base(TupleDefinitions.WixBuildInfo, null, null)
+        {
+        }
+
+        public WixBuildInfoTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBuildInfo, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBuildInfoTupleFields index] => this.Fields[(int)index];
+
+        public string WixVersion
+        {
+            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixVersion]?.Value;
+            set => this.Set((int)WixBuildInfoTupleFields.WixVersion, value);
+        }
+
+        public string WixOutputFile
+        {
+            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixOutputFile]?.Value;
+            set => this.Set((int)WixBuildInfoTupleFields.WixOutputFile, value);
+        }
+
+        public string WixProjectFile
+        {
+            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixProjectFile]?.Value;
+            set => this.Set((int)WixBuildInfoTupleFields.WixProjectFile, value);
+        }
+
+        public string WixPdbFile
+        {
+            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixPdbFile]?.Value;
+            set => this.Set((int)WixBuildInfoTupleFields.WixPdbFile, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs b/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
new file mode 100644
index 00000000..4a4cd372
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleCatalog = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleCatalog,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.WixBundleCatalog), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.Payload_), IntermediateFieldType.String),
+            },
+            typeof(WixBundleCatalogTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleCatalogTupleFields
+    {
+        WixBundleCatalog,
+        Payload_,
+    }
+
+    public class WixBundleCatalogTuple : IntermediateTuple
+    {
+        public WixBundleCatalogTuple() : base(TupleDefinitions.WixBundleCatalog, null, null)
+        {
+        }
+
+        public WixBundleCatalogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleCatalog, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleCatalogTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundleCatalog
+        {
+            get => (string)this.Fields[(int)WixBundleCatalogTupleFields.WixBundleCatalog]?.Value;
+            set => this.Set((int)WixBundleCatalogTupleFields.WixBundleCatalog, value);
+        }
+
+        public string Payload_
+        {
+            get => (string)this.Fields[(int)WixBundleCatalogTupleFields.Payload_]?.Value;
+            set => this.Set((int)WixBundleCatalogTupleFields.Payload_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs b/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
new file mode 100644
index 00000000..d06e029f
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
@@ -0,0 +1,111 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleContainer = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleContainer,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.WixBundleContainer), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Type), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.DownloadUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Size), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Hash), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.AttachedContainerIndex), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.WorkingPath), IntermediateFieldType.String),
+            },
+            typeof(WixBundleContainerTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixBundleContainerTupleFields
+    {
+        WixBundleContainer,
+        Name,
+        Type,
+        DownloadUrl,
+        Size,
+        Hash,
+        AttachedContainerIndex,
+        WorkingPath,
+    }
+
+    /// <summary>
+    /// Types of bundle packages.
+    /// </summary>
+    public enum ContainerType
+    {
+        Attached,
+        Detached,
+    }
+
+    public class WixBundleContainerTuple : IntermediateTuple
+    {
+        public WixBundleContainerTuple() : base(TupleDefinitions.WixBundleContainer, null, null)
+        {
+        }
+
+        public WixBundleContainerTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleContainer, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleContainerTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundleContainer
+        {
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.WixBundleContainer]?.Value;
+            set => this.Set((int)WixBundleContainerTupleFields.WixBundleContainer, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.Name]?.Value;
+            set => this.Set((int)WixBundleContainerTupleFields.Name, value);
+        }
+
+        public ContainerType Type
+        {
+            get => (ContainerType)Enum.Parse(typeof(ContainerType), (string)this.Fields[(int)WixBundleContainerTupleFields.Type]?.Value, true);
+            set => this.Set((int)WixBundleContainerTupleFields.Type, value.ToString());
+        }
+
+        public string DownloadUrl
+        {
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.DownloadUrl]?.Value;
+            set => this.Set((int)WixBundleContainerTupleFields.DownloadUrl, value);
+        }
+
+        public int Size
+        {
+            get => (int)this.Fields[(int)WixBundleContainerTupleFields.Size]?.Value;
+            set => this.Set((int)WixBundleContainerTupleFields.Size, value);
+        }
+
+        public string Hash
+        {
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.Hash]?.Value;
+            set => this.Set((int)WixBundleContainerTupleFields.Hash, value);
+        }
+
+        public int AttachedContainerIndex
+        {
+            get => (int)this.Fields[(int)WixBundleContainerTupleFields.AttachedContainerIndex]?.Value;
+            set => this.Set((int)WixBundleContainerTupleFields.AttachedContainerIndex, value);
+        }
+
+        public string WorkingPath
+        {
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.WorkingPath]?.Value;
+            set => this.Set((int)WixBundleContainerTupleFields.WorkingPath, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
new file mode 100644
index 00000000..7ba036f3
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleExePackage = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleExePackage,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.DetectCondition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.InstallCommand), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.RepairCommand), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.UninstallCommand), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.ExeProtocol), IntermediateFieldType.String),
+            },
+            typeof(WixBundleExePackageTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixBundleExePackageTupleFields
+    {
+        WixBundlePackage_,
+        Attributes,
+        DetectCondition,
+        InstallCommand,
+        RepairCommand,
+        UninstallCommand,
+        ExeProtocol,
+    }
+
+    [Flags]
+    public enum WixBundleExePackageAttributes
+    {
+        Repairable = 0x1,
+    }
+
+    public class WixBundleExePackageTuple : IntermediateTuple
+    {
+        public WixBundleExePackageTuple() : base(TupleDefinitions.WixBundleExePackage, null, null)
+        {
+        }
+
+        public WixBundleExePackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleExePackage, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleExePackageTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackage_
+        {
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.WixBundlePackage_]?.Value;
+            set => this.Set((int)WixBundleExePackageTupleFields.WixBundlePackage_, value);
+        }
+
+        public WixBundleExePackageAttributes Attributes
+        {
+            get => (WixBundleExePackageAttributes)(int)this.Fields[(int)WixBundleExePackageTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixBundleExePackageTupleFields.Attributes, (int)value);
+        }
+
+        public string DetectCondition
+        {
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.DetectCondition]?.Value;
+            set => this.Set((int)WixBundleExePackageTupleFields.DetectCondition, value);
+        }
+
+        public string InstallCommand
+        {
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.InstallCommand]?.Value;
+            set => this.Set((int)WixBundleExePackageTupleFields.InstallCommand, value);
+        }
+
+        public string RepairCommand
+        {
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.RepairCommand]?.Value;
+            set => this.Set((int)WixBundleExePackageTupleFields.RepairCommand, value);
+        }
+
+        public string UninstallCommand
+        {
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.UninstallCommand]?.Value;
+            set => this.Set((int)WixBundleExePackageTupleFields.UninstallCommand, value);
+        }
+
+        public string ExeProtocol
+        {
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.ExeProtocol]?.Value;
+            set => this.Set((int)WixBundleExePackageTupleFields.ExeProtocol, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
new file mode 100644
index 00000000..2729205d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
@@ -0,0 +1,116 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleMsiFeature = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleMsiFeature,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Size), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Title), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Display), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Level), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Directory), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixBundleMsiFeatureTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleMsiFeatureTupleFields
+    {
+        WixBundlePackage_,
+        Name,
+        Size,
+        Parent,
+        Title,
+        Description,
+        Display,
+        Level,
+        Directory,
+        Attributes,
+    }
+
+    public class WixBundleMsiFeatureTuple : IntermediateTuple
+    {
+        public WixBundleMsiFeatureTuple() : base(TupleDefinitions.WixBundleMsiFeature, null, null)
+        {
+        }
+
+        public WixBundleMsiFeatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsiFeature, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleMsiFeatureTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackage_
+        {
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.WixBundlePackage_]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.WixBundlePackage_, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Name]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.Name, value);
+        }
+
+        public int Size
+        {
+            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Size]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.Size, value);
+        }
+
+        public string Parent
+        {
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Parent]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.Parent, value);
+        }
+
+        public string Title
+        {
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Title]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.Title, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Description]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.Description, value);
+        }
+
+        public int Display
+        {
+            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Display]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.Display, value);
+        }
+
+        public int Level
+        {
+            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Level]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.Level, value);
+        }
+
+        public string Directory
+        {
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Directory]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.Directory, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
new file mode 100644
index 00000000..ce3afc15
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
@@ -0,0 +1,111 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleMsiPackage = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleMsiPackage,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.UpgradeCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.Manufacturer), IntermediateFieldType.String),
+            },
+            typeof(WixBundleMsiPackageTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixBundleMsiPackageTupleFields
+    {
+        WixBundlePackage_,
+        Attributes,
+        ProductCode,
+        UpgradeCode,
+        ProductVersion,
+        ProductLanguage,
+        ProductName,
+        Manufacturer,
+    }
+
+    [Flags]
+    public enum WixBundleMsiPackageAttributes
+    {
+        DisplayInternalUI = 0x1,
+        EnableFeatureSelection = 0x4,
+        ForcePerMachine = 0x2,
+        SuppressLooseFilePayloadGeneration = 0x8,
+    }
+
+    public class WixBundleMsiPackageTuple : IntermediateTuple
+    {
+        public WixBundleMsiPackageTuple() : base(TupleDefinitions.WixBundleMsiPackage, null, null)
+        {
+        }
+
+        public WixBundleMsiPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsiPackage, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleMsiPackageTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackage_
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.WixBundlePackage_]?.Value;
+            set => this.Set((int)WixBundleMsiPackageTupleFields.WixBundlePackage_, value);
+        }
+
+        public WixBundleMsiPackageAttributes Attributes
+        {
+            get => (WixBundleMsiPackageAttributes)(int)this.Fields[(int)WixBundleMsiPackageTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixBundleMsiPackageTupleFields.Attributes, (int)value);
+        }
+
+        public string ProductCode
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductCode]?.Value;
+            set => this.Set((int)WixBundleMsiPackageTupleFields.ProductCode, value);
+        }
+
+        public string UpgradeCode
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.UpgradeCode]?.Value;
+            set => this.Set((int)WixBundleMsiPackageTupleFields.UpgradeCode, value);
+        }
+
+        public string ProductVersion
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductVersion]?.Value;
+            set => this.Set((int)WixBundleMsiPackageTupleFields.ProductVersion, value);
+        }
+
+        public int ProductLanguage
+        {
+            get => (int)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductLanguage]?.Value;
+            set => this.Set((int)WixBundleMsiPackageTupleFields.ProductLanguage, value);
+        }
+
+        public string ProductName
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductName]?.Value;
+            set => this.Set((int)WixBundleMsiPackageTupleFields.ProductName, value);
+        }
+
+        public string Manufacturer
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.Manufacturer]?.Value;
+            set => this.Set((int)WixBundleMsiPackageTupleFields.Manufacturer, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
new file mode 100644
index 00000000..5eea57ea
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleMsiProperty = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleMsiProperty,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(WixBundleMsiPropertyTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleMsiPropertyTupleFields
+    {
+        WixBundlePackage_,
+        Name,
+        Value,
+        Condition,
+    }
+
+    public class WixBundleMsiPropertyTuple : IntermediateTuple
+    {
+        public WixBundleMsiPropertyTuple() : base(TupleDefinitions.WixBundleMsiProperty, null, null)
+        {
+        }
+
+        public WixBundleMsiPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsiProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleMsiPropertyTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackage_
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.WixBundlePackage_]?.Value;
+            set => this.Set((int)WixBundleMsiPropertyTupleFields.WixBundlePackage_, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Name]?.Value;
+            set => this.Set((int)WixBundleMsiPropertyTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Value]?.Value;
+            set => this.Set((int)WixBundleMsiPropertyTupleFields.Value, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Condition]?.Value;
+            set => this.Set((int)WixBundleMsiPropertyTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
new file mode 100644
index 00000000..219c7735
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleMspPackage = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleMspPackage,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.PatchCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Manufacturer), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.PatchXml), IntermediateFieldType.String),
+            },
+            typeof(WixBundleMspPackageTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixBundleMspPackageTupleFields
+    {
+        WixBundlePackage_,
+        Attributes,
+        PatchCode,
+        Manufacturer,
+        PatchXml,
+    }
+
+    [Flags]
+    public enum WixBundleMspPackageAttributes
+    {
+        DisplayInternalUI = 0x1,
+        Slipstream = 0x2,
+        TargetUnspecified = 0x4,
+    }
+
+    public class WixBundleMspPackageTuple : IntermediateTuple
+    {
+        public WixBundleMspPackageTuple() : base(TupleDefinitions.WixBundleMspPackage, null, null)
+        {
+        }
+
+        public WixBundleMspPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMspPackage, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleMspPackageTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackage_
+        {
+            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.WixBundlePackage_]?.Value;
+            set => this.Set((int)WixBundleMspPackageTupleFields.WixBundlePackage_, value);
+        }
+
+        public WixBundleMspPackageAttributes Attributes
+        {
+            get => (WixBundleMspPackageAttributes)(int)this.Fields[(int)WixBundleMspPackageTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixBundleMspPackageTupleFields.Attributes, (int)value);
+        }
+
+        public string PatchCode
+        {
+            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchCode]?.Value;
+            set => this.Set((int)WixBundleMspPackageTupleFields.PatchCode, value);
+        }
+
+        public string Manufacturer
+        {
+            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.Manufacturer]?.Value;
+            set => this.Set((int)WixBundleMspPackageTupleFields.Manufacturer, value);
+        }
+
+        public string PatchXml
+        {
+            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchXml]?.Value;
+            set => this.Set((int)WixBundleMspPackageTupleFields.PatchXml, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
new file mode 100644
index 00000000..f6f71d6d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleMsuPackage = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleMsuPackage,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.DetectCondition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.MsuKB), IntermediateFieldType.String),
+            },
+            typeof(WixBundleMsuPackageTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleMsuPackageTupleFields
+    {
+        WixBundlePackage_,
+        DetectCondition,
+        MsuKB,
+    }
+
+    public class WixBundleMsuPackageTuple : IntermediateTuple
+    {
+        public WixBundleMsuPackageTuple() : base(TupleDefinitions.WixBundleMsuPackage, null, null)
+        {
+        }
+
+        public WixBundleMsuPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsuPackage, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleMsuPackageTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackage_
+        {
+            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.WixBundlePackage_]?.Value;
+            set => this.Set((int)WixBundleMsuPackageTupleFields.WixBundlePackage_, value);
+        }
+
+        public string DetectCondition
+        {
+            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.DetectCondition]?.Value;
+            set => this.Set((int)WixBundleMsuPackageTupleFields.DetectCondition, value);
+        }
+
+        public string MsuKB
+        {
+            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.MsuKB]?.Value;
+            set => this.Set((int)WixBundleMsuPackageTupleFields.MsuKB, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
new file mode 100644
index 00000000..0ca895c0
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundlePackageCommandLine = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundlePackageCommandLine,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.InstallArgument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.UninstallArgument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.RepairArgument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(WixBundlePackageCommandLineTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundlePackageCommandLineTupleFields
+    {
+        WixBundlePackage_,
+        InstallArgument,
+        UninstallArgument,
+        RepairArgument,
+        Condition,
+    }
+
+    public class WixBundlePackageCommandLineTuple : IntermediateTuple
+    {
+        public WixBundlePackageCommandLineTuple() : base(TupleDefinitions.WixBundlePackageCommandLine, null, null)
+        {
+        }
+
+        public WixBundlePackageCommandLineTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackageCommandLine, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundlePackageCommandLineTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackage_
+        {
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.WixBundlePackage_]?.Value;
+            set => this.Set((int)WixBundlePackageCommandLineTupleFields.WixBundlePackage_, value);
+        }
+
+        public string InstallArgument
+        {
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.InstallArgument]?.Value;
+            set => this.Set((int)WixBundlePackageCommandLineTupleFields.InstallArgument, value);
+        }
+
+        public string UninstallArgument
+        {
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.UninstallArgument]?.Value;
+            set => this.Set((int)WixBundlePackageCommandLineTupleFields.UninstallArgument, value);
+        }
+
+        public string RepairArgument
+        {
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.RepairArgument]?.Value;
+            set => this.Set((int)WixBundlePackageCommandLineTupleFields.RepairArgument, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.Condition]?.Value;
+            set => this.Set((int)WixBundlePackageCommandLineTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs
new file mode 100644
index 00000000..64c91316
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundlePackageExitCode = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundlePackageExitCode,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeTupleFields.ChainPackageId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeTupleFields.Code), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeTupleFields.Behavior), IntermediateFieldType.String),
+            },
+            typeof(WixBundlePackageExitCodeTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixBundlePackageExitCodeTupleFields
+    {
+        ChainPackageId,
+        Code,
+        Behavior,
+    }
+
+    public enum ExitCodeBehaviorType
+    {
+        NotSet = -1,
+        Success,
+        Error,
+        ScheduleReboot,
+        ForceReboot,
+    }
+
+    public class WixBundlePackageExitCodeTuple : IntermediateTuple
+    {
+        public WixBundlePackageExitCodeTuple() : base(TupleDefinitions.WixBundlePackageExitCode, null, null)
+        {
+        }
+
+        public WixBundlePackageExitCodeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackageExitCode, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundlePackageExitCodeTupleFields index] => this.Fields[(int)index];
+
+        public string ChainPackageId
+        {
+            get => (string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.ChainPackageId]?.Value;
+            set => this.Set((int)WixBundlePackageExitCodeTupleFields.ChainPackageId, value);
+        }
+
+        public int Code
+        {
+            get => (int)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Code]?.Value;
+            set => this.Set((int)WixBundlePackageExitCodeTupleFields.Code, value);
+        }
+
+        public ExitCodeBehaviorType Behavior
+        {
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Behavior]?.Value, true, out ExitCodeBehaviorType value) ? value : ExitCodeBehaviorType.NotSet;
+            set => this.Set((int)WixBundlePackageExitCodeTupleFields.Behavior, value.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs
new file mode 100644
index 00000000..56711155
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundlePackageGroup = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundlePackageGroup,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundlePackageGroupTupleFields.WixBundlePackageGroup), IntermediateFieldType.String),
+            },
+            typeof(WixBundlePackageGroupTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundlePackageGroupTupleFields
+    {
+        WixBundlePackageGroup,
+    }
+
+    public class WixBundlePackageGroupTuple : IntermediateTuple
+    {
+        public WixBundlePackageGroupTuple() : base(TupleDefinitions.WixBundlePackageGroup, null, null)
+        {
+        }
+
+        public WixBundlePackageGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackageGroup, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundlePackageGroupTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackageGroup
+        {
+            get => (string)this.Fields[(int)WixBundlePackageGroupTupleFields.WixBundlePackageGroup]?.Value;
+            set => this.Set((int)WixBundlePackageGroupTupleFields.WixBundlePackageGroup, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
new file mode 100644
index 00000000..e0eedce1
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
@@ -0,0 +1,216 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundlePackage = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundlePackage,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.WixChainItem_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Payload_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.InstallCondition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Cache), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.CacheId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Vital), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.PerMachine), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.LogPathVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackLogPathVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Size), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.InstallSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Language), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundary_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryBackward_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.x64), IntermediateFieldType.Number),
+            },
+            typeof(WixBundlePackageTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixBundlePackageTupleFields
+    {
+        WixChainItem_,
+        Type,
+        Payload_,
+        Attributes,
+        InstallCondition,
+        Cache,
+        CacheId,
+        Vital,
+        PerMachine,
+        LogPathVariable,
+        RollbackLogPathVariable,
+        Size,
+        InstallSize,
+        Version,
+        Language,
+        DisplayName,
+        Description,
+        RollbackBoundary_,
+        RollbackBoundaryBackward_,
+        x64,
+    }
+
+    /// <summary>
+    /// Types of bundle packages.
+    /// </summary>
+    public enum WixBundlePackageType
+    {
+        Exe,
+        Msi,
+        Msp,
+        Msu,
+    }
+
+    [Flags]
+    public enum WixBundlePackageAttributes
+    {
+        Permanent = 0x1,
+        Visible = 0x2,
+    }
+
+    public class WixBundlePackageTuple : IntermediateTuple
+    {
+        public WixBundlePackageTuple() : base(TupleDefinitions.WixBundlePackage, null, null)
+        {
+        }
+
+        public WixBundlePackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackage, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundlePackageTupleFields index] => this.Fields[(int)index];
+
+        public string WixChainItem_
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.WixChainItem_]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.WixChainItem_, value);
+        }
+
+        public WixBundlePackageType Type
+        {
+            get => (WixBundlePackageType)Enum.Parse(typeof(WixBundlePackageType), (string)this.Fields[(int)WixBundlePackageTupleFields.Type]?.Value, true);
+            set => this.Set((int)WixBundlePackageTupleFields.Type, value.ToString());
+        }
+
+        public string Payload_
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Payload_]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.Payload_, value);
+        }
+
+        public WixBundlePackageAttributes Attributes
+        {
+            get => (WixBundlePackageAttributes)(int)this.Fields[(int)WixBundlePackageTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.Attributes, (int)value);
+        }
+
+        public string InstallCondition
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.InstallCondition]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.InstallCondition, value);
+        }
+
+        public YesNoAlwaysType Cache
+        {
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.Cache]?.Value, true, out YesNoAlwaysType value) ? value : YesNoAlwaysType.NotSet;
+            set => this.Set((int)WixBundlePackageTupleFields.Cache, value);
+        }
+
+        public string CacheId
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.CacheId]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.CacheId, value);
+        }
+
+        public bool? Vital
+        {
+            get => (bool?)this.Fields[(int)WixBundlePackageTupleFields.Vital]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.Vital, value);
+        }
+
+        public YesNoDefaultType PerMachine
+        {
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.PerMachine]?.Value, true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
+            set => this.Set((int)WixBundlePackageTupleFields.PerMachine, value);
+        }
+
+        public string LogPathVariable
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.LogPathVariable]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.LogPathVariable, value);
+        }
+
+        public string RollbackLogPathVariable
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackLogPathVariable]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.RollbackLogPathVariable, value);
+        }
+
+        public int Size
+        {
+            get => (int)this.Fields[(int)WixBundlePackageTupleFields.Size]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.Size, value);
+        }
+
+        public int InstallSize
+        {
+            get => (int)this.Fields[(int)WixBundlePackageTupleFields.InstallSize]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.InstallSize, value);
+        }
+
+        public string Version
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Version]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.Version, value);
+        }
+
+        public int Language
+        {
+            get => (int)this.Fields[(int)WixBundlePackageTupleFields.Language]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.Language, value);
+        }
+
+        public string DisplayName
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.DisplayName]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.DisplayName, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Description]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.Description, value);
+        }
+
+        public string RollbackBoundary_
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundary_]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundary_, value);
+        }
+
+        public string RollbackBoundaryBackward_
+        {
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryBackward_]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryBackward_, value);
+        }
+
+        public int x64
+        {
+            get => (int)this.Fields[(int)WixBundlePackageTupleFields.x64]?.Value;
+            set => this.Set((int)WixBundlePackageTupleFields.x64, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs
new file mode 100644
index 00000000..d34c0d2a
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundlePatchTargetCode = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundlePatchTargetCode,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeTupleFields.PackageId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeTupleFields.TargetCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixBundlePatchTargetCodeTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundlePatchTargetCodeTupleFields
+    {
+        PackageId,
+        TargetCode,
+        Attributes,
+    }
+
+    public class WixBundlePatchTargetCodeTuple : IntermediateTuple
+    {
+        public WixBundlePatchTargetCodeTuple() : base(TupleDefinitions.WixBundlePatchTargetCode, null, null)
+        {
+        }
+
+        public WixBundlePatchTargetCodeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePatchTargetCode, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundlePatchTargetCodeTupleFields index] => this.Fields[(int)index];
+
+        public string PackageId
+        {
+            get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.PackageId]?.Value;
+            set => this.Set((int)WixBundlePatchTargetCodeTupleFields.PackageId, value);
+        }
+
+        public string TargetCode
+        {
+            get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.TargetCode]?.Value;
+            set => this.Set((int)WixBundlePatchTargetCodeTupleFields.TargetCode, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixBundlePatchTargetCodeTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs
new file mode 100644
index 00000000..c1f0df6a
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundlePayloadGroup = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundlePayloadGroup,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadGroupTupleFields.WixBundlePayloadGroup), IntermediateFieldType.String),
+            },
+            typeof(WixBundlePayloadGroupTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundlePayloadGroupTupleFields
+    {
+        WixBundlePayloadGroup,
+    }
+
+    public class WixBundlePayloadGroupTuple : IntermediateTuple
+    {
+        public WixBundlePayloadGroupTuple() : base(TupleDefinitions.WixBundlePayloadGroup, null, null)
+        {
+        }
+
+        public WixBundlePayloadGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePayloadGroup, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundlePayloadGroupTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePayloadGroup
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadGroupTupleFields.WixBundlePayloadGroup]?.Value;
+            set => this.Set((int)WixBundlePayloadGroupTupleFields.WixBundlePayloadGroup, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
new file mode 100644
index 00000000..d1c02387
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
@@ -0,0 +1,214 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundlePayload = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundlePayload,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.WixBundlePayload), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.SourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.DownloadUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Compressed), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.UnresolvedSourceFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.EnableSignatureValidation), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.FileSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Hash), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.PublicKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Thumbprint), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Catalog_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Container_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Package), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ContentFile), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.EmbeddedId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.LayoutOnly), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Packaging), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ParentPackagePayload_), IntermediateFieldType.String),
+            },
+            typeof(WixBundlePayloadTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixBundlePayloadTupleFields
+    {
+        WixBundlePayload,
+        Name,
+        SourceFile,
+        DownloadUrl,
+        Compressed,
+        UnresolvedSourceFile,
+        DisplayName,
+        Description,
+        EnableSignatureValidation,
+        FileSize,
+        Version,
+        Hash,
+        PublicKey,
+        Thumbprint,
+        Catalog_,
+        Container_,
+        Package,
+        ContentFile,
+        EmbeddedId,
+        LayoutOnly,
+        Packaging,
+        ParentPackagePayload_,
+    }
+
+    public class WixBundlePayloadTuple : IntermediateTuple
+    {
+        public WixBundlePayloadTuple() : base(TupleDefinitions.WixBundlePayload, null, null)
+        {
+        }
+
+        public WixBundlePayloadTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePayload, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundlePayloadTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePayload
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.WixBundlePayload]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.WixBundlePayload, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Name]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.Name, value);
+        }
+
+        public string SourceFile
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.SourceFile]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.SourceFile, value);
+        }
+
+        public string DownloadUrl
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DownloadUrl]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.DownloadUrl, value);
+        }
+
+        public YesNoDefaultType Compressed
+        {
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePayloadTupleFields.Compressed]?.Value, true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
+            set => this.Set((int)WixBundlePayloadTupleFields.Compressed, value);
+        }
+
+        public string UnresolvedSourceFile
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.UnresolvedSourceFile]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.UnresolvedSourceFile, value);
+        }
+
+        public string DisplayName
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DisplayName]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.DisplayName, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Description]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.Description, value);
+        }
+
+        public bool EnableSignatureValidation
+        {
+            get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.EnableSignatureValidation]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.EnableSignatureValidation, value);
+        }
+
+        public int FileSize
+        {
+            get => (int)this.Fields[(int)WixBundlePayloadTupleFields.FileSize]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.FileSize, value);
+        }
+
+        public string Version
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Version]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.Version, value);
+        }
+
+        public string Hash
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Hash]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.Hash, value);
+        }
+
+        public string PublicKey
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.PublicKey]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.PublicKey, value);
+        }
+
+        public string Thumbprint
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Thumbprint]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.Thumbprint, value);
+        }
+
+        public string Catalog_
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Catalog_]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.Catalog_, value);
+        }
+
+        public string Container_
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Container_]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.Container_, value);
+        }
+
+        public string Package
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Package]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.Package, value);
+        }
+
+        public bool ContentFile
+        {
+            get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.ContentFile]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.ContentFile, value);
+        }
+
+        public string EmbeddedId
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.EmbeddedId]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.EmbeddedId, value);
+        }
+
+        public int LayoutOnly
+        {
+            get => (int)this.Fields[(int)WixBundlePayloadTupleFields.LayoutOnly]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.LayoutOnly, value);
+        }
+
+        public int Packaging
+        {
+            get => (int)this.Fields[(int)WixBundlePayloadTupleFields.Packaging]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.Packaging, value);
+        }
+
+        public string ParentPackagePayload_
+        {
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ParentPackagePayload_]?.Value;
+            set => this.Set((int)WixBundlePayloadTupleFields.ParentPackagePayload_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePropertiesTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePropertiesTuple.cs
new file mode 100644
index 00000000..8a42c3c6
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundlePropertiesTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleProperties = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleProperties,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.LogPathVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.Compressed), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.Id), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.UpgradeCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePropertiesTupleFields.PerMachine), IntermediateFieldType.String),
+            },
+            typeof(WixBundlePropertiesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundlePropertiesTupleFields
+    {
+        DisplayName,
+        LogPathVariable,
+        Compressed,
+        Id,
+        UpgradeCode,
+        PerMachine,
+    }
+
+    public class WixBundlePropertiesTuple : IntermediateTuple
+    {
+        public WixBundlePropertiesTuple() : base(TupleDefinitions.WixBundleProperties, null, null)
+        {
+        }
+
+        public WixBundlePropertiesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleProperties, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundlePropertiesTupleFields index] => this.Fields[(int)index];
+
+        public string DisplayName
+        {
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.DisplayName]?.Value;
+            set => this.Set((int)WixBundlePropertiesTupleFields.DisplayName, value);
+        }
+
+        public string LogPathVariable
+        {
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.LogPathVariable]?.Value;
+            set => this.Set((int)WixBundlePropertiesTupleFields.LogPathVariable, value);
+        }
+
+        public string Compressed
+        {
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.Compressed]?.Value;
+            set => this.Set((int)WixBundlePropertiesTupleFields.Compressed, value);
+        }
+
+        public string Id
+        {
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.Id]?.Value;
+            set => this.Set((int)WixBundlePropertiesTupleFields.Id, value);
+        }
+
+        public string UpgradeCode
+        {
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.UpgradeCode]?.Value;
+            set => this.Set((int)WixBundlePropertiesTupleFields.UpgradeCode, value);
+        }
+
+        public string PerMachine
+        {
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.PerMachine]?.Value;
+            set => this.Set((int)WixBundlePropertiesTupleFields.PerMachine, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
new file mode 100644
index 00000000..d3e1069a
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
@@ -0,0 +1,108 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleRelatedPackage = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleRelatedPackage,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.Id), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MinVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MaxVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.Languages), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MinInclusive), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MaxInclusive), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.LangInclusive), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.OnlyDetect), IntermediateFieldType.Number),
+            },
+            typeof(WixBundleRelatedPackageTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleRelatedPackageTupleFields
+    {
+        WixBundlePackage_,
+        Id,
+        MinVersion,
+        MaxVersion,
+        Languages,
+        MinInclusive,
+        MaxInclusive,
+        LangInclusive,
+        OnlyDetect,
+    }
+
+    public class WixBundleRelatedPackageTuple : IntermediateTuple
+    {
+        public WixBundleRelatedPackageTuple() : base(TupleDefinitions.WixBundleRelatedPackage, null, null)
+        {
+        }
+
+        public WixBundleRelatedPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleRelatedPackage, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleRelatedPackageTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackage_
+        {
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.WixBundlePackage_]?.Value;
+            set => this.Set((int)WixBundleRelatedPackageTupleFields.WixBundlePackage_, value);
+        }
+
+        public string Id
+        {
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.Id]?.Value;
+            set => this.Set((int)WixBundleRelatedPackageTupleFields.Id, value);
+        }
+
+        public string MinVersion
+        {
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MinVersion]?.Value;
+            set => this.Set((int)WixBundleRelatedPackageTupleFields.MinVersion, value);
+        }
+
+        public string MaxVersion
+        {
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MaxVersion]?.Value;
+            set => this.Set((int)WixBundleRelatedPackageTupleFields.MaxVersion, value);
+        }
+
+        public string Languages
+        {
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.Languages]?.Value;
+            set => this.Set((int)WixBundleRelatedPackageTupleFields.Languages, value);
+        }
+
+        public int MinInclusive
+        {
+            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.MinInclusive]?.Value;
+            set => this.Set((int)WixBundleRelatedPackageTupleFields.MinInclusive, value);
+        }
+
+        public int MaxInclusive
+        {
+            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.MaxInclusive]?.Value;
+            set => this.Set((int)WixBundleRelatedPackageTupleFields.MaxInclusive, value);
+        }
+
+        public int LangInclusive
+        {
+            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.LangInclusive]?.Value;
+            set => this.Set((int)WixBundleRelatedPackageTupleFields.LangInclusive, value);
+        }
+
+        public int OnlyDetect
+        {
+            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.OnlyDetect]?.Value;
+            set => this.Set((int)WixBundleRelatedPackageTupleFields.OnlyDetect, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs b/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
new file mode 100644
index 00000000..d08f0eb9
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleRollbackBoundary = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleRollbackBoundary,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.WixChainItem_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Vital), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Transaction), IntermediateFieldType.Number),
+            },
+            typeof(WixBundleRollbackBoundaryTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleRollbackBoundaryTupleFields
+    {
+        WixChainItem_,
+        Vital,
+        Transaction,
+    }
+
+    public class WixBundleRollbackBoundaryTuple : IntermediateTuple
+    {
+        public WixBundleRollbackBoundaryTuple() : base(TupleDefinitions.WixBundleRollbackBoundary, null, null)
+        {
+        }
+
+        public WixBundleRollbackBoundaryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleRollbackBoundary, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleRollbackBoundaryTupleFields index] => this.Fields[(int)index];
+
+        public string WixChainItem_
+        {
+            get => (string)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.WixChainItem_]?.Value;
+            set => this.Set((int)WixBundleRollbackBoundaryTupleFields.WixChainItem_, value);
+        }
+
+        public bool? Vital
+        {
+            get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Vital]?.Value;
+            set => this.Set((int)WixBundleRollbackBoundaryTupleFields.Vital, value);
+        }
+
+        public bool? Transaction
+        {
+            get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Transaction]?.Value;
+            set => this.Set((int)WixBundleRollbackBoundaryTupleFields.Transaction, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs b/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
new file mode 100644
index 00000000..c0ab124d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleSlipstreamMsp = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleSlipstreamMsp,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp), IntermediateFieldType.String),
+            },
+            typeof(WixBundleSlipstreamMspTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleSlipstreamMspTupleFields
+    {
+        WixBundlePackage_,
+        WixBundlePackage_Msp,
+    }
+
+    public class WixBundleSlipstreamMspTuple : IntermediateTuple
+    {
+        public WixBundleSlipstreamMspTuple() : base(TupleDefinitions.WixBundleSlipstreamMsp, null, null)
+        {
+        }
+
+        public WixBundleSlipstreamMspTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleSlipstreamMsp, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleSlipstreamMspTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundlePackage_
+        {
+            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_]?.Value;
+            set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_, value);
+        }
+
+        public string WixBundlePackage_Msp
+        {
+            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp]?.Value;
+            set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleTuple.cs b/src/WixToolset.Data/Tuples/WixBundleTuple.cs
new file mode 100644
index 00000000..4647347b
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleTuple.cs
@@ -0,0 +1,220 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundle = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundle,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Copyright), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.AboutUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.DisableModify), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.DisableRemove), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.DisableRepair), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.HelpTelephone), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.HelpUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Manufacturer), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.UpdateUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Compressed), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.LogPrefixAndExtension), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.IconSourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.SplashScreenSourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Tag), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Platform), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.ParentName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.UpgradeCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.ProviderKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.PerMachine), IntermediateFieldType.Number),
+            },
+            typeof(WixBundleTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleTupleFields
+    {
+        Version,
+        Copyright,
+        Name,
+        AboutUrl,
+        DisableModify,
+        DisableRemove,
+        DisableRepair,
+        HelpTelephone,
+        HelpUrl,
+        Manufacturer,
+        UpdateUrl,
+        Compressed,
+        LogPrefixAndExtension,
+        IconSourceFile,
+        SplashScreenSourceFile,
+        Condition,
+        Tag,
+        Platform,
+        ParentName,
+        UpgradeCode,
+        BundleId,
+        ProviderKey,
+        PerMachine,
+    }
+
+    public class WixBundleTuple : IntermediateTuple
+    {
+        public WixBundleTuple() : base(TupleDefinitions.WixBundle, null, null)
+        {
+        }
+
+        public WixBundleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundle, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleTupleFields index] => this.Fields[(int)index];
+
+        public string Version
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.Version]?.Value;
+            set => this.Set((int)WixBundleTupleFields.Version, value);
+        }
+
+        public string Copyright
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.Copyright]?.Value;
+            set => this.Set((int)WixBundleTupleFields.Copyright, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.Name]?.Value;
+            set => this.Set((int)WixBundleTupleFields.Name, value);
+        }
+
+        public string AboutUrl
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.AboutUrl]?.Value;
+            set => this.Set((int)WixBundleTupleFields.AboutUrl, value);
+        }
+
+        public int DisableModify
+        {
+            get => (int)this.Fields[(int)WixBundleTupleFields.DisableModify]?.Value;
+            set => this.Set((int)WixBundleTupleFields.DisableModify, value);
+        }
+
+        public int DisableRemove
+        {
+            get => (int)this.Fields[(int)WixBundleTupleFields.DisableRemove]?.Value;
+            set => this.Set((int)WixBundleTupleFields.DisableRemove, value);
+        }
+
+        public int DisableRepair
+        {
+            get => (int)this.Fields[(int)WixBundleTupleFields.DisableRepair]?.Value;
+            set => this.Set((int)WixBundleTupleFields.DisableRepair, value);
+        }
+
+        public string HelpTelephone
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.HelpTelephone]?.Value;
+            set => this.Set((int)WixBundleTupleFields.HelpTelephone, value);
+        }
+
+        public string HelpUrl
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.HelpUrl]?.Value;
+            set => this.Set((int)WixBundleTupleFields.HelpUrl, value);
+        }
+
+        public string Manufacturer
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.Manufacturer]?.Value;
+            set => this.Set((int)WixBundleTupleFields.Manufacturer, value);
+        }
+
+        public string UpdateUrl
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.UpdateUrl]?.Value;
+            set => this.Set((int)WixBundleTupleFields.UpdateUrl, value);
+        }
+
+        public int Compressed
+        {
+            get => (int)this.Fields[(int)WixBundleTupleFields.Compressed]?.Value;
+            set => this.Set((int)WixBundleTupleFields.Compressed, value);
+        }
+
+        public string LogPrefixAndExtension
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.LogPrefixAndExtension]?.Value;
+            set => this.Set((int)WixBundleTupleFields.LogPrefixAndExtension, value);
+        }
+
+        public string IconSourceFile
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.IconSourceFile]?.Value;
+            set => this.Set((int)WixBundleTupleFields.IconSourceFile, value);
+        }
+
+        public string SplashScreenSourceFile
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.SplashScreenSourceFile]?.Value;
+            set => this.Set((int)WixBundleTupleFields.SplashScreenSourceFile, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.Condition]?.Value;
+            set => this.Set((int)WixBundleTupleFields.Condition, value);
+        }
+
+        public string Tag
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.Tag]?.Value;
+            set => this.Set((int)WixBundleTupleFields.Tag, value);
+        }
+
+        public string Platform
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.Platform]?.Value;
+            set => this.Set((int)WixBundleTupleFields.Platform, value);
+        }
+
+        public string ParentName
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.ParentName]?.Value;
+            set => this.Set((int)WixBundleTupleFields.ParentName, value);
+        }
+
+        public string UpgradeCode
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.UpgradeCode]?.Value;
+            set => this.Set((int)WixBundleTupleFields.UpgradeCode, value);
+        }
+
+        public string BundleId
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.BundleId]?.Value;
+            set => this.Set((int)WixBundleTupleFields.BundleId, value);
+        }
+
+        public string ProviderKey
+        {
+            get => (string)this.Fields[(int)WixBundleTupleFields.ProviderKey]?.Value;
+            set => this.Set((int)WixBundleTupleFields.ProviderKey, value);
+        }
+
+        public int PerMachine
+        {
+            get => (int)this.Fields[(int)WixBundleTupleFields.PerMachine]?.Value;
+            set => this.Set((int)WixBundleTupleFields.PerMachine, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs b/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs
new file mode 100644
index 00000000..2398b1da
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleUpdate = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleUpdate,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleUpdateTupleFields.Location), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleUpdateTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixBundleUpdateTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleUpdateTupleFields
+    {
+        Location,
+        Attributes,
+    }
+
+    public class WixBundleUpdateTuple : IntermediateTuple
+    {
+        public WixBundleUpdateTuple() : base(TupleDefinitions.WixBundleUpdate, null, null)
+        {
+        }
+
+        public WixBundleUpdateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleUpdate,sourceLineNumber,id)
+        {
+        }
+
+        public IntermediateField this[WixBundleUpdateTupleFields index] => this.Fields[(int)index];
+
+        public string Location
+        {
+            get => (string)this.Fields[(int)WixBundleUpdateTupleFields.Location]?.Value;
+            set => this.Set((int)WixBundleUpdateTupleFields.Location, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixBundleUpdateTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixBundleUpdateTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs b/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
new file mode 100644
index 00000000..c5724e6c
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixBundleVariable = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixBundleVariable,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.WixBundleVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Hidden), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Persisted), IntermediateFieldType.Bool),
+            },
+            typeof(WixBundleVariableTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixBundleVariableTupleFields
+    {
+        WixBundleVariable,
+        Value,
+        Type,
+        Hidden,
+        Persisted,
+    }
+
+    public class WixBundleVariableTuple : IntermediateTuple
+    {
+        public WixBundleVariableTuple() : base(TupleDefinitions.WixBundleVariable, null, null)
+        {
+        }
+
+        public WixBundleVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleVariable, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixBundleVariableTupleFields index] => this.Fields[(int)index];
+
+        public string WixBundleVariable
+        {
+            get => (string)this.Fields[(int)WixBundleVariableTupleFields.WixBundleVariable]?.Value;
+            set => this.Set((int)WixBundleVariableTupleFields.WixBundleVariable, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)WixBundleVariableTupleFields.Value]?.Value;
+            set => this.Set((int)WixBundleVariableTupleFields.Value, value);
+        }
+
+        public string Type
+        {
+            get => (string)this.Fields[(int)WixBundleVariableTupleFields.Type]?.Value;
+            set => this.Set((int)WixBundleVariableTupleFields.Type, value);
+        }
+
+        public bool Hidden
+        {
+            get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Hidden]?.Value;
+            set => this.Set((int)WixBundleVariableTupleFields.Hidden, value);
+        }
+
+        public bool Persisted
+        {
+            get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Persisted]?.Value;
+            set => this.Set((int)WixBundleVariableTupleFields.Persisted, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixChainItemTuple.cs b/src/WixToolset.Data/Tuples/WixChainItemTuple.cs
new file mode 100644
index 00000000..c77bd038
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixChainItemTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixChainItem = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixChainItem,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixChainItemTupleFields.Id), IntermediateFieldType.String),
+            },
+            typeof(WixChainItemTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixChainItemTupleFields
+    {
+        Id,
+    }
+
+    public class WixChainItemTuple : IntermediateTuple
+    {
+        public WixChainItemTuple() : base(TupleDefinitions.WixChainItem, null, null)
+        {
+        }
+
+        public WixChainItemTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixChainItem, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixChainItemTupleFields index] => this.Fields[(int)index];
+
+        public string Id
+        {
+            get => (string)this.Fields[(int)WixChainItemTupleFields.Id]?.Value;
+            set => this.Set((int)WixChainItemTupleFields.Id, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixChainTuple.cs b/src/WixToolset.Data/Tuples/WixChainTuple.cs
new file mode 100644
index 00000000..d3ae2f4a
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixChainTuple.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixChain = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixChain,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixChainTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixChainTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixChainTupleFields
+    {
+        Attributes,
+    }
+
+    [Flags]
+    public enum WixChainAttributes
+    {
+        None = 0x0,
+        DisableRollback = 0x1,
+        DisableSystemRestore = 0x2,
+        ParallelCache = 0x4,
+    }
+
+    public class WixChainTuple : IntermediateTuple
+    {
+        public WixChainTuple() : base(TupleDefinitions.WixChain, null, null)
+        {
+        }
+
+        public WixChainTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixChain, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixChainTupleFields index] => this.Fields[(int)index];
+
+        public WixChainAttributes Attributes
+        {
+            get => (WixChainAttributes)(int)this.Fields[(int)WixChainTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixChainTupleFields.Attributes, (int)value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs b/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs
new file mode 100644
index 00000000..46de9aa9
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixComplexReference = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixComplexReference,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.ParentAttributes), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.ParentLanguage), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.Child), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.ChildAttributes), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.Attributes), IntermediateFieldType.Bool),
+            },
+            typeof(WixComplexReferenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixComplexReferenceTupleFields
+    {
+        Parent,
+        ParentAttributes,
+        ParentLanguage,
+        Child,
+        ChildAttributes,
+        Attributes,
+    }
+
+    public class WixComplexReferenceTuple : IntermediateTuple
+    {
+        public WixComplexReferenceTuple() : base(TupleDefinitions.WixComplexReference, null, null)
+        {
+        }
+
+        public WixComplexReferenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixComplexReference, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixComplexReferenceTupleFields index] => this.Fields[(int)index];
+
+        public string Parent
+        {
+            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Parent]?.Value;
+            set => this.Set((int)WixComplexReferenceTupleFields.Parent, value);
+        }
+
+        public ComplexReferenceParentType ParentType
+        {
+            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentAttributes]?.Value, true);
+            set => this.Set((int)WixComplexReferenceTupleFields.ParentAttributes, value.ToString());
+        }
+
+        public string ParentLanguage
+        {
+            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentLanguage]?.Value;
+            set => this.Set((int)WixComplexReferenceTupleFields.ParentLanguage, value);
+        }
+
+        public string Child
+        {
+            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Child]?.Value;
+            set => this.Set((int)WixComplexReferenceTupleFields.Child, value);
+        }
+
+        public ComplexReferenceChildType ChildType
+        {
+            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ChildAttributes]?.Value, true);
+            set => this.Set((int)WixComplexReferenceTupleFields.ChildAttributes, value.ToString());
+        }
+
+        public bool IsPrimary
+        {
+            get => (bool)this.Fields[(int)WixComplexReferenceTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixComplexReferenceTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs b/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs
new file mode 100644
index 00000000..f4118277
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixComponentGroup = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixComponentGroup,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixComponentGroupTupleFields.WixComponentGroup), IntermediateFieldType.String),
+            },
+            typeof(WixComponentGroupTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixComponentGroupTupleFields
+    {
+        WixComponentGroup,
+    }
+
+    public class WixComponentGroupTuple : IntermediateTuple
+    {
+        public WixComponentGroupTuple() : base(TupleDefinitions.WixComponentGroup, null, null)
+        {
+        }
+
+        public WixComponentGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixComponentGroup, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixComponentGroupTupleFields index] => this.Fields[(int)index];
+
+        public string WixComponentGroup
+        {
+            get => (string)this.Fields[(int)WixComponentGroupTupleFields.WixComponentGroup]?.Value;
+            set => this.Set((int)WixComponentGroupTupleFields.WixComponentGroup, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
new file mode 100644
index 00000000..7aad13d2
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixComponentSearch = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixComponentSearch,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.WixSearch_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Guid), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixComponentSearchTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixComponentSearchTupleFields
+    {
+        WixSearch_,
+        Guid,
+        ProductCode,
+        Attributes,
+    }
+
+    public class WixComponentSearchTuple : IntermediateTuple
+    {
+        public WixComponentSearchTuple() : base(TupleDefinitions.WixComponentSearch, null, null)
+        {
+        }
+
+        public WixComponentSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixComponentSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixComponentSearchTupleFields index] => this.Fields[(int)index];
+
+        public string WixSearch_
+        {
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.WixSearch_]?.Value;
+            set => this.Set((int)WixComponentSearchTupleFields.WixSearch_, value);
+        }
+
+        public string Guid
+        {
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.Guid]?.Value;
+            set => this.Set((int)WixComponentSearchTupleFields.Guid, value);
+        }
+
+        public string ProductCode
+        {
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.ProductCode]?.Value;
+            set => this.Set((int)WixComponentSearchTupleFields.ProductCode, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixComponentSearchTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixComponentSearchTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixControlTuple.cs b/src/WixToolset.Data/Tuples/WixControlTuple.cs
new file mode 100644
index 00000000..c86490fb
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixControlTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixControl = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixControl,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixControlTupleFields.Dialog_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixControlTupleFields.Control_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixControlTupleFields.SourceFile), IntermediateFieldType.Path),
+            },
+            typeof(WixControlTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixControlTupleFields
+    {
+        Dialog_,
+        Control_,
+        SourceFile,
+    }
+
+    public class WixControlTuple : IntermediateTuple
+    {
+        public WixControlTuple() : base(TupleDefinitions.WixControl, null, null)
+        {
+        }
+
+        public WixControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixControl, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixControlTupleFields index] => this.Fields[(int)index];
+
+        public string Dialog_
+        {
+            get => (string)this.Fields[(int)WixControlTupleFields.Dialog_]?.Value;
+            set => this.Set((int)WixControlTupleFields.Dialog_, value);
+        }
+
+        public string Control_
+        {
+            get => (string)this.Fields[(int)WixControlTupleFields.Control_]?.Value;
+            set => this.Set((int)WixControlTupleFields.Control_, value);
+        }
+
+        public string SourceFile
+        {
+            get => (string)this.Fields[(int)WixControlTupleFields.SourceFile]?.Value;
+            set => this.Set((int)WixControlTupleFields.SourceFile, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs b/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs
new file mode 100644
index 00000000..c7ab0b0b
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixCustomRow = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixCustomRow,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixCustomRowTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomRowTupleFields.FieldData), IntermediateFieldType.String),
+            },
+            typeof(WixCustomRowTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixCustomRowTupleFields
+    {
+        Table,
+        FieldData,
+    }
+
+    public class WixCustomRowTuple : IntermediateTuple
+    {
+        public WixCustomRowTuple() : base(TupleDefinitions.WixCustomRow, null, null)
+        {
+        }
+
+        public WixCustomRowTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixCustomRow, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixCustomRowTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)WixCustomRowTupleFields.Table]?.Value;
+            set => this.Set((int)WixCustomRowTupleFields.Table, value);
+        }
+
+        public string FieldData
+        {
+            get => (string)this.Fields[(int)WixCustomRowTupleFields.FieldData]?.Value;
+            set => this.Set((int)WixCustomRowTupleFields.FieldData, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
new file mode 100644
index 00000000..58266aff
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
@@ -0,0 +1,148 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixCustomTable = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixCustomTable,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.ColumnCount), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.ColumnNames), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.ColumnTypes), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.PrimaryKeys), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.MinValues), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.MaxValues), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.KeyTables), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.KeyColumns), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Categories), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Sets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Descriptions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Modularizations), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.BootstrapperApplicationData), IntermediateFieldType.Number),
+            },
+            typeof(WixCustomTableTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixCustomTableTupleFields
+    {
+        Table,
+        ColumnCount,
+        ColumnNames,
+        ColumnTypes,
+        PrimaryKeys,
+        MinValues,
+        MaxValues,
+        KeyTables,
+        KeyColumns,
+        Categories,
+        Sets,
+        Descriptions,
+        Modularizations,
+        BootstrapperApplicationData,
+    }
+
+    public class WixCustomTableTuple : IntermediateTuple
+    {
+        public WixCustomTableTuple() : base(TupleDefinitions.WixCustomTable, null, null)
+        {
+        }
+
+        public WixCustomTableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixCustomTable, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixCustomTableTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Table]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.Table, value);
+        }
+
+        public int ColumnCount
+        {
+            get => (int)this.Fields[(int)WixCustomTableTupleFields.ColumnCount]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.ColumnCount, value);
+        }
+
+        public string ColumnNames
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.ColumnNames]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.ColumnNames, value);
+        }
+
+        public string ColumnTypes
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.ColumnTypes]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.ColumnTypes, value);
+        }
+
+        public string PrimaryKeys
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.PrimaryKeys]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.PrimaryKeys, value);
+        }
+
+        public string MinValues
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.MinValues]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.MinValues, value);
+        }
+
+        public string MaxValues
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.MaxValues]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.MaxValues, value);
+        }
+
+        public string KeyTables
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.KeyTables]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.KeyTables, value);
+        }
+
+        public string KeyColumns
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.KeyColumns]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.KeyColumns, value);
+        }
+
+        public string Categories
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Categories]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.Categories, value);
+        }
+
+        public string Sets
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Sets]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.Sets, value);
+        }
+
+        public string Descriptions
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Descriptions]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.Descriptions, value);
+        }
+
+        public string Modularizations
+        {
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Modularizations]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.Modularizations, value);
+        }
+
+        public int BootstrapperApplicationData
+        {
+            get => (int)this.Fields[(int)WixCustomTableTupleFields.BootstrapperApplicationData]?.Value;
+            set => this.Set((int)WixCustomTableTupleFields.BootstrapperApplicationData, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs b/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
new file mode 100644
index 00000000..68f327f4
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixDeltaPatchFile = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixDeltaPatchFile,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.RetainLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.RetainOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.SymbolPaths), IntermediateFieldType.String),
+            },
+            typeof(WixDeltaPatchFileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixDeltaPatchFileTupleFields
+    {
+        File_,
+        RetainLengths,
+        IgnoreOffsets,
+        IgnoreLengths,
+        RetainOffsets,
+        SymbolPaths,
+    }
+
+    public class WixDeltaPatchFileTuple : IntermediateTuple
+    {
+        public WixDeltaPatchFileTuple() : base(TupleDefinitions.WixDeltaPatchFile, null, null)
+        {
+        }
+
+        public WixDeltaPatchFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchFile, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixDeltaPatchFileTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.File_]?.Value;
+            set => this.Set((int)WixDeltaPatchFileTupleFields.File_, value);
+        }
+
+        public string RetainLengths
+        {
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainLengths]?.Value;
+            set => this.Set((int)WixDeltaPatchFileTupleFields.RetainLengths, value);
+        }
+
+        public string IgnoreOffsets
+        {
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreOffsets]?.Value;
+            set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreOffsets, value);
+        }
+
+        public string IgnoreLengths
+        {
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreLengths]?.Value;
+            set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreLengths, value);
+        }
+
+        public string RetainOffsets
+        {
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainOffsets]?.Value;
+            set => this.Set((int)WixDeltaPatchFileTupleFields.RetainOffsets, value);
+        }
+
+        public string SymbolPaths
+        {
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.SymbolPaths]?.Value;
+            set => this.Set((int)WixDeltaPatchFileTupleFields.SymbolPaths, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs b/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
new file mode 100644
index 00000000..39747be5
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
@@ -0,0 +1,75 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+using System;
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixDeltaPatchSymbolPaths = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixDeltaPatchSymbolPaths,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.Id), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolPaths), IntermediateFieldType.String),
+            },
+            typeof(WixDeltaPatchSymbolPathsTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixDeltaPatchSymbolPathsTupleFields
+    {
+        Id,
+        Type,
+        SymbolPaths,
+    }
+
+    /// <summary>
+    /// The types that the WixDeltaPatchSymbolPaths table can hold.
+    /// </summary>
+    /// <remarks>The order of these values is important since WixDeltaPatchSymbolPaths are sorted by this type.</remarks>
+    public enum SymbolPathType
+    {
+        File,
+        Component,
+        Directory,
+        Media,
+        Product
+    };
+
+    public class WixDeltaPatchSymbolPathsTuple : IntermediateTuple
+    {
+        public WixDeltaPatchSymbolPathsTuple() : base(TupleDefinitions.WixDeltaPatchSymbolPaths, null, null)
+        {
+        }
+
+        public WixDeltaPatchSymbolPathsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixDeltaPatchSymbolPathsTupleFields index] => this.Fields[(int)index];
+
+        public string Id
+        {
+            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.Id]?.Value;
+            set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.Id, value);
+        }
+
+        public SymbolPathType Type
+        {
+            get => (SymbolPathType)Enum.Parse(typeof(SymbolPathType), (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.Type]?.Value, true);
+            set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.Type, value.ToString());
+        }
+
+        public string SymbolPaths
+        {
+            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolPaths]?.Value;
+            set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolPaths, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixDirectoryTuple.cs b/src/WixToolset.Data/Tuples/WixDirectoryTuple.cs
new file mode 100644
index 00000000..ce706dc4
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixDirectoryTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixDirectory = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixDirectory,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixDirectoryTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDirectoryTupleFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
+            },
+            typeof(WixDirectoryTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixDirectoryTupleFields
+    {
+        Directory_,
+        ComponentGuidGenerationSeed,
+    }
+
+    public class WixDirectoryTuple : IntermediateTuple
+    {
+        public WixDirectoryTuple() : base(TupleDefinitions.WixDirectory, null, null)
+        {
+        }
+
+        public WixDirectoryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDirectory, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixDirectoryTupleFields index] => this.Fields[(int)index];
+
+        public string Directory_
+        {
+            get => (string)this.Fields[(int)WixDirectoryTupleFields.Directory_]?.Value;
+            set => this.Set((int)WixDirectoryTupleFields.Directory_, value);
+        }
+
+        public string ComponentGuidGenerationSeed
+        {
+            get => (string)this.Fields[(int)WixDirectoryTupleFields.ComponentGuidGenerationSeed]?.Value;
+            set => this.Set((int)WixDirectoryTupleFields.ComponentGuidGenerationSeed, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs b/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs
new file mode 100644
index 00000000..cc80a5d9
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixEnsureTable = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixEnsureTable,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixEnsureTableTupleFields.Table), IntermediateFieldType.String),
+            },
+            typeof(WixEnsureTableTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixEnsureTableTupleFields
+    {
+        Table,
+    }
+
+    public class WixEnsureTableTuple : IntermediateTuple
+    {
+        public WixEnsureTableTuple() : base(TupleDefinitions.WixEnsureTable, null, null)
+        {
+        }
+
+        public WixEnsureTableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixEnsureTable, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixEnsureTableTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)WixEnsureTableTupleFields.Table]?.Value;
+            set => this.Set((int)WixEnsureTableTupleFields.Table, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs b/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs
new file mode 100644
index 00000000..20e88ce8
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixFeatureGroup = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixFeatureGroup,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixFeatureGroupTupleFields.WixFeatureGroup), IntermediateFieldType.String),
+            },
+            typeof(WixFeatureGroupTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixFeatureGroupTupleFields
+    {
+        WixFeatureGroup,
+    }
+
+    public class WixFeatureGroupTuple : IntermediateTuple
+    {
+        public WixFeatureGroupTuple() : base(TupleDefinitions.WixFeatureGroup, null, null)
+        {
+        }
+
+        public WixFeatureGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFeatureGroup, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixFeatureGroupTupleFields index] => this.Fields[(int)index];
+
+        public string WixFeatureGroup
+        {
+            get => (string)this.Fields[(int)WixFeatureGroupTupleFields.WixFeatureGroup]?.Value;
+            set => this.Set((int)WixFeatureGroupTupleFields.WixFeatureGroup, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs b/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
new file mode 100644
index 00000000..23524b1d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixFeatureModules = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixFeatureModules,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.WixMerge_), IntermediateFieldType.String),
+            },
+            typeof(WixFeatureModulesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixFeatureModulesTupleFields
+    {
+        Feature_,
+        WixMerge_,
+    }
+
+    public class WixFeatureModulesTuple : IntermediateTuple
+    {
+        public WixFeatureModulesTuple() : base(TupleDefinitions.WixFeatureModules, null, null)
+        {
+        }
+
+        public WixFeatureModulesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFeatureModules, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixFeatureModulesTupleFields index] => this.Fields[(int)index];
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.Feature_]?.Value;
+            set => this.Set((int)WixFeatureModulesTupleFields.Feature_, value);
+        }
+
+        public string WixMerge_
+        {
+            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.WixMerge_]?.Value;
+            set => this.Set((int)WixFeatureModulesTupleFields.WixMerge_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
new file mode 100644
index 00000000..62d19ec8
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
@@ -0,0 +1,116 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixFileSearch = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixFileSearch,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.WixSearch_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Path), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinDate), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxDate), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Languages), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixFileSearchTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixFileSearchTupleFields
+    {
+        WixSearch_,
+        Path,
+        MinVersion,
+        MaxVersion,
+        MinSize,
+        MaxSize,
+        MinDate,
+        MaxDate,
+        Languages,
+        Attributes,
+    }
+
+    public class WixFileSearchTuple : IntermediateTuple
+    {
+        public WixFileSearchTuple() : base(TupleDefinitions.WixFileSearch, null, null)
+        {
+        }
+
+        public WixFileSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFileSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixFileSearchTupleFields index] => this.Fields[(int)index];
+
+        public string WixSearch_
+        {
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.WixSearch_]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.WixSearch_, value);
+        }
+
+        public string Path
+        {
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.Path]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.Path, value);
+        }
+
+        public string MinVersion
+        {
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.MinVersion]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.MinVersion, value);
+        }
+
+        public string MaxVersion
+        {
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.MaxVersion]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.MaxVersion, value);
+        }
+
+        public int MinSize
+        {
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.MinSize]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.MinSize, value);
+        }
+
+        public int MaxSize
+        {
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxSize]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.MaxSize, value);
+        }
+
+        public int MinDate
+        {
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.MinDate]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.MinDate, value);
+        }
+
+        public int MaxDate
+        {
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxDate]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.MaxDate, value);
+        }
+
+        public string Languages
+        {
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.Languages]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.Languages, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixFileSearchTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixFileTuple.cs b/src/WixToolset.Data/Tuples/WixFileTuple.cs
new file mode 100644
index 00000000..5ffc5d7f
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixFileTuple.cs
@@ -0,0 +1,170 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixFile = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixFile,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.File_AssemblyManifest), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.File_AssemblyApplication), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.DiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.Source), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.ProcessorArchitecture), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.PatchGroup), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.PatchAttributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.DeltaPatchHeaderSource), IntermediateFieldType.String),
+            },
+            typeof(WixFileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixFileTupleFields
+    {
+        File_,
+        AssemblyType,
+        File_AssemblyManifest,
+        File_AssemblyApplication,
+        Directory_,
+        DiskId,
+        Source,
+        ProcessorArchitecture,
+        PatchGroup,
+        Attributes,
+        PatchAttributes,
+        DeltaPatchHeaderSource,
+    }
+
+    /// <summary>
+    /// Every file row has an assembly type.
+    /// </summary>
+    public enum FileAssemblyType
+    {
+        /// <summary>File is not an assembly.</summary>
+        NotAnAssembly,
+
+        /// <summary>File is a Common Language Runtime Assembly.</summary>
+        DotNetAssembly,
+
+        /// <summary>File is Win32 SxS assembly.</summary>
+        Win32Assembly,
+    }
+
+    /// <summary>
+    /// PatchAttribute values
+    /// </summary>
+    [Flags]
+    public enum PatchAttributeType
+    {
+        None = 0,
+
+        /// <summary>Prevents the updating of the file that is in fact changed in the upgraded image relative to the target images.</summary>
+        Ignore = 1,
+
+        /// <summary>Set if the entire file should be installed rather than creating a binary patch.</summary>
+        IncludeWholeFile = 2,
+
+        /// <summary>Set to indicate that the patch is non-vital.</summary>
+        AllowIgnoreOnError = 4,
+
+        /// <summary>Allowed bits.</summary>
+        Defined = Ignore | IncludeWholeFile | AllowIgnoreOnError
+    }
+
+    public class WixFileTuple : IntermediateTuple
+    {
+        public WixFileTuple() : base(TupleDefinitions.WixFile, null, null)
+        {
+        }
+
+        public WixFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFile, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixFileTupleFields index] => this.Fields[(int)index];
+
+        public string File_
+        {
+            get => (string)this.Fields[(int)WixFileTupleFields.File_]?.Value;
+            set => this.Set((int)WixFileTupleFields.File_, value);
+        }
+
+        public FileAssemblyType AssemblyType
+        {
+            get => (FileAssemblyType)(int)this.Fields[(int)WixFileTupleFields.AssemblyType]?.Value;
+            set => this.Set((int)WixFileTupleFields.AssemblyType, (int)value);
+        }
+
+        public string File_AssemblyManifest
+        {
+            get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyManifest]?.Value;
+            set => this.Set((int)WixFileTupleFields.File_AssemblyManifest, value);
+        }
+
+        public string File_AssemblyApplication
+        {
+            get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyApplication]?.Value;
+            set => this.Set((int)WixFileTupleFields.File_AssemblyApplication, value);
+        }
+
+        public string Directory_
+        {
+            get => (string)this.Fields[(int)WixFileTupleFields.Directory_]?.Value;
+            set => this.Set((int)WixFileTupleFields.Directory_, value);
+        }
+
+        public int DiskId
+        {
+            get => (int)this.Fields[(int)WixFileTupleFields.DiskId]?.Value;
+            set => this.Set((int)WixFileTupleFields.DiskId, value);
+        }
+
+        public string Source
+        {
+            get => (string)this.Fields[(int)WixFileTupleFields.Source]?.Value;
+            set => this.Set((int)WixFileTupleFields.Source, value);
+        }
+
+        public string ProcessorArchitecture
+        {
+            get => (string)this.Fields[(int)WixFileTupleFields.ProcessorArchitecture]?.Value;
+            set => this.Set((int)WixFileTupleFields.ProcessorArchitecture, value);
+        }
+
+        public int PatchGroup
+        {
+            get => (int)this.Fields[(int)WixFileTupleFields.PatchGroup]?.Value;
+            set => this.Set((int)WixFileTupleFields.PatchGroup, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixFileTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixFileTupleFields.Attributes, value);
+        }
+
+        public PatchAttributeType PatchAttributes
+        {
+            get => (PatchAttributeType)(int)this.Fields[(int)WixFileTupleFields.PatchAttributes]?.Value;
+            set => this.Set((int)WixFileTupleFields.PatchAttributes, (int)value);
+        }
+
+        public string DeltaPatchHeaderSource
+        {
+            get => (string)this.Fields[(int)WixFileTupleFields.DeltaPatchHeaderSource]?.Value;
+            set => this.Set((int)WixFileTupleFields.DeltaPatchHeaderSource, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixFragmentTuple.cs b/src/WixToolset.Data/Tuples/WixFragmentTuple.cs
new file mode 100644
index 00000000..a5a59962
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixFragmentTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixFragment = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixFragment,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixFragmentTupleFields.WixFragment), IntermediateFieldType.String),
+            },
+            typeof(WixFragmentTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixFragmentTupleFields
+    {
+        WixFragment,
+    }
+
+    public class WixFragmentTuple : IntermediateTuple
+    {
+        public WixFragmentTuple() : base(TupleDefinitions.WixFragment, null, null)
+        {
+        }
+
+        public WixFragmentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFragment, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixFragmentTupleFields index] => this.Fields[(int)index];
+
+        public string WixFragment
+        {
+            get => (string)this.Fields[(int)WixFragmentTupleFields.WixFragment]?.Value;
+            set => this.Set((int)WixFragmentTupleFields.WixFragment, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixGroupTuple.cs b/src/WixToolset.Data/Tuples/WixGroupTuple.cs
new file mode 100644
index 00000000..be6bf7a4
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixGroupTuple.cs
@@ -0,0 +1,70 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixGroup = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixGroup,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ParentId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ParentType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ChildId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ChildType), IntermediateFieldType.String),
+            },
+            typeof(WixGroupTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixGroupTupleFields
+    {
+        ParentId,
+        ParentType,
+        ChildId,
+        ChildType,
+    }
+
+    public class WixGroupTuple : IntermediateTuple
+    {
+        public WixGroupTuple() : base(TupleDefinitions.WixGroup, null, null)
+        {
+        }
+
+        public WixGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixGroup, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixGroupTupleFields index] => this.Fields[(int)index];
+
+        public string ParentId
+        {
+            get => (string)this.Fields[(int)WixGroupTupleFields.ParentId]?.Value;
+            set => this.Set((int)WixGroupTupleFields.ParentId, value);
+        }
+
+        public ComplexReferenceParentType ParentType
+        {
+            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixGroupTupleFields.ParentType]?.Value, true);
+            set => this.Set((int)WixGroupTupleFields.ParentType, value.ToString());
+        }
+
+        public string ChildId
+        {
+            get => (string)this.Fields[(int)WixGroupTupleFields.ChildId]?.Value;
+            set => this.Set((int)WixGroupTupleFields.ChildId, value);
+        }
+
+        public ComplexReferenceChildType ChildType
+        {
+            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixGroupTupleFields.ChildType]?.Value, true);
+            set => this.Set((int)WixGroupTupleFields.ChildType, value.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs b/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
new file mode 100644
index 00000000..b2fd18ca
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixInstanceComponent = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixInstanceComponent,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixInstanceComponentTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(WixInstanceComponentTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixInstanceComponentTupleFields
+    {
+        Component_,
+    }
+
+    public class WixInstanceComponentTuple : IntermediateTuple
+    {
+        public WixInstanceComponentTuple() : base(TupleDefinitions.WixInstanceComponent, null, null)
+        {
+        }
+
+        public WixInstanceComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixInstanceComponent, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixInstanceComponentTupleFields index] => this.Fields[(int)index];
+
+        public string Component_
+        {
+            get => (string)this.Fields[(int)WixInstanceComponentTupleFields.Component_]?.Value;
+            set => this.Set((int)WixInstanceComponentTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs b/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
new file mode 100644
index 00000000..4f152ac6
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixInstanceTransforms = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixInstanceTransforms,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.Id), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.PropertyId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.ProductName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.UpgradeCode), IntermediateFieldType.String),
+            },
+            typeof(WixInstanceTransformsTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixInstanceTransformsTupleFields
+    {
+        Id,
+        PropertyId,
+        ProductCode,
+        ProductName,
+        UpgradeCode,
+    }
+
+    public class WixInstanceTransformsTuple : IntermediateTuple
+    {
+        public WixInstanceTransformsTuple() : base(TupleDefinitions.WixInstanceTransforms, null, null)
+        {
+        }
+
+        public WixInstanceTransformsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixInstanceTransforms, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixInstanceTransformsTupleFields index] => this.Fields[(int)index];
+
+        public string Id
+        {
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.Id]?.Value;
+            set => this.Set((int)WixInstanceTransformsTupleFields.Id, value);
+        }
+
+        public string PropertyId
+        {
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.PropertyId]?.Value;
+            set => this.Set((int)WixInstanceTransformsTupleFields.PropertyId, value);
+        }
+
+        public string ProductCode
+        {
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductCode]?.Value;
+            set => this.Set((int)WixInstanceTransformsTupleFields.ProductCode, value);
+        }
+
+        public string ProductName
+        {
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductName]?.Value;
+            set => this.Set((int)WixInstanceTransformsTupleFields.ProductName, value);
+        }
+
+        public string UpgradeCode
+        {
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.UpgradeCode]?.Value;
+            set => this.Set((int)WixInstanceTransformsTupleFields.UpgradeCode, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs b/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
new file mode 100644
index 00000000..bc8d2515
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
@@ -0,0 +1,86 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixMediaTemplate = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixMediaTemplate,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CabinetTemplate), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CompressionLevel), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.DiskPrompt), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.VolumeLabel), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.MaximumUncompressedMediaSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting), IntermediateFieldType.Number),
+            },
+            typeof(WixMediaTemplateTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixMediaTemplateTupleFields
+    {
+        CabinetTemplate,
+        CompressionLevel,
+        DiskPrompt,
+        VolumeLabel,
+        MaximumUncompressedMediaSize,
+        MaximumCabinetSizeForLargeFileSplitting,
+    }
+
+    public class WixMediaTemplateTuple : IntermediateTuple
+    {
+        public WixMediaTemplateTuple() : base(TupleDefinitions.WixMediaTemplate, null, null)
+        {
+        }
+
+        public WixMediaTemplateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixMediaTemplate, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixMediaTemplateTupleFields index] => this.Fields[(int)index];
+
+        public string CabinetTemplate
+        {
+            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.CabinetTemplate]?.Value;
+            set => this.Set((int)WixMediaTemplateTupleFields.CabinetTemplate, value);
+        }
+
+        public CompressionLevel CompressionLevel
+        {
+            get => (CompressionLevel)Enum.Parse(typeof(CompressionLevel), (string)this.Fields[(int)WixMediaTupleFields.CompressionLevel]?.Value, true);
+            set => this.Set((int)WixMediaTupleFields.CompressionLevel, value.ToString());
+        }
+
+        public string DiskPrompt
+        {
+            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.DiskPrompt]?.Value;
+            set => this.Set((int)WixMediaTemplateTupleFields.DiskPrompt, value);
+        }
+
+        public string VolumeLabel
+        {
+            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.VolumeLabel]?.Value;
+            set => this.Set((int)WixMediaTemplateTupleFields.VolumeLabel, value);
+        }
+
+        public int MaximumUncompressedMediaSize
+        {
+            get => (int)this.Fields[(int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize]?.Value;
+            set => this.Set((int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize, value);
+        }
+
+        public int MaximumCabinetSizeForLargeFileSplitting
+        {
+            get => (int)this.Fields[(int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting]?.Value;
+            set => this.Set((int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixMediaTuple.cs b/src/WixToolset.Data/Tuples/WixMediaTuple.cs
new file mode 100644
index 00000000..4da11de1
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixMediaTuple.cs
@@ -0,0 +1,62 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixMedia = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixMedia,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixMediaTupleFields.DiskId_), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMediaTupleFields.CompressionLevel), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMediaTupleFields.Layout), IntermediateFieldType.String),
+            },
+            typeof(WixMediaTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixMediaTupleFields
+    {
+        DiskId_,
+        CompressionLevel,
+        Layout,
+    }
+
+    public class WixMediaTuple : IntermediateTuple
+    {
+        public WixMediaTuple() : base(TupleDefinitions.WixMedia, null, null)
+        {
+        }
+
+        public WixMediaTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixMedia, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixMediaTupleFields index] => this.Fields[(int)index];
+
+        public int DiskId_
+        {
+            get => (int)this.Fields[(int)WixMediaTupleFields.DiskId_]?.Value;
+            set => this.Set((int)WixMediaTupleFields.DiskId_, value);
+        }
+
+        public CompressionLevel? CompressionLevel
+        {
+            get => Enum.TryParse((string)this.Fields[(int)WixMediaTupleFields.CompressionLevel]?.Value, true, out CompressionLevel value) ? value : (CompressionLevel?)null;
+            set => this.Set((int)WixMediaTupleFields.CompressionLevel, value?.ToString());
+        }
+
+        public string Layout
+        {
+            get => (string)this.Fields[(int)WixMediaTupleFields.Layout]?.Value;
+            set => this.Set((int)WixMediaTupleFields.Layout, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixMergeTuple.cs b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
new file mode 100644
index 00000000..602acc0e
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixMerge = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixMerge,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.WixMerge), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Language), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FileCompression), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.ConfigurationData), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Feature_), IntermediateFieldType.String),
+            },
+            typeof(WixMergeTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixMergeTupleFields
+    {
+        WixMerge,
+        Language,
+        Directory_,
+        SourceFile,
+        DiskId,
+        FileCompression,
+        ConfigurationData,
+        Feature_,
+    }
+
+    public class WixMergeTuple : IntermediateTuple
+    {
+        public WixMergeTuple() : base(TupleDefinitions.WixMerge, null, null)
+        {
+        }
+
+        public WixMergeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixMerge, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixMergeTupleFields index] => this.Fields[(int)index];
+
+        public string WixMerge
+        {
+            get => (string)this.Fields[(int)WixMergeTupleFields.WixMerge]?.Value;
+            set => this.Set((int)WixMergeTupleFields.WixMerge, value);
+        }
+
+        public int Language
+        {
+            get => (int)this.Fields[(int)WixMergeTupleFields.Language]?.Value;
+            set => this.Set((int)WixMergeTupleFields.Language, value);
+        }
+
+        public string Directory_
+        {
+            get => (string)this.Fields[(int)WixMergeTupleFields.Directory_]?.Value;
+            set => this.Set((int)WixMergeTupleFields.Directory_, value);
+        }
+
+        public string SourceFile
+        {
+            get => (string)this.Fields[(int)WixMergeTupleFields.SourceFile]?.Value;
+            set => this.Set((int)WixMergeTupleFields.SourceFile, value);
+        }
+
+        public int DiskId
+        {
+            get => (int)this.Fields[(int)WixMergeTupleFields.DiskId]?.Value;
+            set => this.Set((int)WixMergeTupleFields.DiskId, value);
+        }
+
+        public int FileCompression
+        {
+            get => (int)this.Fields[(int)WixMergeTupleFields.FileCompression]?.Value;
+            set => this.Set((int)WixMergeTupleFields.FileCompression, value);
+        }
+
+        public string ConfigurationData
+        {
+            get => (string)this.Fields[(int)WixMergeTupleFields.ConfigurationData]?.Value;
+            set => this.Set((int)WixMergeTupleFields.ConfigurationData, value);
+        }
+
+        public string Feature_
+        {
+            get => (string)this.Fields[(int)WixMergeTupleFields.Feature_]?.Value;
+            set => this.Set((int)WixMergeTupleFields.Feature_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixOrderingTuple.cs b/src/WixToolset.Data/Tuples/WixOrderingTuple.cs
new file mode 100644
index 00000000..fde295c1
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixOrderingTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixOrdering = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixOrdering,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemId_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnId_), IntermediateFieldType.String),
+            },
+            typeof(WixOrderingTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixOrderingTupleFields
+    {
+        ItemType,
+        ItemId_,
+        DependsOnType,
+        DependsOnId_,
+    }
+
+    public class WixOrderingTuple : IntermediateTuple
+    {
+        public WixOrderingTuple() : base(TupleDefinitions.WixOrdering, null, null)
+        {
+        }
+
+        public WixOrderingTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixOrdering, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixOrderingTupleFields index] => this.Fields[(int)index];
+
+        public string ItemType
+        {
+            get => (string)this.Fields[(int)WixOrderingTupleFields.ItemType]?.Value;
+            set => this.Set((int)WixOrderingTupleFields.ItemType, value);
+        }
+
+        public string ItemId_
+        {
+            get => (string)this.Fields[(int)WixOrderingTupleFields.ItemId_]?.Value;
+            set => this.Set((int)WixOrderingTupleFields.ItemId_, value);
+        }
+
+        public string DependsOnType
+        {
+            get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnType]?.Value;
+            set => this.Set((int)WixOrderingTupleFields.DependsOnType, value);
+        }
+
+        public string DependsOnId_
+        {
+            get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnId_]?.Value;
+            set => this.Set((int)WixOrderingTupleFields.DependsOnId_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPackageFeatureInfoTuple.cs b/src/WixToolset.Data/Tuples/WixPackageFeatureInfoTuple.cs
new file mode 100644
index 00000000..03948efb
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPackageFeatureInfoTuple.cs
@@ -0,0 +1,116 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixPackageFeatureInfo = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixPackageFeatureInfo,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Package), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Feature), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Size), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Title), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Display), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Level), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Directory), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageFeatureInfoTupleFields.Attributes), IntermediateFieldType.String),
+            },
+            typeof(WixPackageFeatureInfoTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPackageFeatureInfoTupleFields
+    {
+        Package,
+        Feature,
+        Size,
+        Parent,
+        Title,
+        Description,
+        Display,
+        Level,
+        Directory,
+        Attributes,
+    }
+
+    public class WixPackageFeatureInfoTuple : IntermediateTuple
+    {
+        public WixPackageFeatureInfoTuple() : base(TupleDefinitions.WixPackageFeatureInfo, null, null)
+        {
+        }
+
+        public WixPackageFeatureInfoTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPackageFeatureInfo, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPackageFeatureInfoTupleFields index] => this.Fields[(int)index];
+
+        public string Package
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Package]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Package, value);
+        }
+
+        public string Feature
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Feature]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Feature, value);
+        }
+
+        public string Size
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Size]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Size, value);
+        }
+
+        public string Parent
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Parent]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Parent, value);
+        }
+
+        public string Title
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Title]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Title, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Description]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Description, value);
+        }
+
+        public string Display
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Display]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Display, value);
+        }
+
+        public string Level
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Level]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Level, value);
+        }
+
+        public string Directory
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Directory]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Directory, value);
+        }
+
+        public string Attributes
+        {
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixPackageFeatureInfoTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPackagePropertiesTuple.cs b/src/WixToolset.Data/Tuples/WixPackagePropertiesTuple.cs
new file mode 100644
index 00000000..4823409d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPackagePropertiesTuple.cs
@@ -0,0 +1,180 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixPackageProperties = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixPackageProperties,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.Package), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.Vital), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.DownloadSize), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.PackageSize), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.InstalledSize), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.PackageType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.Permanent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.LogPathVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.RollbackLogPathVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.Compressed), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.DisplayInternalUI), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.UpgradeCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.InstallCondition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackagePropertiesTupleFields.Cache), IntermediateFieldType.String),
+            },
+            typeof(WixPackagePropertiesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPackagePropertiesTupleFields
+    {
+        Package,
+        Vital,
+        DisplayName,
+        Description,
+        DownloadSize,
+        PackageSize,
+        InstalledSize,
+        PackageType,
+        Permanent,
+        LogPathVariable,
+        RollbackLogPathVariable,
+        Compressed,
+        DisplayInternalUI,
+        ProductCode,
+        UpgradeCode,
+        Version,
+        InstallCondition,
+        Cache,
+    }
+
+    public class WixPackagePropertiesTuple : IntermediateTuple
+    {
+        public WixPackagePropertiesTuple() : base(TupleDefinitions.WixPackageProperties, null, null)
+        {
+        }
+
+        public WixPackagePropertiesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPackageProperties, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPackagePropertiesTupleFields index] => this.Fields[(int)index];
+
+        public string Package
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Package]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.Package, value);
+        }
+
+        public string Vital
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Vital]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.Vital, value);
+        }
+
+        public string DisplayName
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.DisplayName]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.DisplayName, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Description]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.Description, value);
+        }
+
+        public string DownloadSize
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.DownloadSize]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.DownloadSize, value);
+        }
+
+        public string PackageSize
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.PackageSize]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.PackageSize, value);
+        }
+
+        public string InstalledSize
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.InstalledSize]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.InstalledSize, value);
+        }
+
+        public string PackageType
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.PackageType]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.PackageType, value);
+        }
+
+        public string Permanent
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Permanent]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.Permanent, value);
+        }
+
+        public string LogPathVariable
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.LogPathVariable]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.LogPathVariable, value);
+        }
+
+        public string RollbackLogPathVariable
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.RollbackLogPathVariable]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.RollbackLogPathVariable, value);
+        }
+
+        public string Compressed
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Compressed]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.Compressed, value);
+        }
+
+        public string DisplayInternalUI
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.DisplayInternalUI]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.DisplayInternalUI, value);
+        }
+
+        public string ProductCode
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.ProductCode]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.ProductCode, value);
+        }
+
+        public string UpgradeCode
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.UpgradeCode]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.UpgradeCode, value);
+        }
+
+        public string Version
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Version]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.Version, value);
+        }
+
+        public string InstallCondition
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.InstallCondition]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.InstallCondition, value);
+        }
+
+        public string Cache
+        {
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Cache]?.Value;
+            set => this.Set((int)WixPackagePropertiesTupleFields.Cache, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs b/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs
new file mode 100644
index 00000000..0610adac
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixPatchBaseline = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixPatchBaseline,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.WixPatchBaseline), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.DiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.ValidationFlags), IntermediateFieldType.Number),
+            },
+            typeof(WixPatchBaselineTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPatchBaselineTupleFields
+    {
+        WixPatchBaseline,
+        DiskId,
+        ValidationFlags,
+    }
+
+    public class WixPatchBaselineTuple : IntermediateTuple
+    {
+        public WixPatchBaselineTuple() : base(TupleDefinitions.WixPatchBaseline, null, null)
+        {
+        }
+
+        public WixPatchBaselineTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchBaseline, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPatchBaselineTupleFields index] => this.Fields[(int)index];
+
+        public string WixPatchBaseline
+        {
+            get => (string)this.Fields[(int)WixPatchBaselineTupleFields.WixPatchBaseline]?.Value;
+            set => this.Set((int)WixPatchBaselineTupleFields.WixPatchBaseline, value);
+        }
+
+        public int DiskId
+        {
+            get => (int)this.Fields[(int)WixPatchBaselineTupleFields.DiskId]?.Value;
+            set => this.Set((int)WixPatchBaselineTupleFields.DiskId, value);
+        }
+
+        public int ValidationFlags
+        {
+            get => (int)this.Fields[(int)WixPatchBaselineTupleFields.ValidationFlags]?.Value;
+            set => this.Set((int)WixPatchBaselineTupleFields.ValidationFlags, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs b/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs
new file mode 100644
index 00000000..0683ba9d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixPatchFamilyGroup = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixPatchFamilyGroup,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup), IntermediateFieldType.String),
+            },
+            typeof(WixPatchFamilyGroupTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPatchFamilyGroupTupleFields
+    {
+        WixPatchFamilyGroup,
+    }
+
+    public class WixPatchFamilyGroupTuple : IntermediateTuple
+    {
+        public WixPatchFamilyGroupTuple() : base(TupleDefinitions.WixPatchFamilyGroup, null, null)
+        {
+        }
+
+        public WixPatchFamilyGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchFamilyGroup, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPatchFamilyGroupTupleFields index] => this.Fields[(int)index];
+
+        public string WixPatchFamilyGroup
+        {
+            get => (string)this.Fields[(int)WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup]?.Value;
+            set => this.Set((int)WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
new file mode 100644
index 00000000..81b9573d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixPatchId = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixPatchId,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ClientPatchId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ApiPatchingSymbolFlags), IntermediateFieldType.Number),
+            },
+            typeof(WixPatchIdTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPatchIdTupleFields
+    {
+        ProductCode,
+        ClientPatchId,
+        OptimizePatchSizeForLargeFiles,
+        ApiPatchingSymbolFlags,
+    }
+
+    public class WixPatchIdTuple : IntermediateTuple
+    {
+        public WixPatchIdTuple() : base(TupleDefinitions.WixPatchId, null, null)
+        {
+        }
+
+        public WixPatchIdTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchId, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPatchIdTupleFields index] => this.Fields[(int)index];
+
+        public string ProductCode
+        {
+            get => (string)this.Fields[(int)WixPatchIdTupleFields.ProductCode]?.Value;
+            set => this.Set((int)WixPatchIdTupleFields.ProductCode, value);
+        }
+
+        public string ClientPatchId
+        {
+            get => (string)this.Fields[(int)WixPatchIdTupleFields.ClientPatchId]?.Value;
+            set => this.Set((int)WixPatchIdTupleFields.ClientPatchId, value);
+        }
+
+        public int OptimizePatchSizeForLargeFiles
+        {
+            get => (int)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles]?.Value;
+            set => this.Set((int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles, value);
+        }
+
+        public int ApiPatchingSymbolFlags
+        {
+            get => (int)this.Fields[(int)WixPatchIdTupleFields.ApiPatchingSymbolFlags]?.Value;
+            set => this.Set((int)WixPatchIdTupleFields.ApiPatchingSymbolFlags, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs b/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs
new file mode 100644
index 00000000..c00031a5
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixPatchMetadata = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixPatchMetadata,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPatchMetadataTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchMetadataTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(WixPatchMetadataTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPatchMetadataTupleFields
+    {
+        Property,
+        Value,
+    }
+
+    public class WixPatchMetadataTuple : IntermediateTuple
+    {
+        public WixPatchMetadataTuple() : base(TupleDefinitions.WixPatchMetadata, null, null)
+        {
+        }
+
+        public WixPatchMetadataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchMetadata, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPatchMetadataTupleFields index] => this.Fields[(int)index];
+
+        public string Property
+        {
+            get => (string)this.Fields[(int)WixPatchMetadataTupleFields.Property]?.Value;
+            set => this.Set((int)WixPatchMetadataTupleFields.Property, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)WixPatchMetadataTupleFields.Value]?.Value;
+            set => this.Set((int)WixPatchMetadataTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs b/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs
new file mode 100644
index 00000000..63528439
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixPatchRef = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixPatchRef,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPatchRefTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchRefTupleFields.PrimaryKeys), IntermediateFieldType.String),
+            },
+            typeof(WixPatchRefTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPatchRefTupleFields
+    {
+        Table,
+        PrimaryKeys,
+    }
+
+    public class WixPatchRefTuple : IntermediateTuple
+    {
+        public WixPatchRefTuple() : base(TupleDefinitions.WixPatchRef, null, null)
+        {
+        }
+
+        public WixPatchRefTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchRef, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPatchRefTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)WixPatchRefTupleFields.Table]?.Value;
+            set => this.Set((int)WixPatchRefTupleFields.Table, value);
+        }
+
+        public string PrimaryKeys
+        {
+            get => (string)this.Fields[(int)WixPatchRefTupleFields.PrimaryKeys]?.Value;
+            set => this.Set((int)WixPatchRefTupleFields.PrimaryKeys, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs b/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs
new file mode 100644
index 00000000..8940c0c6
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixPatchTarget = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixPatchTarget,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPatchTargetTupleFields.ProductCode), IntermediateFieldType.String),
+            },
+            typeof(WixPatchTargetTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPatchTargetTupleFields
+    {
+        ProductCode,
+    }
+
+    public class WixPatchTargetTuple : IntermediateTuple
+    {
+        public WixPatchTargetTuple() : base(TupleDefinitions.WixPatchTarget, null, null)
+        {
+        }
+
+        public WixPatchTargetTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchTarget, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPatchTargetTupleFields index] => this.Fields[(int)index];
+
+        public string ProductCode
+        {
+            get => (string)this.Fields[(int)WixPatchTargetTupleFields.ProductCode]?.Value;
+            set => this.Set((int)WixPatchTargetTupleFields.ProductCode, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPayloadPropertiesTuple.cs b/src/WixToolset.Data/Tuples/WixPayloadPropertiesTuple.cs
new file mode 100644
index 00000000..3c437a58
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPayloadPropertiesTuple.cs
@@ -0,0 +1,92 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixPayloadProperties = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixPayloadProperties,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPayloadPropertiesTupleFields.Payload), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPayloadPropertiesTupleFields.Package), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPayloadPropertiesTupleFields.Container), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPayloadPropertiesTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPayloadPropertiesTupleFields.Size), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPayloadPropertiesTupleFields.DownloadUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPayloadPropertiesTupleFields.LayoutOnly), IntermediateFieldType.String),
+            },
+            typeof(WixPayloadPropertiesTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPayloadPropertiesTupleFields
+    {
+        Payload,
+        Package,
+        Container,
+        Name,
+        Size,
+        DownloadUrl,
+        LayoutOnly,
+    }
+
+    public class WixPayloadPropertiesTuple : IntermediateTuple
+    {
+        public WixPayloadPropertiesTuple() : base(TupleDefinitions.WixPayloadProperties, null, null)
+        {
+        }
+
+        public WixPayloadPropertiesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPayloadProperties, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPayloadPropertiesTupleFields index] => this.Fields[(int)index];
+
+        public string Payload
+        {
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Payload]?.Value;
+            set => this.Set((int)WixPayloadPropertiesTupleFields.Payload, value);
+        }
+
+        public string Package
+        {
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Package]?.Value;
+            set => this.Set((int)WixPayloadPropertiesTupleFields.Package, value);
+        }
+
+        public string Container
+        {
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Container]?.Value;
+            set => this.Set((int)WixPayloadPropertiesTupleFields.Container, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Name]?.Value;
+            set => this.Set((int)WixPayloadPropertiesTupleFields.Name, value);
+        }
+
+        public string Size
+        {
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Size]?.Value;
+            set => this.Set((int)WixPayloadPropertiesTupleFields.Size, value);
+        }
+
+        public string DownloadUrl
+        {
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.DownloadUrl]?.Value;
+            set => this.Set((int)WixPayloadPropertiesTupleFields.DownloadUrl, value);
+        }
+
+        public string LayoutOnly
+        {
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.LayoutOnly]?.Value;
+            set => this.Set((int)WixPayloadPropertiesTupleFields.LayoutOnly, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs b/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
new file mode 100644
index 00000000..40065f55
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixProductSearch = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixProductSearch,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.WixSearch_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Guid), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixProductSearchTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixProductSearchTupleFields
+    {
+        WixSearch_,
+        Guid,
+        Attributes,
+    }
+
+    public class WixProductSearchTuple : IntermediateTuple
+    {
+        public WixProductSearchTuple() : base(TupleDefinitions.WixProductSearch, null, null)
+        {
+        }
+
+        public WixProductSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixProductSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixProductSearchTupleFields index] => this.Fields[(int)index];
+
+        public string WixSearch_
+        {
+            get => (string)this.Fields[(int)WixProductSearchTupleFields.WixSearch_]?.Value;
+            set => this.Set((int)WixProductSearchTupleFields.WixSearch_, value);
+        }
+
+        public string Guid
+        {
+            get => (string)this.Fields[(int)WixProductSearchTupleFields.Guid]?.Value;
+            set => this.Set((int)WixProductSearchTupleFields.Guid, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixProductSearchTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixProductSearchTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPropertyTuple.cs b/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
new file mode 100644
index 00000000..74e17d18
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixProperty = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixProperty,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Property_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Admin), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Hidden), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Secure), IntermediateFieldType.Bool),
+            },
+            typeof(WixPropertyTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixPropertyTupleFields
+    {
+        Property_,
+        Admin,
+        Hidden,
+        Secure,
+    }
+
+    public class WixPropertyTuple : IntermediateTuple
+    {
+        public WixPropertyTuple() : base(TupleDefinitions.WixProperty, null, null)
+        {
+        }
+
+        public WixPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPropertyTupleFields index] => this.Fields[(int)index];
+
+        public string Property_
+        {
+            get => (string)this.Fields[(int)WixPropertyTupleFields.Property_]?.Value;
+            set => this.Set((int)WixPropertyTupleFields.Property_, value);
+        }
+
+        public bool Admin
+        {
+            get => (bool)this.Fields[(int)WixPropertyTupleFields.Admin]?.Value;
+            set => this.Set((int)WixPropertyTupleFields.Admin, value);
+        }
+
+        public bool Hidden
+        {
+            get => (bool)this.Fields[(int)WixPropertyTupleFields.Hidden]?.Value;
+            set => this.Set((int)WixPropertyTupleFields.Hidden, value);
+        }
+
+        public bool Secure
+        {
+            get => (bool)this.Fields[(int)WixPropertyTupleFields.Secure]?.Value;
+            set => this.Set((int)WixPropertyTupleFields.Secure, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs b/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
new file mode 100644
index 00000000..c23bf957
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixRegistrySearch = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixRegistrySearch,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.WixSearch_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Root), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixRegistrySearchTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixRegistrySearchTupleFields
+    {
+        WixSearch_,
+        Root,
+        Key,
+        Value,
+        Attributes,
+    }
+
+    public class WixRegistrySearchTuple : IntermediateTuple
+    {
+        public WixRegistrySearchTuple() : base(TupleDefinitions.WixRegistrySearch, null, null)
+        {
+        }
+
+        public WixRegistrySearchTuple(SourceLineNumber sourceLineNumber , Identifier id = null) : base(TupleDefinitions.WixRegistrySearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixRegistrySearchTupleFields index] => this.Fields[(int)index];
+
+        public string WixSearch_
+        {
+            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.WixSearch_]?.Value;
+            set => this.Set((int)WixRegistrySearchTupleFields.WixSearch_, value);
+        }
+
+        public int Root
+        {
+            get => (int)this.Fields[(int)WixRegistrySearchTupleFields.Root]?.Value;
+            set => this.Set((int)WixRegistrySearchTupleFields.Root, value);
+        }
+
+        public string Key
+        {
+            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Key]?.Value;
+            set => this.Set((int)WixRegistrySearchTupleFields.Key, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Value]?.Value;
+            set => this.Set((int)WixRegistrySearchTupleFields.Value, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixRegistrySearchTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixRegistrySearchTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs b/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs
new file mode 100644
index 00000000..491e9aa1
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixRelatedBundle = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixRelatedBundle,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixRelatedBundleTupleFields.Id), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixRelatedBundleTupleFields.Action), IntermediateFieldType.Number),
+            },
+            typeof(WixRelatedBundleTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixRelatedBundleTupleFields
+    {
+        Id,
+        Action,
+    }
+
+    public class WixRelatedBundleTuple : IntermediateTuple
+    {
+        public WixRelatedBundleTuple() : base(TupleDefinitions.WixRelatedBundle, null, null)
+        {
+        }
+
+        public WixRelatedBundleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixRelatedBundle, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixRelatedBundleTupleFields index] => this.Fields[(int)index];
+
+        public string Id
+        {
+            get => (string)this.Fields[(int)WixRelatedBundleTupleFields.Id]?.Value;
+            set => this.Set((int)WixRelatedBundleTupleFields.Id, value);
+        }
+
+        public int Action
+        {
+            get => (int)this.Fields[(int)WixRelatedBundleTupleFields.Action]?.Value;
+            set => this.Set((int)WixRelatedBundleTupleFields.Action, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
new file mode 100644
index 00000000..05021a11
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixSearchRelation = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixSearchRelation,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.WixSearch_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.ParentId_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixSearchRelationTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixSearchRelationTupleFields
+    {
+        WixSearch_,
+        ParentId_,
+        Attributes,
+    }
+
+    public class WixSearchRelationTuple : IntermediateTuple
+    {
+        public WixSearchRelationTuple() : base(TupleDefinitions.WixSearchRelation, null, null)
+        {
+        }
+
+        public WixSearchRelationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSearchRelation, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixSearchRelationTupleFields index] => this.Fields[(int)index];
+
+        public string WixSearch_
+        {
+            get => (string)this.Fields[(int)WixSearchRelationTupleFields.WixSearch_]?.Value;
+            set => this.Set((int)WixSearchRelationTupleFields.WixSearch_, value);
+        }
+
+        public string ParentId_
+        {
+            get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentId_]?.Value;
+            set => this.Set((int)WixSearchRelationTupleFields.ParentId_, value);
+        }
+
+        public int Attributes
+        {
+            get => (int)this.Fields[(int)WixSearchRelationTupleFields.Attributes]?.Value;
+            set => this.Set((int)WixSearchRelationTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixSearchTuple.cs b/src/WixToolset.Data/Tuples/WixSearchTuple.cs
new file mode 100644
index 00000000..887a7b0d
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixSearchTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixSearch = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixSearch,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixSearchTupleFields.WixSearch), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchTupleFields.Variable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchTupleFields.Condition), IntermediateFieldType.String),
+            },
+            typeof(WixSearchTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixSearchTupleFields
+    {
+        WixSearch,
+        Variable,
+        Condition,
+    }
+
+    public class WixSearchTuple : IntermediateTuple
+    {
+        public WixSearchTuple() : base(TupleDefinitions.WixSearch, null, null)
+        {
+        }
+
+        public WixSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixSearchTupleFields index] => this.Fields[(int)index];
+
+        public string WixSearch
+        {
+            get => (string)this.Fields[(int)WixSearchTupleFields.WixSearch]?.Value;
+            set => this.Set((int)WixSearchTupleFields.WixSearch, value);
+        }
+
+        public string Variable
+        {
+            get => (string)this.Fields[(int)WixSearchTupleFields.Variable]?.Value;
+            set => this.Set((int)WixSearchTupleFields.Variable, value);
+        }
+
+        public string Condition
+        {
+            get => (string)this.Fields[(int)WixSearchTupleFields.Condition]?.Value;
+            set => this.Set((int)WixSearchTupleFields.Condition, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs b/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
new file mode 100644
index 00000000..5641f2b3
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixSimpleReference = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixSimpleReference,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixSimpleReferenceTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSimpleReferenceTupleFields.PrimaryKeys), IntermediateFieldType.String),
+            },
+            typeof(WixSimpleReferenceTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public enum WixSimpleReferenceTupleFields
+    {
+        Table,
+        PrimaryKeys,
+    }
+
+    public class WixSimpleReferenceTuple : IntermediateTuple
+    {
+        public WixSimpleReferenceTuple() : base(TupleDefinitions.WixSimpleReference, null, null)
+        {
+        }
+
+        public WixSimpleReferenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSimpleReference, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixSimpleReferenceTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.Table]?.Value;
+            set => this.Set((int)WixSimpleReferenceTupleFields.Table, value);
+        }
+
+        public string PrimaryKeys
+        {
+            get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.PrimaryKeys]?.Value;
+            set => this.Set((int)WixSimpleReferenceTupleFields.PrimaryKeys, value);
+        }
+
+        /// <summary>
+        /// Gets the symbolic name.
+        /// </summary>
+        /// <value>Symbolic name.</value>
+        public string SymbolicName => String.Concat(this.Table, ":", this.PrimaryKeys);
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs b/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
new file mode 100644
index 00000000..ad8b443e
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixSuppressAction = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixSuppressAction,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixSuppressActionTupleFields.SequenceTable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSuppressActionTupleFields.Action), IntermediateFieldType.String),
+            },
+            typeof(WixSuppressActionTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixSuppressActionTupleFields
+    {
+        SequenceTable,
+        Action,
+    }
+
+    public class WixSuppressActionTuple : IntermediateTuple
+    {
+        public WixSuppressActionTuple() : base(TupleDefinitions.WixSuppressAction, null, null)
+        {
+        }
+
+        public WixSuppressActionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSuppressAction, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixSuppressActionTupleFields index] => this.Fields[(int)index];
+
+        public string SequenceTable
+        {
+            get => (string)this.Fields[(int)WixSuppressActionTupleFields.SequenceTable]?.Value;
+            set => this.Set((int)WixSuppressActionTupleFields.SequenceTable, value);
+        }
+
+        public string Action
+        {
+            get => (string)this.Fields[(int)WixSuppressActionTupleFields.Action]?.Value;
+            set => this.Set((int)WixSuppressActionTupleFields.Action, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs b/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
new file mode 100644
index 00000000..c6f42eac
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixSuppressModularization = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixSuppressModularization,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixSuppressModularizationTupleFields.WixSuppressModularization), IntermediateFieldType.String),
+            },
+            typeof(WixSuppressModularizationTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixSuppressModularizationTupleFields
+    {
+        WixSuppressModularization,
+    }
+
+    public class WixSuppressModularizationTuple : IntermediateTuple
+    {
+        public WixSuppressModularizationTuple() : base(TupleDefinitions.WixSuppressModularization, null, null)
+        {
+        }
+
+        public WixSuppressModularizationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSuppressModularization, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixSuppressModularizationTupleFields index] => this.Fields[(int)index];
+
+        public string WixSuppressModularization
+        {
+            get => (string)this.Fields[(int)WixSuppressModularizationTupleFields.WixSuppressModularization]?.Value;
+            set => this.Set((int)WixSuppressModularizationTupleFields.WixSuppressModularization, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixUITuple.cs b/src/WixToolset.Data/Tuples/WixUITuple.cs
new file mode 100644
index 00000000..99e19300
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixUITuple.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixUI = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixUI,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixUITupleFields.WixUI), IntermediateFieldType.String),
+            },
+            typeof(WixUITuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixUITupleFields
+    {
+        WixUI,
+    }
+
+    public class WixUITuple : IntermediateTuple
+    {
+        public WixUITuple() : base(TupleDefinitions.WixUI, null, null)
+        {
+        }
+
+        public WixUITuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixUI, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixUITupleFields index] => this.Fields[(int)index];
+
+        public string WixUI
+        {
+            get => (string)this.Fields[(int)WixUITupleFields.WixUI]?.Value;
+            set => this.Set((int)WixUITupleFields.WixUI, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs b/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs
new file mode 100644
index 00000000..64043ffe
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixUpdateRegistration = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixUpdateRegistration,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Manufacturer), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Department), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.ProductFamily), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Classification), IntermediateFieldType.String),
+            },
+            typeof(WixUpdateRegistrationTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixUpdateRegistrationTupleFields
+    {
+        Manufacturer,
+        Department,
+        ProductFamily,
+        Name,
+        Classification,
+    }
+
+    public class WixUpdateRegistrationTuple : IntermediateTuple
+    {
+        public WixUpdateRegistrationTuple() : base(TupleDefinitions.WixUpdateRegistration, null, null)
+        {
+        }
+
+        public WixUpdateRegistrationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixUpdateRegistration, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixUpdateRegistrationTupleFields index] => this.Fields[(int)index];
+
+        public string Manufacturer
+        {
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Manufacturer]?.Value;
+            set => this.Set((int)WixUpdateRegistrationTupleFields.Manufacturer, value);
+        }
+
+        public string Department
+        {
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Department]?.Value;
+            set => this.Set((int)WixUpdateRegistrationTupleFields.Department, value);
+        }
+
+        public string ProductFamily
+        {
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.ProductFamily]?.Value;
+            set => this.Set((int)WixUpdateRegistrationTupleFields.ProductFamily, value);
+        }
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Name]?.Value;
+            set => this.Set((int)WixUpdateRegistrationTupleFields.Name, value);
+        }
+
+        public string Classification
+        {
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Classification]?.Value;
+            set => this.Set((int)WixUpdateRegistrationTupleFields.Classification, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixVariableTuple.cs b/src/WixToolset.Data/Tuples/WixVariableTuple.cs
new file mode 100644
index 00000000..6b6e7354
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/WixVariableTuple.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixVariable = new IntermediateTupleDefinition(
+            TupleDefinitionType.WixVariable,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixVariableTupleFields.WixVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixVariableTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixVariableTupleFields.Overridable), IntermediateFieldType.Bool),
+            },
+            typeof(WixVariableTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum WixVariableTupleFields
+    {
+        WixVariable,
+        Value,
+        Overridable,
+    }
+
+    public class WixVariableTuple : IntermediateTuple
+    {
+        public WixVariableTuple() : base(TupleDefinitions.WixVariable, null, null)
+        {
+        }
+
+        public WixVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixVariable, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixVariableTupleFields index] => this.Fields[(int)index];
+
+        public string WixVariable
+        {
+            get => (string)this.Fields[(int)WixVariableTupleFields.WixVariable]?.Value;
+            set => this.Set((int)WixVariableTupleFields.WixVariable, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)WixVariableTupleFields.Value]?.Value;
+            set => this.Set((int)WixVariableTupleFields.Value, value);
+        }
+
+        public bool Overridable
+        {
+            get => (bool)this.Fields[(int)WixVariableTupleFields.Overridable]?.Value;
+            set => this.Set((int)WixVariableTupleFields.Overridable, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/_ByHandComponentTuple.cs b/src/WixToolset.Data/Tuples/_ByHandComponentTuple.cs
new file mode 100644
index 00000000..0e8fe8e7
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/_ByHandComponentTuple.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComponentOriginal = new IntermediateTupleDefinition(TupleDefinitionType.Component, new[]
+        {
+            new IntermediateFieldDefinition("Guid", IntermediateFieldType.String),
+            new IntermediateFieldDefinition("Directory", IntermediateFieldType.String),
+            new IntermediateFieldDefinition("Condition", IntermediateFieldType.String),
+            new IntermediateFieldDefinition("KeyPath", IntermediateFieldType.String),
+            new IntermediateFieldDefinition("LocalOnly", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("SourceOnly", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("Optional", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("RegistryKeyPath", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("SharedDllRefCount", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("Permanent", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("OdbcDataSource", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("Transitive", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("NeverOverwrite", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("x64", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("DisableRegistryReflection", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("UnisntallOnSupersedence", IntermediateFieldType.Bool),
+            new IntermediateFieldDefinition("Shared", IntermediateFieldType.Bool),
+        }, typeof(ComponentTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    public class ComponentTupleOriginal : IntermediateTuple
+    {
+        public ComponentTupleOriginal(IntermediateTupleDefinition definition) : base(definition, null, null)
+        {
+            if (definition != TupleDefinitions.ComponentOriginal) throw new ArgumentException(nameof(definition));
+        }
+
+        public string Guid
+        {
+            get => (string)this[0]?.Value;
+            set => this.Set(0, value);
+        }
+
+        public string Directory
+        {
+            get => (string)this[1]?.Value;
+            set => this.Set(1, value);
+        }
+    }
+}
diff --git a/src/WixToolset.Data/Tuples/_ByHandFileTuple.cs b/src/WixToolset.Data/Tuples/_ByHandFileTuple.cs
new file mode 100644
index 00000000..79fb31e5
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/_ByHandFileTuple.cs
@@ -0,0 +1,88 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    //public static partial class TupleDefinitionNames
+    //{
+    //    public const string File = nameof(TupleDefinitionNames.File);
+    //}
+
+    /*
+    [
+        {
+        "File" : [
+            { "Component" : "string" },
+            { "Name" : "string" },
+            { "Compressed" : "bool" },
+            ]
+        },
+        {
+        "Component": [
+            { "Guid" : "string" },
+            ]
+        },
+    ]
+    */
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition FileOriginal = new IntermediateTupleDefinition(
+            TupleDefinitionType.File,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Component), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.ShortName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Size), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Language), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.ReadOnly), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Hidden), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.System), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Vital), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Checksum), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Compressed), IntermediateFieldType.Bool),
+            },
+            typeof(FileTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum FileTupleFieldsOriginal
+    {
+        Component,
+        Name,
+        ShortName,
+        Size,
+        Version,
+        Language,
+        ReadOnly,
+        Hidden,
+        System,
+        Vital,
+        Checksum,
+        Compressed,
+    }
+
+    public class FileTupleOriginal : IntermediateTuple
+    {
+        public FileTupleOriginal() : base(TupleDefinitions.File, null, null)
+        {
+        }
+
+        public FileTupleOriginal(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.File, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[FileTupleFields index] => this.Fields[(int)index];
+
+        public string Component
+        {
+            get => (string)this.Fields[(int)FileTupleFieldsOriginal.Component]?.Value;
+            set => this.Set((int)FileTupleFieldsOriginal.Component, value);
+        }
+    }
+}
diff --git a/src/WixToolset.Data/Tuples/_ByHandTupleDefinitions.cs b/src/WixToolset.Data/Tuples/_ByHandTupleDefinitions.cs
new file mode 100644
index 00000000..0cb0feeb
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/_ByHandTupleDefinitions.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#if false
+namespace WixToolset.Data.Tuples
+{
+    using System;
+
+    //public enum TupleDefinitionType
+    //{
+    //    Component,
+    //    File,
+    //    MustBeFromAnExtension,
+    //}
+
+    public static partial class TupleDefinitionsOriginal
+    {
+        public static readonly Version Version = new Version("4.0.0");
+
+        public static IntermediateTupleDefinition ByName(string name)
+        {
+            if (!Enum.TryParse(name, out TupleDefinitionType type) || type == TupleDefinitionType.MustBeFromAnExtension)
+            {
+                return null;
+            }
+
+            return ByType(type);
+        }
+
+        public static IntermediateTupleDefinition ByType(TupleDefinitionType type)
+        {
+            switch (type)
+            {
+                //case TupleDefinitionType.Component:
+                //    return TupleDefinitions.Component;
+
+                //case TupleDefinitionType.File:
+                //    return TupleDefinitions.File;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type));
+            }
+        }
+
+        //public static T CreateTuple<T>() where T : IntermediateTuple
+        //{
+        //    if (TypeToName.TryGetValue(typeof(T), out var name))
+        //    {
+        //        return ByName(name)?.CreateTuple<T>();
+        //    }
+
+        //    return null;
+        //}
+    }
+}
+#endif
diff --git a/src/WixToolset.Data/Tuples/_StreamsTuple.cs b/src/WixToolset.Data/Tuples/_StreamsTuple.cs
new file mode 100644
index 00000000..1f9d75e8
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/_StreamsTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition _Streams = new IntermediateTupleDefinition(
+            TupleDefinitionType._Streams,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(_StreamsTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_StreamsTupleFields.Data), IntermediateFieldType.Path),
+            },
+            typeof(_StreamsTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum _StreamsTupleFields
+    {
+        Name,
+        Data,
+    }
+
+    public class _StreamsTuple : IntermediateTuple
+    {
+        public _StreamsTuple() : base(TupleDefinitions._Streams, null, null)
+        {
+        }
+
+        public _StreamsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions._Streams, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[_StreamsTupleFields index] => this.Fields[(int)index];
+
+        public string Name
+        {
+            get => (string)this.Fields[(int)_StreamsTupleFields.Name]?.Value;
+            set => this.Set((int)_StreamsTupleFields.Name, value);
+        }
+
+        public string Data
+        {
+            get => (string)this.Fields[(int)_StreamsTupleFields.Data]?.Value;
+            set => this.Set((int)_StreamsTupleFields.Data, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/_SummaryInformationTuple.cs b/src/WixToolset.Data/Tuples/_SummaryInformationTuple.cs
new file mode 100644
index 00000000..4ce3b63f
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/_SummaryInformationTuple.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition _SummaryInformation = new IntermediateTupleDefinition(
+            TupleDefinitionType._SummaryInformation,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(_SummaryInformationTupleFields.PropertyId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(_SummaryInformationTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(_SummaryInformationTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum _SummaryInformationTupleFields
+    {
+        PropertyId,
+        Value,
+    }
+
+    public class _SummaryInformationTuple : IntermediateTuple
+    {
+        public _SummaryInformationTuple() : base(TupleDefinitions._SummaryInformation, null, null)
+        {
+        }
+
+        public _SummaryInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions._SummaryInformation, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[_SummaryInformationTupleFields index] => this.Fields[(int)index];
+
+        public int PropertyId
+        {
+            get => (int)this.Fields[(int)_SummaryInformationTupleFields.PropertyId]?.Value;
+            set => this.Set((int)_SummaryInformationTupleFields.PropertyId, value);
+        }
+
+        public string Value
+        {
+            get => (string)this.Fields[(int)_SummaryInformationTupleFields.Value]?.Value;
+            set => this.Set((int)_SummaryInformationTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/_TransformViewTuple.cs b/src/WixToolset.Data/Tuples/_TransformViewTuple.cs
new file mode 100644
index 00000000..e3355062
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/_TransformViewTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition _TransformView = new IntermediateTupleDefinition(
+            TupleDefinitionType._TransformView,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Column), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Row), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Data), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_TransformViewTupleFields.Current), IntermediateFieldType.String),
+            },
+            typeof(_TransformViewTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum _TransformViewTupleFields
+    {
+        Table,
+        Column,
+        Row,
+        Data,
+        Current,
+    }
+
+    public class _TransformViewTuple : IntermediateTuple
+    {
+        public _TransformViewTuple() : base(TupleDefinitions._TransformView, null, null)
+        {
+        }
+
+        public _TransformViewTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions._TransformView, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[_TransformViewTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Table]?.Value;
+            set => this.Set((int)_TransformViewTupleFields.Table, value);
+        }
+
+        public string Column
+        {
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Column]?.Value;
+            set => this.Set((int)_TransformViewTupleFields.Column, value);
+        }
+
+        public string Row
+        {
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Row]?.Value;
+            set => this.Set((int)_TransformViewTupleFields.Row, value);
+        }
+
+        public string Data
+        {
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Data]?.Value;
+            set => this.Set((int)_TransformViewTupleFields.Data, value);
+        }
+
+        public string Current
+        {
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Current]?.Value;
+            set => this.Set((int)_TransformViewTupleFields.Current, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/_ValidationTuple.cs b/src/WixToolset.Data/Tuples/_ValidationTuple.cs
new file mode 100644
index 00000000..3bcd064c
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/_ValidationTuple.cs
@@ -0,0 +1,116 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition _Validation = new IntermediateTupleDefinition(
+            TupleDefinitionType._Validation,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Column), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Nullable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.MinValue), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.MaxValue), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.KeyTable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.KeyColumn), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Category), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Set), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(_ValidationTupleFields.Description), IntermediateFieldType.String),
+            },
+            typeof(_ValidationTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum _ValidationTupleFields
+    {
+        Table,
+        Column,
+        Nullable,
+        MinValue,
+        MaxValue,
+        KeyTable,
+        KeyColumn,
+        Category,
+        Set,
+        Description,
+    }
+
+    public class _ValidationTuple : IntermediateTuple
+    {
+        public _ValidationTuple() : base(TupleDefinitions._Validation, null, null)
+        {
+        }
+
+        public _ValidationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions._Validation, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[_ValidationTupleFields index] => this.Fields[(int)index];
+
+        public string Table
+        {
+            get => (string)this.Fields[(int)_ValidationTupleFields.Table]?.Value;
+            set => this.Set((int)_ValidationTupleFields.Table, value);
+        }
+
+        public string Column
+        {
+            get => (string)this.Fields[(int)_ValidationTupleFields.Column]?.Value;
+            set => this.Set((int)_ValidationTupleFields.Column, value);
+        }
+
+        public string Nullable
+        {
+            get => (string)this.Fields[(int)_ValidationTupleFields.Nullable]?.Value;
+            set => this.Set((int)_ValidationTupleFields.Nullable, value);
+        }
+
+        public int MinValue
+        {
+            get => (int)this.Fields[(int)_ValidationTupleFields.MinValue]?.Value;
+            set => this.Set((int)_ValidationTupleFields.MinValue, value);
+        }
+
+        public int MaxValue
+        {
+            get => (int)this.Fields[(int)_ValidationTupleFields.MaxValue]?.Value;
+            set => this.Set((int)_ValidationTupleFields.MaxValue, value);
+        }
+
+        public string KeyTable
+        {
+            get => (string)this.Fields[(int)_ValidationTupleFields.KeyTable]?.Value;
+            set => this.Set((int)_ValidationTupleFields.KeyTable, value);
+        }
+
+        public int KeyColumn
+        {
+            get => (int)this.Fields[(int)_ValidationTupleFields.KeyColumn]?.Value;
+            set => this.Set((int)_ValidationTupleFields.KeyColumn, value);
+        }
+
+        public string Category
+        {
+            get => (string)this.Fields[(int)_ValidationTupleFields.Category]?.Value;
+            set => this.Set((int)_ValidationTupleFields.Category, value);
+        }
+
+        public string Set
+        {
+            get => (string)this.Fields[(int)_ValidationTupleFields.Set]?.Value;
+            set => this.Set((int)_ValidationTupleFields.Set, value);
+        }
+
+        public string Description
+        {
+            get => (string)this.Fields[(int)_ValidationTupleFields.Description]?.Value;
+            set => this.Set((int)_ValidationTupleFields.Description, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/tuples_new.json b/src/WixToolset.Data/Tuples/tuples_new.json
new file mode 100644
index 00000000..9386058c
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/tuples_new.json
@@ -0,0 +1,3604 @@
+[
+    {
+        "_Streams": [
+            {
+                "Name": "string"
+            },
+            {
+                "Data": "path"
+            }
+        ]
+    },
+    {
+        "_SummaryInformation": [
+            {
+                "PropertyId": "number"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "_TransformView": [
+            {
+                "Table": "string"
+            },
+            {
+                "Column": "string"
+            },
+            {
+                "Row": "string"
+            },
+            {
+                "Data": "string"
+            },
+            {
+                "Current": "string"
+            }
+        ]
+    },
+    {
+        "_Validation": [
+            {
+                "Table": "string"
+            },
+            {
+                "Column": "string"
+            },
+            {
+                "Nullable": "string"
+            },
+            {
+                "MinValue": "number"
+            },
+            {
+                "MaxValue": "number"
+            },
+            {
+                "KeyTable": "string"
+            },
+            {
+                "KeyColumn": "number"
+            },
+            {
+                "Category": "string"
+            },
+            {
+                "Set": "string"
+            },
+            {
+                "Description": "string"
+            }
+        ]
+    },
+    {
+        "ActionText": [
+            {
+                "Action": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "Template": "string"
+            }
+        ]
+    },
+    {
+        "AdminExecuteSequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "Sequence": "number"
+            }
+        ]
+    },
+    {
+        "AdminUISequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "Sequence": "number"
+            }
+        ]
+    },
+    {
+        "AdvtExecuteSequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "Sequence": "number"
+            }
+        ]
+    },
+    {
+        "AdvtUISequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "Sequence": "number"
+            }
+        ]
+    },
+    {
+        "AppId": [
+            {
+                "AppId": "string"
+            },
+            {
+                "RemoteServerName": "string"
+            },
+            {
+                "LocalService": "string"
+            },
+            {
+                "ServiceParameters": "string"
+            },
+            {
+                "DllSurrogate": "string"
+            },
+            {
+                "ActivateAtStorage": "number"
+            },
+            {
+                "RunAsInteractiveUser": "number"
+            }
+        ]
+    },
+    {
+        "AppSearch": [
+            {
+                "Property": "string"
+            },
+            {
+                "Signature_": "string"
+            }
+        ]
+    },
+    {
+        "BBControl": [
+            {
+                "Billboard_": "string"
+            },
+            {
+                "BBControl": "string"
+            },
+            {
+                "Type": "string"
+            },
+            {
+                "X": "number"
+            },
+            {
+                "Y": "number"
+            },
+            {
+                "Width": "number"
+            },
+            {
+                "Height": "number"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "Text": "string"
+            }
+        ]
+    },
+    {
+        "Billboard": [
+            {
+                "Billboard": "string"
+            },
+            {
+                "Feature_": "string"
+            },
+            {
+                "Action": "string"
+            },
+            {
+                "Ordering": "number"
+            }
+        ]
+    },
+    {
+        "Binary": [
+            {
+                "Name": "string"
+            },
+            {
+                "Data": "path"
+            }
+        ]
+    },
+    {
+        "BindImage": [
+            {
+                "File_": "string"
+            },
+            {
+                "Path": "string"
+            }
+        ]
+    },
+    {
+        "CCPSearch": [
+            {
+                "Signature_": "string"
+            }
+        ]
+    },
+    {
+        "CheckBox": [
+            {
+                "Property": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "Class": [
+            {
+                "CLSID": "string"
+            },
+            {
+                "Context": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "ProgId_Default": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "AppId_": "string"
+            },
+            {
+                "FileTypeMask": "string"
+            },
+            {
+                "Icon_": "string"
+            },
+            {
+                "IconIndex": "number"
+            },
+            {
+                "DefInprocHandler": "string"
+            },
+            {
+                "Argument": "string"
+            },
+            {
+                "Feature_": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "ComboBox": [
+            {
+                "Property": "string"
+            },
+            {
+                "Order": "number"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Text": "string"
+            }
+        ]
+    },
+    {
+        "CompLocator": [
+            {
+                "Signature_": "string"
+            },
+            {
+                "ComponentId": "string"
+            },
+            {
+                "Type": "number"
+            }
+        ]
+    },
+    {
+        "Complus": [
+            {
+                "Component_": "string"
+            },
+            {
+                "ExpType": "number"
+            }
+        ]
+    },
+    {
+        "Component": [
+            {
+                "Component": "string"
+            },
+            {
+                "ComponentId": "string"
+            },
+            {
+                "Directory_": "string"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "KeyPath": "string"
+            }
+        ]
+    },
+    {
+        "Condition": [
+            {
+                "Feature_": "string"
+            },
+            {
+                "Level": "number"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "Control": [
+            {
+                "Dialog_": "string"
+            },
+            {
+                "Control": "string"
+            },
+            {
+                "Type": "string"
+            },
+            {
+                "X": "number"
+            },
+            {
+                "Y": "number"
+            },
+            {
+                "Width": "number"
+            },
+            {
+                "Height": "number"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "Property": "string"
+            },
+            {
+                "Text": "string"
+            },
+            {
+                "Control_Next": "string"
+            },
+            {
+                "Help": "string"
+            }
+        ]
+    },
+    {
+        "ControlCondition": [
+            {
+                "Dialog_": "string"
+            },
+            {
+                "Control_": "string"
+            },
+            {
+                "Action": "string"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "ControlEvent": [
+            {
+                "Dialog_": "string"
+            },
+            {
+                "Control_": "string"
+            },
+            {
+                "Event": "string"
+            },
+            {
+                "Argument": "string"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "Ordering": "number"
+            }
+        ]
+    },
+    {
+        "CreateFolder": [
+            {
+                "Directory_": "string"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "CustomAction": [
+            {
+                "Action": "string"
+            },
+            {
+                "Type": "number"
+            },
+            {
+                "Source": "string"
+            },
+            {
+                "Target": "string"
+            },
+            {
+                "ExtendedType": "number"
+            }
+        ]
+    },
+    {
+        "Dialog": [
+            {
+                "Dialog": "string"
+            },
+            {
+                "HCentering": "number"
+            },
+            {
+                "VCentering": "number"
+            },
+            {
+                "Width": "number"
+            },
+            {
+                "Height": "number"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "Title": "string"
+            },
+            {
+                "Control_First": "string"
+            },
+            {
+                "Control_Default": "string"
+            },
+            {
+                "Control_Cancel": "string"
+            }
+        ]
+    },
+    {
+        "Directory": [
+            {
+                "Directory": "string"
+            },
+            {
+                "Directory_Parent": "string"
+            },
+            {
+                "DefaultDir": "string"
+            }
+        ]
+    },
+    {
+        "DrLocator": [
+            {
+                "Signature_": "string"
+            },
+            {
+                "Parent": "string"
+            },
+            {
+                "Path": "string"
+            },
+            {
+                "Depth": "number"
+            }
+        ]
+    },
+    {
+        "DuplicateFile": [
+            {
+                "FileKey": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "File_": "string"
+            },
+            {
+                "DestName": "string"
+            },
+            {
+                "DestFolder": "string"
+            }
+        ]
+    },
+    {
+        "Environment": [
+            {
+                "Environment": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "Error": [
+            {
+                "Error": "number"
+            },
+            {
+                "Message": "string"
+            }
+        ]
+    },
+    {
+        "EventMapping": [
+            {
+                "Dialog_": "string"
+            },
+            {
+                "Control_": "string"
+            },
+            {
+                "Event": "string"
+            },
+            {
+                "Attribute": "string"
+            }
+        ]
+    },
+    {
+        "Extension": [
+            {
+                "Extension": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "ProgId_": "string"
+            },
+            {
+                "MIME_": "string"
+            },
+            {
+                "Feature_": "string"
+            }
+        ]
+    },
+    {
+        "ExternalFiles": [
+            {
+                "Family": "string"
+            },
+            {
+                "FTK": "string"
+            },
+            {
+                "FilePath": "string"
+            },
+            {
+                "SymbolPaths": "string"
+            },
+            {
+                "IgnoreOffsets": "string"
+            },
+            {
+                "IgnoreLengths": "string"
+            },
+            {
+                "RetainOffsets": "string"
+            },
+            {
+                "Order": "number"
+            }
+        ]
+    },
+    {
+        "FamilyFileRanges": [
+            {
+                "Family": "string"
+            },
+            {
+                "FTK": "string"
+            },
+            {
+                "RetainOffsets": "string"
+            },
+            {
+                "RetainLengths": "string"
+            }
+        ]
+    },
+    {
+        "Feature": [
+            {
+                "Feature": "string"
+            },
+            {
+                "Feature_Parent": "string"
+            },
+            {
+                "Title": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "Display": "number"
+            },
+            {
+                "Level": "number"
+            },
+            {
+                "Directory_": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "FeatureComponents": [
+            {
+                "Feature_": "string"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "File": [
+            {
+                "File": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "FileName": "string"
+            },
+            {
+                "FileSize": "number"
+            },
+            {
+                "Version": "string"
+            },
+            {
+                "Language": "string"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "Sequence": "number"
+            }
+        ]
+    },
+    {
+        "FileSFPCatalog": [
+            {
+                "File_": "string"
+            },
+            {
+                "SFPCatalog_": "string"
+            }
+        ]
+    },
+    {
+        "Font": [
+            {
+                "File_": "string"
+            },
+            {
+                "FontTitle": "string"
+            }
+        ]
+    },
+    {
+        "Icon": [
+            {
+                "Name": "string"
+            },
+            {
+                "Data": "path"
+            }
+        ]
+    },
+    {
+        "ImageFamilies": [
+            {
+                "Family": "string"
+            },
+            {
+                "MediaSrcPropName": "string"
+            },
+            {
+                "MediaDiskId": "number"
+            },
+            {
+                "FileSequenceStart": "number"
+            },
+            {
+                "DiskPrompt": "string"
+            },
+            {
+                "VolumeLabel": "string"
+            }
+        ]
+    },
+    {
+        "IniFile": [
+            {
+                "IniFile": "string"
+            },
+            {
+                "FileName": "string"
+            },
+            {
+                "DirProperty": "string"
+            },
+            {
+                "Section": "string"
+            },
+            {
+                "Key": "string"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Action": "number"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "IniLocator": [
+            {
+                "Signature_": "string"
+            },
+            {
+                "FileName": "string"
+            },
+            {
+                "Section": "string"
+            },
+            {
+                "Key": "string"
+            },
+            {
+                "Field": "number"
+            },
+            {
+                "Type": "number"
+            }
+        ]
+    },
+    {
+        "InstallExecuteSequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "Sequence": "number"
+            }
+        ]
+    },
+    {
+        "InstallUISequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "Sequence": "number"
+            }
+        ]
+    },
+    {
+        "IsolatedComponent": [
+            {
+                "Component_Shared": "string"
+            },
+            {
+                "Component_Application": "string"
+            }
+        ]
+    },
+    {
+        "LaunchCondition": [
+            {
+                "Condition": "string"
+            },
+            {
+                "Description": "string"
+            }
+        ]
+    },
+    {
+        "ListBox": [
+            {
+                "Property": "string"
+            },
+            {
+                "Order": "number"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Text": "string"
+            }
+        ]
+    },
+    {
+        "ListView": [
+            {
+                "Property": "string"
+            },
+            {
+                "Order": "number"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Text": "string"
+            },
+            {
+                "Binary_": "string"
+            }
+        ]
+    },
+    {
+        "LockPermissions": [
+            {
+                "LockObject": "string"
+            },
+            {
+                "Table": "string"
+            },
+            {
+                "Domain": "string"
+            },
+            {
+                "User": "string"
+            },
+            {
+                "Permission": "number"
+            }
+        ]
+    },
+    {
+        "Media": [
+            {
+                "DiskId": "number"
+            },
+            {
+                "LastSequence": "number"
+            },
+            {
+                "DiskPrompt": "string"
+            },
+            {
+                "Cabinet": "string"
+            },
+            {
+                "VolumeLabel": "string"
+            },
+            {
+                "Source": "string"
+            }
+        ]
+    },
+    {
+        "MIME": [
+            {
+                "ContentType": "string"
+            },
+            {
+                "Extension_": "string"
+            },
+            {
+                "CLSID": "string"
+            }
+        ]
+    },
+    {
+        "ModuleAdminExecuteSequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Sequence": "number"
+            },
+            {
+                "BaseAction": "string"
+            },
+            {
+                "After": "number"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "ModuleAdminUISequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Sequence": "number"
+            },
+            {
+                "BaseAction": "string"
+            },
+            {
+                "After": "number"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "ModuleAdvtExecuteSequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Sequence": "number"
+            },
+            {
+                "BaseAction": "string"
+            },
+            {
+                "After": "number"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "ModuleAdvtUISequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Sequence": "number"
+            },
+            {
+                "BaseAction": "string"
+            },
+            {
+                "After": "number"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "ModuleComponents": [
+            {
+                "Component": "string"
+            },
+            {
+                "ModuleID": "string"
+            },
+            {
+                "Language": "number"
+            }
+        ]
+    },
+    {
+        "ModuleConfiguration": [
+            {
+                "Name": "string"
+            },
+            {
+                "Format": "number"
+            },
+            {
+                "Type": "string"
+            },
+            {
+                "ContextData": "string"
+            },
+            {
+                "DefaultValue": "string"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "DisplayName": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "HelpLocation": "string"
+            },
+            {
+                "HelpKeyword": "string"
+            }
+        ]
+    },
+    {
+        "ModuleDependency": [
+            {
+                "ModuleID": "string"
+            },
+            {
+                "ModuleLanguage": "number"
+            },
+            {
+                "RequiredID": "string"
+            },
+            {
+                "RequiredLanguage": "number"
+            },
+            {
+                "RequiredVersion": "string"
+            }
+        ]
+    },
+    {
+        "ModuleExclusion": [
+            {
+                "ModuleID": "string"
+            },
+            {
+                "ModuleLanguage": "number"
+            },
+            {
+                "ExcludedID": "string"
+            },
+            {
+                "ExcludedLanguage": "number"
+            },
+            {
+                "ExcludedMinVersion": "string"
+            },
+            {
+                "ExcludedMaxVersion": "string"
+            }
+        ]
+    },
+    {
+        "ModuleIgnoreTable": [
+            {
+                "Table": "string"
+            }
+        ]
+    },
+    {
+        "ModuleInstallExecuteSequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Sequence": "number"
+            },
+            {
+                "BaseAction": "string"
+            },
+            {
+                "After": "number"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "ModuleInstallUISequence": [
+            {
+                "Action": "string"
+            },
+            {
+                "Sequence": "number"
+            },
+            {
+                "BaseAction": "string"
+            },
+            {
+                "After": "number"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "ModuleSignature": [
+            {
+                "ModuleID": "string"
+            },
+            {
+                "Language": "number"
+            },
+            {
+                "Version": "string"
+            }
+        ]
+    },
+    {
+        "ModuleSubstitution": [
+            {
+                "Table": "string"
+            },
+            {
+                "Row": "string"
+            },
+            {
+                "Column": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "MoveFile": [
+            {
+                "FileKey": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "SourceName": "string"
+            },
+            {
+                "DestName": "string"
+            },
+            {
+                "SourceFolder": "string"
+            },
+            {
+                "DestFolder": "string"
+            },
+            {
+                "Options": "number"
+            }
+        ]
+    },
+    {
+        "MsiAssembly": [
+            {
+                "Component_": "string"
+            },
+            {
+                "Feature_": "string"
+            },
+            {
+                "File_Manifest": "string"
+            },
+            {
+                "File_Application": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "MsiAssemblyName": [
+            {
+                "Component_": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "MsiDigitalCertificate": [
+            {
+                "DigitalCertificate": "string"
+            },
+            {
+                "CertData": "path"
+            }
+        ]
+    },
+    {
+        "MsiDigitalSignature": [
+            {
+                "Table": "string"
+            },
+            {
+                "SignObject": "string"
+            },
+            {
+                "DigitalCertificate_": "string"
+            },
+            {
+                "Hash": "path"
+            }
+        ]
+    },
+    {
+        "MsiEmbeddedChainer": [
+            {
+                "MsiEmbeddedChainer": "string"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "CommandLine": "string"
+            },
+            {
+                "Source": "string"
+            },
+            {
+                "Type": "number"
+            }
+        ]
+    },
+    {
+        "MsiEmbeddedUI": [
+            {
+                "MsiEmbeddedUI": "string"
+            },
+            {
+                "FileName": "string"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "MessageFilter": "number"
+            },
+            {
+                "Data": "path"
+            }
+        ]
+    },
+    {
+        "MsiFileHash": [
+            {
+                "File_": "string"
+            },
+            {
+                "Options": "number"
+            },
+            {
+                "HashPart1": "number"
+            },
+            {
+                "HashPart2": "number"
+            },
+            {
+                "HashPart3": "number"
+            },
+            {
+                "HashPart4": "number"
+            }
+        ]
+    },
+    {
+        "MsiLockPermissionsEx": [
+            {
+                "MsiLockPermissionsEx": "string"
+            },
+            {
+                "LockObject": "string"
+            },
+            {
+                "Table": "string"
+            },
+            {
+                "SDDLText": "string"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "MsiPackageCertificate": [
+            {
+                "PackageCertificate": "string"
+            },
+            {
+                "DigitalCertificate_": "string"
+            }
+        ]
+    },
+    {
+        "MsiPatchCertificate": [
+            {
+                "PatchCertificate": "string"
+            },
+            {
+                "DigitalCertificate_": "string"
+            }
+        ]
+    },
+    {
+        "MsiPatchHeaders": [
+            {
+                "StreamRef": "string"
+            },
+            {
+                "Header": "path"
+            }
+        ]
+    },
+    {
+        "MsiPatchMetadata": [
+            {
+                "Company": "string"
+            },
+            {
+                "Property": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "MsiPatchOldAssemblyFile": [
+            {
+                "File_": "string"
+            },
+            {
+                "Assembly_": "string"
+            }
+        ]
+    },
+    {
+        "MsiPatchOldAssemblyName": [
+            {
+                "Assembly": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "MsiPatchSequence": [
+            {
+                "PatchFamily": "string"
+            },
+            {
+                "ProductCode": "string"
+            },
+            {
+                "Sequence": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "MsiServiceConfig": [
+            {
+                "MsiServiceConfig": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Event": "number"
+            },
+            {
+                "ConfigType": "number"
+            },
+            {
+                "Argument": "string"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "MsiServiceConfigFailureActions": [
+            {
+                "MsiServiceConfigFailureActions": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Event": "number"
+            },
+            {
+                "ResetPeriod": "number"
+            },
+            {
+                "RebootMessage": "string"
+            },
+            {
+                "Command": "string"
+            },
+            {
+                "Actions": "string"
+            },
+            {
+                "DelayActions": "string"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "MsiShortcutProperty": [
+            {
+                "MsiShortcutProperty": "string"
+            },
+            {
+                "Shortcut_": "string"
+            },
+            {
+                "PropertyKey": "string"
+            },
+            {
+                "PropVariantValue": "string"
+            }
+        ]
+    },
+    {
+        "ODBCAttribute": [
+            {
+                "Driver_": "string"
+            },
+            {
+                "Attribute": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "ODBCDataSource": [
+            {
+                "DataSource": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "DriverDescription": "string"
+            },
+            {
+                "Registration": "number"
+            }
+        ]
+    },
+    {
+        "ODBCDriver": [
+            {
+                "Driver": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "File_": "string"
+            },
+            {
+                "File_Setup": "string"
+            }
+        ]
+    },
+    {
+        "ODBCSourceAttribute": [
+            {
+                "DataSource_": "string"
+            },
+            {
+                "Attribute": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "ODBCTranslator": [
+            {
+                "Translator": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "File_": "string"
+            },
+            {
+                "File_Setup": "string"
+            }
+        ]
+    },
+    {
+        "Patch": [
+            {
+                "File_": "string"
+            },
+            {
+                "Sequence": "number"
+            },
+            {
+                "PatchSize": "number"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "Header": "path"
+            },
+            {
+                "StreamRef_": "string"
+            }
+        ]
+    },
+    {
+        "PatchMetadata": [
+            {
+                "Company": "string"
+            },
+            {
+                "Property": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "PatchPackage": [
+            {
+                "PatchId": "string"
+            },
+            {
+                "Media_": "number"
+            }
+        ]
+    },
+    {
+        "PatchSequence": [
+            {
+                "PatchFamily": "string"
+            },
+            {
+                "Target": "string"
+            },
+            {
+                "Sequence": "string"
+            },
+            {
+                "Supersede": "number"
+            }
+        ]
+    },
+    {
+        "ProgId": [
+            {
+                "ProgId": "string"
+            },
+            {
+                "ProgId_Parent": "string"
+            },
+            {
+                "Class_": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "Icon_": "string"
+            },
+            {
+                "IconIndex": "number"
+            }
+        ]
+    },
+    {
+        "Properties": [
+            {
+                "Name": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "Property": [
+            {
+                "Property": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "PublishComponent": [
+            {
+                "ComponentId": "string"
+            },
+            {
+                "Qualifier": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "AppData": "string"
+            },
+            {
+                "Feature_": "string"
+            }
+        ]
+    },
+    {
+        "RadioButton": [
+            {
+                "Property": "string"
+            },
+            {
+                "Order": "number"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "X": "number"
+            },
+            {
+                "Y": "number"
+            },
+            {
+                "Width": "number"
+            },
+            {
+                "Height": "number"
+            },
+            {
+                "Text": "string"
+            },
+            {
+                "Help": "string"
+            }
+        ]
+    },
+    {
+        "Registry": [
+            {
+                "Registry": "string"
+            },
+            {
+                "Root": "number"
+            },
+            {
+                "Key": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "RegLocator": [
+            {
+                "Signature_": "string"
+            },
+            {
+                "Root": "number"
+            },
+            {
+                "Key": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Type": "number"
+            }
+        ]
+    },
+    {
+        "RemoveFile": [
+            {
+                "FileKey": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "FileName": "string"
+            },
+            {
+                "DirProperty": "string"
+            },
+            {
+                "InstallMode": "number"
+            }
+        ]
+    },
+    {
+        "RemoveIniFile": [
+            {
+                "RemoveIniFile": "string"
+            },
+            {
+                "FileName": "string"
+            },
+            {
+                "DirProperty": "string"
+            },
+            {
+                "Section": "string"
+            },
+            {
+                "Key": "string"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Action": "number"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "RemoveRegistry": [
+            {
+                "RemoveRegistry": "string"
+            },
+            {
+                "Root": "number"
+            },
+            {
+                "Key": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "ReserveCost": [
+            {
+                "ReserveKey": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "ReserveFolder": "string"
+            },
+            {
+                "ReserveLocal": "number"
+            },
+            {
+                "ReserveSource": "number"
+            }
+        ]
+    },
+    {
+        "SelfReg": [
+            {
+                "File_": "string"
+            },
+            {
+                "Cost": "number"
+            }
+        ]
+    },
+    {
+        "ServiceControl": [
+            {
+                "ServiceControl": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Event": "number"
+            },
+            {
+                "Arguments": "string"
+            },
+            {
+                "Wait": "number"
+            },
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "ServiceInstall": [
+            {
+                "ServiceInstall": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "DisplayName": "string"
+            },
+            {
+                "ServiceType": "number"
+            },
+            {
+                "StartType": "number"
+            },
+            {
+                "ErrorControl": "number"
+            },
+            {
+                "LoadOrderGroup": "string"
+            },
+            {
+                "Dependencies": "string"
+            },
+            {
+                "StartName": "string"
+            },
+            {
+                "Password": "string"
+            },
+            {
+                "Arguments": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "Description": "string"
+            }
+        ]
+    },
+    {
+        "SFPCatalog": [
+            {
+                "SFPCatalog": "string"
+            },
+            {
+                "Catalog": "path"
+            },
+            {
+                "Dependency": "string"
+            }
+        ]
+    },
+    {
+        "Shortcut": [
+            {
+                "Shortcut": "string"
+            },
+            {
+                "Directory_": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "Target": "string"
+            },
+            {
+                "Arguments": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "Hotkey": "number"
+            },
+            {
+                "Icon_": "string"
+            },
+            {
+                "IconIndex": "number"
+            },
+            {
+                "ShowCmd": "number"
+            },
+            {
+                "WkDir": "string"
+            },
+            {
+                "DisplayResourceDLL": "string"
+            },
+            {
+                "DisplayResourceId": "number"
+            },
+            {
+                "DescriptionResourceDLL": "string"
+            },
+            {
+                "DescriptionResourceId": "number"
+            }
+        ]
+    },
+    {
+        "Signature": [
+            {
+                "Signature": "string"
+            },
+            {
+                "FileName": "string"
+            },
+            {
+                "MinVersion": "string"
+            },
+            {
+                "MaxVersion": "string"
+            },
+            {
+                "MinSize": "number"
+            },
+            {
+                "MaxSize": "number"
+            },
+            {
+                "MinDate": "number"
+            },
+            {
+                "MaxDate": "number"
+            },
+            {
+                "Languages": "string"
+            }
+        ]
+    },
+    {
+        "TargetFiles_OptionalData": [
+            {
+                "Target": "string"
+            },
+            {
+                "FTK": "string"
+            },
+            {
+                "SymbolPaths": "string"
+            },
+            {
+                "IgnoreOffsets": "string"
+            },
+            {
+                "IgnoreLengths": "string"
+            },
+            {
+                "RetainOffsets": "string"
+            }
+        ]
+    },
+    {
+        "TargetImages": [
+            {
+                "Target": "string"
+            },
+            {
+                "MsiPath": "string"
+            },
+            {
+                "SymbolPaths": "string"
+            },
+            {
+                "Upgraded": "string"
+            },
+            {
+                "Order": "number"
+            },
+            {
+                "ProductValidateFlags": "string"
+            },
+            {
+                "IgnoreMissingSrcFiles": "number"
+            }
+        ]
+    },
+    {
+        "TextStyle": [
+            {
+                "TextStyle": "string"
+            },
+            {
+                "FaceName": "string"
+            },
+            {
+                "Size": "number"
+            },
+            {
+                "Color": "number"
+            },
+            {
+                "StyleBits": "number"
+            }
+        ]
+    },
+    {
+        "TypeLib": [
+            {
+                "LibID": "string"
+            },
+            {
+                "Language": "number"
+            },
+            {
+                "Component_": "string"
+            },
+            {
+                "Version": "number"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "Directory_": "string"
+            },
+            {
+                "Feature_": "string"
+            },
+            {
+                "Cost": "number"
+            }
+        ]
+    },
+    {
+        "UIText": [
+            {
+                "Key": "string"
+            },
+            {
+                "Text": "string"
+            }
+        ]
+    },
+    {
+        "Upgrade": [
+            {
+                "UpgradeCode": "string"
+            },
+            {
+                "VersionMin": "string"
+            },
+            {
+                "VersionMax": "string"
+            },
+            {
+                "Language": "string"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "Remove": "string"
+            },
+            {
+                "ActionProperty": "string"
+            }
+        ]
+    },
+    {
+        "UpgradedFiles_OptionalData": [
+            {
+                "Upgraded": "string"
+            },
+            {
+                "FTK": "string"
+            },
+            {
+                "SymbolPaths": "string"
+            },
+            {
+                "AllowIgnoreOnPatchError": "number"
+            },
+            {
+                "IncludeWholeFile": "number"
+            }
+        ]
+    },
+    {
+        "UpgradedFilesToIgnore": [
+            {
+                "Upgraded": "string"
+            },
+            {
+                "FTK": "string"
+            }
+        ]
+    },
+    {
+        "UpgradedImages": [
+            {
+                "Upgraded": "string"
+            },
+            {
+                "MsiPath": "string"
+            },
+            {
+                "PatchMsiPath": "string"
+            },
+            {
+                "SymbolPaths": "string"
+            },
+            {
+                "Family": "string"
+            }
+        ]
+    },
+    {
+        "Verb": [
+            {
+                "Extension_": "string"
+            },
+            {
+                "Verb": "string"
+            },
+            {
+                "Sequence": "number"
+            },
+            {
+                "Command": "string"
+            },
+            {
+                "Argument": "string"
+            }
+        ]
+    },
+    {
+        "WixAction": [
+            {
+                "SequenceTable": "string"
+            },
+            {
+                "Action": "string"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "Sequence": "number"
+            },
+            {
+                "Before": "string"
+            },
+            {
+                "After": "string"
+            },
+            {
+                "Overridable": "number"
+            }
+        ]
+    },
+    {
+        "WixApprovedExeForElevation": [
+            {
+                "Id": "string"
+            },
+            {
+                "Key": "string"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixBBControl": [
+            {
+                "Billboard_": "string"
+            },
+            {
+                "BBControl_": "string"
+            },
+            {
+                "SourceFile": "path"
+            }
+        ]
+    },
+    {
+        "WixBindUpdatedFiles": [
+            {
+                "File_": "string"
+            }
+        ]
+    },
+    {
+        "WixBootstrapperApplication": [
+            {
+                "Id": "string"
+            }
+        ]
+    },
+    {
+        "WixBuildInfo": [
+            {
+                "WixVersion": "string"
+            },
+            {
+                "WixOutputFile": "string"
+            },
+            {
+                "WixProjectFile": "string"
+            },
+            {
+                "WixPdbFile": "string"
+            }
+        ]
+    },
+    {
+        "WixBundle": [
+            {
+                "Version": "string"
+            },
+            {
+                "Copyright": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "AboutUrl": "string"
+            },
+            {
+                "DisableModify": "number"
+            },
+            {
+                "DisableRemove": "number"
+            },
+            {
+                "DisableRepair": "number"
+            },
+            {
+                "HelpTelephone": "string"
+            },
+            {
+                "HelpUrl": "string"
+            },
+            {
+                "Manufacturer": "string"
+            },
+            {
+                "UpdateUrl": "string"
+            },
+            {
+                "Compressed": "number"
+            },
+            {
+                "LogPrefixAndExtension": "string"
+            },
+            {
+                "IconSourceFile": "path"
+            },
+            {
+                "SplashScreenSourceFile": "path"
+            },
+            {
+                "Condition": "string"
+            },
+            {
+                "Tag": "string"
+            },
+            {
+                "Platform": "string"
+            },
+            {
+                "ParentName": "string"
+            },
+            {
+                "UpgradeCode": "string"
+            },
+            {
+                "BundleId": "string"
+            },
+            {
+                "ProviderKey": "string"
+            },
+            {
+                "PerMachine": "number"
+            }
+        ]
+    },
+    {
+        "WixBundleCatalog": [
+            {
+                "WixBundleCatalog": "string"
+            },
+            {
+                "Payload_": "string"
+            }
+        ]
+    },
+    {
+        "WixBundleContainer": [
+            {
+                "WixBundleContainer": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Type": "number"
+            },
+            {
+                "DownloadUrl": "string"
+            },
+            {
+                "Size": "number"
+            },
+            {
+                "Hash": "string"
+            },
+            {
+                "AttachedContainerIndex": "number"
+            },
+            {
+                "WorkingPath": "string"
+            }
+        ]
+    },
+    {
+        "WixBundleExePackage": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "DetectCondition": "string"
+            },
+            {
+                "InstallCommand": "string"
+            },
+            {
+                "RepairCommand": "string"
+            },
+            {
+                "UninstallCommand": "string"
+            },
+            {
+                "ExeProtocol": "string"
+            }
+        ]
+    },
+    {
+        "WixBundleMsiFeature": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Size": "number"
+            },
+            {
+                "Parent": "string"
+            },
+            {
+                "Title": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "Display": "number"
+            },
+            {
+                "Level": "number"
+            },
+            {
+                "Directory": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixBundleMsiPackage": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "ProductCode": "string"
+            },
+            {
+                "UpgradeCode": "string"
+            },
+            {
+                "ProductVersion": "string"
+            },
+            {
+                "ProductLanguage": "number"
+            },
+            {
+                "ProductName": "string"
+            },
+            {
+                "Manufacturer": "string"
+            }
+        ]
+    },
+    {
+        "WixBundleMsiProperty": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "WixBundleMspPackage": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "PatchCode": "string"
+            },
+            {
+                "Manufacturer": "string"
+            },
+            {
+                "PatchXml": "string"
+            }
+        ]
+    },
+    {
+        "WixBundleMsuPackage": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "DetectCondition": "string"
+            },
+            {
+                "MsuKB": "string"
+            }
+        ]
+    },
+    {
+        "WixBundlePackage": [
+            {
+                "WixChainItem_": "string"
+            },
+            {
+                "Type": "number"
+            },
+            {
+                "Payload_": "string"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "InstallCondition": "string"
+            },
+            {
+                "Cache": "number"
+            },
+            {
+                "CacheId": "string"
+            },
+            {
+                "Vital": "number"
+            },
+            {
+                "PerMachine": "number"
+            },
+            {
+                "LogPathVariable": "string"
+            },
+            {
+                "RollbackLogPathVariable": "string"
+            },
+            {
+                "Size": "number"
+            },
+            {
+                "InstallSize": "number"
+            },
+            {
+                "Version": "string"
+            },
+            {
+                "Language": "number"
+            },
+            {
+                "DisplayName": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "RollbackBoundary_": "string"
+            },
+            {
+                "RollbackBoundaryBackward_": "string"
+            },
+            {
+                "x64": "number"
+            }
+        ]
+    },
+    {
+        "WixBundlePackageCommandLine": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "InstallArgument": "string"
+            },
+            {
+                "UninstallArgument": "string"
+            },
+            {
+                "RepairArgument": "string"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "WixBundlePackageExitCode": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "Code": "number"
+            },
+            {
+                "Behavior": "number"
+            }
+        ]
+    },
+    {
+        "WixBundlePackageGroup": [
+            {
+                "WixBundlePackageGroup": "string"
+            }
+        ]
+    },
+    {
+        "WixBundlePatchTargetCode": [
+            {
+                "PackageId": "string"
+            },
+            {
+                "TargetCode": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixBundlePayload": [
+            {
+                "WixBundlePayload": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "SourceFile": "path"
+            },
+            {
+                "DownloadUrl": "string"
+            },
+            {
+                "Compressed": "number"
+            },
+            {
+                "UnresolvedSourceFile": "string"
+            },
+            {
+                "DisplayName": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "EnableSignatureValidation": "number"
+            },
+            {
+                "FileSize": "number"
+            },
+            {
+                "Version": "string"
+            },
+            {
+                "Hash": "string"
+            },
+            {
+                "PublicKey": "string"
+            },
+            {
+                "Thumbprint": "string"
+            },
+            {
+                "Catalog_": "string"
+            },
+            {
+                "Container_": "string"
+            },
+            {
+                "Package": "string"
+            },
+            {
+                "ContentFile": "number"
+            },
+            {
+                "EmbeddedId": "string"
+            },
+            {
+                "LayoutOnly": "number"
+            },
+            {
+                "Packaging": "number"
+            },
+            {
+                "ParentPackagePayload_": "string"
+            }
+        ]
+    },
+    {
+        "WixBundlePayloadGroup": [
+            {
+                "WixBundlePayloadGroup": "string"
+            }
+        ]
+    },
+    {
+        "WixBundleProperties": [
+            {
+                "DisplayName": "string"
+            },
+            {
+                "LogPathVariable": "string"
+            },
+            {
+                "Compressed": "string"
+            },
+            {
+                "Id": "string"
+            },
+            {
+                "UpgradeCode": "string"
+            },
+            {
+                "PerMachine": "string"
+            }
+        ]
+    },
+    {
+        "WixBundleRelatedPackage": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "Id": "string"
+            },
+            {
+                "MinVersion": "string"
+            },
+            {
+                "MaxVersion": "string"
+            },
+            {
+                "Languages": "string"
+            },
+            {
+                "MinInclusive": "number"
+            },
+            {
+                "MaxInclusive": "number"
+            },
+            {
+                "LangInclusive": "number"
+            },
+            {
+                "OnlyDetect": "number"
+            }
+        ]
+    },
+    {
+        "WixBundleRollbackBoundary": [
+            {
+                "WixChainItem_": "string"
+            },
+            {
+                "Vital": "number"
+            },
+            {
+                "Transaction": "number"
+            }
+        ]
+    },
+    {
+        "WixBundleSlipstreamMsp": [
+            {
+                "WixBundlePackage_": "string"
+            },
+            {
+                "WixBundlePackage_Msp": "string"
+            }
+        ]
+    },
+    {
+        "WixBundleUpdate": [
+            {
+                "Location": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixBundleVariable": [
+            {
+                "WixBundleVariable": "string"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Type": "string"
+            },
+            {
+                "Hidden": "number"
+            },
+            {
+                "Persisted": "number"
+            }
+        ]
+    },
+    {
+        "WixChain": [
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixChainItem": [
+            {
+                "Id": "string"
+            }
+        ]
+    },
+    {
+        "WixComplexReference": [
+            {
+                "Parent": "string"
+            },
+            {
+                "ParentAttributes": "number"
+            },
+            {
+                "ParentLanguage": "string"
+            },
+            {
+                "Child": "string"
+            },
+            {
+                "ChildAttributes": "number"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixComponentGroup": [
+            {
+                "WixComponentGroup": "string"
+            }
+        ]
+    },
+    {
+        "WixComponentSearch": [
+            {
+                "WixSearch_": "string"
+            },
+            {
+                "Guid": "string"
+            },
+            {
+                "ProductCode": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixControl": [
+            {
+                "Dialog_": "string"
+            },
+            {
+                "Control_": "string"
+            },
+            {
+                "SourceFile": "path"
+            }
+        ]
+    },
+    {
+        "WixCustomRow": [
+            {
+                "Table": "string"
+            },
+            {
+                "FieldData": "string"
+            }
+        ]
+    },
+    {
+        "WixCustomTable": [
+            {
+                "Table": "string"
+            },
+            {
+                "ColumnCount": "number"
+            },
+            {
+                "ColumnNames": "string"
+            },
+            {
+                "ColumnTypes": "string"
+            },
+            {
+                "PrimaryKeys": "string"
+            },
+            {
+                "MinValues": "string"
+            },
+            {
+                "MaxValues": "string"
+            },
+            {
+                "KeyTables": "string"
+            },
+            {
+                "KeyColumns": "string"
+            },
+            {
+                "Categories": "string"
+            },
+            {
+                "Sets": "string"
+            },
+            {
+                "Descriptions": "string"
+            },
+            {
+                "Modularizations": "string"
+            },
+            {
+                "BootstrapperApplicationData": "number"
+            }
+        ]
+    },
+    {
+        "WixDeltaPatchFile": [
+            {
+                "File_": "string"
+            },
+            {
+                "RetainLengths": "preserved"
+            },
+            {
+                "IgnoreOffsets": "preserved"
+            },
+            {
+                "IgnoreLengths": "preserved"
+            },
+            {
+                "RetainOffsets": "preserved"
+            },
+            {
+                "SymbolPaths": "preserved"
+            }
+        ]
+    },
+    {
+        "WixDeltaPatchSymbolPaths": [
+            {
+                "Id": "string"
+            },
+            {
+                "Type": "number"
+            },
+            {
+                "SymbolPaths": "preserved"
+            }
+        ]
+    },
+    {
+        "WixDirectory": [
+            {
+                "Directory_": "string"
+            },
+            {
+                "ComponentGuidGenerationSeed": "string"
+            }
+        ]
+    },
+    {
+        "WixEnsureTable": [
+            {
+                "Table": "string"
+            }
+        ]
+    },
+    {
+        "WixFeatureGroup": [
+            {
+                "WixFeatureGroup": "string"
+            }
+        ]
+    },
+    {
+        "WixFeatureModules": [
+            {
+                "Feature_": "string"
+            },
+            {
+                "WixMerge_": "string"
+            }
+        ]
+    },
+    {
+        "WixFile": [
+            {
+                "File_": "string"
+            },
+            {
+                "AssemblyType": "number"
+            },
+            {
+                "File_AssemblyManifest": "string"
+            },
+            {
+                "File_AssemblyApplication": "string"
+            },
+            {
+                "Directory_": "string"
+            },
+            {
+                "DiskId": "number"
+            },
+            {
+                "Source": "path"
+            },
+            {
+                "ProcessorArchitecture": "string"
+            },
+            {
+                "PatchGroup": "number"
+            },
+            {
+                "Attributes": "number"
+            },
+            {
+                "PatchAttributes": "number"
+            },
+            {
+                "DeltaPatchHeaderSource": "string"
+            }
+        ]
+    },
+    {
+        "WixFileSearch": [
+            {
+                "WixSearch_": "string"
+            },
+            {
+                "Path": "string"
+            },
+            {
+                "MinVersion": "string"
+            },
+            {
+                "MaxVersion": "string"
+            },
+            {
+                "MinSize": "number"
+            },
+            {
+                "MaxSize": "number"
+            },
+            {
+                "MinDate": "number"
+            },
+            {
+                "MaxDate": "number"
+            },
+            {
+                "Languages": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixFragment": [
+            {
+                "WixFragment": "string"
+            }
+        ]
+    },
+    {
+        "WixGroup": [
+            {
+                "ParentId": "string"
+            },
+            {
+                "ParentType": "string"
+            },
+            {
+                "ChildId": "string"
+            },
+            {
+                "ChildType": "string"
+            }
+        ]
+    },
+    {
+        "WixInstanceComponent": [
+            {
+                "Component_": "string"
+            }
+        ]
+    },
+    {
+        "WixInstanceTransforms": [
+            {
+                "Id": "string"
+            },
+            {
+                "PropertyId": "string"
+            },
+            {
+                "ProductCode": "string"
+            },
+            {
+                "ProductName": "string"
+            },
+            {
+                "UpgradeCode": "string"
+            }
+        ]
+    },
+    {
+        "WixMedia": [
+            {
+                "DiskId_": "number"
+            },
+            {
+                "CompressionLevel": "number"
+            },
+            {
+                "Layout": "string"
+            }
+        ]
+    },
+    {
+        "WixMediaTemplate": [
+            {
+                "CabinetTemplate": "string"
+            },
+            {
+                "CompressionLevel": "number"
+            },
+            {
+                "DiskPrompt": "string"
+            },
+            {
+                "VolumeLabel": "string"
+            },
+            {
+                "MaximumUncompressedMediaSize": "number"
+            },
+            {
+                "MaximumCabinetSizeForLargeFileSplitting": "number"
+            }
+        ]
+    },
+    {
+        "WixMerge": [
+            {
+                "WixMerge": "string"
+            },
+            {
+                "Language": "number"
+            },
+            {
+                "Directory_": "string"
+            },
+            {
+                "SourceFile": "path"
+            },
+            {
+                "DiskId": "number"
+            },
+            {
+                "FileCompression": "number"
+            },
+            {
+                "ConfigurationData": "string"
+            },
+            {
+                "Feature_": "string"
+            }
+        ]
+    },
+    {
+        "WixOrdering": [
+            {
+                "ItemType": "string"
+            },
+            {
+                "ItemId_": "string"
+            },
+            {
+                "DependsOnType": "string"
+            },
+            {
+                "DependsOnId_": "string"
+            }
+        ]
+    },
+    {
+        "WixPackageFeatureInfo": [
+            {
+                "Package": "string"
+            },
+            {
+                "Feature": "string"
+            },
+            {
+                "Size": "string"
+            },
+            {
+                "Parent": "string"
+            },
+            {
+                "Title": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "Display": "string"
+            },
+            {
+                "Level": "string"
+            },
+            {
+                "Directory": "string"
+            },
+            {
+                "Attributes": "string"
+            }
+        ]
+    },
+    {
+        "WixPackageProperties": [
+            {
+                "Package": "string"
+            },
+            {
+                "Vital": "string"
+            },
+            {
+                "DisplayName": "string"
+            },
+            {
+                "Description": "string"
+            },
+            {
+                "DownloadSize": "string"
+            },
+            {
+                "PackageSize": "string"
+            },
+            {
+                "InstalledSize": "string"
+            },
+            {
+                "PackageType": "string"
+            },
+            {
+                "Permanent": "string"
+            },
+            {
+                "LogPathVariable": "string"
+            },
+            {
+                "RollbackLogPathVariable": "string"
+            },
+            {
+                "Compressed": "string"
+            },
+            {
+                "DisplayInternalUI": "string"
+            },
+            {
+                "ProductCode": "string"
+            },
+            {
+                "UpgradeCode": "string"
+            },
+            {
+                "Version": "string"
+            },
+            {
+                "InstallCondition": "string"
+            },
+            {
+                "Cache": "string"
+            }
+        ]
+    },
+    {
+        "WixPatchBaseline": [
+            {
+                "WixPatchBaseline": "string"
+            },
+            {
+                "DiskId": "number"
+            },
+            {
+                "ValidationFlags": "number"
+            }
+        ]
+    },
+    {
+        "WixPatchFamilyGroup": [
+            {
+                "WixPatchFamilyGroup": "string"
+            }
+        ]
+    },
+    {
+        "WixPatchId": [
+            {
+                "ProductCode": "string"
+            },
+            {
+                "ClientPatchId": "string"
+            },
+            {
+                "OptimizePatchSizeForLargeFiles": "number"
+            },
+            {
+                "ApiPatchingSymbolFlags": "number"
+            }
+        ]
+    },
+    {
+        "WixPatchMetadata": [
+            {
+                "Property": "string"
+            },
+            {
+                "Value": "string"
+            }
+        ]
+    },
+    {
+        "WixPatchRef": [
+            {
+                "Table": "string"
+            },
+            {
+                "PrimaryKeys": "string"
+            }
+        ]
+    },
+    {
+        "WixPatchTarget": [
+            {
+                "ProductCode": "string"
+            }
+        ]
+    },
+    {
+        "WixPayloadProperties": [
+            {
+                "Payload": "string"
+            },
+            {
+                "Package": "string"
+            },
+            {
+                "Container": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Size": "string"
+            },
+            {
+                "DownloadUrl": "string"
+            },
+            {
+                "LayoutOnly": "string"
+            }
+        ]
+    },
+    {
+        "WixProductSearch": [
+            {
+                "WixSearch_": "string"
+            },
+            {
+                "Guid": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixProperty": [
+            {
+                "Property_": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixRegistrySearch": [
+            {
+                "WixSearch_": "string"
+            },
+            {
+                "Root": "number"
+            },
+            {
+                "Key": "string"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixRelatedBundle": [
+            {
+                "Id": "string"
+            },
+            {
+                "Action": "number"
+            }
+        ]
+    },
+    {
+        "WixSearch": [
+            {
+                "WixSearch": "string"
+            },
+            {
+                "Variable": "string"
+            },
+            {
+                "Condition": "string"
+            }
+        ]
+    },
+    {
+        "WixSearchRelation": [
+            {
+                "WixSearch_": "string"
+            },
+            {
+                "ParentId_": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    },
+    {
+        "WixSimpleReference": [
+            {
+                "Table": "string"
+            },
+            {
+                "PrimaryKeys": "string"
+            }
+        ]
+    },
+    {
+        "WixSuppressAction": [
+            {
+                "SequenceTable": "string"
+            },
+            {
+                "Action": "string"
+            }
+        ]
+    },
+    {
+        "WixSuppressModularization": [
+            {
+                "WixSuppressModularization": "string"
+            }
+        ]
+    },
+    {
+        "WixUI": [
+            {
+                "WixUI": "string"
+            }
+        ]
+    },
+    {
+        "WixUpdateRegistration": [
+            {
+                "Manufacturer": "string"
+            },
+            {
+                "Department": "string"
+            },
+            {
+                "ProductFamily": "string"
+            },
+            {
+                "Name": "string"
+            },
+            {
+                "Classification": "string"
+            }
+        ]
+    },
+    {
+        "WixVariable": [
+            {
+                "WixVariable": "string"
+            },
+            {
+                "Value": "string"
+            },
+            {
+                "Attributes": "number"
+            }
+        ]
+    }
+]
\ No newline at end of file