Reintegrate MSI constructs into WxToolset.Data.WindowsInstaller namespace

62 files changed, 8105 insertions, 0 deletions

diff --git a/src/WixToolset.Data/WindowsInstaller/ColumnCategory.cs b/src/WixToolset.Data/WindowsInstaller/ColumnCategory.cs
new file mode 100644
index 00000000..0d50b7fd
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/ColumnCategory.cs
@@ -0,0 +1,91 @@
+// 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.WindowsInstaller
+{
+    /// <summary>
+    /// Column validation category type
+    /// </summary>
+    public enum ColumnCategory
+    {
+        /// <summary>Unknown category, default and invalid.</summary>
+        Unknown,
+
+        /// <summary>Text category.</summary>
+        Text,
+
+        /// <summary>UpperCase category.</summary>
+        UpperCase,
+
+        /// <summary>LowerCase category.</summary>
+        LowerCase,
+
+        /// <summary>Integer category.</summary>
+        Integer,
+
+        /// <summary>DoubleInteger category.</summary>
+        DoubleInteger,
+
+        /// <summary>TimeDate category.</summary>
+        TimeDate,
+
+        /// <summary>Identifier category.</summary>
+        Identifier,
+
+        /// <summary>Property category.</summary>
+        Property,
+
+        /// <summary>Filename category.</summary>
+        Filename,
+
+        /// <summary>WildCardFilename category.</summary>
+        WildCardFilename,
+
+        /// <summary>Path category.</summary>
+        Path,
+
+        /// <summary>Paths category.</summary>
+        Paths,
+
+        /// <summary>AnyPath category.</summary>
+        AnyPath,
+
+        /// <summary>DefaultDir category.</summary>
+        DefaultDir,
+
+        /// <summary>RegPath category.</summary>
+        RegPath,
+
+        /// <summary>Formatted category.</summary>
+        Formatted,
+
+        /// <summary>Template category.</summary>
+        Template,
+
+        /// <summary>Condition category.</summary>
+        Condition,
+
+        /// <summary>Guid category.</summary>
+        Guid,
+
+        /// <summary>Version category.</summary>
+        Version,
+
+        /// <summary>Language category.</summary>
+        Language,
+
+        /// <summary>Binary category.</summary>
+        Binary,
+
+        /// <summary>CustomSource category.</summary>
+        CustomSource,
+
+        /// <summary>Cabinet category.</summary>
+        Cabinet,
+
+        /// <summary>Shortcut category.</summary>
+        Shortcut,
+
+        /// <summary>Formatted SDDL category.</summary>
+        FormattedSDDLText,
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/ColumnDefinition.cs b/src/WixToolset.Data/WindowsInstaller/ColumnDefinition.cs
new file mode 100644
index 00000000..b6d4f29f
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/ColumnDefinition.cs
@@ -0,0 +1,685 @@
+// 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.WindowsInstaller
+{
+    using System;
+    using System.Globalization;
+    using System.Xml;
+
+    /// <summary>
+    /// Definition of a table's column.
+    /// </summary>
+    public sealed class ColumnDefinition : IComparable<ColumnDefinition>
+    {
+        /// <summary>
+        /// Creates a new column definition.
+        /// </summary>
+        /// <param name="name">Name of column.</param>
+        /// <param name="type">Type of column</param>
+        /// <param name="length">Length of column.</param>
+        /// <param name="primaryKey">If column is primary key.</param>
+        /// <param name="nullable">If column is nullable.</param>
+        /// <param name="category">Validation category for column.</param>
+        /// <param name="minValue">Optional minimum value for the column.</param>
+        /// <param name="maxValue">Optional maximum value for the colum.</param>
+        /// <param name="keyTable">Optional name of table for foreign key.</param>
+        /// <param name="keyColumn">Optional name of column for foreign key.</param>
+        /// <param name="possibilities">Set of possible values for column.</param>
+        /// <param name="description">Description of column in vaidation table.</param>
+        /// <param name="modularizeType">Type of modularization for column</param>
+        /// <param name="forceLocalizable">If the column is localizable.</param>
+        /// <param name="useCData">If whitespace should be preserved in a CDATA node.</param>
+        public ColumnDefinition(string name, ColumnType type, int length, bool primaryKey, bool nullable, ColumnCategory category, long? minValue = null, long? maxValue = null, string keyTable = null, int? keyColumn = null, string possibilities = null, string description = null, ColumnModularizeType? modularizeType = null, bool forceLocalizable = false, bool useCData = false)
+        {
+            this.Name = name;
+            this.Type = type;
+            this.Length = length;
+            this.PrimaryKey = primaryKey;
+            this.Nullable = nullable;
+            this.ModularizeType = CalculateModularizationType(modularizeType, category);
+            this.IsLocalizable = forceLocalizable || ColumnType.Localized == type;
+            this.MinValue = minValue;
+            this.MaxValue = maxValue;
+            this.KeyTable = keyTable;
+            this.KeyColumn = keyColumn;
+            this.Category = category;
+            this.Possibilities = possibilities;
+            this.Description = description;
+            this.UseCData = useCData;
+        }
+
+        /// <summary>
+        /// Gets whether this column was added via a transform.
+        /// </summary>
+        /// <value>Whether this column was added via a transform.</value>
+        public bool Added { get; set; }
+
+        /// <summary>
+        /// Gets the name of the column.
+        /// </summary>
+        /// <value>Name of column.</value>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the type of the column.
+        /// </summary>
+        /// <value>Type of column.</value>
+        public ColumnType Type { get; }
+
+        /// <summary>
+        /// Gets the length of the column.
+        /// </summary>
+        /// <value>Length of column.</value>
+        public int Length { get; }
+
+        /// <summary>
+        /// Gets if the column is a primary key.
+        /// </summary>
+        /// <value>true if column is primary key.</value>
+        public bool PrimaryKey { get; }
+
+        /// <summary>
+        /// Gets if the column is nullable.
+        /// </summary>
+        /// <value>true if column is nullable.</value>
+        public bool Nullable { get; }
+
+        /// <summary>
+        /// Gets the type of modularization for this column.
+        /// </summary>
+        /// <value>Column's modularization type.</value>
+        public ColumnModularizeType ModularizeType { get; }
+
+        /// <summary>
+        /// Gets if the column is localizable. Can be because the type is localizable, or because the column 
+        /// was explicitly set to be so.
+        /// </summary>
+        /// <value>true if column is localizable.</value>
+        public bool IsLocalizable { get; }
+
+        /// <summary>
+        /// Gets the minimum value for the column.
+        /// </summary>
+        /// <value>Minimum value for the column.</value>
+        public long? MinValue { get; }
+
+        /// <summary>
+        /// Gets the maximum value for the column.
+        /// </summary>
+        /// <value>Maximum value for the column.</value>
+        public long? MaxValue { get; }
+
+        /// <summary>
+        /// Gets the table that has the foreign key for this column
+        /// </summary>
+        /// <value>Foreign key table name.</value>
+        public string KeyTable { get; }
+
+        /// <summary>
+        /// Gets the foreign key column that this column refers to.
+        /// </summary>
+        /// <value>Foreign key column.</value>
+        public int? KeyColumn { get; }
+
+        /// <summary>
+        /// Gets the validation category for this column.
+        /// </summary>
+        /// <value>Validation category.</value>
+        public ColumnCategory Category { get; }
+
+        /// <summary>
+        /// Gets the set of possibilities for this column.
+        /// </summary>
+        /// <value>Set of possibilities for this column.</value>
+        public string Possibilities { get; }
+
+        /// <summary>
+        /// Gets the description for this column.
+        /// </summary>
+        /// <value>Description of column.</value>
+        public string Description { get; }
+
+        /// <summary>
+        /// Gets if whitespace should be preserved in a CDATA node.
+        /// </summary>
+        /// <value>true if whitespace should be preserved in a CDATA node.</value>
+        public bool UseCData { get; }
+
+        /// <summary>
+        /// Parses a column definition in a table definition.
+        /// </summary>
+        /// <param name="reader">Reader to get data from.</param>
+        /// <returns>The ColumnDefintion represented by the Xml.</returns>
+        internal static ColumnDefinition Read(XmlReader reader)
+        {
+            if (!reader.LocalName.Equals("columnDefinition"))
+            {
+                throw new XmlException();
+            }
+
+            bool added = false;
+            ColumnCategory category = ColumnCategory.Unknown;
+            string description = null;
+            bool empty = reader.IsEmptyElement;
+            int? keyColumn = null;
+            string keyTable = null;
+            int length = -1;
+            bool localizable = false;
+            long? maxValue = null;
+            long? minValue = null;
+            var modularize = ColumnModularizeType.None;
+            string name = null;
+            bool nullable = false;
+            string possibilities = null;
+            bool primaryKey = false;
+            var type = ColumnType.Unknown;
+            bool useCData = false;
+
+            // parse the attributes
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "added":
+                        added = reader.Value.Equals("yes");
+                        break;
+                    case "category":
+                        switch (reader.Value)
+                        {
+                            case "anyPath":
+                                category = ColumnCategory.AnyPath;
+                                break;
+                            case "binary":
+                                category = ColumnCategory.Binary;
+                                break;
+                            case "cabinet":
+                                category = ColumnCategory.Cabinet;
+                                break;
+                            case "condition":
+                                category = ColumnCategory.Condition;
+                                break;
+                            case "customSource":
+                                category = ColumnCategory.CustomSource;
+                                break;
+                            case "defaultDir":
+                                category = ColumnCategory.DefaultDir;
+                                break;
+                            case "doubleInteger":
+                                category = ColumnCategory.DoubleInteger;
+                                break;
+                            case "filename":
+                                category = ColumnCategory.Filename;
+                                break;
+                            case "formatted":
+                                category = ColumnCategory.Formatted;
+                                break;
+                            case "formattedSddl":
+                                category = ColumnCategory.FormattedSDDLText;
+                                break;
+                            case "guid":
+                                category = ColumnCategory.Guid;
+                                break;
+                            case "identifier":
+                                category = ColumnCategory.Identifier;
+                                break;
+                            case "integer":
+                                category = ColumnCategory.Integer;
+                                break;
+                            case "language":
+                                category = ColumnCategory.Language;
+                                break;
+                            case "lowerCase":
+                                category = ColumnCategory.LowerCase;
+                                break;
+                            case "path":
+                                category = ColumnCategory.Path;
+                                break;
+                            case "paths":
+                                category = ColumnCategory.Paths;
+                                break;
+                            case "property":
+                                category = ColumnCategory.Property;
+                                break;
+                            case "regPath":
+                                category = ColumnCategory.RegPath;
+                                break;
+                            case "shortcut":
+                                category = ColumnCategory.Shortcut;
+                                break;
+                            case "template":
+                                category = ColumnCategory.Template;
+                                break;
+                            case "text":
+                                category = ColumnCategory.Text;
+                                break;
+                            case "timeDate":
+                                category = ColumnCategory.TimeDate;
+                                break;
+                            case "upperCase":
+                                category = ColumnCategory.UpperCase;
+                                break;
+                            case "version":
+                                category = ColumnCategory.Version;
+                                break;
+                            case "wildCardFilename":
+                                category = ColumnCategory.WildCardFilename;
+                                break;
+                            default:
+                                throw new InvalidOperationException();
+                        }
+                        break;
+                    case "description":
+                        description = reader.Value;
+                        break;
+                    case "keyColumn":
+                        keyColumn = Convert.ToInt32(reader.Value, 10);
+                        break;
+                    case "keyTable":
+                        keyTable = reader.Value;
+                        break;
+                    case "length":
+                        length = Convert.ToInt32(reader.Value, 10);
+                        break;
+                    case "localizable":
+                        localizable = reader.Value.Equals("yes");
+                        break;
+                    case "maxValue":
+                        maxValue = Convert.ToInt32(reader.Value, 10);
+                        break;
+                    case "minValue":
+                        minValue = Convert.ToInt32(reader.Value, 10);
+                        break;
+                    case "modularize":
+                        switch (reader.Value)
+                        {
+                            case "column":
+                                modularize = ColumnModularizeType.Column;
+                                break;
+                            case "companionFile":
+                                modularize = ColumnModularizeType.CompanionFile;
+                                break;
+                            case "condition":
+                                modularize = ColumnModularizeType.Condition;
+                                break;
+                            case "controlEventArgument":
+                                modularize = ColumnModularizeType.ControlEventArgument;
+                                break;
+                            case "controlText":
+                                modularize = ColumnModularizeType.ControlText;
+                                break;
+                            case "icon":
+                                modularize = ColumnModularizeType.Icon;
+                                break;
+                            case "none":
+                                modularize = ColumnModularizeType.None;
+                                break;
+                            case "property":
+                                modularize = ColumnModularizeType.Property;
+                                break;
+                            case "semicolonDelimited":
+                                modularize = ColumnModularizeType.SemicolonDelimited;
+                                break;
+                            default:
+                                throw new XmlException();
+                        }
+                        break;
+                    case "name":
+                        switch (reader.Value)
+                        {
+                            case "CREATE":
+                            case "DELETE":
+                            case "DROP":
+                            case "INSERT":
+                                throw new XmlException();
+                            default:
+                                name = reader.Value;
+                                break;
+                        }
+                        break;
+                    case "nullable":
+                        nullable = reader.Value.Equals("yes");
+                        break;
+                    case "primaryKey":
+                        primaryKey = reader.Value.Equals("yes");
+                        break;
+                    case "set":
+                        possibilities = reader.Value;
+                        break;
+                    case "type":
+                        switch (reader.Value)
+                        {
+                            case "localized":
+                                type = ColumnType.Localized;
+                                break;
+                            case "number":
+                                type = ColumnType.Number;
+                                break;
+                            case "object":
+                                type = ColumnType.Object;
+                                break;
+                            case "string":
+                                type = ColumnType.String;
+                                break;
+                            case "preserved":
+                                type = ColumnType.Preserved;
+                                break;
+                            default:
+                                throw new XmlException();
+                        }
+                        break;
+                    case "useCData":
+                        useCData = reader.Value.Equals("yes");
+                        break;
+                }
+            }
+
+            // parse the child elements (there should be none)
+            if (!empty)
+            {
+                bool done = false;
+
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            throw new XmlException();
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+
+            ColumnDefinition columnDefinition = new ColumnDefinition(name, type, length, primaryKey, nullable, category, minValue, maxValue, keyTable, keyColumn, possibilities, description, modularize, localizable, useCData);
+            columnDefinition.Added = added;
+
+            return columnDefinition;
+        }
+
+        /// <summary>
+        /// Persists a ColumnDefinition in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the Output should persist itself as XML.</param>
+        internal void Write(XmlWriter writer)
+        {
+            writer.WriteStartElement("columnDefinition", TableDefinitionCollection.XmlNamespaceUri);
+
+            writer.WriteAttributeString("name", this.Name);
+
+            switch (this.Type)
+            {
+                case ColumnType.Localized:
+                    writer.WriteAttributeString("type", "localized");
+                    break;
+                case ColumnType.Number:
+                    writer.WriteAttributeString("type", "number");
+                    break;
+                case ColumnType.Object:
+                    writer.WriteAttributeString("type", "object");
+                    break;
+                case ColumnType.String:
+                    writer.WriteAttributeString("type", "string");
+                    break;
+                case ColumnType.Preserved:
+                    writer.WriteAttributeString("type", "preserved");
+                    break;
+            }
+
+            writer.WriteAttributeString("length", this.Length.ToString(CultureInfo.InvariantCulture.NumberFormat));
+
+            if (this.PrimaryKey)
+            {
+                writer.WriteAttributeString("primaryKey", "yes");
+            }
+
+            if (this.Nullable)
+            {
+                writer.WriteAttributeString("nullable", "yes");
+            }
+
+            if (this.IsLocalizable)
+            {
+                writer.WriteAttributeString("localizable", "yes");
+            }
+
+            if (this.Added)
+            {
+                writer.WriteAttributeString("added", "yes");
+            }
+
+            switch (this.ModularizeType)
+            {
+                case ColumnModularizeType.Column:
+                    writer.WriteAttributeString("modularize", "column");
+                    break;
+                case ColumnModularizeType.CompanionFile:
+                    writer.WriteAttributeString("modularize", "companionFile");
+                    break;
+                case ColumnModularizeType.Condition:
+                    writer.WriteAttributeString("modularize", "condition");
+                    break;
+                case ColumnModularizeType.ControlEventArgument:
+                    writer.WriteAttributeString("modularize", "controlEventArgument");
+                    break;
+                case ColumnModularizeType.ControlText:
+                    writer.WriteAttributeString("modularize", "controlText");
+                    break;
+                case ColumnModularizeType.Icon:
+                    writer.WriteAttributeString("modularize", "icon");
+                    break;
+                case ColumnModularizeType.None:
+                    // this is the default value
+                    break;
+                case ColumnModularizeType.Property:
+                    writer.WriteAttributeString("modularize", "property");
+                    break;
+                case ColumnModularizeType.SemicolonDelimited:
+                    writer.WriteAttributeString("modularize", "semicolonDelimited");
+                    break;
+            }
+
+            if (this.MinValue.HasValue)
+            {
+                writer.WriteAttributeString("minValue", this.MinValue.Value.ToString(CultureInfo.InvariantCulture.NumberFormat));
+            }
+
+            if (this.MaxValue.HasValue)
+            {
+                writer.WriteAttributeString("maxValue", this.MaxValue.Value.ToString(CultureInfo.InvariantCulture.NumberFormat));
+            }
+
+            if (!String.IsNullOrEmpty(this.KeyTable))
+            {
+                writer.WriteAttributeString("keyTable", this.KeyTable);
+            }
+
+            if (this.KeyColumn.HasValue)
+            {
+                writer.WriteAttributeString("keyColumn", this.KeyColumn.HasValue.ToString(CultureInfo.InvariantCulture.NumberFormat));
+            }
+
+            switch (this.Category)
+            {
+                case ColumnCategory.AnyPath:
+                    writer.WriteAttributeString("category", "anyPath");
+                    break;
+                case ColumnCategory.Binary:
+                    writer.WriteAttributeString("category", "binary");
+                    break;
+                case ColumnCategory.Cabinet:
+                    writer.WriteAttributeString("category", "cabinet");
+                    break;
+                case ColumnCategory.Condition:
+                    writer.WriteAttributeString("category", "condition");
+                    break;
+                case ColumnCategory.CustomSource:
+                    writer.WriteAttributeString("category", "customSource");
+                    break;
+                case ColumnCategory.DefaultDir:
+                    writer.WriteAttributeString("category", "defaultDir");
+                    break;
+                case ColumnCategory.DoubleInteger:
+                    writer.WriteAttributeString("category", "doubleInteger");
+                    break;
+                case ColumnCategory.Filename:
+                    writer.WriteAttributeString("category", "filename");
+                    break;
+                case ColumnCategory.Formatted:
+                    writer.WriteAttributeString("category", "formatted");
+                    break;
+                case ColumnCategory.FormattedSDDLText:
+                    writer.WriteAttributeString("category", "formattedSddl");
+                    break;
+                case ColumnCategory.Guid:
+                    writer.WriteAttributeString("category", "guid");
+                    break;
+                case ColumnCategory.Identifier:
+                    writer.WriteAttributeString("category", "identifier");
+                    break;
+                case ColumnCategory.Integer:
+                    writer.WriteAttributeString("category", "integer");
+                    break;
+                case ColumnCategory.Language:
+                    writer.WriteAttributeString("category", "language");
+                    break;
+                case ColumnCategory.LowerCase:
+                    writer.WriteAttributeString("category", "lowerCase");
+                    break;
+                case ColumnCategory.Path:
+                    writer.WriteAttributeString("category", "path");
+                    break;
+                case ColumnCategory.Paths:
+                    writer.WriteAttributeString("category", "paths");
+                    break;
+                case ColumnCategory.Property:
+                    writer.WriteAttributeString("category", "property");
+                    break;
+                case ColumnCategory.RegPath:
+                    writer.WriteAttributeString("category", "regPath");
+                    break;
+                case ColumnCategory.Shortcut:
+                    writer.WriteAttributeString("category", "shortcut");
+                    break;
+                case ColumnCategory.Template:
+                    writer.WriteAttributeString("category", "template");
+                    break;
+                case ColumnCategory.Text:
+                    writer.WriteAttributeString("category", "text");
+                    break;
+                case ColumnCategory.TimeDate:
+                    writer.WriteAttributeString("category", "timeDate");
+                    break;
+                case ColumnCategory.UpperCase:
+                    writer.WriteAttributeString("category", "upperCase");
+                    break;
+                case ColumnCategory.Version:
+                    writer.WriteAttributeString("category", "version");
+                    break;
+                case ColumnCategory.WildCardFilename:
+                    writer.WriteAttributeString("category", "wildCardFilename");
+                    break;
+            }
+
+            if (!String.IsNullOrEmpty(this.Possibilities))
+            {
+                writer.WriteAttributeString("set", this.Possibilities);
+            }
+
+            if (!String.IsNullOrEmpty(this.Description))
+            {
+                writer.WriteAttributeString("description", this.Description);
+            }
+
+            if (this.UseCData)
+            {
+                writer.WriteAttributeString("useCData", "yes");
+            }
+
+            writer.WriteEndElement();
+        }
+
+        /// <summary>
+        /// Compare this column definition to another column definition.
+        /// </summary>
+        /// <remarks>
+        /// Only Windows Installer traits are compared, allowing for updates to WiX-specific table definitions.
+        /// </remarks>
+        /// <param name="other">The <see cref="ColumnDefinition"/> to compare with this one.</param>
+        /// <returns>0 if the columns' core propeties are the same; otherwise, non-0.</returns>
+        public int CompareTo(ColumnDefinition other)
+        {
+            // by definition, this object is greater than null
+            if (null == other)
+            {
+                return 1;
+            }
+
+            // compare column names
+            int ret = String.Compare(this.Name, other.Name, StringComparison.Ordinal);
+
+            // compare column types
+            if (0 == ret)
+            {
+                ret = this.Type == other.Type ? 0 : -1;
+
+                // compare column lengths
+                if (0 == ret)
+                {
+                    ret = this.Length == other.Length ? 0 : -1;
+
+                    // compare whether both are primary keys
+                    if (0 == ret)
+                    {
+                        ret = this.PrimaryKey == other.PrimaryKey ? 0 : -1;
+
+                        // compare nullability
+                        if (0 == ret)
+                        {
+                            ret = this.Nullable == other.Nullable ? 0 : -1;
+                        }
+                    }
+                }
+            }
+
+            return ret;
+        }
+
+        private static ColumnModularizeType CalculateModularizationType(ColumnModularizeType? modularizeType, ColumnCategory category)
+        {
+            if (modularizeType.HasValue)
+            {
+                return modularizeType.Value;
+            }
+
+            switch (category)
+            {
+                case ColumnCategory.Identifier:
+                case ColumnCategory.CustomSource:
+                    return ColumnModularizeType.Column;
+
+                case ColumnCategory.Condition:
+                    return ColumnModularizeType.Condition;
+
+                case ColumnCategory.AnyPath:
+                case ColumnCategory.Formatted:
+                case ColumnCategory.FormattedSDDLText:
+                case ColumnCategory.Path:
+                case ColumnCategory.Paths:
+                case ColumnCategory.RegPath:
+                case ColumnCategory.Template:
+                    return ColumnModularizeType.Property;
+
+                case ColumnCategory.Shortcut:
+                    return ColumnModularizeType.Property;
+            }
+
+            return ColumnModularizeType.None;
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/ColumnModularizeType.cs b/src/WixToolset.Data/WindowsInstaller/ColumnModularizeType.cs
new file mode 100644
index 00000000..d44f55a7
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/ColumnModularizeType.cs
@@ -0,0 +1,37 @@
+// 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.WindowsInstaller
+{
+    /// <summary>
+    /// Specifies if the column should be modularized.
+    /// </summary>
+    public enum ColumnModularizeType
+    {
+        /// <summary>Column should not be modularized.</summary>
+        None,
+
+        /// <summary>Column should be modularized.</summary>
+        Column,
+
+        /// <summary>When the column is an primary or foreign key to the Icon table it should be modularized special.</summary>
+        Icon,
+
+        /// <summary>When the column is a companion file it should be modularized.</summary>
+        CompanionFile,
+
+        /// <summary>Column is a condition and should be modularized.</summary>
+        Condition,
+
+        /// <summary>Special modularization type for the ControlEvent table's Argument column.</summary>
+        ControlEventArgument,
+
+        /// <summary>Special modularization type for the Control table's Text column.</summary>
+        ControlText,
+
+        /// <summary>Any Properties in the column should be modularized.</summary>
+        Property,
+
+        /// <summary>Semi-colon list of keys, all of which need to be modularized.</summary>
+        SemicolonDelimited,
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/ColumnType.cs b/src/WixToolset.Data/WindowsInstaller/ColumnType.cs
new file mode 100644
index 00000000..423125db
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/ColumnType.cs
@@ -0,0 +1,28 @@
+// 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.WindowsInstaller
+{
+    /// <summary>
+    /// Defines MSI column types.
+    /// </summary>
+    public enum ColumnType
+    {
+        /// <summary>Unknown column type, default and invalid.</summary>
+        Unknown,
+
+        /// <summary>Column is a string.</summary>
+        String,
+
+        /// <summary>Column is a localizable string.</summary>
+        Localized,
+
+        /// <summary>Column is a number.</summary>
+        Number,
+
+        /// <summary>Column is a binary stream.</summary>
+        Object,
+
+        /// <summary>Column is a string that is preserved in transforms (like Object).</summary>
+        Preserved,
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Field.cs b/src/WixToolset.Data/WindowsInstaller/Field.cs
new file mode 100644
index 00000000..11cd2c33
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Field.cs
@@ -0,0 +1,312 @@
+// 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.WindowsInstaller
+{
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Xml;
+
+    /// <summary>
+    /// Field containing data for a column in a row.
+    /// </summary>
+    public class Field
+    {
+        private object data;
+
+        /// <summary>
+        /// Instantiates a new Field.
+        /// </summary>
+        /// <param name="columnDefinition">Column definition for this field.</param>
+        protected Field(ColumnDefinition columnDefinition)
+        {
+            this.Column = columnDefinition;
+        }
+
+        /// <summary>
+        /// Gets or sets the column definition for this field.
+        /// </summary>
+        /// <value>Column definition.</value>
+        public ColumnDefinition Column { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the data for this field.
+        /// </summary>
+        /// <value>Data in the field.</value>
+        public object Data
+        {
+            get
+            {
+                return this.data;
+            }
+
+            set
+            {
+                // Validate the value before setting it.
+                this.data = this.ValidateValue(this.Column, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether this field is modified.
+        /// </summary>
+        /// <value>Whether this field is modified.</value>
+        public bool Modified { get; set; }
+
+        /// <summary>
+        /// Gets or sets the previous data.
+        /// </summary>
+        /// <value>The previous data.</value>
+        public string PreviousData { get; set; }
+
+        /// <summary>
+        /// Instantiate a new Field object of the correct type.
+        /// </summary>
+        /// <param name="columnDefinition">The column definition for the field.</param>
+        /// <returns>The new Field object.</returns>
+        public static Field Create(ColumnDefinition columnDefinition)
+        {
+            return (ColumnType.Object == columnDefinition.Type) ? new ObjectField(columnDefinition) : new Field(columnDefinition);
+        }
+
+        /// <summary>
+        /// Sets the value of a particular field in the row without validating.
+        /// </summary>
+        /// <param name="field">field index.</param>
+        /// <param name="value">Value of a field in the row.</param>
+        /// <returns>True if successful, false if validation failed.</returns>
+        public bool BestEffortSet(object value)
+        {
+            bool success = true;
+            object bestEffortValue = value;
+
+            try
+            {
+                bestEffortValue = this.ValidateValue(this.Column, value);
+            }
+            catch (InvalidOperationException)
+            {
+                success = false;
+            }
+
+            this.data = bestEffortValue;
+            return success;
+        }
+
+        /// <summary>
+        /// Determine if this field is identical to another field.
+        /// </summary>
+        /// <param name="field">The other field to compare to.</param>
+        /// <returns>true if they are equal; false otherwise.</returns>
+        public bool IsIdentical(Field field)
+        {
+            return (this.Column.Name == field.Column.Name &&
+                ((null != this.data && this.data.Equals(field.data)) || (null == this.data && null == field.data)));
+        }
+
+        /// <summary>
+        /// Overrides the built in object implementation to return the field's data as a string.
+        /// </summary>
+        /// <returns>Field's data as a string.</returns>
+        public override string ToString()
+        {
+            return this.AsString();
+        }
+
+        /// <summary>
+        /// Gets the field as an integer.
+        /// </summary>
+        /// <returns>Field's data as an integer.</returns>
+        public int AsInteger()
+        {
+            return (this.data is int) ? (int)this.data : Convert.ToInt32(this.data, CultureInfo.InvariantCulture);
+        }
+
+        /// <summary>
+        /// Gets the field as an integer that could be null.
+        /// </summary>
+        /// <returns>Field's data as an integer that could be null.</returns>
+        public int? AsNullableInteger()
+        {
+            return (null == this.data) ? (int?)null : (this.data is int) ? (int)this.data : Convert.ToInt32(this.data, CultureInfo.InvariantCulture);
+        }
+
+        /// <summary>
+        /// Gets the field as a string.
+        /// </summary>
+        /// <returns>Field's data as a string.</returns>
+        public string AsString()
+        {
+            return (null == this.data) ? null : Convert.ToString(this.data, CultureInfo.InvariantCulture);
+        }
+
+        /// <summary>
+        /// Validate a value for this column.
+        /// </summary>
+        /// <param name="value">The value to validate.</param>
+        /// <returns>Validated value.</returns>
+        internal object ValidateValue(ColumnDefinition column, object value)
+        {
+            if (null == value)
+            {
+                if (!column.Nullable)
+                {
+                    throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with a null value because this is a required field.", column.Name));
+                }
+            }
+            else // check numerical values against their specified minimum and maximum values.
+            {
+                if (ColumnType.Number == column.Type && !column.IsLocalizable)
+                {
+                    // For now all enums in the tables can be represented by integers. This if statement would need to
+                    // be enhanced if that ever changes.
+                    if (value is int || value.GetType().IsEnum)
+                    {
+                        int intValue = (int)value;
+
+                        // validate the value against the minimum allowed value
+                        if (column.MinValue.HasValue && column.MinValue > intValue)
+                        {
+                            throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with value {1} because it is less than the minimum allowed value for this column, {2}.", column.Name, intValue, column.MinValue));
+                        }
+
+                        // validate the value against the maximum allowed value
+                        if (column.MaxValue.HasValue && column.MaxValue < intValue)
+                        {
+                            throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with value {1} because it is greater than the maximum allowed value for this column, {2}.", column.Name, intValue, column.MaxValue));
+                        }
+
+                        return intValue;
+                    }
+                    else if (value is long longValue)
+                    {
+                        // validate the value against the minimum allowed value
+                        if (column.MinValue.HasValue && column.MinValue > longValue)
+                        {
+                            throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with value {1} because it is less than the minimum allowed value for this column, {2}.", column.Name, longValue, column.MinValue));
+                        }
+
+                        // validate the value against the maximum allowed value
+                        if (column.MaxValue.HasValue && column.MaxValue < longValue)
+                        {
+                            throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with value {1} because it is greater than the maximum allowed value for this column, {2}.", column.Name, longValue, column.MaxValue));
+                        }
+
+                        return longValue;
+                    }
+                    else
+                    {
+                        throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set number column '{0}' with a value of type '{1}'.", column.Name, value.GetType().ToString()));
+                    }
+                }
+                else
+                {
+                    if (!(value is string))
+                    {
+                        //throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set string column '{0}' with a value of type '{1}'.", this.name, value.GetType().ToString()));
+                        return value.ToString();
+                    }
+                }
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Parse a field from the xml.
+        /// </summary>
+        /// <param name="reader">XmlReader where the intermediate is persisted.</param>
+        internal virtual void Read(XmlReader reader)
+        {
+            Debug.Assert("field" == reader.LocalName);
+
+            bool empty = reader.IsEmptyElement;
+
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "modified":
+                        this.Modified = reader.Value.Equals("yes");
+                        break;
+                    case "previousData":
+                        this.PreviousData = reader.Value;
+                        break;
+                }
+            }
+
+            if (!empty)
+            {
+                bool done = false;
+
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            throw new XmlException();
+                        case XmlNodeType.CDATA:
+                        case XmlNodeType.Text:
+                        case XmlNodeType.SignificantWhitespace:
+                            if (0 < reader.Value.Length)
+                            {
+                                if (ColumnType.Number == this.Column.Type && !this.Column.IsLocalizable)
+                                {
+                                    // older wix files could persist data as a long value (which would overflow an int)
+                                    // since the Convert class always throws exceptions for overflows, read in integral
+                                    // values as a long to avoid the overflow, then cast it to an int (this operation can
+                                    // overflow without throwing an exception inside an unchecked block)
+                                    this.data = unchecked((int)Convert.ToInt64(reader.Value, CultureInfo.InvariantCulture));
+                                }
+                                else
+                                {
+                                    this.data = reader.Value;
+                                }
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Persists a field in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the Field should persist itself as XML.</param>
+        internal virtual void Write(XmlWriter writer)
+        {
+            writer.WriteStartElement("field", Intermediate.XmlNamespaceUri);
+
+            if (this.Modified)
+            {
+                writer.WriteAttributeString("modified", "yes");
+            }
+
+            if (null != this.PreviousData)
+            {
+                writer.WriteAttributeString("previousData", this.PreviousData);
+            }
+
+            // Convert the data to a string that will persist nicely (nulls as String.Empty).
+            string text = Convert.ToString(this.data, CultureInfo.InvariantCulture);
+            if (this.Column.UseCData)
+            {
+                writer.WriteCData(text);
+            }
+            else
+            {
+                writer.WriteString(text);
+            }
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/ObjectField.cs b/src/WixToolset.Data/WindowsInstaller/ObjectField.cs
new file mode 100644
index 00000000..016693f5
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/ObjectField.cs
@@ -0,0 +1,183 @@
+// 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.WindowsInstaller
+{
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Xml;
+
+    /// <summary>
+    /// Field containing data for an object column in a row.
+    /// </summary>
+    public sealed class ObjectField : Field
+    {
+        /// <summary>
+        /// Instantiates a new Field.
+        /// </summary>
+        /// <param name="columnDefinition">Column definition for this field.</param>
+        internal ObjectField(ColumnDefinition columnDefinition) :
+            base(columnDefinition)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the index of the embedded file in a library.
+        /// </summary>
+        /// <value>The index of the embedded file.</value>
+        public int? EmbeddedFileIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the previous index of the embedded file in the library.
+        /// </summary>
+        /// <value>The previous index of the embedded file.</value>
+        public int? PreviousEmbeddedFileIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path to the embedded cabinet of the previous file.
+        /// </summary>
+        /// <value>The path of the cabinet containing the previous file.</value>
+        public Uri PreviousBaseUri { get; set; }
+
+        /// <summary>
+        /// Gets the base URI of the object field.
+        /// </summary>
+        /// <value>The base URI of the object field.</value>
+        public Uri BaseUri { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the unresolved data for this field.
+        /// </summary>
+        /// <value>Unresolved Data in the field.</value>
+        public string UnresolvedData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the unresolved previous data.
+        /// </summary>
+        /// <value>The unresolved previous data.</value>
+        public string UnresolvedPreviousData { get; set; }
+
+        /// <summary>
+        /// Parse a field from the xml.
+        /// </summary>
+        /// <param name="reader">XmlReader where the intermediate is persisted.</param>
+        internal override void Read(XmlReader reader)
+        {
+            Debug.Assert("field" == reader.LocalName);
+
+            bool empty = reader.IsEmptyElement;
+
+            this.BaseUri = new Uri(reader.BaseURI);
+
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "cabinetFileId":
+                        this.EmbeddedFileIndex = Convert.ToInt32(reader.Value);
+                        break;
+                    case "modified":
+                        this.Modified = reader.Value.Equals("yes");
+                        break;
+                    case "previousData":
+                        this.PreviousData = reader.Value;
+                        break;
+                    case "unresolvedPreviousData":
+                        this.UnresolvedPreviousData = reader.Value;
+                        break;
+                    case "unresolvedData":
+                        this.UnresolvedData = reader.Value;
+                        break;
+                    case "previousCabinetFileId":
+                        this.PreviousEmbeddedFileIndex = Convert.ToInt32(reader.Value);
+                        break;
+                }
+            }
+
+            if (!empty)
+            {
+                bool done = false;
+
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            throw new XmlException();
+                        case XmlNodeType.CDATA:
+                        case XmlNodeType.Text:
+                            if (0 < reader.Value.Length)
+                            {
+                                this.Data = reader.Value;
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Persists a field in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the Field should persist itself as XML.</param>
+        internal override void Write(XmlWriter writer)
+        {
+            writer.WriteStartElement("field", Intermediate.XmlNamespaceUri);
+
+            if (this.EmbeddedFileIndex.HasValue)
+            {
+                writer.WriteStartAttribute("cabinetFileId");
+                writer.WriteValue(this.EmbeddedFileIndex);
+                writer.WriteEndAttribute();
+            }
+
+            if (this.Modified)
+            {
+                writer.WriteAttributeString("modified", "yes");
+            }
+
+            if (null != this.UnresolvedPreviousData)
+            {
+                writer.WriteAttributeString("unresolvedPreviousData", this.UnresolvedPreviousData);
+            }
+
+            if (null != this.PreviousData)
+            {
+                writer.WriteAttributeString("previousData", this.PreviousData);
+            }
+
+            if (null != this.UnresolvedData)
+            {
+                writer.WriteAttributeString("unresolvedData", this.UnresolvedData);
+            }
+
+            if (this.PreviousEmbeddedFileIndex.HasValue)
+            {
+                writer.WriteStartAttribute("previousCabinetFileId");
+                writer.WriteValue(this.PreviousEmbeddedFileIndex);
+                writer.WriteEndAttribute();
+            }
+
+            // Convert the data to a string that will persist nicely (nulls as String.Empty).
+            string text = Convert.ToString(this.Data, CultureInfo.InvariantCulture);
+            if (this.Column.UseCData)
+            {
+                writer.WriteCData(text);
+            }
+            else
+            {
+                writer.WriteString(text);
+            }
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Output.cs b/src/WixToolset.Data/WindowsInstaller/Output.cs
new file mode 100644
index 00000000..6164622d
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Output.cs
@@ -0,0 +1,274 @@
+// 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.WindowsInstaller
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.IO;
+    using System.Linq;
+    using System.Xml;
+
+    /// <summary>
+    /// Output is generated by the linker.
+    /// </summary>
+    public sealed class Output
+    {
+        public const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/wixout";
+        private static readonly Version CurrentVersion = new Version("4.0.0.0");
+
+        /// <summary>
+        /// Creates a new empty output object.
+        /// </summary>
+        /// <param name="sourceLineNumbers">The source line information for the output.</param>
+        public Output(SourceLineNumber sourceLineNumbers)
+        {
+            this.SourceLineNumbers = sourceLineNumbers;
+            this.SubStorages = new List<SubStorage>();
+            this.Tables = new TableIndexedCollection();
+        }
+
+        /// <summary>
+        /// Gets the type of the output.
+        /// </summary>
+        /// <value>Type of the output.</value>
+        public OutputType Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the codepage for this output.
+        /// </summary>
+        /// <value>Codepage of the output.</value>
+        public int Codepage { get; set; }
+
+        /// <summary>
+        /// Gets the source line information for this output.
+        /// </summary>
+        /// <value>The source line information for this output.</value>
+        public SourceLineNumber SourceLineNumbers { get; private set; }
+
+        /// <summary>
+        /// Gets the substorages in this output.
+        /// </summary>
+        /// <value>The substorages in this output.</value>
+        public ICollection<SubStorage> SubStorages { get; private set; }
+
+        /// <summary>
+        /// Gets the tables contained in this output.
+        /// </summary>
+        /// <value>Collection of tables.</value>
+        public TableIndexedCollection Tables { get; private set; }
+
+        /// <summary>
+        /// Loads an output from a path on disk.
+        /// </summary>
+        /// <param name="path">Path to output file saved on disk.</param>
+        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
+        /// <returns>Output object.</returns>
+        public static Output Load(string path, bool suppressVersionCheck)
+        {
+            using (FileStream stream = File.OpenRead(path))
+            using (FileStructure fs = FileStructure.Read(stream))
+            {
+                if (FileFormat.Wixout != fs.FileFormat)
+                {
+                    throw new WixUnexpectedFileFormatException(path, FileFormat.Wixout, fs.FileFormat);
+                }
+
+                Uri uri = new Uri(Path.GetFullPath(path));
+                using (XmlReader reader = XmlReader.Create(fs.GetDataStream(), null, uri.AbsoluteUri))
+                {
+                    try
+                    {
+                        reader.MoveToContent();
+                        return Output.Read(reader, suppressVersionCheck);
+                    }
+                    catch (XmlException xe)
+                    {
+                        throw new WixCorruptFileException(path, fs.FileFormat, xe);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Saves an output to a path on disk.
+        /// </summary>
+        /// <param name="path">Path to save output file to on disk.</param>
+        public void Save(string path)
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(Path.GetFullPath(path)));
+
+            using (FileStream stream = File.Create(path))
+            using (FileStructure fs = FileStructure.Create(stream, FileFormat.Wixout, null))
+            using (XmlWriter writer = XmlWriter.Create(fs.GetDataStream()))
+            {
+                writer.WriteStartDocument();
+                this.Write(writer);
+                writer.WriteEndDocument();
+            }
+        }
+
+        /// <summary>
+        /// Processes an XmlReader and builds up the output object.
+        /// </summary>
+        /// <param name="reader">Reader to get data from.</param>
+        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
+        /// <returns>The Output represented by the Xml.</returns>
+        internal static Output Read(XmlReader reader, bool suppressVersionCheck)
+        {
+            if (!reader.LocalName.Equals("wixOutput"))
+            {
+                throw new XmlException();
+            }
+
+            bool empty = reader.IsEmptyElement;
+            Output output = new Output(SourceLineNumber.CreateFromUri(reader.BaseURI));
+            Version version = null;
+
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "codepage":
+                        output.Codepage = Convert.ToInt32(reader.Value, CultureInfo.InvariantCulture.NumberFormat);
+                        break;
+                    case "type":
+                        switch (reader.Value)
+                        {
+                            case "Bundle":
+                                output.Type = OutputType.Bundle;
+                                break;
+                            case "Module":
+                                output.Type = OutputType.Module;
+                                break;
+                            case "Patch":
+                                output.Type = OutputType.Patch;
+                                break;
+                            case "PatchCreation":
+                                output.Type = OutputType.PatchCreation;
+                                break;
+                            case "Product":
+                                output.Type = OutputType.Product;
+                                break;
+                            case "Transform":
+                                output.Type = OutputType.Transform;
+                                break;
+                            default:
+                                throw new XmlException();
+                        }
+                        break;
+                    case "version":
+                        version = new Version(reader.Value);
+                        break;
+                }
+            }
+
+            if (!suppressVersionCheck && null != version && !Output.CurrentVersion.Equals(version))
+            {
+                throw new WixException(WixDataErrors.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "wixOutput", version.ToString(), Output.CurrentVersion.ToString()));
+            }
+
+            // loop through the rest of the xml building up the Output object
+            TableDefinitionCollection tableDefinitions = null;
+            List<Table> tables = new List<Table>();
+            if (!empty)
+            {
+                bool done = false;
+
+                // loop through all the fields in a row
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            switch (reader.LocalName)
+                            {
+                                case "subStorage":
+                                    output.SubStorages.Add(SubStorage.Read(reader));
+                                    break;
+                                case "table":
+                                    if (null == tableDefinitions)
+                                    {
+                                        throw new XmlException();
+                                    }
+                                    tables.Add(Table.Read(reader, tableDefinitions));
+                                    break;
+                                case "tableDefinitions":
+                                    tableDefinitions = TableDefinitionCollection.Read(reader);
+                                    break;
+                                default:
+                                    throw new XmlException();
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+
+            output.Tables = new TableIndexedCollection(tables);
+            return output;
+        }
+
+        /// <summary>
+        /// Ensure this output contains a particular table.
+        /// </summary>
+        /// <param name="tableDefinition">Definition of the table that should exist.</param>
+        /// <param name="section">Optional section to use for the table. If one is not provided, the entry section will be used.</param>
+        /// <returns>The table in this output.</returns>
+        public Table EnsureTable(TableDefinition tableDefinition)
+        {
+            if (!this.Tables.TryGetTable(tableDefinition.Name, out Table table))
+            {
+                table = new Table(tableDefinition);
+                this.Tables.Add(table);
+            }
+
+            return table;
+        }
+
+        /// <summary>
+        /// Persists an output in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the Output should persist itself as XML.</param>
+        internal void Write(XmlWriter writer)
+        {
+            writer.WriteStartElement("wixOutput", XmlNamespaceUri);
+
+            writer.WriteAttributeString("type", this.Type.ToString());
+
+            if (0 != this.Codepage)
+            {
+                writer.WriteAttributeString("codepage", this.Codepage.ToString(CultureInfo.InvariantCulture));
+            }
+
+            writer.WriteAttributeString("version", Output.CurrentVersion.ToString());
+
+            // Collect all the table definitions and write them.
+            TableDefinitionCollection tableDefinitions = new TableDefinitionCollection();
+            foreach (Table table in this.Tables)
+            {
+                tableDefinitions.Add(table.Definition);
+            }
+            tableDefinitions.Write(writer);
+
+            foreach (Table table in this.Tables.OrderBy(t => t.Name))
+            {
+                table.Write(writer);
+            }
+
+            foreach (SubStorage subStorage in this.SubStorages)
+            {
+                subStorage.Write(writer);
+            }
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Pdb.cs b/src/WixToolset.Data/WindowsInstaller/Pdb.cs
new file mode 100644
index 00000000..41700b0d
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Pdb.cs
@@ -0,0 +1,163 @@
+// 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.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Xml;
+
+    /// <summary>
+    /// Pdb generated by the binder.
+    /// </summary>
+    public sealed class Pdb
+    {
+        public const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/wixpdb";
+        private static readonly Version CurrentVersion = new Version("4.0.0.0");
+
+        /// <summary>
+        /// Creates a new empty pdb object.
+        /// </summary>
+        /// <param name="sourceLineNumbers">The source line information for the pdb.</param>
+        public Pdb()
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the output that is a part of this pdb.
+        /// </summary>
+        /// <value>Type of the output.</value>
+        public Output Output { get; set; }
+
+        /// <summary>
+        /// Loads a pdb from a path on disk.
+        /// </summary>
+        /// <param name="path">Path to pdb file saved on disk.</param>
+        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
+        /// <returns>Pdb pdb.</returns>
+        public static Pdb Load(string path, bool suppressVersionCheck)
+        {
+            using (FileStream stream = File.OpenRead(path))
+            using (FileStructure fs = FileStructure.Read(stream))
+            {
+                if (FileFormat.Wixpdb != fs.FileFormat)
+                {
+                    throw new WixUnexpectedFileFormatException(path, FileFormat.Wixpdb, fs.FileFormat);
+                }
+
+                Uri uri = new Uri(Path.GetFullPath(path));
+                using (XmlReader reader = XmlReader.Create(fs.GetDataStream(), null, uri.AbsoluteUri))
+                {
+                    try
+                    {
+                        reader.MoveToContent();
+                        return Pdb.Read(reader, suppressVersionCheck);
+                    }
+                    catch (XmlException xe)
+                    {
+                        throw new WixCorruptFileException(path, fs.FileFormat, xe);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Saves a pdb to a path on disk.
+        /// </summary>
+        /// <param name="path">Path to save pdb file to on disk.</param>
+        public void Save(string path)
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(Path.GetFullPath(path)));
+
+            using (FileStream stream = File.Create(path))
+            using (FileStructure fs = FileStructure.Create(stream, FileFormat.Wixpdb, null))
+            using (XmlWriter writer = XmlWriter.Create(fs.GetDataStream()))
+            {
+                writer.WriteStartDocument();
+                this.Write(writer);
+                writer.WriteEndDocument();
+            }
+        }
+
+        /// <summary>
+        /// Processes an XmlReader and builds up the pdb object.
+        /// </summary>
+        /// <param name="reader">Reader to get data from.</param>
+        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
+        /// <returns>The Pdb represented by the Xml.</returns>
+        internal static Pdb Read(XmlReader reader, bool suppressVersionCheck)
+        {
+            if ("wixPdb" != reader.LocalName)
+            {
+                throw new XmlException();
+            }
+
+            bool empty = reader.IsEmptyElement;
+            Pdb pdb = new Pdb();
+            Version version = null;
+
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "version":
+                        version = new Version(reader.Value);
+                        break;
+                }
+            }
+
+            if (!suppressVersionCheck && null != version && !Pdb.CurrentVersion.Equals(version))
+            {
+                throw new WixException(WixDataErrors.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "wixPdb", version.ToString(), Pdb.CurrentVersion.ToString()));
+            }
+
+            // loop through the rest of the pdb building up the Output object
+            if (!empty)
+            {
+                bool done = false;
+
+                // loop through all the fields in a row
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            switch (reader.LocalName)
+                            {
+                                case "wixOutput":
+                                    pdb.Output = Output.Read(reader, suppressVersionCheck);
+                                    break;
+                                default:
+                                    throw new XmlException();
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+
+            return pdb;
+        }
+
+        /// <summary>
+        /// Persists a pdb in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the Pdb should persist itself as XML.</param>
+        internal void Write(XmlWriter writer)
+        {
+            writer.WriteStartElement("wixPdb", XmlNamespaceUri);
+
+            writer.WriteAttributeString("version", Pdb.CurrentVersion.ToString());
+
+            this.Output.Write(writer);
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Row.cs b/src/WixToolset.Data/WindowsInstaller/Row.cs
new file mode 100644
index 00000000..cb8b81d8
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Row.cs
@@ -0,0 +1,387 @@
+// 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.WindowsInstaller
+{
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Text;
+    using System.Xml;
+
+    /// <summary>
+    /// Row containing data for a table.
+    /// </summary>
+    public class Row
+    {
+        private static long rowCount;
+
+        /// <summary>
+        /// Creates a row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        /// <remarks>The compiler should use this constructor exclusively.</remarks>
+        public Row(SourceLineNumber sourceLineNumbers, Table table)
+            : this(sourceLineNumbers, table.Definition)
+        {
+            this.Table = table;
+        }
+
+        /// <summary>
+        /// Creates a row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDefinition">TableDefinition this row should get its column definitions from.</param>
+        /// <remarks>This constructor is used in cases where there isn't a clear owner of the row.  The linker uses this constructor for the rows it generates.</remarks>
+        public Row(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
+        {
+            this.Number = rowCount++;
+            this.SourceLineNumbers = sourceLineNumbers;
+            this.Fields = new Field[tableDefinition.Columns.Count];
+            this.TableDefinition = tableDefinition;
+
+            for (var i = 0; i < this.Fields.Length; ++i)
+            {
+                this.Fields[i] = Field.Create(this.TableDefinition.Columns[i]);
+            }
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of a row from another row.
+        /// </summary>
+        /// <param name="source">The row the data is copied from.</param>
+        protected Row(Row source)
+        {
+            this.Table = source.Table;
+            this.TableDefinition = source.TableDefinition;
+            this.Number = source.Number;
+            this.Operation = source.Operation;
+            this.Redundant = source.Redundant;
+            this.SectionId = source.SectionId;
+            this.SourceLineNumbers = source.SourceLineNumbers;
+            this.Fields = source.Fields;
+        }
+
+        /// <summary>
+        /// Gets or sets the row transform operation.
+        /// </summary>
+        /// <value>The row transform operation.</value>
+        public RowOperation Operation { get; set; }
+
+        /// <summary>
+        /// Gets or sets wether the row is a duplicate of another row thus redundant.
+        /// </summary>
+        public bool Redundant { get; set; }
+
+        /// <summary>
+        /// Gets or sets the SectionId property on the row.
+        /// </summary>
+        /// <value>The SectionId property on the row.</value>
+        public string SectionId { get; set; }
+
+        /// <summary>
+        /// Gets the source file and line number for the row.
+        /// </summary>
+        /// <value>Source file and line number.</value>
+        public SourceLineNumber SourceLineNumbers { get; }
+
+        /// <summary>
+        /// Gets the table this row belongs to.
+        /// </summary>
+        /// <value>null if Row does not belong to a Table, or owner Table otherwise.</value>
+        public Table Table { get; }
+
+        /// <summary>
+        /// Gets the table definition for this row.
+        /// </summary>
+        /// <remarks>A Row always has a TableDefinition, even if the Row does not belong to a Table.</remarks>
+        /// <value>TableDefinition for Row.</value>
+        public TableDefinition TableDefinition { get; }
+
+        /// <summary>
+        /// Gets the fields contained by this row.
+        /// </summary>
+        /// <value>Array of field objects</value>
+        public Field[] Fields { get; }
+
+        /// <summary>
+        /// Gets the unique number for the row.
+        /// </summary>
+        /// <value>Number for row.</value>
+        public long Number { get; }
+
+        /// <summary>
+        /// Gets or sets the value of a particular field in the row.
+        /// </summary>
+        /// <param name="field">field index.</param>
+        /// <value>Value of a field in the row.</value>
+        public object this[int field]
+        {
+            get { return this.Fields[field].Data; }
+            set { this.Fields[field].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the field as an integer.
+        /// </summary>
+        /// <returns>Field's data as an integer.</returns>
+        public int FieldAsInteger(int field)
+        {
+            return this.Fields[field].AsInteger();
+        }
+
+        /// <summary>
+        /// Gets the field as an integer that could be null.
+        /// </summary>
+        /// <returns>Field's data as an integer that could be null.</returns>
+        public int? FieldAsNullableInteger(int field)
+        {
+            return this.Fields[field].AsNullableInteger();
+        }
+
+        /// <summary>
+        /// Gets the field as a string.
+        /// </summary>
+        /// <returns>Field's data as a string.</returns>
+        public string FieldAsString(int field)
+        {
+            return this.Fields[field].AsString();
+        }
+
+        /// <summary>
+        /// Sets the value of a particular field in the row without validating.
+        /// </summary>
+        /// <param name="field">field index.</param>
+        /// <param name="value">Value of a field in the row.</param>
+        /// <returns>True if successful, false if validation failed.</returns>
+        public bool BestEffortSetField(int field, object value)
+        {
+            return this.Fields[field].BestEffortSet(value);
+        }
+
+        /// <summary>
+        /// Get the value used to represent the row in a keyed row collection.
+        /// </summary>
+        /// <returns>Primary key or row number if no primary key is available.</returns>
+        public string GetKey()
+        {
+            return this.GetPrimaryKey() ?? Convert.ToString(this.Number, CultureInfo.InvariantCulture);
+        }
+
+        /// <summary>
+        /// Get the primary key of this row.
+        /// </summary>
+        /// <param name="delimiter">Delimiter character for multiple column primary keys.</param>
+        /// <returns>The primary key or null if the row's table has no primary key columns.</returns>
+        public string GetPrimaryKey(char delimiter = '/')
+        {
+            return this.GetPrimaryKey(delimiter, String.Empty);
+        }
+
+        /// <summary>
+        /// Get the primary key of this row.
+        /// </summary>
+        /// <param name="delimiter">Delimiter character for multiple column primary keys.</param>
+        /// <param name="nullReplacement">String to represent null values in the primary key.</param>
+        /// <returns>The primary key or null if the row's table has no primary key columns.</returns>
+        public string GetPrimaryKey(char delimiter, string nullReplacement)
+        {
+            var foundPrimaryKey = false;
+            var primaryKey = new StringBuilder();
+
+            foreach (var field in this.Fields)
+            {
+                if (field.Column.PrimaryKey)
+                {
+                    if (foundPrimaryKey)
+                    {
+                        primaryKey.Append(delimiter);
+                    }
+
+                    primaryKey.Append((null == field.Data) ? nullReplacement : Convert.ToString(field.Data, CultureInfo.InvariantCulture));
+
+                    foundPrimaryKey = true;
+                }
+                else // primary keys must be the first columns of a row so the first non-primary key means we can stop looking.
+                {
+                    break;
+                }
+            }
+
+            return foundPrimaryKey ? primaryKey.ToString() : null;
+        }
+
+        /// <summary>
+        /// Returns true if the specified field is null or an empty string.
+        /// </summary>
+        /// <param name="field">Index of the field to check.</param>
+        /// <returns>true if the specified field is null or an empty string, false otherwise.</returns>
+        public bool IsColumnEmpty(int field)
+        {
+            if (null == this.Fields[field].Data)
+            {
+                return true;
+            }
+
+            string dataString = this.Fields[field].Data as string;
+            if (null != dataString && 0 == dataString.Length)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Tests if the passed in row is identical.
+        /// </summary>
+        /// <param name="row">Row to compare against.</param>
+        /// <returns>True if two rows are identical.</returns>
+        public bool IsIdentical(Row row)
+        {
+            bool identical = (this.TableDefinition.Name == row.TableDefinition.Name && this.Fields.Length == row.Fields.Length);
+
+            for (var i = 0; identical && i < this.Fields.Length; ++i)
+            {
+                if (!(this.Fields[i].IsIdentical(row.Fields[i])))
+                {
+                    identical = false;
+                }
+            }
+
+            return identical;
+        }
+
+        /// <summary>
+        /// Returns a string representation of the Row.
+        /// </summary>
+        /// <returns>A string representation of the Row.</returns>
+        public override string ToString()
+        {
+            return String.Join("/", (object[])this.Fields);
+        }
+
+        /// <summary>
+        /// Creates a Row from the XmlReader.
+        /// </summary>
+        /// <param name="reader">Reader to get data from.</param>
+        /// <param name="table">Table for this row.</param>
+        /// <returns>New row object.</returns>
+        internal static Row Read(XmlReader reader, Table table)
+        {
+            Debug.Assert("row" == reader.LocalName);
+
+            bool empty = reader.IsEmptyElement;
+            RowOperation operation = RowOperation.None;
+            bool redundant = false;
+            string sectionId = null;
+            SourceLineNumber sourceLineNumbers = null;
+
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "op":
+                        operation = (RowOperation)Enum.Parse(typeof(RowOperation), reader.Value, true);
+                        break;
+                    case "redundant":
+                        redundant = reader.Value.Equals("yes");
+                        break;
+                    case "sectionId":
+                        sectionId = reader.Value;
+                        break;
+                    case "sourceLineNumber":
+                        sourceLineNumbers = SourceLineNumber.CreateFromEncoded(reader.Value);
+                        break;
+                }
+            }
+
+            var row = table.CreateRow(sourceLineNumbers);
+            row.Operation = operation;
+            row.Redundant = redundant;
+            row.SectionId = sectionId;
+
+            // loop through all the fields in a row
+            if (!empty)
+            {
+                var done = false;
+                var field = 0;
+
+                // loop through all the fields in a row
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            switch (reader.LocalName)
+                            {
+                                case "field":
+                                    if (row.Fields.Length <= field)
+                                    {
+                                        if (!reader.IsEmptyElement)
+                                        {
+                                            throw new XmlException();
+                                        }
+                                    }
+                                    else
+                                    {
+                                        row.Fields[field].Read(reader);
+                                    }
+                                    ++field;
+                                    break;
+                                default:
+                                    throw new XmlException();
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+
+            return row;
+        }
+
+        /// <summary>
+        /// Persists a row in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the Row should persist itself as XML.</param>
+        internal void Write(XmlWriter writer)
+        {
+            writer.WriteStartElement("row", Intermediate.XmlNamespaceUri);
+
+            if (RowOperation.None != this.Operation)
+            {
+                writer.WriteAttributeString("op", this.Operation.ToString().ToLowerInvariant());
+            }
+
+            if (this.Redundant)
+            {
+                writer.WriteAttributeString("redundant", "yes");
+            }
+
+            if (null != this.SectionId)
+            {
+                writer.WriteAttributeString("sectionId", this.SectionId);
+            }
+
+            if (null != this.SourceLineNumbers)
+            {
+                writer.WriteAttributeString("sourceLineNumber", this.SourceLineNumbers.GetEncoded());
+            }
+
+            for (int i = 0; i < this.Fields.Length; ++i)
+            {
+                this.Fields[i].Write(writer);
+            }
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/RowOperation.cs b/src/WixToolset.Data/WindowsInstaller/RowOperation.cs
new file mode 100644
index 00000000..22908d2b
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/RowOperation.cs
@@ -0,0 +1,30 @@
+// 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.WindowsInstaller
+{
+    /// <summary>
+    /// The row transform operations.
+    /// </summary>
+    public enum RowOperation
+    {
+        /// <summary>
+        /// No operation.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Added row.
+        /// </summary>
+        Add,
+
+        /// <summary>
+        /// Deleted row.
+        /// </summary>
+        Delete,
+
+        /// <summary>
+        /// Modified row.
+        /// </summary>
+        Modify
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/BBControlRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/BBControlRow.cs
new file mode 100644
index 00000000..bf962e73
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/BBControlRow.cs
@@ -0,0 +1,113 @@
+// 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.WindowsInstaller.Rows
+{
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Specialization of a row for the Control table.
+    /// </summary>
+    public sealed class BBControlRow : Row
+    {
+        /// <summary>
+        /// Creates a Control row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Control row belongs to and should get its column definitions from.</param>
+        public BBControlRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the dialog of the Control row.
+        /// </summary>
+        /// <value>Primary key of the Control row.</value>
+        public string Billboard
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the identifier for this Control row.
+        /// </summary>
+        /// <value>Identifier for this Control row.</value>
+        public string BBControl
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the BBControl.
+        /// </summary>
+        /// <value>Name of the BBControl.</value>
+        [SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods")]
+        public string Type
+        {
+            get { return this.Fields[2].AsString(); }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the X location of the BBControl.
+        /// </summary>
+        /// <value>X location of the BBControl.</value>
+        public string X
+        {
+            get { return this.Fields[3].AsString(); }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Y location of the BBControl.
+        /// </summary>
+        /// <value>Y location of the BBControl.</value>
+        public string Y
+        {
+            get { return this.Fields[4].AsString(); }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the BBControl.
+        /// </summary>
+        /// <value>Width of the BBControl.</value>
+        public string Width
+        {
+            get { return this.Fields[5].AsString(); }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the height of the BBControl.
+        /// </summary>
+        /// <value>Height of the BBControl.</value>
+        public string Height
+        {
+            get { return this.Fields[6].AsString(); }
+            set { this.Fields[6].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the attributes for the BBControl.
+        /// </summary>
+        /// <value>Attributes for the BBControl.</value>
+        public int Attributes
+        {
+            get { return (int)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text of the BBControl.
+        /// </summary>
+        /// <value>Text of the BBControl.</value>
+        public string Text
+        {
+            get { return (string)this.Fields[8].Data; }
+            set { this.Fields[8].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/ComponentRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/ComponentRow.cs
new file mode 100644
index 00000000..50ef5313
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/ComponentRow.cs
@@ -0,0 +1,244 @@
+// 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.WindowsInstaller.Rows
+{
+    using WixToolset.Data.Msi;
+
+    /// <summary>
+    /// Specialization of a row for the Component table.
+    /// </summary>
+    public sealed class ComponentRow : Row
+    {
+        private string sourceFile;
+
+        /// <summary>
+        /// Creates a Control row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Component row belongs to and should get its column definitions from.</param>
+        public ComponentRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the identifier for this Component row.
+        /// </summary>
+        /// <value>Identifier for this Component row.</value>
+        public string Component
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the ComponentId for this Component row.
+        /// </summary>
+        /// <value>guid for this Component row.</value>
+        public string Guid
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Directory_ of the Component.
+        /// </summary>
+        /// <value>Directory of the Component.</value>
+        public string Directory
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the local only attribute of the Component.
+        /// </summary>
+        /// <value>Local only attribute of the component.</value>
+        public bool IsLocalOnly
+        {
+            get { return MsiInterop.MsidbComponentAttributesLocalOnly == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesLocalOnly); }
+            set
+            {
+                if (value)
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesLocalOnly;
+                }
+                else
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesLocalOnly;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the source only attribute of the Component.
+        /// </summary>
+        /// <value>Source only attribute of the component.</value>
+        public bool IsSourceOnly
+        {
+            get { return MsiInterop.MsidbComponentAttributesSourceOnly == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesSourceOnly); }
+            set
+            {
+                if (value)
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesSourceOnly;
+                }
+                else
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesSourceOnly;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the optional attribute of the Component.
+        /// </summary>
+        /// <value>Optional attribute of the component.</value>
+        public bool IsOptional
+        {
+            get { return MsiInterop.MsidbComponentAttributesOptional == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesOptional); }
+            set
+            {
+                if (value)
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesOptional;
+                }
+                else
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesOptional;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the registry key path attribute of the Component.
+        /// </summary>
+        /// <value>Registry key path attribute of the component.</value>
+        public bool IsRegistryKeyPath
+        {
+            get { return MsiInterop.MsidbComponentAttributesRegistryKeyPath == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesRegistryKeyPath); }
+            set
+            {
+                if (value)
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesRegistryKeyPath;
+                }
+                else
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesRegistryKeyPath;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the shared dll ref count attribute of the Component.
+        /// </summary>
+        /// <value>Shared dll ref countattribute of the component.</value>
+        public bool IsSharedDll
+        {
+            get { return MsiInterop.MsidbComponentAttributesSharedDllRefCount == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesSharedDllRefCount); }
+            set
+            {
+                if (value)
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesSharedDllRefCount;
+                }
+                else
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesSharedDllRefCount;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the permanent attribute of the Component.
+        /// </summary>
+        /// <value>Permanent attribute of the component.</value>
+        public bool IsPermanent
+        {
+            get { return MsiInterop.MsidbComponentAttributesPermanent == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesPermanent); }
+            set
+            {
+                if (value)
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesPermanent;
+                }
+                else
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesPermanent;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ODBC data source key path attribute of the Component.
+        /// </summary>
+        /// <value>ODBC data source key path attribute of the component.</value>
+        public bool IsOdbcDataSourceKeyPath
+        {
+            get { return MsiInterop.MsidbComponentAttributesODBCDataSource == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesODBCDataSource); }
+            set
+            {
+                if (value)
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesODBCDataSource;
+                }
+                else
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesODBCDataSource;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the 64 bit attribute of the Component.
+        /// </summary>
+        /// <value>64-bitness of the component.</value>
+        public bool Is64Bit
+        {
+            get { return MsiInterop.MsidbComponentAttributes64bit == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributes64bit); }
+            set
+            {
+                if (value)
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributes64bit;
+                }
+                else
+                {
+                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributes64bit;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the condition of the Component.
+        /// </summary>
+        /// <value>Condition of the Component.</value>
+        public string Condition
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the key path of the Component.
+        /// </summary>
+        /// <value>Key path of the Component.</value>
+        public string KeyPath
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the source location to the file to fill in the Text of the control.
+        /// </summary>
+        /// <value>Source location to the file to fill in the Text of the control.</value>
+        public string SourceFile
+        {
+            get { return this.sourceFile; }
+            set { this.sourceFile = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/ContainerType.cs b/src/WixToolset.Data/WindowsInstaller/Rows/ContainerType.cs
new file mode 100644
index 00000000..b983c2a6
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/ContainerType.cs
@@ -0,0 +1,13 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Types of bundle packages.
+    /// </summary>
+    public enum ContainerType
+    {
+        Attached,
+        Detached,
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/ControlRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/ControlRow.cs
new file mode 100644
index 00000000..95289dea
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/ControlRow.cs
@@ -0,0 +1,143 @@
+// 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.WindowsInstaller.Rows
+{
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Specialization of a row for the Control table.
+    /// </summary>
+    public sealed class ControlRow : Row
+    {
+        /// <summary>
+        /// Creates a Control row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Control row belongs to and should get its column definitions from.</param>
+        public ControlRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the dialog of the Control row.
+        /// </summary>
+        /// <value>Primary key of the Control row.</value>
+        public string Dialog
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the identifier for this Control row.
+        /// </summary>
+        /// <value>Identifier for this Control row.</value>
+        public string Control
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the control.
+        /// </summary>
+        /// <value>Name of the control.</value>
+        [SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods")]
+        public string Type
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the X location of the control.
+        /// </summary>
+        /// <value>X location of the control.</value>
+        public string X
+        {
+            get { return this.Fields[3].AsString(); }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Y location of the control.
+        /// </summary>
+        /// <value>Y location of the control.</value>
+        public string Y
+        {
+            get { return this.Fields[4].AsString(); }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the control.
+        /// </summary>
+        /// <value>Width of the control.</value>
+        public string Width
+        {
+            get { return this.Fields[5].AsString(); }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the height of the control.
+        /// </summary>
+        /// <value>Height of the control.</value>
+        public string Height
+        {
+            get { return this.Fields[6].AsString(); }
+            set { this.Fields[6].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the attributes for the control.
+        /// </summary>
+        /// <value>Attributes for the control.</value>
+        public int Attributes
+        {
+            get { return (int)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Property associated with the control.
+        /// </summary>
+        /// <value>Property associated with the control.</value>
+        public string Property
+        {
+            get { return (string)this.Fields[8].Data; }
+            set { this.Fields[8].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text of the control.
+        /// </summary>
+        /// <value>Text of the control.</value>
+        public string Text
+        {
+            get { return (string)this.Fields[9].Data; }
+            set { this.Fields[9].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the next control.
+        /// </summary>
+        /// <value>Next control.</value>
+        public string Next
+        {
+            get { return (string)this.Fields[10].Data; }
+            set { this.Fields[10].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the help for the control.
+        /// </summary>
+        /// <value>Help for the control.</value>
+        public string Help
+        {
+            get { return (string)this.Fields[11].Data; }
+            set { this.Fields[11].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
new file mode 100644
index 00000000..7fc34b3d
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
@@ -0,0 +1,640 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    using WixToolset.Data.Msi;
+
+    /// <summary>
+    /// Specialization of a row for the file table.
+    /// </summary>
+    public sealed class FileRow : Row //, IComparable
+    {
+        //private string assemblyApplication;
+        //private string assemblyManifest;
+        //private FileAssemblyType assemblyType;
+        //private string directory;
+        //private int diskId;
+        //private bool fromModule;
+        //private bool isGeneratedShortFileName;
+        //private int patchGroup;
+        //private string processorArchitecture;
+        //private string source;
+        //private Row hashRow;
+        //private List<Row> assemblyNameRows;
+        //private string[] previousSource;
+        //private string symbols;
+        //private string[] previousSymbols;
+        //private PatchAttributeType patchAttributes;
+        //private string retainOffsets;
+        //private string retainLengths;
+        //private string ignoreOffsets;
+        //private string ignoreLengths;
+        //private string[] previousRetainOffsets;
+        //private string[] previousRetainLengths;
+        //private string[] previousIgnoreOffsets;
+        //private string[] previousIgnoreLengths;
+        //private string patch;
+
+        /// <summary>
+        /// Creates a File row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this File row belongs to and should get its column definitions from.</param>
+        public FileRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+            //this.assemblyType = FileAssemblyType.NotAnAssembly;
+            //this.previousSource = new string[1];
+            //this.previousSymbols = new string[1];
+            //this.previousRetainOffsets = new string[1];
+            //this.previousRetainLengths = new string[1];
+            //this.previousIgnoreOffsets = new string[1];
+            //this.previousIgnoreLengths = new string[1];
+        }
+
+        /// <summary>
+        /// Creates a File row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDefinition">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public FileRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
+            : base(sourceLineNumbers, tableDefinition)
+        {
+            //this.assemblyType = FileAssemblyType.NotAnAssembly;
+            //this.previousSource = new string[1];
+            //this.previousSymbols = new string[1];
+            //this.previousRetainOffsets = new string[1];
+            //this.previousRetainLengths = new string[1];
+            //this.previousIgnoreOffsets = new string[1];
+            //this.previousIgnoreLengths = new string[1];
+        }
+
+        /// <summary>
+        /// Gets or sets the primary key of the file row.
+        /// </summary>
+        /// <value>Primary key of the file row.</value>
+        public string File
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the component this file row belongs to.
+        /// </summary>
+        /// <value>Component this file row belongs to.</value>
+        public string Component
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the file.
+        /// </summary>
+        /// <value>Name of the file.</value>
+        public string FileName
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the real filesystem name of the file (without a pipe). This is typically the long name of the file.
+        /// However, if no long name is available, falls back to the short name.
+        /// </summary>
+        /// <value>Long Name of the file - or if no long name is available, falls back to the short name.</value>
+        public string LongFileName
+        {
+            get
+            {
+                string fileName = this.FileName;
+                int index = fileName.IndexOf('|');
+
+                // If it doesn't contain a pipe, just return the whole string
+                if (-1 == index)
+                {
+                    return fileName;
+                }
+                else // otherwise, extract the part of the string after the pipe
+                {
+                    return fileName.Substring(index + 1);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the size of the file.
+        /// </summary>
+        /// <value>Size of the file.</value>
+        public int FileSize
+        {
+            get { return (int)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the version of the file.
+        /// </summary>
+        /// <value>Version of the file.</value>
+        public string Version
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the LCID of the file.
+        /// </summary>
+        /// <value>LCID of the file.</value>
+        public string Language
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the attributes on a file.
+        /// </summary>
+        /// <value>Attributes on a file.</value>
+        public int Attributes
+        {
+            get { return Convert.ToInt32(this.Fields[6].Data, CultureInfo.InvariantCulture); }
+            set { this.Fields[6].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether this file should be compressed.
+        /// </summary>
+        /// <value>Whether this file should be compressed.</value>
+        public YesNoType Compressed
+        {
+            get
+            {
+                bool compressedFlag = (0 < (this.Attributes & MsiInterop.MsidbFileAttributesCompressed));
+                bool noncompressedFlag = (0 < (this.Attributes & MsiInterop.MsidbFileAttributesNoncompressed));
+
+                if (compressedFlag && noncompressedFlag)
+                {
+                    throw new WixException(WixDataErrors.IllegalFileCompressionAttributes(this.SourceLineNumbers));
+                }
+                else if (compressedFlag)
+                {
+                    return YesNoType.Yes;
+                }
+                else if (noncompressedFlag)
+                {
+                    return YesNoType.No;
+                }
+                else
+                {
+                    return YesNoType.NotSet;
+                }
+            }
+
+            set
+            {
+                if (YesNoType.Yes == value)
+                {
+                    // these are mutually exclusive
+                    this.Attributes |= MsiInterop.MsidbFileAttributesCompressed;
+                    this.Attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed;
+                }
+                else if (YesNoType.No == value)
+                {
+                    // these are mutually exclusive
+                    this.Attributes |= MsiInterop.MsidbFileAttributesNoncompressed;
+                    this.Attributes &= ~MsiInterop.MsidbFileAttributesCompressed;
+                }
+                else // not specified
+                {
+                    Debug.Assert(YesNoType.NotSet == value);
+
+                    // clear any compression bits
+                    this.Attributes &= ~MsiInterop.MsidbFileAttributesCompressed;
+                    this.Attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the sequence of the file row.
+        /// </summary>
+        /// <value>Sequence of the file row.</value>
+        public int Sequence
+        {
+            get { return (int)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+
+        /////// <summary>
+        /////// Gets or sets the type of assembly of file row.
+        /////// </summary>
+        /////// <value>Assembly type for file row.</value>
+        ////public FileAssemblyType AssemblyType
+        ////{
+        ////    get { return this.assemblyType; }
+        ////    set { this.assemblyType = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the identifier for the assembly application.
+        /////// </summary>
+        /////// <value>Identifier for the assembly application.</value>
+        ////public string AssemblyApplication
+        ////{
+        ////    get { return this.assemblyApplication; }
+        ////    set { this.assemblyApplication = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the identifier for the assembly manifest.
+        /////// </summary>
+        /////// <value>Identifier for the assembly manifest.</value>
+        ////public string AssemblyManifest
+        ////{
+        ////    get { return this.assemblyManifest; }
+        ////    set { this.assemblyManifest = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the directory of the file.
+        /////// </summary>
+        /////// <value>Directory of the file.</value>
+        ////public string Directory
+        ////{
+        ////    get { return this.directory; }
+        ////    set { this.directory = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the disk id for this file.
+        /////// </summary>
+        /////// <value>Disk id for the file.</value>
+        ////public int DiskId
+        ////{
+        ////    get { return this.diskId; }
+        ////    set { this.diskId = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the source location to the file.
+        /////// </summary>
+        /////// <value>Source location to the file.</value>
+        ////public string Source
+        ////{
+        ////    get { return this.source; }
+        ////    set { this.source = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the source location to the previous file.
+        /////// </summary>
+        /////// <value>Source location to the previous file.</value>
+        ////public string PreviousSource
+        ////{
+        ////    get { return this.previousSource[0]; }
+        ////    set { this.previousSource[0] = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets the source location to the previous files.
+        /////// </summary>
+        /////// <value>Source location to the previous files.</value>
+        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
+        ////public string[] PreviousSourceArray
+        ////{
+        ////    get { return this.previousSource; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the architecture the file executes on.
+        /////// </summary>
+        /////// <value>Architecture the file executes on.</value>
+        ////public string ProcessorArchitecture
+        ////{
+        ////    get { return this.processorArchitecture; }
+        ////    set { this.processorArchitecture = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets of sets the patch group of a patch-added file.
+        /////// </summary>
+        /////// <value>The patch group of a patch-added file.</value>
+        ////public int PatchGroup
+        ////{
+        ////    get { return this.patchGroup; }
+        ////    set { this.patchGroup = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the patch header of the file.
+        /////// </summary>
+        /////// <value>Patch header of the file.</value>
+        ////public string Patch
+        ////{
+        ////    get { return this.patch; }
+        ////    set { this.patch = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the locations to find the file's symbols.
+        /////// </summary>
+        /////// <value>Symbol paths for the file.</value>
+        ////public string Symbols
+        ////{
+        ////    get { return this.symbols; }
+        ////    set { this.symbols = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the locations to find the file's previous symbols.
+        /////// </summary>
+        /////// <value>Symbol paths for the previous file.</value>
+        ////public string PreviousSymbols
+        ////{
+        ////    get { return this.previousSymbols[0]; }
+        ////    set { this.previousSymbols[0] = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets the locations to find the files' previous symbols.
+        /////// </summary>
+        /////// <value>Symbol paths for the previous files.</value>
+        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
+        ////public string[] PreviousSymbolsArray
+        ////{
+        ////    get { return this.previousSymbols; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the generated short file name attribute.
+        /////// </summary>
+        /////// <value>The generated short file name attribute.</value>
+        ////public bool IsGeneratedShortFileName
+        ////{
+        ////    get { return this.isGeneratedShortFileName; }
+
+        ////    set { this.isGeneratedShortFileName = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets whether this row came from a merge module.
+        /////// </summary>
+        /////// <value>Whether this row came from a merge module.</value>
+        ////public bool FromModule
+        ////{
+        ////    get { return this.fromModule; }
+        ////    set { this.fromModule = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the MsiFileHash row created for this FileRow.
+        /////// </summary>
+        /////// <value>Row for MsiFileHash table.</value>
+        ////public Row HashRow
+        ////{
+        ////    get { return this.hashRow; }
+        ////    set { this.hashRow = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the set of MsiAssemblyName rows created for this FileRow.
+        /////// </summary>
+        /////// <value>RowCollection of MsiAssemblyName table.</value>
+        ////[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        ////public List<Row> AssemblyNameRows
+        ////{
+        ////    get { return this.assemblyNameRows; }
+        ////    set { this.assemblyNameRows = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the patching attributes to the file.
+        /////// </summary>
+        /////// <value>Patching attributes of the file.</value>
+        ////public PatchAttributeType PatchAttributes
+        ////{
+        ////    get { return this.patchAttributes; }
+        ////    set { this.patchAttributes = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the delta patch retain-length list for the file.
+        /////// </summary>
+        /////// <value>RetainLength list for the file.</value>
+        ////public string RetainLengths
+        ////{
+        ////    get { return this.retainLengths; }
+        ////    set { this.retainLengths = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the delta patch ignore-offset list for the file.
+        /////// </summary>
+        /////// <value>IgnoreOffset list for the file.</value>
+        ////public string IgnoreOffsets
+        ////{
+        ////    get { return this.ignoreOffsets; }
+        ////    set { this.ignoreOffsets = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the delta patch ignore-length list for the file.
+        /////// </summary>
+        /////// <value>IgnoreLength list for the file.</value>
+        ////public string IgnoreLengths
+        ////{
+        ////    get { return this.ignoreLengths; }
+        ////    set { this.ignoreLengths = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the delta patch retain-offset list for the file.
+        /////// </summary>
+        /////// <value>RetainOffset list for the file.</value>
+        ////public string RetainOffsets
+        ////{
+        ////    get { return this.retainOffsets; }
+        ////    set { this.retainOffsets = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the delta patch retain-length list for the previous file.
+        /////// </summary>
+        /////// <value>RetainLength list for the previous file.</value>
+        ////public string PreviousRetainLengths
+        ////{
+        ////    get { return this.previousRetainLengths[0]; }
+        ////    set { this.previousRetainLengths[0] = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets the delta patch retain-length list for the previous files.
+        /////// </summary>
+        /////// <value>RetainLength list for the previous files.</value>
+        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
+        ////public string[] PreviousRetainLengthsArray
+        ////{
+        ////    get { return this.previousRetainLengths; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the delta patch ignore-offset list for the previous file.
+        /////// </summary>
+        /////// <value>IgnoreOffset list for the previous file.</value>
+        ////public string PreviousIgnoreOffsets
+        ////{
+        ////    get { return this.previousIgnoreOffsets[0]; }
+        ////    set { this.previousIgnoreOffsets[0] = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets the delta patch ignore-offset list for the previous files.
+        /////// </summary>
+        /////// <value>IgnoreOffset list for the previous files.</value>
+        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
+        ////public string[] PreviousIgnoreOffsetsArray
+        ////{
+        ////    get { return this.previousIgnoreOffsets; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the delta patch ignore-length list for the previous file.
+        /////// </summary>
+        /////// <value>IgnoreLength list for the previous file.</value>
+        ////public string PreviousIgnoreLengths
+        ////{
+        ////    get { return this.previousIgnoreLengths[0]; }
+        ////    set { this.previousIgnoreLengths[0] = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets the delta patch ignore-length list for the previous files.
+        /////// </summary>
+        /////// <value>IgnoreLength list for the previous files.</value>
+        ////[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
+        ////public string[] PreviousIgnoreLengthsArray
+        ////{
+        ////    get { return this.previousIgnoreLengths; }
+        ////}
+
+        /////// <summary>
+        /////// Gets or sets the delta patch retain-offset list for the previous file.
+        /////// </summary>
+        /////// <value>RetainOffset list for the previous file.</value>
+        ////public string PreviousRetainOffsets
+        ////{
+        ////    get { return this.previousRetainOffsets[0]; }
+        ////    set { this.previousRetainOffsets[0] = value; }
+        ////}
+
+        /////// <summary>
+        /////// Gets the delta patch retain-offset list for the previous files.
+        /////// </summary>
+        /////// <value>RetainOffset list for the previous files.</value>
+        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
+        ////public string[] PreviousRetainOffsetsArray
+        ////{
+        ////    get { return this.previousRetainOffsets; }
+        ////}
+
+        /////// <summary>
+        /////// Compares the current FileRow with another object of the same type.
+        /////// </summary>
+        /////// <param name="obj">An object to compare with this instance.</param>
+        /////// <returns>An integer that indicates the relative order of the comparands.</returns>
+        ////[SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.ArgumentException.#ctor(System.String)")]
+        ////[SuppressMessage("Microsoft.Globalization", "CA1309:UseOrdinalStringComparison")]
+        ////public int CompareTo(object obj)
+        ////{
+        ////    if (this == obj)
+        ////    {
+        ////        return 0;
+        ////    }
+
+        ////    FileRow fileRow = obj as FileRow;
+        ////    if (null == fileRow)
+        ////    {
+        ////        throw new ArgumentException(WixDataStrings.EXP_OtherObjectIsNotFileRow);
+        ////    }
+
+        ////    int compared = this.DiskId - fileRow.DiskId;
+        ////    if (0 == compared)
+        ////    {
+        ////        compared = this.patchGroup - fileRow.patchGroup;
+
+        ////        if (0 == compared)
+        ////        {
+        ////            compared = String.Compare(this.File, fileRow.File, StringComparison.InvariantCulture);
+        ////        }
+        ////    }
+
+        ////    return compared;
+        ////}
+
+        /////// <summary>
+        /////// Copies data from another FileRow object.
+        /////// </summary>
+        /////// <param name="src">An row to get data from.</param>
+        ////public void CopyFrom(FileRow src)
+        ////{
+        ////    for (int i = 0; i < src.Fields.Length; i++)
+        ////    {
+        ////        this[i] = src[i];
+        ////    }
+        ////    this.assemblyManifest = src.assemblyManifest;
+        ////    this.assemblyType = src.assemblyType;
+        ////    this.directory = src.directory;
+        ////    this.diskId = src.diskId;
+        ////    this.fromModule = src.fromModule;
+        ////    this.isGeneratedShortFileName = src.isGeneratedShortFileName;
+        ////    this.patchGroup = src.patchGroup;
+        ////    this.processorArchitecture = src.processorArchitecture;
+        ////    this.source = src.source;
+        ////    this.PreviousSource = src.PreviousSource;
+        ////    this.Operation = src.Operation;
+        ////    this.symbols = src.symbols;
+        ////    this.PreviousSymbols = src.PreviousSymbols;
+        ////    this.patchAttributes = src.patchAttributes;
+        ////    this.retainOffsets = src.retainOffsets;
+        ////    this.retainLengths = src.retainLengths;
+        ////    this.ignoreOffsets = src.ignoreOffsets;
+        ////    this.ignoreLengths = src.ignoreLengths;
+        ////    this.PreviousRetainOffsets = src.PreviousRetainOffsets;
+        ////    this.PreviousRetainLengths = src.PreviousRetainLengths;
+        ////    this.PreviousIgnoreOffsets = src.PreviousIgnoreOffsets;
+        ////    this.PreviousIgnoreLengths = src.PreviousIgnoreLengths;
+        ////}
+
+        /////// <summary>
+        /////// Appends previous data from another FileRow object.
+        /////// </summary>
+        /////// <param name="src">An row to get data from.</param>
+        ////public void AppendPreviousDataFrom(FileRow src)
+        ////{
+        ////    AppendStringToArray(ref this.previousSource, src.previousSource[0]);
+        ////    AppendStringToArray(ref this.previousSymbols, src.previousSymbols[0]);
+        ////    AppendStringToArray(ref this.previousRetainOffsets, src.previousRetainOffsets[0]);
+        ////    AppendStringToArray(ref this.previousRetainLengths, src.previousRetainLengths[0]);
+        ////    AppendStringToArray(ref this.previousIgnoreOffsets, src.previousIgnoreOffsets[0]);
+        ////    AppendStringToArray(ref this.previousIgnoreLengths, src.previousIgnoreLengths[0]);
+        ////}
+
+        /////// <summary>
+        /////// Helper method for AppendPreviousDataFrom.
+        /////// </summary>
+        /////// <param name="source">Destination array.</param>
+        /////// <param name="destination">Source string.</param>
+        ////private static void AppendStringToArray(ref string[] destination, string source)
+        ////{
+        ////    string[] result = new string[destination.Length + 1];
+        ////    destination.CopyTo(result, 0);
+        ////    result[destination.Length] = source;
+        ////    destination = result;
+        ////}
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/MediaRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/MediaRow.cs
new file mode 100644
index 00000000..b931632f
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/MediaRow.cs
@@ -0,0 +1,80 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the Media table.
+    /// </summary>
+    public sealed class MediaRow : Row
+    {
+        /// <summary>
+        /// Creates a Media row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
+        public MediaRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the disk id for this media row.
+        /// </summary>
+        /// <value>Disk id.</value>
+        public int DiskId
+        {
+            get { return (int)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the last sequence number for this media row.
+        /// </summary>
+        /// <value>Last sequence number.</value>
+        public int LastSequence
+        {
+            get { return (int)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the disk prompt for this media row.
+        /// </summary>
+        /// <value>Disk prompt.</value>
+        public string DiskPrompt
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the cabinet name for this media row.
+        /// </summary>
+        /// <value>Cabinet name.</value>
+        public string Cabinet
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the volume label for this media row.
+        /// </summary>
+        /// <value>Volume label.</value>
+        public string VolumeLabel
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the source for this media row.
+        /// </summary>
+        /// <value>Source.</value>
+        public string Source
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/PropertyRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/PropertyRow.cs
new file mode 100644
index 00000000..ad5197d9
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/PropertyRow.cs
@@ -0,0 +1,40 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the upgrade table.
+    /// </summary>
+    public sealed class PropertyRow : Row
+    {
+        /// <summary>
+        /// Creates an Upgrade row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Upgrade row belongs to and should get its column definitions from.</param>
+        public PropertyRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets and sets the upgrade code for the row.
+        /// </summary>
+        /// <value>Property identifier for the row.</value>
+        public string Property
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the value for the row.
+        /// </summary>
+        /// <value>Property value for the row.</value>
+        public string Value
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/SummaryInfoRowCollection.cs b/src/WixToolset.Data/WindowsInstaller/Rows/SummaryInfoRowCollection.cs
new file mode 100644
index 00000000..fc0410e9
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/SummaryInfoRowCollection.cs
@@ -0,0 +1,41 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+    using System.Collections.ObjectModel;
+
+    /// <summary>
+    /// Indexed container class for summary information rows.
+    /// </summary>
+    public sealed class SummaryInfoRowCollection : KeyedCollection<int, Row>
+    {
+        /// <summary>
+        /// Creates the keyed collection from existing rows in a table.
+        /// </summary>
+        /// <param name="table">The summary information table to index.</param>
+        public SummaryInfoRowCollection(Table table)
+        {
+            if (0 != String.CompareOrdinal("_SummaryInformation", table.Name))
+            {
+                string message = string.Format(WixDataStrings.EXP_UnsupportedTable, table.Name);
+                throw new ArgumentException(message, "table");
+            }
+
+            foreach (Row row in table.Rows)
+            {
+                this.Add(row);
+            }
+        }
+
+        /// <summary>
+        /// Gets the summary property ID for the <paramref name="row"/>.
+        /// </summary>
+        /// <param name="row">The row to index.</param>
+        /// <returns>The summary property ID for the <paramref name="row"/>.
+        protected override int GetKeyForItem(Row row)
+        {
+            return (int)row[0];
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/UpgradeRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/UpgradeRow.cs
new file mode 100644
index 00000000..d757c8d3
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/UpgradeRow.cs
@@ -0,0 +1,90 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the upgrade table.
+    /// </summary>
+    public sealed class UpgradeRow : Row
+    {
+        /// <summary>
+        /// Creates an Upgrade row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Upgrade row belongs to and should get its column definitions from.</param>
+        public UpgradeRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets and sets the upgrade code for the row.
+        /// </summary>
+        /// <value>Upgrade code for the row.</value>
+        public string UpgradeCode
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the version minimum for the row.
+        /// </summary>
+        /// <value>Version minimum for the row.</value>
+        public string VersionMin
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the version maximum for the row.
+        /// </summary>
+        /// <value>Version maximum for the row.</value>
+        public string VersionMax
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the language for the row.
+        /// </summary>
+        /// <value>Language for the row.</value>
+        public string Language
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the attributes for the row.
+        /// </summary>
+        /// <value>Attributes for the row.</value>
+        public int Attributes
+        {
+            get { return (int)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the remove code for the row.
+        /// </summary>
+        /// <value>Remove code for the row.</value>
+        public string Remove
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the action property for the row.
+        /// </summary>
+        /// <value>Action property for the row.</value>
+        public string ActionProperty
+        {
+            get { return (string)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixActionRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixActionRow.cs
new file mode 100644
index 00000000..f7bc784d
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixActionRow.cs
@@ -0,0 +1,118 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Xml;
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Specialization of a row for the sequence tables.
+    /// </summary>
+    public sealed class WixActionRow : Row, IComparable
+    {
+        /// <summary>
+        /// Instantiates an ActionRow that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Action row belongs to and should get its column definitions from.</param>
+        public WixActionRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Instantiates an ActionRow by copying data from another ActionRow.
+        /// </summary>
+        /// <param name="source">The row the data is copied from.</param>
+        /// <remarks>The previous and next action collections are not copied.</remarks>
+        private WixActionRow(WixActionRow source)
+            : base(source)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the action.
+        /// </summary>
+        /// <value>The name of the action.</value>
+        public string Action
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the name of the action this action should be scheduled after.
+        /// </summary>
+        /// <value>The name of the action this action should be scheduled after.</value>
+        public string After
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the name of the action this action should be scheduled before.
+        /// </summary>
+        /// <value>The name of the action this action should be scheduled before.</value>
+        public string Before
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the condition of the action.
+        /// </summary>
+        /// <value>The condition of the action.</value>
+        public string Condition
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether this action is overridable.
+        /// </summary>
+        /// <value>Whether this action is overridable.</value>
+        public bool Overridable
+        {
+            get { return (1 == Convert.ToInt32(this.Fields[6].Data, CultureInfo.InvariantCulture)); }
+            set { this.Fields[6].Data = (value ? 1 : 0); }
+        }
+
+        /// <summary>
+        /// Gets or sets the sequence number of this action.
+        /// </summary>
+        /// <value>The sequence number of this action.</value>
+        public int Sequence
+        {
+            get { return Convert.ToInt32(this.Fields[3].Data, CultureInfo.InvariantCulture); }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets of sets the sequence table of this action.
+        /// </summary>
+        /// <value>The sequence table of this action.</value>
+        public SequenceTable SequenceTable
+        {
+            get { return (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[0].Data); }
+            set { this.Fields[0].Data = value.ToString(); }
+        }
+
+        /// <summary>
+        /// Compares the current instance with another object of the same type.
+        /// </summary>
+        /// <param name="obj">Other reference to compare this one to.</param>
+        /// <returns>Returns less than 0 for less than, 0 for equals, and greater than 0 for greater.</returns>
+        public int CompareTo(object obj)
+        {
+            WixActionRow otherActionRow = (WixActionRow)obj;
+
+            return this.Sequence.CompareTo(otherActionRow.Sequence);
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs
new file mode 100644
index 00000000..b3d85c8a
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs
@@ -0,0 +1,78 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixApprovedExeForElevation table.
+    /// </summary>
+    public class WixApprovedExeForElevationRow : Row
+    {
+        /// <summary>
+        /// Creates an ApprovedExeForElevation row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this ApprovedExeForElevation row belongs to and should get its column definitions from.</param>
+        public WixApprovedExeForElevationRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates an ApprovedExeForElevation row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this ApprovedExeForElevation row belongs to and should get its column definitions from.</param>
+        public WixApprovedExeForElevationRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the ApprovedExeForElevation identifier.
+        /// </summary>
+        /// <value>The ApprovedExeForElevation identifier.</value>
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Key path.
+        /// </summary>
+        /// <value>The Key path.</value>
+        public string Key
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Value name.
+        /// </summary>
+        /// <value>The Value name.</value>
+        public string ValueName
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the attibutes.
+        /// </summary>
+        /// <value>The BundleApprovedExeForElevationAttributes.</value>
+        public BundleApprovedExeForElevationAttributes Attributes
+        {
+            get { return (BundleApprovedExeForElevationAttributes)this.Fields[3].Data; }
+            set { this.Fields[3].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets whether this row is 64-bit.
+        /// </summary>
+        public bool Win64
+        {
+            get { return BundleApprovedExeForElevationAttributes.Win64 == (this.Attributes & BundleApprovedExeForElevationAttributes.Win64); }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleCatalogRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleCatalogRow.cs
new file mode 100644
index 00000000..0bebb5f3
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleCatalogRow.cs
@@ -0,0 +1,50 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixCatalog table.
+    /// </summary>
+    public sealed class WixBundleCatalogRow : Row
+    {
+        /// <summary>
+        /// Creates a Catalog row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Catalog row belongs to and should get its column definitions from.</param>
+        public WixBundleCatalogRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a Catalog row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Catalog row belongs to and should get its column definitions from.</param>
+        public WixBundleCatalogRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the catalog identifier.
+        /// </summary>
+        /// <value>The catalog identifier.</value>
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the payload identifier.
+        /// </summary>
+        /// <value>The payload identifier.</value>
+        public string Payload
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleContainerRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleContainerRow.cs
new file mode 100644
index 00000000..1c138190
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleContainerRow.cs
@@ -0,0 +1,78 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the Container table.
+    /// </summary>
+    public class WixBundleContainerRow : Row
+    {
+        /// <summary>
+        /// Creates a ContainerRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleContainerRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a ContainerRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleContainerRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        public string Name
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        public ContainerType Type
+        {
+            get { return (ContainerType)this.Fields[2].Data; }
+            set { this.Fields[2].Data = (int)value; }
+        }
+
+        public string DownloadUrl
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        public long Size
+        {
+            get { return (long)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        public string Hash
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        public int AttachedContainerIndex
+        {
+            get { return (null == this.Fields[6].Data) ? -1 : (int)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+
+        public string WorkingPath
+        {
+            get { return (string)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleExePackageRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleExePackageRow.cs
new file mode 100644
index 00000000..95fc0f54
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleExePackageRow.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.WindowsInstaller.Rows
+{
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Specialization of a row for the WixBundleExePackage table.
+    /// </summary>
+    public sealed class WixBundleExePackageRow : Row
+    {
+        /// <summary>
+        /// Creates a WixBundleExePackage row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
+        public WixBundleExePackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixBundleExePackageRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixBundleExePackageRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the raw Exe attributes of a patch.
+        /// </summary>
+        public WixBundleExePackageAttributes Attributes
+        {
+            get { return (WixBundleExePackageAttributes)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the protcol for the executable package.
+        /// </summary>
+        public string DetectCondition
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the install command for the executable package.
+        /// </summary>
+        public string InstallCommand
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the repair command for the executable package.
+        /// </summary>
+        public string RepairCommand
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the uninstall command for the executable package.
+        /// </summary>
+        public string UninstallCommand
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the protcol for the executable package.
+        /// </summary>
+        public string ExeProtocol
+        {
+            get { return (string)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets whether the executable package is repairable.
+        /// </summary>
+        public bool Repairable
+        {
+            get { return 0 != (this.Attributes & WixBundleExePackageAttributes.Repairable); }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiFeatureRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiFeatureRow.cs
new file mode 100644
index 00000000..6230a20c
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiFeatureRow.cs
@@ -0,0 +1,93 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the MsiFeature table.
+    /// </summary>
+    public class WixBundleMsiFeatureRow : Row
+    {
+        /// <summary>
+        /// Creates a MsiFeatureRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleMsiFeatureRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a MsiFeatureRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleMsiFeatureRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        public string Name
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        public long Size
+        {
+            get { return (long)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        public string Parent
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        public string Title
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        public string Description
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        public int Display
+        {
+            get { return (int)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+
+        public int Level
+        {
+            get { return (int)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+
+        public string Directory
+        {
+            get { return (string)this.Fields[8].Data; }
+            set { this.Fields[8].Data = value; }
+        }
+
+        public int Attributes
+        {
+            get { return (int)this.Fields[9].Data; }
+            set { this.Fields[9].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPackageRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPackageRow.cs
new file mode 100644
index 00000000..fdd2b6cf
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPackageRow.cs
@@ -0,0 +1,138 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+    using System.Globalization;
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Specialization of a row for the WixBundleMsiPackage table.
+    /// </summary>
+    public sealed class WixBundleMsiPackageRow : Row
+    {
+        /// <summary>
+        /// Creates a WixBundleMsiPackage row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
+        public WixBundleMsiPackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixBundleMsiPackageRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixBundleMsiPackageRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the raw MSI attributes of a package.
+        /// </summary>
+        public WixBundleMsiPackageAttributes Attributes
+        {
+            get { return (WixBundleMsiPackageAttributes)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the MSI package's product code.
+        /// </summary>
+        public string ProductCode
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the MSI package's upgrade code.
+        /// </summary>
+        public string UpgradeCode
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the product version of the MSI package.
+        /// </summary>
+        public string ProductVersion
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the language of the MSI package.
+        /// </summary>
+        public int ProductLanguage
+        {
+            get { return Convert.ToInt32(this.Fields[5].Data, CultureInfo.InvariantCulture); }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the product name of the MSI package.
+        /// </summary>
+        public string ProductName
+        {
+            get { return (string)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the MSI package's manufacturer.
+        /// </summary>
+        public string Manufacturer
+        {
+            get { return (string)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the display internal UI of a package.
+        /// </summary>
+        public bool DisplayInternalUI
+        {
+            get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.DisplayInternalUI); }
+        }
+
+        /// <summary>
+        /// Gets the display internal UI of a package.
+        /// </summary>
+        public bool EnableFeatureSelection
+        {
+            get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection); }
+        }
+
+        /// <summary>
+        /// Gets the display internal UI of a package.
+        /// </summary>
+        public bool ForcePerMachine
+        {
+            get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.ForcePerMachine); }
+        }
+
+        /// <summary>
+        /// Gets the suppress loose file payload generation of a package.
+        /// </summary>
+        public bool SuppressLooseFilePayloadGeneration
+        {
+            get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.SuppressLooseFilePayloadGeneration); }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPropertyRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPropertyRow.cs
new file mode 100644
index 00000000..baa58f73
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsiPropertyRow.cs
@@ -0,0 +1,58 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixBundleMsiProperty table.
+    /// </summary>
+    public sealed class WixBundleMsiPropertyRow : Row
+    {
+        /// <summary>
+        /// Creates an WixBundleMsiProperty row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this WixBundleMsiProperty row belongs to and should get its column definitions from.</param>
+        public WixBundleMsiPropertyRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the property identity.
+        /// </summary>
+        public string Name
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the value for the row.
+        /// </summary>
+        /// <value>MsiProperty value for the row.</value>
+        public string Value
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the condition for the row.
+        /// </summary>
+        /// <value>MsiProperty condition for the row.</value>
+        public string Condition
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMspPackageRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMspPackageRow.cs
new file mode 100644
index 00000000..23c331fd
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMspPackageRow.cs
@@ -0,0 +1,101 @@
+// 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.WindowsInstaller.Rows
+{
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Specialization of a row for the ChainMspPackage table.
+    /// </summary>
+    public sealed class WixBundleMspPackageRow : Row
+    {
+        /// <summary>
+        /// Creates a ChainMspPackage row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
+        public WixBundleMspPackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixBundleMspPackage row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixBundleMspPackageRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the raw MSP attributes of a patch.
+        /// </summary>
+        public WixBundleMspPackageAttributes Attributes
+        {
+            get { return (WixBundleMspPackageAttributes)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the patch code.
+        /// </summary>
+        public string PatchCode
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the patch's manufacturer.
+        /// </summary>
+        public string Manufacturer
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the patch's xml.
+        /// </summary>
+        public string PatchXml
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the display internal UI of a patch.
+        /// </summary>
+        public bool DisplayInternalUI
+        {
+            get { return 0 != (this.Attributes & WixBundleMspPackageAttributes.DisplayInternalUI); }
+        }
+
+        /// <summary>
+        /// Gets whether to slipstream the patch.
+        /// </summary>
+        public bool Slipstream
+        {
+            get { return 0 != (this.Attributes & WixBundleMspPackageAttributes.Slipstream); }
+        }
+
+        /// <summary>
+        /// Gets whether the patch targets an unspecified number of packages.
+        /// </summary>
+        public bool TargetUnspecified
+        {
+            get { return 0 != (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified); }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsuPackageRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsuPackageRow.cs
new file mode 100644
index 00000000..2a858d07
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleMsuPackageRow.cs
@@ -0,0 +1,57 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixBundleMsuPackage table.
+    /// </summary>
+    public sealed class WixBundleMsuPackageRow : Row
+    {
+        /// <summary>
+        /// Creates a WixBundleMsuPackage row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
+        public WixBundleMsuPackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixBundleMsuPackage row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixBundleMsuPackageRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the detection condition the package.
+        /// </summary>
+        public string DetectCondition
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the KB of the package.
+        /// </summary>
+        public string MsuKB
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePackageCommandLineRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePackageCommandLineRow.cs
new file mode 100644
index 00000000..3f23c82c
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePackageCommandLineRow.cs
@@ -0,0 +1,80 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixBundlePackageCommandLine table.
+    /// </summary>
+    public class WixBundlePackageCommandLineRow : Row
+    {
+        /// <summary>
+        /// Creates a WixBundlePackageCommandLineRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this WixBundlePackageCommandLineRow row belongs to and should get its column definitions from.</param>
+        public WixBundlePackageCommandLineRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates an WixBundlePackageCommandLineRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this WixBundlePackageCommandLineRow row belongs to and should get its column definitions from.</param>
+        public WixBundlePackageCommandLineRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the package identifier.
+        /// </summary>
+        /// <value>The package identifier.</value>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the command-line argument for installation.
+        /// </summary>
+        /// <value>The command-line argument.</value>
+        public string InstallArgument
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the command-line argument for uninstallation.
+        /// </summary>
+        /// <value>The command-line argument.</value>
+        public string UninstallArgument
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the command-line argument for repair.
+        /// </summary>
+        /// <value>The command-line argument.</value>
+        public string RepairArgument
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the condition.
+        /// </summary>
+        /// <value>The condition.</value>
+        public string Condition
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePackageExitCodeRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePackageExitCodeRow.cs
new file mode 100644
index 00000000..2de40eb2
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePackageExitCodeRow.cs
@@ -0,0 +1,53 @@
+// 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.WindowsInstaller.Rows
+{
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Specialization of a row for the ExitCode table.
+    /// </summary>
+    public class WixBundlePackageExitCodeRow : Row
+    {
+        /// <summary>
+        /// Creates a ExitCodeRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public WixBundlePackageExitCodeRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a ExitCodeRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
+        public WixBundlePackageExitCodeRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        public int? Code
+        {
+            get { return (null == this.Fields[1].Data) ? (int?)null : (int?)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        public ExitCodeBehaviorType Behavior
+        {
+            get { return (ExitCodeBehaviorType)this.Fields[2].Data; }
+            set { this.Fields[2].Data = (int)value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePackageRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePackageRow.cs
new file mode 100644
index 00000000..8a1f438e
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePackageRow.cs
@@ -0,0 +1,228 @@
+// 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.WindowsInstaller.Rows
+{
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Specialization of a row for the WixBundlePackage table.
+    /// </summary>
+    public sealed class WixBundlePackageRow : Row
+    {
+        /// <summary>
+        /// Creates a WixBundlePackage row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
+        public WixBundlePackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixBundlePackage row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixBundlePackageRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key to the WixChainItem.
+        /// </summary>
+        public string WixChainItemId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the item type.
+        /// </summary>
+        public WixBundlePackageType Type
+        {
+            get { return (WixBundlePackageType)this.Fields[1].Data; }
+            set { this.Fields[1].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the indentifier of the package's payload.
+        /// </summary>
+        public string PackagePayload
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the raw attributes of a package.
+        /// </summary>
+        public WixBundlePackageAttributes Attributes
+        {
+            get { return (WixBundlePackageAttributes)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the install condition of the package.
+        /// </summary>
+        public string InstallCondition
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the language of the package.
+        /// </summary>
+        public YesNoAlwaysType Cache
+        {
+            get { return (null == this.Fields[5].Data) ? YesNoAlwaysType.NotSet : (YesNoAlwaysType)this.Fields[5].Data; }
+            set { this.Fields[5].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the indentifier of the package's cache.
+        /// </summary>
+        public string CacheId
+        {
+            get { return (string)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the package is vital.
+        /// </summary>
+        public YesNoType Vital
+        {
+            get { return (null == this.Fields[7].Data) ? YesNoType.NotSet : (YesNoType)this.Fields[7].Data; }
+            set { this.Fields[7].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the package is per-machine.
+        /// </summary>
+        public YesNoDefaultType PerMachine
+        {
+            get { return (null == this.Fields[8].Data) ? YesNoDefaultType.NotSet : (YesNoDefaultType)this.Fields[8].Data; }
+            set { this.Fields[8].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable that points to the log for the package.
+        /// </summary>
+        public string LogPathVariable
+        {
+            get { return (string)this.Fields[9].Data; }
+            set { this.Fields[9].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable that points to the rollback log for the package.
+        /// </summary>
+        public string RollbackLogPathVariable
+        {
+            get { return (string)this.Fields[10].Data; }
+            set { this.Fields[10].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the size of the package.
+        /// </summary>
+        public long Size
+        {
+            get { return (long)this.Fields[11].Data; }
+            set { this.Fields[11].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the install size of the package.
+        /// </summary>
+        public long? InstallSize
+        {
+            get { return (long?)this.Fields[12].Data; }
+            set { this.Fields[12].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the version of the package.
+        /// </summary>
+        public string Version
+        {
+            get { return (string)this.Fields[13].Data; }
+            set { this.Fields[13].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the language of the package.
+        /// </summary>
+        public int Language
+        {
+            get { return (int)this.Fields[14].Data; }
+            set { this.Fields[14].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the display name of the package.
+        /// </summary>
+        public string DisplayName
+        {
+            get { return (string)this.Fields[15].Data; }
+            set { this.Fields[15].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the description of the package.
+        /// </summary>
+        public string Description
+        {
+            get { return (string)this.Fields[16].Data; }
+            set { this.Fields[16].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the rollback boundary identifier for the package.
+        /// </summary>
+        public string RollbackBoundary
+        {
+            get { return (string)this.Fields[17].Data; }
+            set { this.Fields[17].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the backward rollback boundary identifier for the package.
+        /// </summary>
+        public string RollbackBoundaryBackward
+        {
+            get { return (string)this.Fields[18].Data; }
+            set { this.Fields[18].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the package is x64.
+        /// </summary>
+        public YesNoType x64
+        {
+            get { return (null == this.Fields[19].Data) ? YesNoType.NotSet : (YesNoType)this.Fields[19].Data; }
+            set { this.Fields[19].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets whether the package is permanent.
+        /// </summary>
+        public bool Permanent
+        {
+            get { return 0 != (this.Attributes & WixBundlePackageAttributes.Permanent); }
+        }
+
+        /// <summary>
+        /// Gets whether the package is visible.
+        /// </summary>
+        public bool Visible
+        {
+            get { return 0 != (this.Attributes & WixBundlePackageAttributes.Visible); }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs
new file mode 100644
index 00000000..6e05e4b7
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs
@@ -0,0 +1,79 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+
+    /// <summary>
+    /// Attributes for the PatchTargetCode table.
+    /// </summary>
+    [Flags]
+    public enum WixBundlePatchTargetCodeAttributes : int
+    {
+        None = 0,
+
+        /// <summary>
+        /// The transform targets a specific ProductCode.
+        /// </summary>
+        TargetsProductCode = 1,
+
+        /// <summary>
+        /// The transform targets a specific UpgradeCode.
+        /// </summary>
+        TargetsUpgradeCode = 2,
+    }
+
+    /// <summary>
+    /// Specialization of a row for the PatchTargetCode table.
+    /// </summary>
+    public class WixBundlePatchTargetCodeRow : Row
+    {
+        /// <summary>
+        /// Creates a PatchTargetCodeRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this PatchTargetCode row belongs to and should get its column definitions from.</param>
+        public WixBundlePatchTargetCodeRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a PatchTargetCodeRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this PatchTargetCode row belongs to and should get its column definitions from.</param>
+        public WixBundlePatchTargetCodeRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        public string MspPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        public string TargetCode
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        public WixBundlePatchTargetCodeAttributes Attributes
+        {
+            get { return (WixBundlePatchTargetCodeAttributes)this.Fields[2].Data; }
+            set { this.Fields[2].Data = (int)value; }
+        }
+
+        public bool TargetsProductCode
+        {
+            get { return 0 != (WixBundlePatchTargetCodeAttributes.TargetsProductCode & this.Attributes); }
+        }
+
+        public bool TargetsUpgradeCode
+        {
+            get { return 0 != (WixBundlePatchTargetCodeAttributes.TargetsUpgradeCode & this.Attributes); }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePayloadRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePayloadRow.cs
new file mode 100644
index 00000000..ca4d35cc
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundlePayloadRow.cs
@@ -0,0 +1,185 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+    using System.IO;
+
+    /// <summary>
+    /// Specialization of a row for the PayloadInfo table.
+    /// </summary>
+    public class WixBundlePayloadRow : Row
+    {
+        /// <summary>
+        /// Creates a PayloadRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public WixBundlePayloadRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a PayloadRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
+        public WixBundlePayloadRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        public string Name
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        public string SourceFile
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        public string DownloadUrl
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        public YesNoDefaultType Compressed
+        {
+            get { return (YesNoDefaultType)this.Fields[4].Data; }
+            set { this.Fields[4].Data = (int)value; }
+        }
+
+        public string UnresolvedSourceFile
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        public string DisplayName
+        {
+            get { return (string)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+
+        public string Description
+        {
+            get { return (string)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+
+        public bool EnableSignatureValidation
+        {
+            get { return (null != this.Fields[8].Data) && (1 == (int)this.Fields[8].Data); }
+            set { this.Fields[8].Data = value ? 1 : 0; }
+        }
+
+        public int FileSize
+        {
+            get { return (int)this.Fields[9].Data; }
+            set { this.Fields[9].Data = value; }
+        }
+
+        public string Version
+        {
+            get { return (string)this.Fields[10].Data; }
+            set { this.Fields[10].Data = value; }
+        }
+
+        public string Hash
+        {
+            get { return (string)this.Fields[11].Data; }
+            set { this.Fields[11].Data = value; }
+        }
+
+        public string PublicKey
+        {
+            get { return (string)this.Fields[12].Data; }
+            set { this.Fields[12].Data = value; }
+        }
+
+        public string Thumbprint
+        {
+            get { return (string)this.Fields[13].Data; }
+            set { this.Fields[13].Data = value; }
+        }
+
+        public string Catalog
+        {
+            get { return (string)this.Fields[14].Data; }
+            set { this.Fields[14].Data = value; }
+        }
+
+        public string Container
+        {
+            get { return (string)this.Fields[15].Data; }
+            set { this.Fields[15].Data = value; }
+        }
+
+        public string Package
+        {
+            get { return (string)this.Fields[16].Data; }
+            set { this.Fields[16].Data = value; }
+        }
+
+        public bool ContentFile
+        {
+            get { return (null != this.Fields[17].Data) && (1 == (int)this.Fields[17].Data); }
+            set { this.Fields[17].Data = value ? 1 : 0; }
+        }
+
+        public string EmbeddedId
+        {
+            get { return (string)this.Fields[18].Data; }
+            set { this.Fields[18].Data = value; }
+        }
+
+        public bool LayoutOnly
+        {
+            get { return (null != this.Fields[19].Data) && (1 == (int)this.Fields[19].Data); }
+            set { this.Fields[19].Data = value ? 1 : 0; }
+        }
+
+        public PackagingType Packaging
+        {
+            get
+            {
+                object data = this.Fields[20].Data;
+                return (null == data) ? PackagingType.Unknown : (PackagingType)data;
+            }
+
+            set
+            {
+                if (PackagingType.Unknown == value)
+                {
+                    this.Fields[20].Data = null;
+                }
+                else
+                {
+                    this.Fields[20].Data = (int)value;
+                }
+            }
+        }
+
+        public string ParentPackagePayload
+        {
+            get { return (string)this.Fields[21].Data; }
+            set { this.Fields[21].Data = value; }
+        }
+
+        public string FullFileName
+        {
+            get { return String.IsNullOrEmpty(this.SourceFile) ? String.Empty : Path.GetFullPath(this.SourceFile); }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleRelatedPackageRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleRelatedPackageRow.cs
new file mode 100644
index 00000000..5b0d2a18
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleRelatedPackageRow.cs
@@ -0,0 +1,87 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the RelatedPackage table.
+    /// </summary>
+    public class WixBundleRelatedPackageRow : Row
+    {
+        /// <summary>
+        /// Creates a RelatedPackageRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleRelatedPackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a RelatedPackageRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleRelatedPackageRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        public string Id
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        public string MinVersion
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        public string MaxVersion
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        public string Languages
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        public bool MinInclusive
+        {
+            get { return 1 == (int)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value ? 1 : 0; }
+        }
+
+        public bool MaxInclusive
+        {
+            get { return 1 == (int)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value ? 1 : 0; }
+        }
+
+        public bool LangInclusive
+        {
+            get { return 1 == (int)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value ? 1 : 0; }
+        }
+
+        public bool OnlyDetect
+        {
+            get { return 1 == (int)this.Fields[8].Data; }
+            set { this.Fields[8].Data = value ? 1 : 0; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleRollbackBoundaryRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleRollbackBoundaryRow.cs
new file mode 100644
index 00000000..434a19e3
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleRollbackBoundaryRow.cs
@@ -0,0 +1,59 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixBundleRollbackBoundary table.
+    /// </summary>
+    public sealed class WixBundleRollbackBoundaryRow : Row
+    {
+        /// <summary>
+        /// Creates a WixBundleRollbackBoundary row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
+        public WixBundleRollbackBoundaryRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a RollbackBoundaryRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixBundleRollbackBoundaryRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the package is vital.
+        /// </summary>
+        /// <value>Vitality of the package.</value>
+        public YesNoType Vital
+        {
+            get { return (null == this.Fields[1].Data) ? YesNoType.NotSet : (YesNoType)this.Fields[1].Data; }
+            set { this.Fields[1].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the rollback-boundary should be installed as an MSI transaction.
+        /// </summary>
+        /// <value>Vitality of the package.</value>
+        public YesNoType Transaction
+        {
+            get { return (null == this.Fields[2].Data) ? YesNoType.NotSet : (YesNoType)this.Fields[2].Data; }
+            set { this.Fields[2].Data = (int)value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleRow.cs
new file mode 100644
index 00000000..22538606
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleRow.cs
@@ -0,0 +1,228 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+
+    /// <summary>
+    /// Bundle info for binding Bundles.
+    /// </summary>
+    public class WixBundleRow : Row
+    {
+        /// <summary>
+        /// Creates a WixBundleRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this WixBundleRow row belongs to and should get its column definitions from.</param>
+        public WixBundleRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixBundleRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this WixBundleRow row belongs to and should get its column definitions from.</param>
+        public WixBundleRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        public string Version
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        public string Copyright
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        public string Name
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        public string AboutUrl
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        public int DisableModify
+        {
+            get { return (null == this.Fields[4].Data) ? 0 : (int)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        public bool DisableRemove
+        {
+            get { return (null != this.Fields[5].Data && 0 != (int)this.Fields[5].Data); }
+            set { this.Fields[5].Data = value ? 1 : 0; }
+        }
+
+        // There is no 6. It used to be DisableRepair.
+
+        public string HelpTelephone
+        {
+            get { return (string)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+
+        public string HelpLink
+        {
+            get { return (string)this.Fields[8].Data; }
+            set { this.Fields[8].Data = value; }
+        }
+
+        public string Publisher
+        {
+            get { return (string)this.Fields[9].Data; }
+            set { this.Fields[9].Data = value; }
+        }
+
+        public string UpdateUrl
+        {
+            get { return (string)this.Fields[10].Data; }
+            set { this.Fields[10].Data = value; }
+        }
+
+        public YesNoDefaultType Compressed
+        {
+            get { return (null == this.Fields[11].Data) ? YesNoDefaultType.Default : (0 == (int)this.Fields[11].Data) ? YesNoDefaultType.No : YesNoDefaultType.Yes; }
+            set { this.Fields[11].Data = (int)value; }
+        }
+
+        public PackagingType DefaultPackagingType
+        {
+            get { return (YesNoDefaultType.No == this.Compressed) ? PackagingType.External : PackagingType.Embedded; }
+        }
+
+        public string LogPathPrefixExtension
+        {
+            get { return (string)this.Fields[12].Data ?? String.Empty; }
+            set { this.Fields[12].Data = value; }
+        }
+
+        public string LogPathVariable
+        {
+            get
+            {
+                string[] logVariableAndPrefixExtension = this.LogPathPrefixExtension.Split(':');
+                return logVariableAndPrefixExtension[0];
+            }
+        }
+
+        public string LogPrefix
+        {
+            get
+            {
+                string[] logVariableAndPrefixExtension = this.LogPathPrefixExtension.Split(':');
+                if (2 > logVariableAndPrefixExtension.Length)
+                {
+                    return String.Empty;
+                }
+                string logPrefixAndExtension = logVariableAndPrefixExtension[1];
+                int extensionIndex = logPrefixAndExtension.LastIndexOf('.');
+                return logPrefixAndExtension.Substring(0, extensionIndex);
+            }
+        }
+
+        public string LogExtension
+        {
+            get
+            {
+                string[] logVariableAndPrefixExtension = this.LogPathPrefixExtension.Split(':');
+                if (2 > logVariableAndPrefixExtension.Length)
+                {
+                    return String.Empty;
+                }
+                string logPrefixAndExtension = logVariableAndPrefixExtension[1];
+                int extensionIndex = logPrefixAndExtension.LastIndexOf('.');
+                return logPrefixAndExtension.Substring(extensionIndex + 1);
+            }
+        }
+
+        public string IconPath
+        {
+            get { return (string)this.Fields[13].Data; }
+            set { this.Fields[13].Data = value; }
+        }
+
+        public string SplashScreenBitmapPath
+        {
+            get { return (string)this.Fields[14].Data; }
+            set { this.Fields[14].Data = value; }
+        }
+
+        public string Condition
+        {
+            get { return (string)this.Fields[15].Data; }
+            set { this.Fields[15].Data = value; }
+        }
+
+        public string Tag
+        {
+            get { return (string)this.Fields[16].Data; }
+            set { this.Fields[16].Data = value; }
+        }
+
+        public Platform Platform
+        {
+            get { return (Platform)Enum.Parse(typeof(Platform), (string)this.Fields[17].Data); }
+            set { this.Fields[17].Data = value.ToString(); }
+        }
+
+        public string ParentName
+        {
+            get { return (string)this.Fields[18].Data; }
+            set { this.Fields[18].Data = value; }
+        }
+
+        public string UpgradeCode
+        {
+            get { return (string)this.Fields[19].Data; }
+            set { this.Fields[19].Data = value; }
+        }
+
+        public Guid BundleId
+        {
+            get
+            {
+                if (null == this.Fields[20].Data)
+                {
+                    this.Fields[20].Data = Guid.NewGuid().ToString("B");
+                }
+
+                return new Guid((string)this.Fields[20].Data);
+            }
+
+            set { this.Fields[20].Data = value.ToString(); }
+        }
+
+        public string ProviderKey
+        {
+            get
+            {
+                if (null == this.Fields[21].Data)
+                {
+                    this.Fields[21].Data = this.BundleId.ToString("B");
+                }
+
+                return (string)this.Fields[21].Data;
+            }
+
+            set { this.Fields[21].Data = value; }
+        }
+
+        public bool PerMachine
+        {
+            get { return (null != this.Fields[22].Data && 0 != (int)this.Fields[22].Data); }
+            set { this.Fields[22].Data = value ? 1 : 0; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleSlipstreamMspRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleSlipstreamMspRow.cs
new file mode 100644
index 00000000..0fea725f
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleSlipstreamMspRow.cs
@@ -0,0 +1,48 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the SlipstreamMsp table.
+    /// </summary>
+    public class WixBundleSlipstreamMspRow : Row
+    {
+        /// <summary>
+        /// Creates a SlipstreamMspRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleSlipstreamMspRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a SlipstreamMspRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleSlipstreamMspRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row.
+        /// </summary>
+        public string ChainPackageId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the foreign key identifier to the ChainPackage row for the MSP package.
+        /// </summary>
+        public string MspPackageId
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleUpdateRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleUpdateRow.cs
new file mode 100644
index 00000000..68360ae9
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleUpdateRow.cs
@@ -0,0 +1,36 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Bundle update info for binding Bundles.
+    /// </summary>
+    public class WixBundleUpdateRow : Row
+    {
+        /// <summary>
+        /// Creates a WixBundleUpdateRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this WixBundleUpdateRow row belongs to and should get its column definitions from.</param>
+        public WixBundleUpdateRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixBundleUpdateRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this WixBundleUpdateRow row belongs to and should get its column definitions from.</param>
+        public WixBundleUpdateRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        public string Location
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleVariableRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleVariableRow.cs
new file mode 100644
index 00000000..64fa0336
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixBundleVariableRow.cs
@@ -0,0 +1,80 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the Variable table.
+    /// </summary>
+    public sealed class WixBundleVariableRow : Row
+    {
+        /// <summary>
+        /// Creates a Variable row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleVariableRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a Variable row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
+        public WixBundleVariableRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the variable identifier.
+        /// </summary>
+        /// <value>The variable identifier.</value>
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable's value.
+        /// </summary>
+        /// <value>The variable's value.</value>
+        public string Value
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable's type.
+        /// </summary>
+        /// <value>The variable's type.</value>
+        public string Type
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether this variable is hidden.
+        /// </summary>
+        /// <value>Whether this variable is hidden.</value>
+        public bool Hidden
+        {
+            get { return (null == this.Fields[3].Data || 0 == ((int)this.Fields[3].Data)) ? false : true; }
+            set { this.Fields[3].Data = value ? 1 : 0; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether this variable is persisted.
+        /// </summary>
+        /// <value>Whether this variable is persisted.</value>
+        public bool Persisted
+        {
+            get { return (null == this.Fields[4].Data || 0 == ((int)this.Fields[4].Data)) ? false : true; }
+            set { this.Fields[4].Data = value ? 1 : 0; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixChainItemRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixChainItemRow.cs
new file mode 100644
index 00000000..8e08d613
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixChainItemRow.cs
@@ -0,0 +1,39 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixChainItem table.
+    /// </summary>
+    public sealed class WixChainItemRow : Row
+    {
+        /// <summary>
+        /// Creates a WixChainItem row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this ChainItem row belongs to and should get its column definitions from.</param>
+        public WixChainItemRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixChainItem row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this ChainItem row belongs to and should get its column definitions from.</param>
+        public WixChainItemRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the WixChainItem identifier.
+        /// </summary>
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixChainRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixChainRow.cs
new file mode 100644
index 00000000..78ba9766
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixChainRow.cs
@@ -0,0 +1,65 @@
+// 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.WindowsInstaller.Rows
+{
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Specialization of a row for the WixChain table.
+    /// </summary>
+    public sealed class WixChainRow : Row
+    {
+        /// <summary>
+        /// Creates a WixChain row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
+        public WixChainRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixChainRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixChainRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the raw chain attributes.
+        /// </summary>
+        public WixChainAttributes Attributes
+        {
+            get { return (WixChainAttributes)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the disable rollback state of a chain.
+        /// </summary>
+        public bool DisableRollback
+        {
+            get { return 0 != (this.Attributes & WixChainAttributes.DisableRollback); }
+        }
+
+        /// <summary>
+        /// Gets disable system restore state of a chain.
+        /// </summary>
+        public bool DisableSystemRestore
+        {
+            get { return 0 != (this.Attributes & WixChainAttributes.DisableSystemRestore); }
+        }
+
+        /// <summary>
+        /// Gets parallel cache of a chain.
+        /// </summary>
+        public bool ParallelCache
+        {
+            get { return 0 != (this.Attributes & WixChainAttributes.ParallelCache); }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixComplexReferenceRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixComplexReferenceRow.cs
new file mode 100644
index 00000000..2abd7656
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixComplexReferenceRow.cs
@@ -0,0 +1,202 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Specialization of a row for the WixComplexReference table.
+    /// </summary>
+    public sealed class WixComplexReferenceRow : Row, IComparable
+    {
+        /// <summary>
+        /// Creates a WixComplexReferenceRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixComplexReferenceRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets the parent type of the complex reference.
+        /// </summary>
+        /// <value>Parent type of the complex reference.</value>
+        public ComplexReferenceParentType ParentType
+        {
+            get { return (ComplexReferenceParentType)Enum.ToObject(typeof(ComplexReferenceParentType), (int)this.Fields[1].Data); }
+            set { this.Fields[1].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the parent identifier of the complex reference.
+        /// </summary>
+        /// <value>Parent identifier of the complex reference.</value>
+        public string ParentId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the parent language of the complex reference.
+        /// </summary>
+        /// <value>Parent language of the complex reference.</value>
+        public string ParentLanguage
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the child type of the complex reference.
+        /// </summary>
+        /// <value>Child type of the complex reference.</value>
+        public ComplexReferenceChildType ChildType
+        {
+            get { return (ComplexReferenceChildType)Enum.ToObject(typeof(ComplexReferenceChildType), (int)this.Fields[4].Data); }
+            set { this.Fields[4].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets the child identifier of the complex reference.
+        /// </summary>
+        /// <value>Child identifier of the complex reference.</value>
+        public string ChildId
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets if this is the primary complex reference.
+        /// </summary>
+        /// <value>true if primary complex reference.</value>
+        public bool IsPrimary
+        {
+            get
+            {
+                return (0x1 == ((int)this.Fields[5].Data & 0x1));
+            }
+
+            set
+            {
+                if (null == this.Fields[5].Data)
+                {
+                    this.Fields[5].Data = 0;
+                }
+
+                if (value)
+                {
+                    this.Fields[5].Data = (int)this.Fields[5].Data | 0x1;
+                }
+                else
+                {
+                    this.Fields[5].Data = (int)this.Fields[5].Data & ~0x1;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines if two complex references are equivalent.
+        /// </summary>
+        /// <param name="obj">Complex reference to compare.</param>
+        /// <returns>True if complex references are equivalent.</returns>
+        public override bool Equals(object obj)
+        {
+            return 0 == this.CompareTo(obj);
+        }
+
+        /// <summary>
+        /// Gets the hash code for the complex reference.
+        /// </summary>
+        /// <returns>Hash code for the complex reference.</returns>
+        public override int GetHashCode()
+        {
+            return this.ChildType.GetHashCode() ^ this.ChildId.GetHashCode() ^ this.ParentType.GetHashCode() ^ this.ParentLanguage.GetHashCode() ^ this.ParentId.GetHashCode() ^ this.IsPrimary.GetHashCode();
+        }
+
+        /// <summary>
+        /// Compares two complex references.
+        /// </summary>
+        /// <param name="obj">Complex reference to compare to.</param>
+        /// <returns>Zero if the objects are equivalent, negative number if the provided object is less, positive if greater.</returns>
+        public int CompareTo(object obj)
+        {
+            int comparison = this.CompareToWithoutConsideringPrimary(obj);
+            if (0 == comparison)
+            {
+                comparison = ((WixComplexReferenceRow)obj).IsPrimary.CompareTo(this.IsPrimary); // Note: the order of these is purposely switched to ensure that "Yes" is lower than "No" and "NotSet"
+            }
+            return comparison;
+        }
+
+        /// <summary>
+        /// Compares two complex references without considering the primary bit.
+        /// </summary>
+        /// <param name="obj">Complex reference to compare to.</param>
+        /// <returns>Zero if the objects are equivalent, negative number if the provided object is less, positive if greater.</returns>
+        [SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.ArgumentException.#ctor(System.String,System.String)")]
+        public int CompareToWithoutConsideringPrimary(object obj)
+        {
+            var other = obj as WixComplexReferenceRow ?? throw new ArgumentNullException(nameof(obj));
+
+            int comparison = this.ChildType - other.ChildType;
+            if (0 == comparison)
+            {
+                comparison = String.Compare(this.ChildId, other.ChildId, StringComparison.Ordinal);
+                if (0 == comparison)
+                {
+                    comparison = this.ParentType - other.ParentType;
+                    if (0 == comparison)
+                    {
+                        string thisParentLanguage = null == this.ParentLanguage ? String.Empty : this.ParentLanguage;
+                        string otherParentLanguage = null == other.ParentLanguage ? String.Empty : other.ParentLanguage;
+                        comparison = String.Compare(thisParentLanguage, otherParentLanguage, StringComparison.Ordinal);
+                        if (0 == comparison)
+                        {
+                            comparison = String.Compare(this.ParentId, other.ParentId, StringComparison.Ordinal);
+                        }
+                    }
+                }
+            }
+
+            return comparison;
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of the ComplexReference.
+        /// </summary>
+        /// <returns>A shallow copy of the ComplexReference.</returns>
+        public WixComplexReferenceRow Clone()
+        {
+            WixComplexReferenceRow wixComplexReferenceRow = new WixComplexReferenceRow(this.SourceLineNumbers, this.Table);
+            wixComplexReferenceRow.ParentType = this.ParentType;
+            wixComplexReferenceRow.ParentId = this.ParentId;
+            wixComplexReferenceRow.ParentLanguage = this.ParentLanguage;
+            wixComplexReferenceRow.ChildType = this.ChildType;
+            wixComplexReferenceRow.ChildId = this.ChildId;
+            wixComplexReferenceRow.IsPrimary = this.IsPrimary;
+
+            return wixComplexReferenceRow;
+        }
+
+        /// <summary>
+        /// Changes all of the parent references to point to the passed in parent reference.
+        /// </summary>
+        /// <param name="parent">New parent complex reference.</param>
+        public void Reparent(WixComplexReferenceRow parent)
+        {
+            this.ParentId = parent.ParentId;
+            this.ParentLanguage = parent.ParentLanguage;
+            this.ParentType = parent.ParentType;
+
+            if (!this.IsPrimary)
+            {
+                this.IsPrimary = parent.IsPrimary;
+            }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixDeltaPatchFileRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixDeltaPatchFileRow.cs
new file mode 100644
index 00000000..9edcea92
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixDeltaPatchFileRow.cs
@@ -0,0 +1,142 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixDeltaPatchFile table.
+    /// </summary>
+    public sealed class WixDeltaPatchFileRow : Row
+    {
+        /// <summary>
+        /// Creates a WixDeltaPatchFile row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public WixDeltaPatchFileRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixDeltaPatchFile row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this File row belongs to and should get its column definitions from.</param>
+        public WixDeltaPatchFileRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the primary key of the file row.
+        /// </summary>
+        /// <value>Primary key of the file row.</value>
+        public string File
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the delta patch retain-length list for the file.
+        /// </summary>
+        /// <value>RetainLength list for the file.</value>
+        public string RetainLengths
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the previous delta patch retain-length list for the file.
+        /// </summary>
+        /// <value>Previous RetainLength list for the file.</value>
+        public string PreviousRetainLengths
+        {
+            get { return this.Fields[1].PreviousData; }
+            set { this.Fields[1].PreviousData = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the delta patch ignore-offset list for the file.
+        /// </summary>
+        /// <value>IgnoreOffset list for the file.</value>
+        public string IgnoreOffsets
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the previous delta patch ignore-offset list for the file.
+        /// </summary>
+        /// <value>Previous IgnoreOffset list for the file.</value>
+        public string PreviousIgnoreOffsets
+        {
+            get { return this.Fields[2].PreviousData; }
+            set { this.Fields[2].PreviousData = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the delta patch ignore-length list for the file.
+        /// </summary>
+        /// <value>IgnoreLength list for the file.</value>
+        public string IgnoreLengths
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the previous delta patch ignore-length list for the file.
+        /// </summary>
+        /// <value>Previous IgnoreLength list for the file.</value>
+        public string PreviousIgnoreLengths
+        {
+            get { return this.Fields[3].PreviousData; }
+            set { this.Fields[3].PreviousData = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the delta patch retain-offset list for the file.
+        /// </summary>
+        /// <value>RetainOffset list for the file.</value>
+        public string RetainOffsets
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the previous delta patch retain-offset list for the file.
+        /// </summary>
+        /// <value>PreviousRetainOffset list for the file.</value>
+        public string PreviousRetainOffsets
+        {
+            get { return this.Fields[4].PreviousData; }
+            set { this.Fields[4].PreviousData = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the symbol paths for the file.
+        /// </summary>
+        /// <value>SymbolPath list for the file.</value>
+        /// <remarks>This is set during binding.</remarks>
+        public string Symbols
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the previous symbol paths for the file.
+        /// </summary>
+        /// <value>PreviousSymbolPath list for the file.</value>
+        /// <remarks>This is set during binding.</remarks>
+        public string PreviousSymbols
+        {
+            get { return (string)this.Fields[5].PreviousData; }
+            set { this.Fields[5].PreviousData = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs
new file mode 100644
index 00000000..13899bd0
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.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.WindowsInstaller.Rows
+{
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Specialization of a row for the WixDeltaPatchSymbolPaths table.
+    /// </summary>
+    public sealed class WixDeltaPatchSymbolPathsRow : Row
+    {
+        /// <summary>
+        /// Creates a WixDeltaPatchSymbolPaths row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
+        public WixDeltaPatchSymbolPathsRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixDeltaPatchSymbolPaths row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixDeltaPatchSymbolPathsRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the identifier the symbol paths apply to.
+        /// </summary>
+        /// <value>RetainLength list for the file.</value>
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the identifier.
+        /// </summary>
+        public SymbolPathType Type
+        {
+            get { return (SymbolPathType)this.Fields[1].AsInteger(); }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the delta patch symbol paths.
+        /// </summary>
+        public string SymbolPaths
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixFileRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixFileRow.cs
new file mode 100644
index 00000000..302272c4
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixFileRow.cs
@@ -0,0 +1,163 @@
+// 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.WindowsInstaller.Rows
+{
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Specialization of a row for the WixFile table.
+    /// </summary>
+    public sealed class WixFileRow : Row
+    {
+        /// <summary>
+        /// Creates a WixFile row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
+        public WixFileRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixFile row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixFileRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the primary key of the file row.
+        /// </summary>
+        /// <value>Primary key of the file row.</value>
+        public string File
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the assembly type of the file row.
+        /// </summary>
+        /// <value>Assembly type of the file row.</value>
+        public FileAssemblyType AssemblyType
+        {
+            get { return (null == this.Fields[1]) ? FileAssemblyType.NotAnAssembly : (FileAssemblyType)this.Fields[1].AsInteger(); }
+            set { this.Fields[1].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the identifier for the assembly manifest.
+        /// </summary>
+        /// <value>Identifier for the assembly manifest.</value>
+        public string AssemblyManifest
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the application for the assembly.
+        /// </summary>
+        /// <value>Application for the assembly.</value>
+        public string AssemblyApplication
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the directory of the file.
+        /// </summary>
+        /// <value>Directory of the file.</value>
+        public string Directory
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the disk id for this file.
+        /// </summary>
+        /// <value>Disk id for the file.</value>
+        public int DiskId
+        {
+            get { return (int)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the source location to the file.
+        /// </summary>
+        /// <value>Source location to the file.</value>
+        public string Source
+        {
+            get { return (string)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the source location to the file.
+        /// </summary>
+        /// <value>Source location to the file.</value>
+        public string PreviousSource
+        {
+            get { return (string)this.Fields[6].PreviousData; }
+            set { this.Fields[6].PreviousData = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the architecture the file executes on.
+        /// </summary>
+        /// <value>Architecture the file executes on.</value>
+        public string ProcessorArchitecture
+        {
+            get { return (string)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the patch group of a patch-added file.
+        /// </summary>
+        /// <value>The patch group of a patch-added file.</value>
+        public int PatchGroup
+        {
+            get { return (null == this.Fields[8].Data) ? 0 : (int)this.Fields[8].Data; }
+            set { this.Fields[8].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the attributes on a file.
+        /// </summary>
+        /// <value>Attributes on a file.</value>
+        public int Attributes
+        {
+            get { return (int)this.Fields[9].Data; }
+            set { this.Fields[9].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the patching attributes to the file.
+        /// </summary>
+        /// <value>Patching attributes of the file.</value>
+        public PatchAttributeType PatchAttributes
+        {
+            get { return (PatchAttributeType)this.Fields[10].AsInteger(); }
+            set { this.Fields[10].Data = (int)value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the path to the delta patch header.
+        /// </summary>
+        /// <value>Patch header path.</value>
+        /// <remarks>Set by the binder only when doing delta patching.</remarks>
+        public string DeltaPatchHeaderSource
+        {
+            get { return (string)this.Fields[11].Data; }
+            set { this.Fields[11].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixGroupRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixGroupRow.cs
new file mode 100644
index 00000000..e59df729
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixGroupRow.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.WindowsInstaller.Rows
+{
+    using System;
+
+    /// <summary>
+    /// Specialization of a row for the WixGroup table.
+    /// </summary>
+    public sealed class WixGroupRow : Row
+    {
+        /// <summary>
+        /// Creates a WixGroupRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixGroupRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the parent identifier of the complex reference.
+        /// </summary>
+        /// <value>Parent identifier of the complex reference.</value>
+        public string ParentId
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the parent type of the complex reference.
+        /// </summary>
+        /// <value>Parent type of the complex reference.</value>
+        public ComplexReferenceParentType ParentType
+        {
+            get { return (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[1].Data); }
+            set { this.Fields[1].Data = value.ToString(); }
+        }
+
+        /// <summary>
+        /// Gets the child identifier of the complex reference.
+        /// </summary>
+        /// <value>Child identifier of the complex reference.</value>
+        public string ChildId
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the child type of the complex reference.
+        /// </summary>
+        /// <value>Child type of the complex reference.</value>
+        public ComplexReferenceChildType ChildType
+        {
+            get { return (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[3].Data); }
+            set { this.Fields[3].Data = value.ToString(); }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaRow.cs
new file mode 100644
index 00000000..dfe40c35
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaRow.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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixMedia table.
+    /// </summary>
+    public sealed class WixMediaRow : Row
+    {
+        /// <summary>
+        /// Creates a WixMedia row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
+        public WixMediaRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixMedia row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
+        public WixMediaRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the disk id for this media.
+        /// </summary>
+        /// <value>Disk id for the media.</value>
+        public int DiskId
+        {
+            get { return (int)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the compression level for this media row.
+        /// </summary>
+        /// <value>Compression level.</value>
+        public CompressionLevel? CompressionLevel
+        {
+            get { return (CompressionLevel?)this.Fields[1].AsNullableInteger(); }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the layout location for this media row.
+        /// </summary>
+        /// <value>Layout location to the root of the media.</value>
+        public string Layout
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaTemplateRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaTemplateRow.cs
new file mode 100644
index 00000000..b2a64356
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaTemplateRow.cs
@@ -0,0 +1,81 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the MediaTemplate table.
+    /// </summary>
+    public sealed class WixMediaTemplateRow : Row
+    {
+        /// <summary>
+        /// Creates a MediaTemplate row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this MediaTeplate row belongs to and should get its column definitions from.</param>
+        public WixMediaTemplateRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the cabinet template name for this media template row.
+        /// </summary>
+        /// <value>Cabinet name.</value>
+        public string CabinetTemplate
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the compression level for this media template row.
+        /// </summary>
+        /// <value>Compression level.</value>
+        public CompressionLevel? CompressionLevel
+        {
+            get { return (CompressionLevel?)this.Fields[1].AsNullableInteger(); }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the disk prompt for this media template row.
+        /// </summary>
+        /// <value>Disk prompt.</value>
+        public string DiskPrompt
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the volume label for this media template row.
+        /// </summary>
+        /// <value>Volume label.</value>
+        public string VolumeLabel
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum uncompressed media size for this media template row.
+        /// </summary>
+        /// <value>Disk id.</value>
+        public int MaximumUncompressedMediaSize
+        {
+            get { return (int)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Maximum Cabinet Size For Large File Splitting for this media template row.
+        /// </summary>
+        /// <value>Disk id.</value>
+        public int MaximumCabinetSizeForLargeFileSplitting
+        {
+            get { return (int)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixMergeRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixMergeRow.cs
new file mode 100644
index 00000000..ac60452e
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixMergeRow.cs
@@ -0,0 +1,147 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+    using System.Globalization;
+
+    /// <summary>
+    /// Specialization of a row for tracking merge statements.
+    /// </summary>
+    public sealed class WixMergeRow : Row
+    {
+        /// <summary>
+        /// Creates a Merge row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this Merge row belongs to and should get its column definitions from.</param>
+        public WixMergeRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>Creates a Merge row that belongs to a table.</summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this Merge row belongs to and should get its column definitions from.</param>
+        public WixMergeRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets and sets the id for a merge row.
+        /// </summary>
+        /// <value>Id for the row.</value>
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the language for a merge row.
+        /// </summary>
+        /// <value>Language for the row.</value>
+        public string Language
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the directory for a merge row.
+        /// </summary>
+        /// <value>Direcotory for the row.</value>
+        public string Directory
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the path to the merge module for a merge row.
+        /// </summary>
+        /// <value>Source path for the row.</value>
+        public string SourceFile
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the disk id the merge module should be placed on for a merge row.
+        /// </summary>
+        /// <value>Disk identifier for row.</value>
+        public int DiskId
+        {
+            get { return (int)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the compression value for a merge row.
+        /// </summary>
+        /// <value>Compression for a merge row.</value>
+        public YesNoType FileCompression
+        {
+            get
+            {
+                if (null == this.Fields[5].Data)
+                {
+                    return YesNoType.NotSet;
+                }
+                else if (1 == (int)this.Fields[5].Data)
+                {
+                    return YesNoType.Yes;
+                }
+                else if (0 == (int)this.Fields[5].Data)
+                {
+                    return YesNoType.No;
+                }
+                else
+                {
+                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_MergeTableFileCompressionColumnContainsInvalidValue, this.Fields[5].Data));
+                }
+            }
+            set
+            {
+                if (YesNoType.Yes == value)
+                {
+                    this.Fields[5].Data = 1;
+                }
+                else if (YesNoType.No == value)
+                {
+                    this.Fields[5].Data = 0;
+                }
+                else if (YesNoType.NotSet == value)
+                {
+                    this.Fields[5].Data = null;
+                }
+                else
+                {
+                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_CannotSetMergeTableFileCompressionColumnToInvalidValue, value));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets and sets the configuration data for a merge row.
+        /// </summary>
+        /// <value>Comma delimited string of "name=value" pairs.</value>
+        public string ConfigurationData
+        {
+            get { return (string)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the primary feature for a merge row.
+        /// </summary>
+        /// <value>The primary feature for a merge row.</value>
+        public string Feature
+        {
+            get { return (string)this.Fields[7].Data; }
+            set { this.Fields[7].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixPayloadPropertiesRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixPayloadPropertiesRow.cs
new file mode 100644
index 00000000..8bb9ef31
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixPayloadPropertiesRow.cs
@@ -0,0 +1,72 @@
+// 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.WindowsInstaller.Rows
+{
+    /// <summary>
+    /// Specialization of a row for the WixPayloadProperties table.
+    /// </summary>
+    public class WixPayloadPropertiesRow : Row
+    {
+        /// <summary>
+        /// Creates a WixPayloadProperties row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this WixPayloadProperties row belongs to and should get its column definitions from.</param>
+        public WixPayloadPropertiesRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixPayloadProperties row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this WixPayloadProperties row belongs to and should get its column definitions from.</param>
+        public WixPayloadPropertiesRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        public string Package
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        public string Container
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        public string Name
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        public string Size
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+
+        public string DownloadUrl
+        {
+            get { return (string)this.Fields[5].Data; }
+            set { this.Fields[5].Data = value; }
+        }
+
+        public string LayoutOnly
+        {
+            get { return (string)this.Fields[6].Data; }
+            set { this.Fields[6].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixPropertyRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixPropertyRow.cs
new file mode 100644
index 00000000..2f356b71
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixPropertyRow.cs
@@ -0,0 +1,118 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+    using System.Globalization;
+
+    /// <summary>
+    /// Specialization of a row for the WixProperty table.
+    /// </summary>
+    public sealed class WixPropertyRow : Row
+    {
+        /// <summary>Creates a WixProperty row that belongs to a table.</summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this WixProperty row belongs to and should get its column definitions from.</param>
+        public WixPropertyRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets and sets the id for this property row.
+        /// </summary>
+        /// <value>Id for the property.</value>
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets if this is an admin property row.
+        /// </summary>
+        /// <value>Flag if this is an admin property.</value>
+        public bool Admin
+        {
+            get
+            {
+                return (0x1 == (Convert.ToInt32(this.Fields[1].Data, CultureInfo.InvariantCulture) & 0x1));
+            }
+
+            set
+            {
+                if (null == this.Fields[1].Data)
+                {
+                    this.Fields[1].Data = 0;
+                }
+
+                if (value)
+                {
+                    this.Fields[1].Data = (int)this.Fields[1].Data | 0x1;
+                }
+                else
+                {
+                    this.Fields[1].Data = (int)this.Fields[1].Data & ~0x1;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets and sets if this is a hidden property row.
+        /// </summary>
+        /// <value>Flag if this is a hidden property.</value>
+        public bool Hidden
+        {
+            get
+            {
+                return (0x2 == (Convert.ToInt32(this.Fields[1].Data, CultureInfo.InvariantCulture) & 0x2));
+            }
+
+            set
+            {
+                if (null == this.Fields[1].Data)
+                {
+                    this.Fields[1].Data = 0;
+                }
+
+                if (value)
+                {
+                    this.Fields[1].Data = (int)this.Fields[1].Data | 0x2;
+                }
+                else
+                {
+                    this.Fields[1].Data = (int)this.Fields[1].Data & ~0x2;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets and sets if this is a secure property row.
+        /// </summary>
+        /// <value>Flag if this is a secure property.</value>
+        public bool Secure
+        {
+            get
+            {
+                return (0x4 == (Convert.ToInt32(this.Fields[1].Data, CultureInfo.InvariantCulture) & 0x4));
+            }
+
+            set
+            {
+                if (null == this.Fields[1].Data)
+                {
+                    this.Fields[1].Data = 0;
+                }
+
+                if (value)
+                {
+                    this.Fields[1].Data = (int)this.Fields[1].Data | 0x4;
+                }
+                else
+                {
+                    this.Fields[1].Data = (int)this.Fields[1].Data & ~0x4;
+                }
+            }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixRelatedBundleRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixRelatedBundleRow.cs
new file mode 100644
index 00000000..d06429c5
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixRelatedBundleRow.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.WindowsInstaller.Rows
+{
+    using Serialize = WixToolset.Data.Serialize;
+
+    /// <summary>
+    /// Specialization of a row for the RelatedBundle table.
+    /// </summary>
+    public sealed class WixRelatedBundleRow : Row
+    {
+        /// <summary>
+        /// Creates a RelatedBundle row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this RelatedBundle row belongs to and should get its column definitions from.</param>
+        public WixRelatedBundleRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a RelatedBundle row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this RelatedBundle row belongs to and should get its column definitions from.</param>
+        public WixRelatedBundleRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the related bundle identifier.
+        /// </summary>
+        /// <value>The related bundle identifier.</value>
+        public string Id
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the related bundle action.
+        /// </summary>
+        /// <value>The related bundle action.</value>
+        public Serialize.RelatedBundle.ActionType Action
+        {
+            get { return (Serialize.RelatedBundle.ActionType)this.Fields[1].Data; }
+            set { this.Fields[1].Data = (int)value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixSimpleReferenceRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixSimpleReferenceRow.cs
new file mode 100644
index 00000000..bf7dfb0e
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixSimpleReferenceRow.cs
@@ -0,0 +1,61 @@
+// 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.WindowsInstaller.Rows
+{
+    using System;
+
+    /// <summary>
+    /// Specialization of a row for the WixSimpleReference table.
+    /// </summary>
+    public sealed class WixSimpleReferenceRow : Row
+    {
+        /// <summary>
+        /// Creates a WixSimpleReferenceRow that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
+        public WixSimpleReferenceRow(SourceLineNumber sourceLineNumbers, Table table)
+            : base(sourceLineNumbers, table)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixSimpleReferenceRow that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDefinitions">Table definitions for this row.</param>
+        public WixSimpleReferenceRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinitions)
+            : base(sourceLineNumbers, tableDefinitions)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the primary keys of the simple reference.
+        /// </summary>
+        /// <value>The primary keys of the simple reference.</value>
+        public string PrimaryKeys
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        /// <summary>
+        /// Gets the symbolic name.
+        /// </summary>
+        /// <value>Symbolic name.</value>
+        public string SymbolicName
+        {
+            get { return String.Concat(this.TableName, ":", this.PrimaryKeys); }
+        }
+
+        /// <summary>
+        /// Gets or sets the table name of the simple reference.
+        /// </summary>
+        /// <value>The table name of the simple reference.</value>
+        public string TableName
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixUpdateRegistrationRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixUpdateRegistrationRow.cs
new file mode 100644
index 00000000..8602d502
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixUpdateRegistrationRow.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.WindowsInstaller.Rows
+{
+    using System;
+
+    /// <summary>
+    /// Update registration information for Binding.
+    /// </summary>
+    public class WixUpdateRegistrationRow : Row
+    {
+        /// <summary>
+        /// Creates a WixUpdateRegistrationRow row that does not belong to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="tableDef">TableDefinition this WixUpdateRegistrationRow row belongs to and should get its column definitions from.</param>
+        public WixUpdateRegistrationRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
+            base(sourceLineNumbers, tableDef)
+        {
+        }
+
+        /// <summary>
+        /// Creates a WixUpdateRegistrationRow row that belongs to a table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">Table this WixUpdateRegistrationRow row belongs to and should get its column definitions from.</param>
+        public WixUpdateRegistrationRow(SourceLineNumber sourceLineNumbers, Table table) :
+            base(sourceLineNumbers, table)
+        {
+        }
+
+        public string Manufacturer
+        {
+            get { return (string)this.Fields[0].Data; }
+            set { this.Fields[0].Data = value; }
+        }
+
+        public string Department
+        {
+            get { return (string)this.Fields[1].Data; }
+            set { this.Fields[1].Data = value; }
+        }
+
+        public string ProductFamily
+        {
+            get { return (string)this.Fields[2].Data; }
+            set { this.Fields[2].Data = value; }
+        }
+
+        public string Name
+        {
+            get { return (string)this.Fields[3].Data; }
+            set { this.Fields[3].Data = value; }
+        }
+
+        public string Classification
+        {
+            get { return (string)this.Fields[4].Data; }
+            set { this.Fields[4].Data = value; }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/SubStorage.cs b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs
new file mode 100644
index 00000000..c1981f1b
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs
@@ -0,0 +1,109 @@
+// 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.WindowsInstaller
+{
+    using System.Xml;
+
+    /// <summary>
+    /// Substorage inside an output.
+    /// </summary>
+    public sealed class SubStorage
+    {
+        /// <summary>
+        /// Instantiate a new substorage.
+        /// </summary>
+        /// <param name="name">The substorage name.</param>
+        /// <param name="data">The substorage data.</param>
+        public SubStorage(string name, Output data)
+        {
+            this.Name = name;
+            this.Data = data;
+        }
+
+        /// <summary>
+        /// Gets the substorage name.
+        /// </summary>
+        /// <value>The substorage name.</value>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the substorage data.
+        /// </summary>
+        /// <value>The substorage data.</value>
+        public Output Data { get; }
+
+        /// <summary>
+        /// Creates a SubStorage from the XmlReader.
+        /// </summary>
+        /// <param name="reader">Reader to get data from.</param>
+        /// <returns>New SubStorage object.</returns>
+        internal static SubStorage Read(XmlReader reader)
+        {
+            if (!reader.LocalName.Equals("subStorage" == reader.LocalName))
+            {
+                throw new XmlException();
+            }
+
+            Output data = null;
+            bool empty = reader.IsEmptyElement;
+            string name = null;
+
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "name":
+                        name = reader.Value;
+                        break;
+                }
+            }
+
+            if (!empty)
+            {
+                bool done = false;
+
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            switch (reader.LocalName)
+                            {
+                                case "wixOutput":
+                                    data = Output.Read(reader, true);
+                                    break;
+                                default:
+                                    throw new XmlException();
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+
+            return new SubStorage(name, data);
+        }
+
+        /// <summary>
+        /// Persists a SubStorage in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the SubStorage should persist itself as XML.</param>
+        internal void Write(XmlWriter writer)
+        {
+            writer.WriteStartElement("subStorage", Output.XmlNamespaceUri);
+
+            writer.WriteAttributeString("name", this.Name);
+
+            this.Data.Write(writer);
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/Table.cs b/src/WixToolset.Data/WindowsInstaller/Table.cs
new file mode 100644
index 00000000..7fcc1b31
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/Table.cs
@@ -0,0 +1,333 @@
+// 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.WindowsInstaller
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Xml;
+    using WixToolset.Data.WindowsInstaller.Rows;
+
+    /// <summary>
+    /// Object that represents a table in a database.
+    /// </summary>
+    public class Table
+    {
+        /// <summary>
+        /// Creates a table.
+        /// </summary>
+        /// <param name="tableDefinition">Definition of the table.</param>
+        public Table(TableDefinition tableDefinition)
+        {
+            this.Definition = tableDefinition;
+            this.Rows = new List<Row>();
+        }
+
+        /// <summary>
+        /// Gets the table definition.
+        /// </summary>
+        /// <value>Definition of the table.</value>
+        public TableDefinition Definition { get; }
+
+        /// <summary>
+        /// Gets the name of the table.
+        /// </summary>
+        /// <value>Name of the table.</value>
+        public string Name => this.Definition.Name;
+
+        /// <summary>
+        /// Gets or sets the table transform operation.
+        /// </summary>
+        /// <value>The table transform operation.</value>
+        public TableOperation Operation { get; set; }
+
+        /// <summary>
+        /// Gets the rows contained in the table.
+        /// </summary>
+        /// <value>Rows contained in the table.</value>
+        public IList<Row> Rows { get; }
+
+        /// <summary>
+        /// Creates a new row in the table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="add">Specifies whether to only create the row or add it to the table automatically.</param>
+        /// <returns>Row created in table.</returns>
+        public Row CreateRow(SourceLineNumber sourceLineNumbers, bool add = true)
+        {
+            Row row;
+
+            switch (this.Name)
+            {
+                case "BBControl":
+                    row = new BBControlRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundlePackage":
+                    row = new WixBundlePackageRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleExePackage":
+                    row = new WixBundleExePackageRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleMsiPackage":
+                    row = new WixBundleMsiPackageRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleMspPackage":
+                    row = new WixBundleMspPackageRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleMsuPackage":
+                    row = new WixBundleMsuPackageRow(sourceLineNumbers, this);
+                    break;
+                case "Component":
+                    row = new ComponentRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleContainer":
+                    row = new WixBundleContainerRow(sourceLineNumbers, this);
+                    break;
+                case "Control":
+                    row = new ControlRow(sourceLineNumbers, this);
+                    break;
+                case "File":
+                    row = new FileRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleMsiFeature":
+                    row = new WixBundleMsiFeatureRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleMsiProperty":
+                    row = new WixBundleMsiPropertyRow(sourceLineNumbers, this);
+                    break;
+                case "Media":
+                    row = new MediaRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundlePayload":
+                    row = new WixBundlePayloadRow(sourceLineNumbers, this);
+                    break;
+                case "Property":
+                    row = new PropertyRow(sourceLineNumbers, this);
+                    break;
+                case "WixRelatedBundle":
+                    row = new WixRelatedBundleRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleRelatedPackage":
+                    row = new WixBundleRelatedPackageRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleRollbackBoundary":
+                    row = new WixBundleRollbackBoundaryRow(sourceLineNumbers, this);
+                    break;
+                case "Upgrade":
+                    row = new UpgradeRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleVariable":
+                    row = new WixBundleVariableRow(sourceLineNumbers, this);
+                    break;
+                case "WixAction":
+                    row = new WixActionRow(sourceLineNumbers, this);
+                    break;
+                case "WixApprovedExeForElevation":
+                    row = new WixApprovedExeForElevationRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundle":
+                    row = new WixBundleRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundlePackageExitCode":
+                    row = new WixBundlePackageExitCodeRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundlePatchTargetCode":
+                    row = new WixBundlePatchTargetCodeRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleSlipstreamMsp":
+                    row = new WixBundleSlipstreamMspRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleUpdate":
+                    row = new WixBundleUpdateRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundleCatalog":
+                    row = new WixBundleCatalogRow(sourceLineNumbers, this);
+                    break;
+                case "WixChain":
+                    row = new WixChainRow(sourceLineNumbers, this);
+                    break;
+                case "WixChainItem":
+                    row = new WixChainItemRow(sourceLineNumbers, this);
+                    break;
+                case "WixBundlePackageCommandLine":
+                    row = new WixBundlePackageCommandLineRow(sourceLineNumbers, this);
+                    break;
+                case "WixComplexReference":
+                    row = new WixComplexReferenceRow(sourceLineNumbers, this);
+                    break;
+                case "WixDeltaPatchFile":
+                    row = new WixDeltaPatchFileRow(sourceLineNumbers, this);
+                    break;
+                case "WixDeltaPatchSymbolPaths":
+                    row = new WixDeltaPatchSymbolPathsRow(sourceLineNumbers, this);
+                    break;
+                case "WixFile":
+                    row = new WixFileRow(sourceLineNumbers, this);
+                    break;
+                case "WixGroup":
+                    row = new WixGroupRow(sourceLineNumbers, this);
+                    break;
+                case "WixMedia":
+                    row = new WixMediaRow(sourceLineNumbers, this);
+                    break;
+                case "WixMediaTemplate":
+                    row = new WixMediaTemplateRow(sourceLineNumbers, this);
+                    break;
+                case "WixMerge":
+                    row = new WixMergeRow(sourceLineNumbers, this);
+                    break;
+                case "WixPayloadProperties":
+                    row = new WixPayloadPropertiesRow(sourceLineNumbers, this);
+                    break;
+                case "WixProperty":
+                    row = new WixPropertyRow(sourceLineNumbers, this);
+                    break;
+                case "WixSimpleReference":
+                    row = new WixSimpleReferenceRow(sourceLineNumbers, this);
+                    break;
+                case "WixUpdateRegistration":
+                    row = new WixUpdateRegistrationRow(sourceLineNumbers, this);
+                    break;
+
+                default:
+                    row = new Row(sourceLineNumbers, this);
+                    break;
+            }
+
+            if (add)
+            {
+                this.Rows.Add(row);
+            }
+
+            return row;
+        }
+
+        /// <summary>
+        /// Parse a table from the xml.
+        /// </summary>
+        /// <param name="reader">XmlReader where the intermediate is persisted.</param>
+        /// <param name="tableDefinitions">TableDefinitions to use in the intermediate.</param>
+        /// <returns>The parsed table.</returns>
+        internal static Table Read(XmlReader reader, TableDefinitionCollection tableDefinitions)
+        {
+            Debug.Assert("table" == reader.LocalName);
+
+            bool empty = reader.IsEmptyElement;
+            TableOperation operation = TableOperation.None;
+            string name = null;
+
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "name":
+                        name = reader.Value;
+                        break;
+                    case "op":
+                        switch (reader.Value)
+                        {
+                            case "add":
+                                operation = TableOperation.Add;
+                                break;
+                            case "drop":
+                                operation = TableOperation.Drop;
+                                break;
+                            default:
+                                throw new XmlException();
+                        }
+                        break;
+                }
+            }
+
+            if (null == name)
+            {
+                throw new XmlException();
+            }
+
+            TableDefinition tableDefinition = tableDefinitions[name];
+            Table table = new Table(tableDefinition);
+            table.Operation = operation;
+
+            if (!empty)
+            {
+                bool done = false;
+
+                // loop through all the rows in a table
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            switch (reader.LocalName)
+                            {
+                                case "row":
+                                    Row.Read(reader, table);
+                                    break;
+                                default:
+                                    throw new XmlException();
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+
+            return table;
+        }
+
+        /// <summary>
+        /// Persists a row in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the Row should persist itself as XML.</param>
+        internal void Write(XmlWriter writer)
+        {
+            if (null == writer)
+            {
+                throw new ArgumentNullException("writer");
+            }
+
+            writer.WriteStartElement("table", Intermediate.XmlNamespaceUri);
+            writer.WriteAttributeString("name", this.Name);
+
+            if (TableOperation.None != this.Operation)
+            {
+                writer.WriteAttributeString("op", this.Operation.ToString().ToLowerInvariant());
+            }
+
+            foreach (var row in this.Rows)
+            {
+                row.Write(writer);
+            }
+
+            writer.WriteEndElement();
+        }
+
+        /// <summary>
+        /// Validates the rows of this OutputTable and throws if it collides on
+        /// primary keys.
+        /// </summary>
+        public void ValidateRows()
+        {
+            var primaryKeys = new Dictionary<string, SourceLineNumber>();
+
+            foreach (var row in this.Rows)
+            {
+                var primaryKey = row.GetPrimaryKey();
+
+                if (primaryKeys.TryGetValue(primaryKey, out var collisionSourceLineNumber))
+                {
+                    throw new WixException(WixDataErrors.DuplicatePrimaryKey(collisionSourceLineNumber, primaryKey, this.Definition.Name));
+                }
+
+                primaryKeys.Add(primaryKey, row.SourceLineNumbers);
+            }
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
new file mode 100644
index 00000000..518f0926
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
@@ -0,0 +1,218 @@
+// 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.WindowsInstaller
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Xml;
+
+    /// <summary>
+    /// Definition of a table in a database.
+    /// </summary>
+    public sealed class TableDefinition : IComparable<TableDefinition>
+    {
+        /// <summary>
+        /// Tracks the maximum number of columns supported in a real table.
+        /// This is a Windows Installer limitation.
+        /// </summary>
+        public const int MaxColumnsInRealTable = 32;
+
+        /// <summary>
+        /// Creates a table definition.
+        /// </summary>
+        /// <param name="name">Name of table to create.</param>
+        /// <param name="columns">Column definitions for the table.</param>
+        /// <param name="unreal">Flag if table is unreal.</param>
+        /// <param name="bootstrapperApplicationData">Flag if table is part of UX Manifest.</param>
+        public TableDefinition(string name, IList<ColumnDefinition> columns, bool unreal = false, bool bootstrapperApplicationData = false)
+        {
+            this.Name = name;
+            this.Unreal = unreal;
+            this.BootstrapperApplicationData = bootstrapperApplicationData;
+
+            this.Columns = new ReadOnlyCollection<ColumnDefinition>(columns);
+        }
+
+        /// <summary>
+        /// Gets the name of the table.
+        /// </summary>
+        /// <value>Name of the table.</value>
+        public string Name { get; private set; }
+
+        /// <summary>
+        /// Gets if the table is unreal.
+        /// </summary>
+        /// <value>Flag if table is unreal.</value>
+        public bool Unreal { get; private set; }
+
+        /// <summary>
+        /// Gets if the table is a part of the bootstrapper application data manifest.
+        /// </summary>
+        /// <value>Flag if table is a part of the bootstrapper application data manifest.</value>
+        public bool BootstrapperApplicationData { get; private set; }
+
+        /// <summary>
+        /// Gets the collection of column definitions for this table.
+        /// </summary>
+        /// <value>Collection of column definitions for this table.</value>
+        public IList<ColumnDefinition> Columns { get; private set; }
+
+        /// <summary>
+        /// Gets the column definition in the table by index.
+        /// </summary>
+        /// <param name="columnIndex">Index of column to locate.</param>
+        /// <value>Column definition in the table by index.</value>
+        public ColumnDefinition this[int columnIndex]
+        {
+            get { return this.Columns[columnIndex]; }
+        }
+
+        /// <summary>
+        /// Compares this table definition to another table definition.
+        /// </summary>
+        /// <remarks>
+        /// Only Windows Installer traits are compared, allowing for updates to WiX-specific table definitions.
+        /// </remarks>
+        /// <param name="updated">The updated <see cref="TableDefinition"/> to compare with this target definition.</param>
+        /// <returns>0 if the tables' core properties are the same; otherwise, non-0.</returns>
+        public int CompareTo(TableDefinition updated)
+        {
+            // by definition, this object is greater than null
+            if (null == updated)
+            {
+                return 1;
+            }
+
+            // compare the table names
+            int ret = String.Compare(this.Name, updated.Name, StringComparison.Ordinal);
+
+            // compare the column count
+            if (0 == ret)
+            {
+                // transforms can only add columns
+                ret = Math.Min(0, updated.Columns.Count - this.Columns.Count);
+
+                // compare name, type, and length of each column
+                for (int i = 0; 0 == ret && this.Columns.Count > i; i++)
+                {
+                    ColumnDefinition thisColumnDef = this.Columns[i];
+                    ColumnDefinition updatedColumnDef = updated.Columns[i];
+
+                    ret = thisColumnDef.CompareTo(updatedColumnDef);
+                }
+            }
+
+            return ret;
+        }
+
+        /// <summary>
+        /// Parses table definition from xml reader.
+        /// </summary>
+        /// <param name="reader">Reader to get data from.</param>
+        /// <returns>The TableDefintion represented by the Xml.</returns>
+        internal static TableDefinition Read(XmlReader reader)
+        {
+            bool empty = reader.IsEmptyElement;
+            string name = null;
+            bool unreal = false;
+            bool bootstrapperApplicationData = false;
+
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "name":
+                        name = reader.Value;
+                        break;
+                    case "unreal":
+                        unreal = reader.Value.Equals("yes");
+                        break;
+                    case "bootstrapperApplicationData":
+                        bootstrapperApplicationData = reader.Value.Equals("yes");
+                        break;
+                }
+            }
+
+            if (null == name)
+            {
+                throw new XmlException();
+            }
+
+            List<ColumnDefinition> columns = new List<ColumnDefinition>();
+            bool hasPrimaryKeyColumn = false;
+
+            // parse the child elements
+            if (!empty)
+            {
+                bool done = false;
+
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            switch (reader.LocalName)
+                            {
+                                case "columnDefinition":
+                                    ColumnDefinition columnDefinition = ColumnDefinition.Read(reader);
+                                    columns.Add(columnDefinition);
+
+                                    if (columnDefinition.PrimaryKey)
+                                    {
+                                        hasPrimaryKeyColumn = true;
+                                    }
+                                    break;
+                                default:
+                                    throw new XmlException();
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!unreal && !bootstrapperApplicationData && !hasPrimaryKeyColumn)
+                {
+                    throw new WixException(WixDataErrors.RealTableMissingPrimaryKeyColumn(SourceLineNumber.CreateFromUri(reader.BaseURI), name));
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+
+            return new TableDefinition(name, columns, unreal, bootstrapperApplicationData);
+        }
+
+        /// <summary>
+        /// Persists an output in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the Output should persist itself as XML.</param>
+        internal void Write(XmlWriter writer)
+        {
+            writer.WriteStartElement("tableDefinition", TableDefinitionCollection.XmlNamespaceUri);
+
+            writer.WriteAttributeString("name", this.Name);
+
+            if (this.Unreal)
+            {
+                writer.WriteAttributeString("unreal", "yes");
+            }
+
+            if (this.BootstrapperApplicationData)
+            {
+                writer.WriteAttributeString("bootstrapperApplicationData", "yes");
+            }
+
+            foreach (ColumnDefinition columnDefinition in this.Columns)
+            {
+                columnDefinition.Write(writer);
+            }
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
new file mode 100644
index 00000000..0954e9de
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
@@ -0,0 +1,238 @@
+// 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.WindowsInstaller
+{
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Xml;
+
+    /// <summary>
+    /// Collection for table definitions indexed by table name.
+    /// </summary>
+    public sealed class TableDefinitionCollection : ICollection<TableDefinition>
+    {
+        public const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/wi/tables";
+
+        private Dictionary<string, TableDefinition> collection;
+
+        /// <summary>
+        /// Instantiate a new TableDefinitionCollection class.
+        /// </summary>
+        public TableDefinitionCollection()
+        {
+            this.collection = new Dictionary<string, TableDefinition>();
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of the provided table definition collection.
+        /// </summary>
+        public TableDefinitionCollection(TableDefinitionCollection tableDefinitions)
+        {
+            this.collection = new Dictionary<string, TableDefinition>(tableDefinitions.collection);
+        }
+
+        /// <summary>
+        /// Gets the number of items in the collection.
+        /// </summary>
+        /// <value>Number of items in collection.</value>
+        public int Count
+        {
+            get { return this.collection.Count; }
+        }
+
+        /// <summary>
+        /// Table definition collections are never read-only.
+        /// </summary>
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Gets a table definition by name.
+        /// </summary>
+        /// <param name="tableName">Name of table to locate.</param>
+        public TableDefinition this[string tableName]
+        {
+            get
+            {
+                if (!this.collection.TryGetValue(tableName, out var table))
+                {
+                    throw new WixMissingTableDefinitionException(WixDataErrors.MissingTableDefinition(tableName));
+                }
+
+                return table;
+            }
+        }
+
+        /// <summary>
+        /// Tries to get a table definition by name.
+        /// </summary>
+        /// <param name="tableName">Name of table to locate.</param>
+        /// <param name="table">Table definition if found.</param>
+        /// <returns>True if table definition was found otherwise false.</returns>
+        public bool TryGet(string tableName, out TableDefinition table)
+        {
+            return this.collection.TryGetValue(tableName, out table);
+        }
+
+        /// <summary>
+        /// Load a table definition collection from an XmlReader.
+        /// </summary>
+        /// <param name="reader">Reader to get data from.</param>
+        /// <param name="suppressSchema">Suppress xml schema validation while loading.</param>
+        /// <returns>The TableDefinitionCollection represented by the xml.</returns>
+        public static TableDefinitionCollection Load(XmlReader reader)
+        {
+            reader.MoveToContent();
+
+            return Read(reader);
+        }
+
+        /// <summary>
+        /// Adds a table definition to the collection.
+        /// </summary>
+        /// <param name="tableDefinition">Table definition to add to the collection.</param>
+        /// <value>Indexes by table definition name.</value>
+        public void Add(TableDefinition tableDefinition)
+        {
+            this.collection.Add(tableDefinition.Name, tableDefinition);
+        }
+
+        /// <summary>
+        /// Removes all table definitions from the collection.
+        /// </summary>
+        public void Clear()
+        {
+            this.collection.Clear();
+        }
+
+        /// <summary>
+        /// Checks if the collection contains a table name.
+        /// </summary>
+        /// <param name="tableName">The table to check in the collection.</param>
+        /// <returns>True if collection contains the table.</returns>
+        public bool Contains(string tableName)
+        {
+            return this.collection.ContainsKey(tableName);
+        }
+
+        /// <summary>
+        /// Checks if the collection contains a table.
+        /// </summary>
+        /// <param name="table">The table to check in the collection.</param>
+        /// <returns>True if collection contains the table.</returns>
+        public bool Contains(TableDefinition table)
+        {
+            return this.collection.ContainsKey(table.Name);
+        }
+
+        /// <summary>
+        /// Copies table definitions to an arry.
+        /// </summary>
+        /// <param name="array">Array to copy the table definitions to.</param>
+        /// <param name="index">Index in the array to start copying at.</param>
+        public void CopyTo(TableDefinition[] array, int index)
+        {
+            this.collection.Values.CopyTo(array, index);
+        }
+
+        /// <summary>
+        /// Removes a table definition from the collection.
+        /// </summary>
+        /// <param name="table">Table to remove from the collection.</param>
+        /// <returns>True if the table definition existed in the collection and was removed.</returns>
+        public bool Remove(TableDefinition table)
+        {
+            return this.collection.Remove(table.Name);
+        }
+
+        /// <summary>
+        /// Gets enumerator for the collection.
+        /// </summary>
+        /// <returns>Enumerator for the collection.</returns>
+        public IEnumerator<TableDefinition> GetEnumerator()
+        {
+            return this.collection.Values.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Gets the untyped enumerator for the collection.
+        /// </summary>
+        /// <returns>Untyped enumerator for the collection.</returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.collection.Values.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Loads a collection of table definitions from a XmlReader in memory.
+        /// </summary>
+        /// <param name="reader">Reader to get data from.</param>
+        /// <returns>The TableDefinitionCollection represented by the xml.</returns>
+        internal static TableDefinitionCollection Read(XmlReader reader)
+        {
+            if ("tableDefinitions" != reader.LocalName)
+            {
+                throw new XmlException();
+            }
+
+            bool empty = reader.IsEmptyElement;
+            TableDefinitionCollection tableDefinitionCollection = new TableDefinitionCollection();
+
+            while (reader.MoveToNextAttribute())
+            {
+            }
+
+            // parse the child elements
+            if (!empty)
+            {
+                bool done = false;
+
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            switch (reader.LocalName)
+                            {
+                                case "tableDefinition":
+                                    tableDefinitionCollection.Add(TableDefinition.Read(reader));
+                                    break;
+                                default:
+                                    throw new XmlException();
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+
+            return tableDefinitionCollection;
+        }
+
+        /// <summary>
+        /// Persists a TableDefinitionCollection in an XML format.
+        /// </summary>
+        /// <param name="writer">XmlWriter where the TableDefinitionCollection should persist itself as XML.</param>
+        internal void Write(XmlWriter writer)
+        {
+            writer.WriteStartElement("tableDefinitions", XmlNamespaceUri);
+
+            foreach (TableDefinition tableDefinition in this.collection.Values.OrderBy(t => t.Name))
+            {
+                tableDefinition.Write(writer);
+            }
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs b/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs
new file mode 100644
index 00000000..1b7de72b
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs
@@ -0,0 +1,143 @@
+// 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.WindowsInstaller
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// Collection for tables.
+    /// </summary>
+    public sealed class TableIndexedCollection : ICollection<Table>
+    {
+        private Dictionary<string, Table> collection;
+
+        /// <summary>
+        /// Instantiate a new empty collection.
+        /// </summary>
+        public TableIndexedCollection()
+        {
+            this.collection = new Dictionary<string,Table>();
+        }
+
+        /// <summary>
+        /// Instantiate a new collection populated with a set of tables.
+        /// </summary>
+        /// <param name="tables">Set of tables.</param>
+        public TableIndexedCollection(IEnumerable<Table> tables)
+        {
+            this.collection = tables.ToDictionary(t => t.Name);
+        }
+
+        /// <summary>
+        /// Gets the number of items in the collection.
+        /// </summary>
+        /// <value>Number of items in collection.</value>
+        public int Count => this.collection.Count;
+
+        /// <summary>
+        /// Table indexed collection is never read only.
+        /// </summary>
+        public bool IsReadOnly => false;
+
+        /// <summary>
+        /// Adds a table to the collection.
+        /// </summary>
+        /// <param name="table">Table to add to the collection.</param>
+        /// <remarks>Indexes the table by name.</remarks>
+        public void Add(Table table)
+        {
+            this.collection.Add(table.Name, table);
+        }
+
+        /// <summary>
+        /// Clear the tables from the collection.
+        /// </summary>
+        public void Clear()
+        {
+            this.collection.Clear();
+        }
+
+        /// <summary>
+        /// Determines if a table is in the collection.
+        /// </summary>
+        /// <param name="table">Table to check if it is in the collection.</param>
+        /// <returns>True if the table name is in the collection, otherwise false.</returns>
+        public bool Contains(Table table) => this.collection.ContainsKey(table.Name);
+
+        /// <summary>
+        /// Copies the collection into an array.
+        /// </summary>
+        /// <param name="array">Array to copy the collection into.</param>
+        /// <param name="arrayIndex">Index to start copying from.</param>
+        public void CopyTo(Table[] array, int arrayIndex)
+        {
+            this.collection.Values.CopyTo(array, arrayIndex);
+        }
+
+        /// <summary>
+        /// Remove a table from the collection by name.
+        /// </summary>
+        /// <param name="tableName">Table name to remove from the collection.</param>
+        public void Remove(string tableName)
+        {
+            this.collection.Remove(tableName);
+        }
+
+        /// <summary>
+        /// Remove a table from the collection.
+        /// </summary>
+        /// <param name="table">Table with matching name to remove from the collection.</param>
+        public bool Remove(Table table)
+        {
+            return this.collection.Remove(table.Name);
+        }
+
+        /// <summary>
+        /// Gets an enumerator over the whole collection.
+        /// </summary>
+        /// <returns>Collection enumerator.</returns>
+        public IEnumerator<Table> GetEnumerator()
+        {
+            return this.collection.Values.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Gets an untyped enumerator over the whole collection.
+        /// </summary>
+        /// <returns>Untyped collection enumerator.</returns>
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return this.collection.Values.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Gets a table by name.
+        /// </summary>
+        /// <param name="tableName">Name of table to locate.</param>
+        public Table this[string tableName]
+        {
+            get
+            {
+                Table table;
+                return this.collection.TryGetValue(tableName, out table) ? table : null;
+            }
+
+            set
+            {
+                this.collection[tableName] = value;
+            }
+        }
+
+        /// <summary>
+        /// Tries to find a table by name.
+        /// </summary>
+        /// <param name="tableName">Table name to locate.</param>
+        /// <param name="table">Found table.</param>
+        /// <returns>True if table with table name was found, otherwise false.</returns>
+        public bool TryGetTable(string tableName, out Table table)
+        {
+            return this.collection.TryGetValue(tableName, out table);
+        }
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/TableOperation.cs b/src/WixToolset.Data/WindowsInstaller/TableOperation.cs
new file mode 100644
index 00000000..ccd0ebca
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/TableOperation.cs
@@ -0,0 +1,25 @@
+// 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.WindowsInstaller
+{
+    /// <summary>
+    /// The table transform operations.
+    /// </summary>
+    public enum TableOperation
+    {
+        /// <summary>
+        /// No operation.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Added table.
+        /// </summary>
+        Add,
+
+        /// <summary>
+        /// Dropped table.
+        /// </summary>
+        Drop,
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/WixMissingTableDefinitionException.cs b/src/WixToolset.Data/WindowsInstaller/WixMissingTableDefinitionException.cs
new file mode 100644
index 00000000..4b15c0e5
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/WixMissingTableDefinitionException.cs
@@ -0,0 +1,22 @@
+// 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.WindowsInstaller
+{
+    using System;
+
+    /// <summary>
+    /// Exception thrown when a table definition is missing.
+    /// </summary>
+    [Serializable]
+    public class WixMissingTableDefinitionException : WixException
+    {
+        /// <summary>
+        /// Instantiate new WixMissingTableDefinitionException.
+        /// </summary>
+        /// <param name="error">Localized error information.</param>
+        public WixMissingTableDefinitionException(MessageEventArgs error)
+            : base(error)
+        {
+        }
+    }
+}