3 files changed, 13 insertions, 2 deletions

diff --git a/src/wixext/Symbols/XmlConfigSymbol.cs b/src/wixext/Symbols/XmlConfigSymbol.cs
index ca1cf047..6503a586 100644
--- a/src/wixext/Symbols/XmlConfigSymbol.cs
+++ b/src/wixext/Symbols/XmlConfigSymbol.cs
@@ -12,6 +12,7 @@ namespace WixToolset.Util
             new[]
             {
                 new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementId), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String),
@@ -31,6 +32,7 @@ namespace WixToolset.Util.Symbols
     public enum XmlConfigSymbolFields
     {
         File,
+        ElementId,
         ElementPath,
         VerifyPath,
         Name,
@@ -58,6 +60,12 @@ namespace WixToolset.Util.Symbols
             set => this.Set((int)XmlConfigSymbolFields.File, value);
         }
 
+        public string ElementId
+        {
+            get => this.Fields[(int)XmlConfigSymbolFields.ElementId].AsString();
+            set => this.Set((int)XmlConfigSymbolFields.ElementId, value);
+        }
+
         public string ElementPath
         {
             get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString();
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index 68c7a234..7314570e 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -3706,13 +3706,15 @@ namespace WixToolset.Util
                 var symbol = section.AddSymbol(new XmlConfigSymbol(sourceLineNumbers, id)
                 {
                     File = file,
-                    ElementPath = elementId ?? elementPath,
+                    ElementId = elementId,
+                    ElementPath = elementPath,
                     VerifyPath = verifyPath,
                     Name = name,
                     Value = value,
                     Flags = flags,
                     ComponentRef = componentId,
                 });
+
                 if (CompilerConstants.IntegerNotSet != sequence)
                 {
                     symbol.Sequence = sequence;
diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs
index e5d0850f..1908915c 100644
--- a/src/wixext/UtilTableDefinitions.cs
+++ b/src/wixext/UtilTableDefinitions.cs
@@ -253,7 +253,8 @@ namespace WixToolset.Util
             {
                 new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("File", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The .XML file in which to write the information", modularizeType: ColumnModularizeType.Property),
-                new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The XPATH query for an element to modify or add children to.  Can also be a foreign key reference to another Wix4XmlConfig row if no attributes are set and the row referenced is a create element row.", modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("ElementId", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Wix4XmlConfig", keyColumn: 1, description: "A foreign key reference to another Wix4XmlConfig row if no attributes are set and the row referenced is a create element row.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ElementPath", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The XPATH query for an element to modify or add children to. Must be null if ElementId is provided", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("VerifyPath", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The XPATH query run from ElementPath to verify whether a repair is necessary.  Also used to uninstall.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The .XML file node to set/add in the element.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to be written.", modularizeType: ColumnModularizeType.Property),