diff --git a/BuildingSync.xsd b/BuildingSync.xsd
index 339d2f48..2d28fd1c 100644
--- a/BuildingSync.xsd
+++ b/BuildingSync.xsd
@@ -308,6 +308,16 @@
                                       </xs:element>
                                       <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
                                       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+                                      <xs:element name="AirInfiltrationSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+                                      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+                                      <xs:element ref="auc:Location" minOccurs="0"/>
+                                      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+                                      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+                                      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+                                      <xs:element ref="auc:Quantity" minOccurs="0"/>
+                                      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+                                      <xs:element ref="auc:YearInstalled" minOccurs="0"/>
+                                      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
                                     </xs:sequence>
                                     <xs:attribute name="ID" type="xs:ID" use="required"/>
                                   </xs:complexType>
@@ -373,6 +383,16 @@
                                       </xs:element>
                                       <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
                                       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+                                      <xs:element name="WaterInfiltrationSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+                                      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+                                      <xs:element ref="auc:Location" minOccurs="0"/>
+                                      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+                                      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+                                      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+                                      <xs:element ref="auc:Quantity" minOccurs="0"/>
+                                      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+                                      <xs:element ref="auc:YearInstalled" minOccurs="0"/>
+                                      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
                                     </xs:sequence>
                                   </xs:complexType>
                                 </xs:element>
@@ -5494,6 +5514,8 @@
                         <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
                         <xs:element ref="auc:Quantity" minOccurs="0"/>
                         <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+                        <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+                        <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
                       </xs:sequence>
                       <xs:attribute name="ID" type="xs:ID" use="required"/>
                       <xs:attribute ref="auc:Status"/>
@@ -5645,6 +5667,7 @@
                         <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
                         <xs:element ref="auc:Quantity" minOccurs="0"/>
                         <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+                        <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
                       </xs:sequence>
                       <xs:attribute name="ID" type="xs:ID" use="required"/>
                       <xs:attribute ref="auc:Status"/>
@@ -5838,6 +5861,9 @@
                         <xs:element ref="auc:Quantity" minOccurs="0"/>
                         <xs:element name="DeliveryCondition" type="auc:EquipmentCondition" minOccurs="0"/>
                         <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+                        <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+                        <xs:element ref="auc:Location" minOccurs="0"/>
+                        <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
                       </xs:sequence>
                       <xs:attribute name="ID" type="xs:ID" use="required"/>
                       <xs:attribute ref="auc:Status">
@@ -5943,6 +5969,14 @@
       <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
+      <xs:element name="HVACSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+      <xs:element ref="auc:YearInstalled" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -6189,6 +6223,10 @@
       </xs:element>
       <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+      <xs:element name="DuctSystemCondition" name="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -6432,6 +6470,13 @@
         </xs:complexType>
       </xs:element>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+      <xs:element ref="auc:Quantity" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -6608,6 +6653,13 @@
         </xs:complexType>
       </xs:element>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+      <xs:element ref="auc:Quantity" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -6891,6 +6943,13 @@
         </xs:complexType>
       </xs:element>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+      <xs:element ref="auc:Quantity" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
   </xs:complexType>
@@ -7165,6 +7224,7 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -7668,6 +7728,7 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="LightingSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -8318,6 +8379,7 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="CookingSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -8571,6 +8633,15 @@
                         <xs:element ref="auc:Manufacturer" minOccurs="0"/>
                         <xs:element ref="auc:ModelNumber" minOccurs="0"/>
                         <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+                        <xs:element name="AntiSweatHeaterCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+                        <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+                        <xs:element ref="auc:Location" minOccurs="0"/>
+                        <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+                        <xs:element ref="auc:Quantity" minOccurs="0"/>
+                        <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+                        <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+                        <xs:element ref="auc:YearInstalled" minOccurs="0"/>
+                        <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
                       </xs:sequence>
                     </xs:complexType>
                   </xs:element>
@@ -8603,6 +8674,7 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="RefrigerationSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -8717,6 +8789,7 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="DishwasherSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -8830,6 +8903,7 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="LaundrySystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -8990,6 +9064,8 @@
       <xs:element ref="auc:LinkedSystemIDs" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="PumpSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -9213,6 +9289,7 @@
       <xs:element ref="auc:LinkedSystemIDs" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="FanSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -9359,6 +9436,7 @@
       <xs:element ref="auc:LinkedSystemIDs" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="MotorSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -9447,6 +9525,9 @@
       <xs:element ref="auc:Location" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="HeatRecoverySystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -9666,6 +9747,15 @@
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:YearInstalled" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+      <xs:element name="WallSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:Location" minOccurs="0"/>
+      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -9829,6 +9919,15 @@
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:YearInstalled" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+      <xs:element name="CeilingSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:Location" minOccurs="0"/>
+      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -10078,6 +10177,14 @@
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:YearInstalled" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:Location" minOccurs="0"/>
+      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -10567,6 +10674,11 @@
       <xs:element ref="auc:ModelNumber" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="FenestrationSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:Location" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -10682,6 +10794,15 @@
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:YearInstalled" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
+      <xs:element name="ExteriorFloorSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:Location" minOccurs="0"/>
+      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -10919,6 +11040,15 @@
       <xs:element ref="auc:YearInstalled" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
+      <xs:element name="FoundationSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
+      <xs:element ref="auc:Location" minOccurs="0"/>
+      <xs:element ref="auc:Manufacturer" minOccurs="0"/>
+      <xs:element ref="auc:ModelNumber" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+      <xs:element ref="auc:ThirdPartyCertification" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -11003,6 +11133,7 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="CriticalITSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -11094,6 +11225,7 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="PlugElectricLoadCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Source"/>
@@ -11178,6 +11310,7 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="ProcessGasElectricLoadCondition" type="auc:EquipmentCondition" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Source"/>
@@ -11574,6 +11707,8 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="OnsiteStorageTransmissionGenerationSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -11700,6 +11835,9 @@
       <xs:element ref="auc:LinkedPremises" minOccurs="0"/>
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="PoolCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
+      <xs:element ref="auc:YearOfManufacture" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
@@ -11808,6 +11946,8 @@
       <xs:element ref="auc:UserDefinedFields" minOccurs="0"/>
       <xs:element ref="auc:Quantity" minOccurs="0"/>
       <xs:element ref="auc:EquipmentID" minOccurs="0"/>
+      <xs:element name="WaterSystemCondition" type="auc:EquipmentCondition" minOccurs="0"/>
+      <xs:element ref="auc:PrimaryFuel" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="ID" type="xs:ID" use="required"/>
     <xs:attribute ref="auc:Status"/>
diff --git a/proposals/2025/Add Optional Elements to All Assets.md b/proposals/2025/Add Optional Elements to All Assets.md
new file mode 100644
index 00000000..b36eb0cd
--- /dev/null
+++ b/proposals/2025/Add Optional Elements to All Assets.md	
@@ -0,0 +1,71 @@
+# Add Optional Elements to All Assets
+
+## Overview
+
+In BuildingSync XML schema, the following optional `xs:element`s are defined for almost all `xs:complexType`s for &ldquo;assets&rdquo; (plants, systems, units of equipment, etc.):
+
+* EquipmentCondition
+* EquipmentID
+* LinkedPremises
+* Location
+* Manufacturer
+* ModelNumber
+* PrimaryFuel
+* Quantity
+* ThirdPartyCertification
+* UserDefinedFields
+* YearInstalled
+* YearOfManufacture
+
+The use case for the definition of these optional `xs:element`s is asset tracking and management. They include, but are not limited to, the manufacturer name, year of manufacture, model number, and tag for the asset, along with its year of installation, location, and condition. They also include BuildingSync-specific `xs:element`s for linking the asset to premises that it serves and for representing software-specific, user-defined fields.
+
+This proposal is to add these optional `xs:element`s to the `xs:complexType`s for all assets.
+
+The changes that are recommended by this proposal are non-breaking because all the `xs:element`s are optional (viz., `minOccurs="0"`).
+
+## Justification
+
+The following table shows which optional `xs:element`s are currently defined for each `xs:complexType`:
+
+| |EquipmentCondition|EquipmentID|LinkedPremises|Location|Manufacturer|ModelNumber|PrimaryFuel|Quantity|ThirdPartyCertification|UserDefinedFields|YearInstalled|YearOfManufacture|
+|-|-|-|-|-|-|-|-|-|-|-|-|-|
+|AirInfiltrationSystem|N|N|Y|N|N|N|N|N|N|Y|N|N|
+|AntiSweatHeaters|N|Y|N|N|Y|Y|N|N|N|N|N|N|
+|CeilingSystemType|N|N|N|N|N|N|N|Y|N|Y|Y|N|
+|CondenserPlantType|Y|N|N|Y|N|N|Y|N|N|Y|Y|N|
+|ConveyanceSystemType|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|CookingSystemType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|CoolingPlantType|Y|N|N|Y|N|N|Y|N|N|Y|Y|N|
+|CoolingSource|Y|Y|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|CriticalITSystemType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|Delivery|Y|Y|N|N|Y|Y|Y|Y|Y|N|Y|Y|
+|DishwasherSystemType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|DomesticHotWaterSystemType|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|DuctSystemType|N|N|Y|Y|Y|Y|N|Y|N|Y|Y|Y|
+|ExteriorFloorSystemType|N|N|N|N|N|N|N|Y|N|Y|Y|N|
+|FanSystemType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|FenestrationSystemType|N|Y|N|N|Y|Y|N|Y|Y|Y|Y|N|
+|FoundationSystemType|N|N|N|N|N|N|N|Y|N|Y|Y|N|
+|HVACSystemType|N|N|Y|Y|N|N|N|Y|N|Y|N|N|
+|HeatRecoverySystemType|N|Y|N|Y|Y|Y|N|Y|Y|Y|Y|Y|
+|HeatingPlantType|Y|N|N|Y|N|N|Y|N|N|Y|Y|N|
+|HeatingSource|Y|Y|N|Y|Y|Y|Y|Y|N|Y|Y|Y|
+|LaundrySystemType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|LightingSystemType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|MotorSystemType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|OnsiteStorageTransmissionGenerationSystemType|N|Y|Y|Y|Y|Y|N|Y|Y|Y|Y|Y|
+|OtherHVACSystemType|Y|Y|Y|Y|Y|Y|Y|Y|N|Y|Y|Y|
+|PlugElectricLoadType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|PoolType|N|Y|Y|Y|Y|Y|N|Y|Y|Y|Y|N|
+|ProcessGasElectricLoadType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|PumpSystemType|N|Y|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|RefrigerationSystemType|N|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|Y|
+|RoofSystemType|N|N|N|N|N|N|N|Y|N|Y|Y|N|
+|WallSystemType|N|N|N|N|N|N|N|Y|N|Y|Y|N|
+|WaterInfiltrationSystem|N|N|Y|N|N|N|N|N|N|Y|N|N|
+|WaterUseType|N|Y|Y|Y|Y|Y|N|Y|Y|Y|Y|Y|
+|**Total**|9/35|23/35|20/35|25/35|24/35|24/35|20/35|29/35|20/35|33/35|31/35|21/35|
+
+## Implementation
+
+When they are absent, the optional `xs:element`s are added to the `xs:complexType`s.