From b928de16c1e9dfd75d8c48150bec107309ec7eb4 Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 05:22:51 +0530
Subject: [PATCH 01/12] Task#1957573-Update BIS schemas for Civil domain 2025

---
 .../CifBridge.ecschema.xml                    | 473 +++++++++--
 .../CifCommon.ecschema.xml                    | 221 ++++--
 .../CifGeometricRules.ecschema.xml            | 350 ++++++++-
 .../CifGeotechnical.ecschema.xml              |   6 +-
 .../CifHydraulicAnalysis.ecschema.xml         | 742 +++++++++++++++++-
 .../CifHydraulicResults.ecschema.xml          | 114 ++-
 .../CifRail.ecschema.xml                      | 167 ++--
 .../CifRoads.ecschema.xml                     |  18 +-
 .../CifSubsurface.ecschema.xml                | 120 +--
 ...CifSubsurfaceConflictAnalysis.ecschema.xml |  18 +-
 10 files changed, 1910 insertions(+), 319 deletions(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml
index d6fd6e70e..e861abca6 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml
@@ -4,9 +4,9 @@
 |  * See LICENSE.md in the project root for license terms and full copyright notice.
 ======================================================================================= -->
 <ECSchema schemaName="CifBridge" alias="cifbrg" version="01.00.19" description="iModel Connector schema containing aspect classes with properties from OpenBridge Modeler." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-    <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
+    <ECSchemaReference name="BisCore" version="01.00.25" alias="bis"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
-    <ECSchemaReference name="CifCommon" version="01.00.10" alias="cifcmn"/>
+    <ECSchemaReference name="CifCommon" version="01.00.15" alias="cifcmn"/>
     <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECSchemaReference name="SchemaUpgradeCustomAttributes" version="01.00.00" alias="SchemaUpgradeCA"/>
@@ -49,6 +49,10 @@
         <ECEnumerator name="Vertical" value="0" displayLabel="Vertical"/>
         <ECEnumerator name="Normal" value="1" displayLabel="Normal"/>
     </ECEnumeration>
+    <ECEnumeration typeName="BeamGroupAspect_BeamGroup_BeamRotationPoint_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Top" value="0" displayLabel="Top"/>
+        <ECEnumerator name="Bottom" value="1" displayLabel="Bottom"/>
+    </ECEnumeration>
     <ECEnumeration typeName="BeamGroupAspect_BeamGroup_EndCutOrientation_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Vertical" value="0" displayLabel="Vertical"/>
         <ECEnumerator name="Normal" value="1" displayLabel="Normal"/>
@@ -155,6 +159,11 @@
         <ECEnumerator name="Frame_V___Concrete" value="7" displayLabel="Frame V - Concrete"/>
         <ECEnumerator name="Frame_Inverted_V___Concrete" value="8" displayLabel="Frame Inverted V - Concrete"/>
         <ECEnumerator name="Built_up_Diaphragm" value="9" displayLabel="Built-up Diaphragm"/>
+        <ECEnumerator name="Frame_X___Tub_Girder" value="10" displayLabel="Frame X - Tub Girder"/>
+        <ECEnumerator name="Frame_V___Tub_Girder" value="11" displayLabel="Frame V - Tub Girder"/>
+        <ECEnumerator name="Frame_Inverted_V___Tub_Girder" value="12" displayLabel="Frame Inverted V - Tub Girder"/>
+        <ECEnumerator name="Diaphragm___Tub_Girder" value="13" displayLabel="Diaphragm - Tub Girder"/>
+        <ECEnumerator name="Bent_Plate___Tub_Girder" value="14" displayLabel="Bent Plate - Tub Girder"/>
     </ECEnumeration>
     <ECEnumeration typeName="CrossFrameHolderAspect_CrossFrameHolder_CrossFrameType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Frame_X" value="0" displayLabel="Frame X"/>
@@ -167,6 +176,28 @@
         <ECEnumerator name="Frame_V___Concrete" value="7" displayLabel="Frame V - Concrete"/>
         <ECEnumerator name="Frame_Inverted_V___Concrete" value="8" displayLabel="Frame Inverted V - Concrete"/>
         <ECEnumerator name="Built_up_Diaphragm" value="9" displayLabel="Built-up Diaphragm"/>
+        <ECEnumerator name="Frame_X___Tub_Girder" value="10" displayLabel="Frame X - Tub Girder"/>
+        <ECEnumerator name="Frame_V___Tub_Girder" value="11" displayLabel="Frame V - Tub Girder"/>
+        <ECEnumerator name="Frame_Inverted_V___Tub_Girder" value="12" displayLabel="Frame Inverted V - Tub Girder"/>
+        <ECEnumerator name="Diaphragm___Tub_Girder" value="13" displayLabel="Diaphragm - Tub Girder"/>
+        <ECEnumerator name="Bent_Plate___Tub_Girder" value="14" displayLabel="Bent Plate - Tub Girder"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="CrossFrameTubsAspect_CrossFrameTubs_CrossFrameType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Frame_X" value="0" displayLabel="Frame X"/>
+        <ECEnumerator name="Frame_V" value="1" displayLabel="Frame V"/>
+        <ECEnumerator name="Frame_Inverted_V" value="2" displayLabel="Frame Inverted V"/>
+        <ECEnumerator name="Diaphragm" value="3" displayLabel="Diaphragm"/>
+        <ECEnumerator name="Bent_Plate_Diaphragm" value="4" displayLabel="Bent Plate Diaphragm"/>
+        <ECEnumerator name="Bent_Plate___Concrete" value="5" displayLabel="Bent Plate - Concrete"/>
+        <ECEnumerator name="Frame_X___Concrete" value="6" displayLabel="Frame X - Concrete"/>
+        <ECEnumerator name="Frame_V___Concrete" value="7" displayLabel="Frame V - Concrete"/>
+        <ECEnumerator name="Frame_Inverted_V___Concrete" value="8" displayLabel="Frame Inverted V - Concrete"/>
+        <ECEnumerator name="Built_up_Diaphragm" value="9" displayLabel="Built-up Diaphragm"/>
+        <ECEnumerator name="Frame_X___Tub_Girder" value="10" displayLabel="Frame X - Tub Girder"/>
+        <ECEnumerator name="Frame_V___Tub_Girder" value="11" displayLabel="Frame V - Tub Girder"/>
+        <ECEnumerator name="Frame_Inverted_V___Tub_Girder" value="12" displayLabel="Frame Inverted V - Tub Girder"/>
+        <ECEnumerator name="Diaphragm___Tub_Girder" value="13" displayLabel="Diaphragm - Tub Girder"/>
+        <ECEnumerator name="Bent_Plate___Tub_Girder" value="14" displayLabel="Bent Plate - Tub Girder"/>
     </ECEnumeration>
     <ECEnumeration typeName="CustomAbutmentAnalyticalAspect_Pier_AbutmentAnalyticalType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Regular" value="0" displayLabel="Regular"/>
@@ -222,6 +253,12 @@
         <ECEnumerator name="Level" value="1" displayLabel="Level"/>
         <ECEnumerator name="Parallel" value="0" displayLabel="Parallel"/>
     </ECEnumeration>
+    <ECEnumeration typeName="CustomPierBySupportLineRuleAspect_CustomPierBySupportLineRuleCellType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Standard" value="0" displayLabel="Standard"/>
+        <ECEnumerator name="Parametric" value="1" displayLabel="Parametric"/>
+        <ECEnumerator name="Generative_Component" value="2" displayLabel="Generative Component"/>
+        <ECEnumerator name="Unknown" value="3" displayLabel="Unknown"/>
+    </ECEnumeration>
     <ECEnumeration typeName="CustomPierPileAspect_Pier_PileShape_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Rectangle" value="0" displayLabel="Rectangle"/>
         <ECEnumerator name="Circular_Pile" value="1" displayLabel="Circular Pile"/>
@@ -249,9 +286,10 @@
         <ECEnumerator name="Rectangle" value="1" displayLabel="Rectangle"/>
         <ECEnumerator name="InvertedT" value="2" displayLabel="InvertedT"/>
         <ECEnumerator name="Variable" value="8" displayLabel="Variable"/>
-        <ECEnumerator name="None" value="-1" displayLabel="None"/>
         <ECEnumerator name="Stem_Wall" value="6" displayLabel="Stem Wall"/>
         <ECEnumerator name="Pile_Cap" value="5" displayLabel="Pile Cap"/>
+        <ECEnumerator name="Trapezoidal" value="10" displayLabel="Trapezoidal"/>
+        <ECEnumerator name="None" value="-1" displayLabel="None"/>
     </ECEnumeration>
     <ECEnumeration typeName="PierColumnBaseAspect_PierColumn_Type_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Circular" value="0" displayLabel="Circular"/>
@@ -259,9 +297,9 @@
         <ECEnumerator name="Rect_Fillet" value="2" displayLabel="Rect-Fillet"/>
         <ECEnumerator name="Rect_Chamfer" value="3" displayLabel="Rect-Chamfer"/>
         <ECEnumerator name="Rect_Bevel" value="4" displayLabel="Rect-Bevel"/>
-        <ECEnumerator name="None" value="-1" displayLabel="None"/>
         <ECEnumerator name="Oval" value="6" displayLabel="Oval"/>
         <ECEnumerator name="Variable" value="7" displayLabel="Variable"/>
+        <ECEnumerator name="None" value="-1" displayLabel="None"/>
     </ECEnumeration>
     <ECEnumeration typeName="PierFootingBaseAspect_Pierfooting_FootingType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Rectangular_Isolated" value="0" displayLabel="Rectangular Isolated"/>
@@ -269,13 +307,15 @@
         <ECEnumerator name="Rectangle_Drilled_Shaft" value="2" displayLabel="Rectangle Drilled Shaft"/>
         <ECEnumerator name="Circular_Drilled_Shaft" value="3" displayLabel="Circular Drilled Shaft"/>
         <ECEnumerator name="Rect__Combined_with_Crash_Wall" value="4" displayLabel="Rect. Combined with Crash Wall"/>
-        <ECEnumerator name="None" value="-1" displayLabel="None"/>
         <ECEnumerator name="Custom" value="5" displayLabel="Custom"/>
+        <ECEnumerator name="None" value="-1" displayLabel="None"/>
     </ECEnumeration>
     <ECEnumeration typeName="PileBaseAspect_Pile_Type_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Rectangle" value="0" displayLabel="Rectangle"/>
         <ECEnumerator name="Circular_Pile" value="1" displayLabel="Circular Pile"/>
         <ECEnumerator name="H_Pile" value="2" displayLabel="H Pile"/>
+        <ECEnumerator name="Circular_Drilled_Shaft" value="3" displayLabel="Circular Drilled Shaft"/>
+        <ECEnumerator name="Pipe_Pile" value="4" displayLabel="Pipe Pile"/>
     </ECEnumeration>
     <ECEnumeration typeName="SegmentalBalanceRuleAspect_SegmentalBalanceRule_TemplateOrientation_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Vertical" value="0" displayLabel="Vertical"/>
@@ -308,6 +348,10 @@
         <ECEnumerator name="Level" value="0" displayLabel="Level"/>
         <ECEnumerator name="Parallel_To_Diaphragm_Top" value="1" displayLabel="Parallel To Diaphragm Top"/>
     </ECEnumeration>
+    <ECEnumeration typeName="SupportLineAspect_SupportLine_DirectionInputMode_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Skew" value="0" displayLabel="Skew"/>
+        <ECEnumerator name="Direction" value="1" displayLabel="Direction"/>
+    </ECEnumeration>
     <ECEnumeration typeName="SupportLineBtMidPointRuleAspect_SupportLineBtMidPointRule_DirectionInputMode_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Skew" value="0" displayLabel="Skew"/>
         <ECEnumerator name="Direction" value="1" displayLabel="Direction"/>
@@ -329,6 +373,13 @@
         <ECEnumerator name="Normal_Skewed" value="0" displayLabel="Normal/Skewed"/>
         <ECEnumerator name="Inline_Skewed" value="1" displayLabel="Inline/Skewed"/>
     </ECEnumeration>
+    <ECEnumeration typeName="WingwallPileAspect_WingwallPile_PileType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Rectangle" value="0" displayLabel="Rectangle"/>
+        <ECEnumerator name="Circular_Pile" value="1" displayLabel="Circular Pile"/>
+        <ECEnumerator name="H_Pile" value="2" displayLabel="H Pile"/>
+        <ECEnumerator name="Circular_Drilled_Shaft" value="3" displayLabel="Circular Drilled Shaft"/>
+        <ECEnumerator name="Pipe_Pile" value="4" displayLabel="Pipe Pile"/>
+    </ECEnumeration>
     <ECEntityClass typeName="AbutmentAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Pier_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_Abutment" priority="299950"/>
@@ -337,6 +388,7 @@
         <ECProperty propertyName="Pier_PierCapMaterial" typeName="string" displayLabel="Cap Material" category="BridgeModelerAttributes_Material_Material" priority="299950"/>
         <ECProperty propertyName="Pier_ColumnMaterial" typeName="string" displayLabel="Column Material" category="BridgeModelerAttributes_Material_Material" priority="299949"/>
         <ECProperty propertyName="Pier_FootingMaterial" typeName="string" displayLabel="Footing Material" category="BridgeModelerAttributes_Material_Material" priority="299948"/>
+        <ECProperty propertyName="Pier_HPileEncasementMaterial" typeName="string" displayLabel="Pile Encasement Material" category="BridgeModelerAttributes_Material_Material" priority="299946"/>
         <ECProperty propertyName="Pier_PileMaterial" typeName="string" displayLabel="Pile Material" category="BridgeModelerAttributes_Material_Material" priority="299945"/>
         <ECProperty propertyName="Pier_PierCapBuildOrder" typeName="int" displayLabel="Pier Cap Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299950">
             <ECCustomAttributes>
@@ -353,19 +405,18 @@
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="Pier_PileBuildOrder" typeName="int" displayLabel="Pile Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299946">
+        <ECProperty propertyName="Pier_ConcretePadBuildOrder" typeName="int" displayLabel="Concrete Pad Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299947">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="Pier_AbutmentAnalyticalType" typeName="AbutmentAspect_Pier_AbutmentAnalyticalType_Enum" displayLabel="Abutment Type" category="AnalyticalProperties_Analytical" priority="299950"/>
-        <ECProperty propertyName="Pier_ConcretePadMaterial" typeName="string" displayLabel="Concrete Pad Material" category="BridgeModelerAttributes_Material_Material" priority="299947"/>
-        <ECProperty propertyName="Pier_ConcretePadBuildOrder" typeName="int" displayLabel="Concrete Pad Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299947">
+        <ECProperty propertyName="Pier_PileBuildOrder" typeName="int" displayLabel="Pile Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299946">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="Pier_HPileEncasementMaterial" typeName="string" displayLabel="Pile Encasement Material" category="BridgeModelerAttributes_Material_Material" priority="299946"/>
+        <ECProperty propertyName="Pier_AbutmentAnalyticalType" typeName="AbutmentAspect_Pier_AbutmentAnalyticalType_Enum" displayLabel="Abutment Type" category="AnalyticalProperties_Analytical" priority="299950"/>
+        <ECProperty propertyName="Pier_ConcretePadMaterial" typeName="string" displayLabel="Concrete Pad Material" category="BridgeModelerAttributes_Material_Material" priority="299947"/>
     </ECEntityClass>
     <ECEntityClass typeName="AbutmentWingComponentAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -414,29 +465,34 @@
         <ECProperty propertyName="ApproachRefLineRule_Length" typeName="double" displayLabel="Length" category="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" priority="299999" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ApproachRefLineRule_DirectionInputMode" typeName="ApproachRefLineRuleAspect_ApproachRefLineRule_DirectionInputMode_Enum" displayLabel="Direction Mode" category="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" priority="299997"/>
         <ECProperty propertyName="ApproachRefLineRule_Direction" typeName="double" displayLabel="Direction" category="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" priority="299996" kindOfQuantity="cifu:BEARING"/>
-        <ECProperty propertyName="ApproachRefLineRule_Offset" typeName="double" displayLabel="Offset From SupportLine" category="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" priority="299993" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="ApproachRefLineRule_Skew" typeName="double" displayLabel="Skew" category="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" priority="299995" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="ApproachRefLineRule_Offset" typeName="double" displayLabel="Offset From SupportLine" category="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" priority="299993" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ApproachRefLineRule_HorizontalOffset" typeName="double" displayLabel="Horizontal Offset" category="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="ApproachRefLineRule_Skew" typeName="double" displayLabel="Skew" category="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" priority="299995" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="ApproachRefLineRule_Station" typeName="string" displayLabel="Station" category="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" priority="299998"/>
     </ECEntityClass>
     <ECEntityClass typeName="ApproachSlabAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="ApproachSlab_Name" typeName="string" displayLabel="Name" category="ApproachSlabProperties_Approach_Slab" priority="400000"/>
         <ECProperty propertyName="ApproachSlab_Description" typeName="string" displayLabel="Description" category="ApproachSlabProperties_Approach_Slab" priority="399999"/>
-        <ECProperty propertyName="ApproachSlab_TemplateName" typeName="string" displayLabel="Template Name" category="ApproachSlabProperties_Approach_Slab" priority="399998"/>
-        <ECProperty propertyName="ApproachSlab_MainMaterial" typeName="string" displayLabel="Approach Slab Material Name" category="BridgeModelerAttributes_Material_Material" priority="399996"/>
-        <ECProperty propertyName="ApproachSlab_MainBuildOrder" typeName="int" displayLabel="Approach Slab Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="399995">
+        <ECProperty propertyName="ApproachSlab_TemplateName" typeName="string" displayLabel="Template Name" category="ApproachSlabProperties_Approach_Slab" priority="399998">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="ApproachSlab_TopSurfaceArea" typeName="double" displayLabel="Top Surface Area" category="ApproachSlabProperties_Approach_Slab" priority="200000" kindOfQuantity="cifu:AREA"/>
         <ECProperty propertyName="ApproachSlab_StartStation" typeName="double" displayLabel="Start Station" category="ApproachSlabProperties_Approach_Slab" priority="299999" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="ApproachSlab_EndStation" typeName="double" displayLabel="End Station" category="ApproachSlabProperties_Approach_Slab" priority="299998" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="ApproachSlab_TopSurfaceArea" typeName="double" displayLabel="Top Surface Area" category="ApproachSlabProperties_Approach_Slab" priority="200000" kindOfQuantity="cifu:AREA"/>
+        <ECProperty propertyName="ApproachSlab_MainMaterial" typeName="string" displayLabel="Approach Slab Material Name" category="BridgeModelerAttributes_Material_Material" priority="399996"/>
+        <ECProperty propertyName="ApproachSlab_MainBuildOrder" typeName="int" displayLabel="Approach Slab Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="399995">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
     </ECEntityClass>
     <ECEntityClass typeName="ApproachSlabByTemplateRuleAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="ApproachSlabByTemplateRule_IsSyncDeck" typeName="boolean" displayLabel="Sync With Deck" category="ApproachSlabProperties_Approach_Slab" priority="300000"/>
+        <ECProperty propertyName="ApproachSlabByTemplateRule_VariationAlongSkew" typeName="boolean" displayLabel="Variation Along Skew" category="ApproachSlabProperties_Approach_Slab" priority="300000"/>
         <ECProperty propertyName="ApproachSlabByTemplateRule_StartOffset" typeName="double" displayLabel="Start Station Offset" category="ApproachSlabProperties_Approach_Slab" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ApproachSlabByTemplateRule_EndOffset" typeName="double" displayLabel="End Station Offset" category="ApproachSlabProperties_Approach_Slab" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ApproachSlabByTemplateRule_TemplateOrientation" typeName="ApproachSlabByTemplateRuleAspect_ApproachSlabByTemplateRule_TemplateOrientation_Enum" displayLabel="Template Orientation" category="ApproachSlabProperties_Approach_Slab" priority="299989">
@@ -483,16 +539,20 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Barrier_Name" typeName="string" displayLabel="Name" category="BarrierProperties_Barrier" priority="400000"/>
         <ECProperty propertyName="Barrier_Description" typeName="string" displayLabel="Description" category="BarrierProperties_Barrier" priority="399999"/>
-        <ECProperty propertyName="Barrier_TemplateName" typeName="string" displayLabel="Template Name" category="BarrierProperties_Barrier" priority="399998"/>
+        <ECProperty propertyName="Barrier_TemplateName" typeName="string" displayLabel="Template Name" category="BarrierProperties_Barrier" priority="399998">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
         <ECProperty propertyName="Barrier_MainMaterial" typeName="string" displayLabel="Barrier Material" category="BridgeModelerAttributes_Material_Material" priority="399916"/>
         <ECProperty propertyName="Barrier_MainBuildOrder" typeName="int" displayLabel="Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="399906">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="Barrier_Length" typeName="double" displayLabel="Length" category="BarrierProperties_Barrier" priority="-100" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Barrier_PayUnit" typeName="BarrierAspect_Barrier_PayUnit_Enum" displayLabel="Pay Unit" category="BarrierProperties_Barrier" priority="-90"/>
         <ECProperty propertyName="Barrier_PayUnitText" typeName="string" displayLabel="Pay Unit Text" category="BarrierProperties_Barrier" priority="-95"/>
+        <ECProperty propertyName="Barrier_Length" typeName="double" displayLabel="Length" category="BarrierProperties_Barrier" priority="-100" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
     <ECEntityClass typeName="SolidByTemplateRuleAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -514,10 +574,6 @@
     </ECEntityClass>
     <ECEntityClass typeName="BarrierByTemplateRuleAspect">
         <BaseClass>SolidByTemplateRuleAspect</BaseClass>
-        <ECProperty propertyName="BarrierByTemplateRule_StartOffset" typeName="double" displayLabel="Start Station Offset" category="BarrierProperties_Barrier" priority="299999" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="BarrierByTemplateRule_EndOffset" typeName="double" displayLabel="End Station Offset" category="BarrierProperties_Barrier" priority="299998" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="BarrierByTemplateRule_TemplateOrientation" typeName="BarrierByTemplateRuleAspect_BarrierByTemplateRule_TemplateOrientation_Enum" displayLabel="Template Orientation" category="BarrierProperties_Barrier" priority="299997"/>
-        <ECProperty propertyName="BarrierByTemplateRule_PointControlPath" typeName="string" displayLabel="Point Control Path" category="BarrierProperties_Barrier" priority="299974"/>
         <ECProperty propertyName="BarrierByTemplateRule_HorizontalOffset" typeName="double" displayLabel="Horizontal Offset" category="BarrierProperties_Barrier" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BarrierByTemplateRule_VerticalOffset" typeName="double" displayLabel="Vertical Offset" category="BarrierProperties_Barrier" priority="299989" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BarrierByTemplateRule_Template" typeName="string" displayLabel="Template" category="BarrierProperties_Barrier" priority="399997"/>
@@ -525,8 +581,12 @@
         <ECProperty propertyName="BarrierByTemplateRule_MaximumDistanceBetweenSections" typeName="double" displayLabel="Max Dist Between Sections" category="BarrierProperties_Barrier" priority="299987" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BarrierByTemplateRule_VarConst" typeName="string" displayLabel="Variable Constraint" category="BarrierProperties_Barrier" priority="299986"/>
         <ECProperty propertyName="BarrierByTemplateRule_PointControl" typeName="string" displayLabel="Point Control" category="BarrierProperties_Barrier" priority="299985"/>
-        <ECProperty propertyName="BarrierByTemplateRule_EndCutOrientation" typeName="BarrierByTemplateRuleAspect_BarrierByTemplateRule_EndCutOrientation_Enum" displayLabel="End Cut Orientation" category="BarrierProperties_Barrier" priority="299995"/>
+        <ECProperty propertyName="BarrierByTemplateRule_StartOffset" typeName="double" displayLabel="Start Station Offset" category="BarrierProperties_Barrier" priority="299999" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BarrierByTemplateRule_EndOffset" typeName="double" displayLabel="End Station Offset" category="BarrierProperties_Barrier" priority="299998" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BarrierByTemplateRule_TemplateOrientation" typeName="BarrierByTemplateRuleAspect_BarrierByTemplateRule_TemplateOrientation_Enum" displayLabel="Template Orientation" category="BarrierProperties_Barrier" priority="299997"/>
         <ECProperty propertyName="BarrierByTemplateRule_StartCutOrientation" typeName="BarrierByTemplateRuleAspect_BarrierByTemplateRule_StartCutOrientation_Enum" displayLabel="Start Cut Orientation" category="BarrierProperties_Barrier" priority="299996"/>
+        <ECProperty propertyName="BarrierByTemplateRule_EndCutOrientation" typeName="BarrierByTemplateRuleAspect_BarrierByTemplateRule_EndCutOrientation_Enum" displayLabel="End Cut Orientation" category="BarrierProperties_Barrier" priority="299995"/>
+        <ECProperty propertyName="BarrierByTemplateRule_PointControlPath" typeName="string" displayLabel="Point Control Path" category="BarrierProperties_Barrier" priority="299974"/>
         <ECProperty propertyName="BarrierByTemplateRule_PlacementSurface" typeName="int" displayLabel="Placement Surface" category="BarrierProperties_Barrier" priority="299994"/>
     </ECEntityClass>
     <ECEntityClass typeName="BeamCorridorAspect">
@@ -536,7 +596,10 @@
     </ECEntityClass>
     <ECEntityClass typeName="BeamGroupAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
-        <ECProperty propertyName="BeamGroup_UseBeamRotation" typeName="boolean" displayLabel="Use Beam Rotation" category="BeamGroupProperties_Beam_Group_Properties" priority="299998"/>
+        <ECProperty propertyName="BeamGroup_UseBeamRotation" typeName="boolean" displayLabel="Use Beam Rotation" category="BeamGroupProperties_Beam_Group_Properties" priority="299999"/>
+        <ECProperty propertyName="BeamGroup_BeamRotationPoint" typeName="BeamGroupAspect_BeamGroup_BeamRotationPoint_Enum" displayLabel="Beam Rotation Point" category="BeamGroupProperties_Beam_Group_Properties" priority="299998"/>
+        <ECProperty propertyName="BeamGroup_StartCutOrientation" typeName="BeamGroupAspect_BeamGroup_StartCutOrientation_Enum" displayLabel="Start Cut Orientation" category="BeamGroupProperties_Beam_Group_Properties" priority="299997"/>
+        <ECProperty propertyName="BeamGroup_EndCutOrientation" typeName="BeamGroupAspect_BeamGroup_EndCutOrientation_Enum" displayLabel="End Cut Orientation" category="BeamGroupProperties_Beam_Group_Properties" priority="299996"/>
         <ECProperty propertyName="BeamGroup_FollowLeftDeckEdge" typeName="boolean" displayLabel="Follow Left Deck Edge" category="BeamGroupProperties_Beam_Group_Properties" priority="299995"/>
         <ECProperty propertyName="BeamGroup_FollowRightDeckEdge" typeName="boolean" displayLabel="Follow Right Deck Edge" category="BeamGroupProperties_Beam_Group_Properties" priority="299994"/>
         <ECProperty propertyName="BeamGroup_ConstructWetJoints" typeName="boolean" displayLabel="Construct Wet Joints" category="BeamGroupProperties_Beam_Group_Properties" priority="299993"/>
@@ -552,8 +615,6 @@
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="BeamGroup_StartCutOrientation" typeName="BeamGroupAspect_BeamGroup_StartCutOrientation_Enum" displayLabel="Start Cut Orientation" category="BeamGroupProperties_Beam_Group_Properties" priority="299997"/>
-        <ECProperty propertyName="BeamGroup_EndCutOrientation" typeName="BeamGroupAspect_BeamGroup_EndCutOrientation_Enum" displayLabel="End Cut Orientation" category="BeamGroupProperties_Beam_Group_Properties" priority="299996"/>
     </ECEntityClass>
     <ECEntityClass typeName="BeamSeatAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -564,17 +625,29 @@
         <ECProperty propertyName="BeamSeatD2" typeName="double" displayLabel="D2" category="BridgeModelerAttributes_General" priority="299995" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BeamSeatW1" typeName="double" displayLabel="W1" category="BridgeModelerAttributes_General" priority="299994" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BeamSeatW2" typeName="double" displayLabel="W2" category="BridgeModelerAttributes_General" priority="299993" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BeamSeatThicknessDefinitionMethod" typeName="BeamSeatAspect_BeamSeatThicknessDefinitionMethod_Enum" displayLabel="Thickness Definition" category="BridgeModelerAttributes_General" priority="299992"/>
         <ECProperty propertyName="BeamSeatMinThickness" typeName="double" displayLabel="Min. Thickness" category="BridgeModelerAttributes_General" priority="299991" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BeamSeatThicknessAtCenter" typeName="double" displayLabel="Thickness at Center" category="BridgeModelerAttributes_General" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BeamSeatDepthAtD1W1" typeName="double" displayLabel="Depth at D1W1" category="BridgeModelerAttributes_General" priority="299989" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BeamSeatDepthAtD1W2" typeName="double" displayLabel="Depth at D1W2" category="BridgeModelerAttributes_General" priority="299988" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BeamSeatDepthAtD2W1" typeName="double" displayLabel="Depth at D2W1" category="BridgeModelerAttributes_General" priority="299987" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BeamSeatDepthAtD2W2" typeName="double" displayLabel="Depth at D2W2" category="BridgeModelerAttributes_General" priority="299986" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="BeamSeatThicknessDefinitionMethod" typeName="BeamSeatAspect_BeamSeatThicknessDefinitionMethod_Enum" displayLabel="Thickness Definition" category="BridgeModelerAttributes_General" priority="299992"/>
         <ECProperty propertyName="BeamSeatTopElevation" typeName="double" displayLabel="Top Elevation" category="BridgeModelerAttributes_General" priority="299985" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="BeamSeatPayUnit" typeName="int" displayLabel="Pad or Plate Pay Unit" category="BridgeModelerAttributes_General" priority="299984"/>
-        <ECProperty propertyName="BeamSeatPayUnitText" typeName="string" displayLabel="Pad or Plate Pay Unit Text" category="BridgeModelerAttributes_General" priority="299983"/>
-        <ECProperty propertyName="BeamSeatQuantity" typeName="double" displayLabel="Quantity" category="BridgeModelerAttributes_General" priority="299982"/>
+        <ECProperty propertyName="BeamSeat_X" typeName="double" displayLabel="X" category="BridgeModelerAttributes_General" priority="299984"/>
+        <ECProperty propertyName="BeamSeat_Y" typeName="double" displayLabel="Y" category="BridgeModelerAttributes_General" priority="299983"/>
+        <ECProperty propertyName="BeamSeat_Station" typeName="double" displayLabel="Station" category="BridgeModelerAttributes_General" priority="299982" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="BeamSeat_Offset" typeName="double" displayLabel="Offset" category="BridgeModelerAttributes_General" priority="299981"/>
+        <ECProperty propertyName="BeamSeat_ReferenceElevation" typeName="double" displayLabel="Reference Elevation" category="BridgeModelerAttributes_General" priority="299980" kindOfQuantity="cifu:LENGTH">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
+        <ECProperty propertyName="BeamSeat_BeamName" typeName="string" displayLabel="Beam Name" category="BridgeModelerAttributes_General" priority="299979"/>
+        <ECProperty propertyName="BeamSeatPayUnit" typeName="int" displayLabel="Pad or Plate Pay Unit" category="BridgeModelerAttributes_General" priority="299978"/>
+        <ECProperty propertyName="BeamSeatPayUnitText" typeName="string" displayLabel="Pad or Plate Pay Unit Text" category="BridgeModelerAttributes_General" priority="299977"/>
+        <ECProperty propertyName="BeamSeatQuantity" typeName="double" displayLabel="Quantity" category="BridgeModelerAttributes_General" priority="299976"/>
+        <ECProperty propertyName="BeamSeat_BeamSeatMaterial" typeName="string" displayLabel="Beam Seat Material" category="BridgeModelerAttributes_General" priority="299975"/>
+        <ECProperty propertyName="BeamSeat_GroutPadMaterial" typeName="string" displayLabel="Grout Pad Material" category="BridgeModelerAttributes_General" priority="299974"/>
     </ECEntityClass>
     <ECEntityClass typeName="BeamSegmentBaseAspect" modifier="Abstract">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -582,6 +655,7 @@
         <ECProperty propertyName="BeamSegment_BeamName" typeName="string" displayLabel="Beam Name" category="BeamSegmentProperties_Beam_Segment_Properties" priority="299975"/>
         <ECProperty propertyName="BeamSegment_SpanName" typeName="string" displayLabel="Span Name" category="BeamSegmentProperties_Beam_Segment_Properties" priority="299974"/>
         <ECProperty propertyName="BeamSegment_TypeText" typeName="string" displayLabel="Type Text" category="BeamSegmentProperties_Beam_Segment_Properties" priority="299998"/>
+        <ECProperty propertyName="BeamSegment_SegmentName" typeName="string" displayLabel="Segment Name" category="BeamSegmentProperties_Beam_Segment_Properties" priority="299973"/>
     </ECEntityClass>
     <ECEntityClass typeName="BeamSegmentCollectionBaseAspect" modifier="Abstract">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -763,6 +837,13 @@
         <ECProperty propertyName="BMFeaturizedEntityProperties_NBIID" typeName="string" displayLabel="NBI Element Number" category="BridgeModelerAttributes_General" priority="200000"/>
         <ECProperty propertyName="BMFeaturizedEntityProperties_StateID" typeName="string" displayLabel="State Element Number" category="BridgeModelerAttributes_General" priority="290001"/>
         <ECProperty propertyName="OBMBridge_StructureNumber" typeName="string" displayLabel="Bridge Structure #" category="BridgeModelerAttributes_General" priority="290002"/>
+        <ECProperty propertyName="OBMBridge_Description" typeName="string" displayLabel="Bridge Description" category="BridgeModelerAttributes_General" priority="290003"/>
+        <ECProperty propertyName="OBMBridge_Name" typeName="string" displayLabel="Bridge Name" category="BridgeModelerAttributes_General" priority="290004"/>
+        <ECProperty propertyName="BMFeaturizedEntityProperties_SyncId" typeName="string" displayLabel="SyncId" category="BridgeModelerAttributes_General" priority="290002"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="BMGeometricComponentPropertiesAspect">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="BMGeometricComponentProperties_SyncId" typeName="string" displayLabel="SyncId" category="BridgeModelerAttributes_Geometric_Component" priority="290001"/>
     </ECEntityClass>
     <ECEntityClass typeName="BMParametricCellSubElementAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -829,8 +910,8 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Bridge_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_Bridge" priority="299950"/>
         <ECProperty propertyName="Bridge_Description" typeName="string" displayLabel="Description" category="BridgeModelerAttributes_Bridge" priority="299949"/>
-        <ECProperty propertyName="Bridge_UseRoadwayAlignmentStationing" typeName="boolean" displayLabel="Use Road Alignment For Stationing " category="BridgeModelerAttributes_Bridge" priority="299940"/>
         <ECProperty propertyName="Bridge_StructureNumber" typeName="string" displayLabel="Structure Number" category="BridgeModelerAttributes_Bridge" priority="299945"/>
+        <ECProperty propertyName="Bridge_UseRoadwayAlignmentStationing" typeName="boolean" displayLabel="Use Road Alignment For Stationing " category="BridgeModelerAttributes_Bridge" priority="299940"/>
     </ECEntityClass>
     <ECEntityClass typeName="BridgeUnitAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -1014,12 +1095,16 @@
         </ECProperty>
         <ECProperty propertyName="CrossFrameG2_TemplateName" typeName="string" displayLabel="Template Name" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299997"/>
         <ECProperty propertyName="CrossFrameG2_CrossFrameType" typeName="CrossFrameG2Aspect_CrossFrameG2_CrossFrameType_Enum" displayLabel="Cross-Frame Type" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299996"/>
+        <ECProperty propertyName="CrossFrameG2_CrossFrameTypeText" typeName="string" displayLabel="Cross-Frame Type Text" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299995"/>
         <ECProperty propertyName="CrossFrameG2_LayoutDefinition" typeName="string" displayLabel="Cross-Frame Placement" category="CrossFrameProperties_Cross_Frame_Properties" priority="299995"/>
         <ECProperty propertyName="CrossFrameG2_MainBuildOrder" typeName="int" displayLabel="Crossframe Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299994">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
+        <ECProperty propertyName="CrossFrameG2_BridgeStructureNumber" typeName="string" displayLabel="Bridge Structure #" category="CrossFrameProperties_Cross_Frame_Properties" priority="299992"/>
+        <ECProperty propertyName="CrossFrameG2_BridgeName" typeName="string" displayLabel="Bridge Name" category="CrossFrameProperties_Cross_Frame_Properties" priority="299991"/>
+        <ECProperty propertyName="CrossFrameG2_BridgeDescription" typeName="string" displayLabel="Bridge Description" category="CrossFrameProperties_Cross_Frame_Properties" priority="299990"/>
     </ECEntityClass>
     <ECEntityClass typeName="CrossFrameG2GroupAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -1046,6 +1131,7 @@
         </ECProperty>
         <ECProperty propertyName="CrossFrameHolder_Template" typeName="string" displayLabel="Template" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299997"/>
         <ECProperty propertyName="CrossFrameHolder_CrossFrameType" typeName="CrossFrameHolderAspect_CrossFrameHolder_CrossFrameType_Enum" displayLabel="Cross-Frame Type" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299996"/>
+        <ECProperty propertyName="CrossFrameHolder_CrossFrameTypeText" typeName="string" displayLabel="Cross-Frame Type Text" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299995"/>
         <ECProperty propertyName="CrossFrameHolder_LayoutDefinition" typeName="string" displayLabel="Cross-Frame Placement" category="CrossFrameProperties_Cross_Frame_Properties" priority="299994"/>
         <ECProperty propertyName="CrossFrameHolder_MainBuildOrder" typeName="int" displayLabel="Crossframe Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299993">
             <ECCustomAttributes>
@@ -1053,7 +1139,46 @@
             </ECCustomAttributes>
         </ECProperty>
         <ECProperty propertyName="CrossFrameHolder_TemplateName" typeName="string" displayLabel="Template Name" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299997"/>
-        <ECProperty propertyName="CrossFrameHolder_CrossFrameTypeText" typeName="string" displayLabel="Cross-Frame Type Text" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299995"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="CrossFrameTubsAspect">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="CrossFrameTubs_Name" typeName="string" displayLabel="Name" category="CrossFrameProperties_Cross_Frame_Properties" priority="299999"/>
+        <ECProperty propertyName="CrossFrameTubs_TotalWeight" typeName="double" displayLabel="Total Components Weight" category="CrossFrameProperties_Cross_Frame_Properties" priority="299998" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="CrossFrameTubs_TemplateName" typeName="string" displayLabel="Template Name" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299997"/>
+        <ECProperty propertyName="CrossFrameTubs_CrossFrameType" typeName="CrossFrameTubsAspect_CrossFrameTubs_CrossFrameType_Enum" displayLabel="Cross-Frame Type" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299996"/>
+        <ECProperty propertyName="CrossFrameTubs_CrossFrameTypeText" typeName="string" displayLabel="Cross-Frame Type Text" category="CrossFrameTemplateProperties_Cross_Frame_Template_Properties" priority="299995"/>
+        <ECProperty propertyName="CrossFrameTubs_LayoutDefinition" typeName="string" displayLabel="Cross-Frame Placement" category="CrossFrameProperties_Cross_Frame_Properties" priority="299994"/>
+        <ECProperty propertyName="CrossFrameTubs_MainBuildOrder" typeName="int" displayLabel="Crossframe Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299993">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
+        <ECProperty propertyName="CrossFrameTubs_BridgeStructureNumber" typeName="string" displayLabel="Bridge Structure #" category="CrossFrameProperties_Cross_Frame_Properties" priority="299992"/>
+        <ECProperty propertyName="CrossFrameTubs_BridgeName" typeName="string" displayLabel="Bridge Name" category="CrossFrameProperties_Cross_Frame_Properties" priority="299991"/>
+        <ECProperty propertyName="CrossFrameTubs_BridgeDescription" typeName="string" displayLabel="Bridge Description" category="CrossFrameProperties_Cross_Frame_Properties" priority="299990"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="CrossFrameTubsGroupAspect">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="CrossFrameTubsGroup_Name" typeName="string" displayLabel="Name" category="CrossFrameGroupProperties_Cross_Frame_Group_Properties" priority="299950"/>
+        <ECProperty propertyName="CrossFrameTubsGroup_Description" typeName="string" displayLabel="Description" category="CrossFrameGroupProperties_Cross_Frame_Group_Properties" priority="299950"/>
+        <ECProperty propertyName="CrossFrameTubsGroup_LayoutDefinition" typeName="string" displayLabel="Cross-Frame Placement" category="CrossFrameGroupProperties_Cross_Frame_Group_Properties" priority="299930"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="CustomAbutmentAspect">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="Pier_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_Custom_Abutment" priority="299950"/>
+        <ECProperty propertyName="Pier_Description" typeName="string" displayLabel="Description" category="BridgeModelerAttributes_Custom_Abutment" priority="299949"/>
+        <ECProperty propertyName="Pier_TemplateName" typeName="string" displayLabel="Cell Name" category="BridgeModelerAttributes_Custom_Abutment" priority="299948"/>
+        <ECProperty propertyName="Pier_PierCapMaterial" typeName="string" displayLabel="Cap Material" category="BridgeModelerAttributes_Material_Material" priority="299950"/>
+        <ECProperty propertyName="Pier_ColumnMaterial" typeName="string" displayLabel="Column Material" category="BridgeModelerAttributes_Material_Material" priority="299949"/>
+        <ECProperty propertyName="Pier_FootingMaterial" typeName="string" displayLabel="Footing Material" category="BridgeModelerAttributes_Material_Material" priority="299948"/>
+        <ECProperty propertyName="Pier_ConcretePadMaterial" typeName="string" displayLabel="Concrete Pad Material" category="BridgeModelerAttributes_Material_Material" priority="299947"/>
+        <ECProperty propertyName="Pier_HPileEncasementMaterial" typeName="string" displayLabel="Pile Encasement Material" category="BridgeModelerAttributes_Material_Material" priority="299946"/>
+        <ECProperty propertyName="Pier_PileMaterial" typeName="string" displayLabel="Pile Material" category="BridgeModelerAttributes_Material_Material" priority="299945"/>
+        <ECProperty propertyName="Pier_PierCapBuildOrder" typeName="int" displayLabel="Pier Cap Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299950">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
     </ECEntityClass>
     <ECEntityClass typeName="CustomAbutmentAnalyticalAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -1339,6 +1464,26 @@
         <ECProperty propertyName="Pier_PileEdgeDistance" typeName="double" displayLabel="Pile Edge Distance" category="AnalyticalProperties_Analytical" priority="299930" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Pier_PileShape" typeName="CustomPierPileAspect_Pier_PileShape_Enum" displayLabel="Pile Shape" category="AnalyticalProperties_Analytical" priority="299932"/>
     </ECEntityClass>
+    <ECEntityClass typeName="DeckAspect">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="Deck_Name" typeName="string" displayLabel="Name" category="DeckProperties_Deck" priority="400000"/>
+        <ECProperty propertyName="Deck_Description" typeName="string" displayLabel="Description" category="DeckProperties_Deck" priority="399999"/>
+        <ECProperty propertyName="Deck_TemplateName" typeName="string" displayLabel="Template Name" category="DeckProperties_Deck" priority="399998">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
+        <ECProperty propertyName="Deck_IsAnalytical" typeName="boolean" displayLabel="Analytical Deck" category="DeckProperties_Deck" priority="399916"/>
+        <ECProperty propertyName="Deck_StartStation" typeName="double" displayLabel="Start Station" category="DeckProperties_Deck" priority="399906" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="Deck_EndStation" typeName="double" displayLabel="End Station" category="DeckProperties_Deck" priority="399896" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="Deck_TopSurfaceArea" typeName="double" displayLabel="Top Surface Area" category="DeckProperties_Deck" priority="200000" kindOfQuantity="cifu:AREA"/>
+        <ECProperty propertyName="Deck_MainMaterial" typeName="string" displayLabel="Deck Material" category="BridgeModelerAttributes_Material_Material" priority="399916"/>
+        <ECProperty propertyName="Deck_MainBuildOrder" typeName="int" displayLabel="Deck Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="399906">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
+    </ECEntityClass>
     <ECEntityClass typeName="DeckByMultiTemplateRuleAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="DeckByMultiTemplateRule_StartOffset" typeName="double" displayLabel="Start Station Offset" category="DeckProperties_Deck" priority="299999" kindOfQuantity="cifu:LENGTH"/>
@@ -1683,6 +1828,15 @@
             <Class class="BMFeaturizedEntityPropertiesAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsBMGeometricComponentPropertiesAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="BMGeometricComponentPropertiesAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsBMParametricCellSubElementAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -1863,6 +2017,24 @@
             <Class class="CrossFrameHolderAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsCrossFrameTubsAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="CrossFrameTubsAspect"/>
+        </Target>
+    </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsCrossFrameTubsGroupAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="CrossFrameTubsGroupAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsCustomAbutmentAnalyticalAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -1980,6 +2152,15 @@
             <Class class="CustomPierBySupportLineRuleAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsDeckAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="DeckAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsCustomPierCapAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -2092,18 +2273,18 @@
         <ECProperty propertyName="FieldSplice_TopFlangeInsidePlateWidth" typeName="double" displayLabel="TF Inside Plate Width" category="TopFlangePlatesProperties_Top_Flange_Plates_Properties" priority="299994" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_TopFlangeInsidePlateThickness" typeName="double" displayLabel="TF Inside Plate Thickness" category="TopFlangePlatesProperties_Top_Flange_Plates_Properties" priority="299993" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_TopFlangeBolts" typeName="int" displayLabel="TF Bolts" category="TopFlangePlatesProperties_Top_Flange_Plates_Properties" priority="299992"/>
+        <ECProperty propertyName="FieldSplice_TopFlangeChamfer" typeName="double" displayLabel="TF Chamfer" category="TopFlangePlatesProperties_Top_Flange_Plates_Properties" priority="299991" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_BottomFlangePlateLength" typeName="double" displayLabel="BF Plate Length" category="BottomFlangePlatesProperties_Bottom_Flange_Plates_Properties" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_BottomFlangeOutsidePlateWidth" typeName="double" displayLabel="BF Outside Plate Width" category="BottomFlangePlatesProperties_Bottom_Flange_Plates_Properties" priority="299989" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_BottomFlangeOutsidePlateTickness" typeName="double" displayLabel="BF Outside Plate Thickness" category="BottomFlangePlatesProperties_Bottom_Flange_Plates_Properties" priority="299988" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_BottomFlangeInsidePlateWidth" typeName="double" displayLabel="BF Inside Plate Width" category="BottomFlangePlatesProperties_Bottom_Flange_Plates_Properties" priority="299987" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_BottomFlangeInsidePlateThickness" typeName="double" displayLabel="BF Inside Plate Thickness" category="BottomFlangePlatesProperties_Bottom_Flange_Plates_Properties" priority="299986" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_BottomFlangeBolts" typeName="int" displayLabel="BF Bolts" category="BottomFlangePlatesProperties_Bottom_Flange_Plates_Properties" priority="299985"/>
+        <ECProperty propertyName="FieldSplice_BottomFlangeChamfer" typeName="double" displayLabel="BF Chamfer" category="BottomFlangePlatesProperties_Bottom_Flange_Plates_Properties" priority="299984" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_WebPlateLength" typeName="double" displayLabel="Web Plate Length" category="WebPlatesbProperties_Web_Plates_Properties" priority="299983" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_WebOutsidePlateHeight" typeName="double" displayLabel="Web Plate Height" category="WebPlatesbProperties_Web_Plates_Properties" priority="299982" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_WebOutsidePlateTickness" typeName="double" displayLabel="Web Plate Thickness" category="WebPlatesbProperties_Web_Plates_Properties" priority="299981" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="FieldSplice_WebBolts" typeName="int" displayLabel="Web Bolts" category="WebPlatesbProperties_Web_Plates_Properties" priority="299980"/>
-        <ECProperty propertyName="FieldSplice_TopFlangeChamfer" typeName="double" displayLabel="TF Chamfer" category="TopFlangePlatesProperties_Top_Flange_Plates_Properties" priority="299991" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="FieldSplice_BottomFlangeChamfer" typeName="double" displayLabel="BF Chamfer" category="BottomFlangePlatesProperties_Bottom_Flange_Plates_Properties" priority="299984" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsFieldSpliceAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -2290,6 +2471,8 @@
         <ECProperty propertyName="Pier_PierCapMaterial" typeName="string" displayLabel="Cap Material" category="BridgeModelerAttributes_Material_Material" priority="299950"/>
         <ECProperty propertyName="Pier_ColumnMaterial" typeName="string" displayLabel="Column Material" category="BridgeModelerAttributes_Material_Material" priority="299949"/>
         <ECProperty propertyName="Pier_FootingMaterial" typeName="string" displayLabel="Footing Material" category="BridgeModelerAttributes_Material_Material" priority="299948"/>
+        <ECProperty propertyName="Pier_ConcretePadMaterial" typeName="string" displayLabel="Concrete Pad Material" category="BridgeModelerAttributes_Material_Material" priority="299947"/>
+        <ECProperty propertyName="Pier_HPileEncasementMaterial" typeName="string" displayLabel="Pile Encasement Material" category="BridgeModelerAttributes_Material_Material" priority="299946"/>
         <ECProperty propertyName="Pier_PileMaterial" typeName="string" displayLabel="Pile Material" category="BridgeModelerAttributes_Material_Material" priority="299945"/>
         <ECProperty propertyName="Pier_PierCapBuildOrder" typeName="int" displayLabel="Pier Cap Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299950">
             <ECCustomAttributes>
@@ -2306,18 +2489,16 @@
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="Pier_PileBuildOrder" typeName="int" displayLabel="Pile Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299946">
+        <ECProperty propertyName="Pier_ConcretePadBuildOrder" typeName="int" displayLabel="Concrete Pad Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299947">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="Pier_ConcretePadMaterial" typeName="string" displayLabel="Concrete Pad Material" category="BridgeModelerAttributes_Material_Material" priority="299947"/>
-        <ECProperty propertyName="Pier_ConcretePadBuildOrder" typeName="int" displayLabel="Concrete Pad Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299947">
+        <ECProperty propertyName="Pier_PileBuildOrder" typeName="int" displayLabel="Pile Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299946">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="Pier_HPileEncasementMaterial" typeName="string" displayLabel="Pile Encasement Material" category="BridgeModelerAttributes_Material_Material" priority="299946"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPierAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -2332,11 +2513,11 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="PierBell_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_General" priority="299950"/>
         <ECProperty propertyName="PierBell_SupportName" typeName="string" displayLabel="Support Name" category="BridgeModelerAttributes_General" priority="299940"/>
+        <ECProperty propertyName="PierBell_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
         <ECProperty propertyName="PierBell_TopDiameter" typeName="double" displayLabel="Bell Top Diameter" category="BellProperties_Bell" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierBell_BottomDiameter" typeName="double" displayLabel="Bell Bottom Diameter" category="BellProperties_Bell" priority="-1" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierBell_SlopedHeight" typeName="double" displayLabel="Bell Sloped Height" category="BellProperties_Bell" priority="-2" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierBell_StraightHeight" typeName="double" displayLabel="Bell Straight Height" category="BellProperties_Bell" priority="-3" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="PierBell_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPierBellAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -2378,13 +2559,13 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="PierCheekWall_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_General" priority="299950"/>
         <ECProperty propertyName="PierCheekWall_SupportName" typeName="string" displayLabel="Support Name" category="BridgeModelerAttributes_General" priority="299940"/>
+        <ECProperty propertyName="PierCheekWall_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
         <ECProperty propertyName="PierCheekWall_Height" typeName="double" displayLabel="Height" category="CheekWallProperties_Cheek_Wall" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierCheekWall_TopLength" typeName="double" displayLabel="Top Length" category="CheekWallProperties_Cheek_Wall" priority="-1" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierCheekWall_BtmLength" typeName="double" displayLabel="Bottom Length" category="CheekWallProperties_Cheek_Wall" priority="-2" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierCheekWall_Width" typeName="double" displayLabel="Width" category="CheekWallProperties_Cheek_Wall" priority="-3" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierCheekWall_WidthOffset" typeName="double" displayLabel="Width Offset" category="CheekWallProperties_Cheek_Wall" priority="-4" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierCheekWall_LengthOffset" typeName="double" displayLabel="Length Offset" category="CheekWallProperties_Cheek_Wall" priority="-5" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="PierCheekWall_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
         <ECProperty propertyName="PierCheekWall_TopElevation" typeName="double" displayLabel="Top Elevation" category="CheekWallProperties_Cheek_Wall" priority="-6" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPierCheekWallAspect" modifier="None" strength="embedding">
@@ -2413,12 +2594,12 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="PierCrashWall_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_General" priority="299950"/>
         <ECProperty propertyName="PierCrashWall_SupportName" typeName="string" displayLabel="Support Name" category="BridgeModelerAttributes_General" priority="299940"/>
+        <ECProperty propertyName="PierCrashWall_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
         <ECProperty propertyName="PierCrashWall_WallExtraLengthTop" typeName="double" displayLabel="Wall Extra Length Top" category="CrashWallProperties_Crash_Wall" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierCrashWall_WallExtraLengthBottom" typeName="double" displayLabel="Wall Extra Length Bottom" category="CrashWallProperties_Crash_Wall" priority="-1" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierCrashWall_WallThicknessTop" typeName="double" displayLabel="Wall Thickness Top" category="CrashWallProperties_Crash_Wall" priority="-2" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierCrashWall_WallThicknessBottom" typeName="double" displayLabel="Wall Thickness Bottom" category="CrashWallProperties_Crash_Wall" priority="-3" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierCrashWall_WallHeight" typeName="double" displayLabel="Wall Height" category="CrashWallProperties_Crash_Wall" priority="-4" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="PierCrashWall_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPierCrashWallAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -2429,6 +2610,19 @@
             <Class class="PierCrashWallAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECEntityClass typeName="PierCustomAspect">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="PierCustom_PierName" typeName="string" displayLabel="Pier Name" category="BridgeModelerAttributes_General" priority="299950"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsPierCustomAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="PierCustomAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="PierFootingSlopedExtraTopLengthAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Pierfooting_SlopedExtraTopLength" typeName="double" displayLabel="Top Extra Length" category="FootingProperties_Footing" priority="-14" kindOfQuantity="cifu:LENGTH"/>
@@ -2457,13 +2651,57 @@
             <Class class="PierFootingWithConcretePadAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECEntityClass typeName="PierPileAspect">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="PierPile_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_General" priority="299950"/>
+        <ECProperty propertyName="PierPile_SupportName" typeName="string" displayLabel="Support Name" category="BridgeModelerAttributes_General" priority="299940"/>
+        <ECProperty propertyName="PierPile_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
+        <ECProperty propertyName="PierPile_PileType" typeName="PileBaseAspect_Pile_Type_Enum" displayLabel="Pile Shape" category="PileProperties_Pile" priority="0"/>
+        <ECProperty propertyName="PierPile_PileTypeText" typeName="string" displayLabel="Pile Shape Text" category="PileProperties_Pile" priority="-1"/>
+        <ECProperty propertyName="PierPile_PileLength" typeName="double" displayLabel="Pile Length" category="PileProperties_Pile" priority="-2" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_TopMargin" typeName="double" displayLabel="Top Margin" category="PileProperties_Pile" priority="-3" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_BottomMargin" typeName="double" displayLabel="Bottom Margin" category="PileProperties_Pile" priority="-4" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_LeftMargin" typeName="double" displayLabel="Left Margin" category="PileProperties_Pile" priority="-5" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_RightMargin" typeName="double" displayLabel="Right Margin" category="PileProperties_Pile" priority="-6" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_TopElevation" typeName="double" displayLabel="Top Elevation" category="PileProperties_Pile" priority="-7" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_BottomElevation" typeName="double" displayLabel="Bottom Elevation" category="PileProperties_Pile" priority="-8" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_BottomAngleXAdjustment" typeName="double" displayLabel="Longitudinal Angle" category="PileProperties_Pile" priority="-9" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="PierPile_BottomAngleYAdjustment" typeName="double" displayLabel="Transverse Angle" category="PileProperties_Pile" priority="-10" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="PierPile_PileWidth" typeName="double" displayLabel="Pile Width" category="PileProperties_Pile" priority="-11" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_PileDepth" typeName="double" displayLabel="Pile Depth" category="PileProperties_Pile" priority="-12" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_PileDiameter" typeName="double" displayLabel="Pile Diameter" category="PileProperties_Pile" priority="-13" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_OutsideDiameter" typeName="double" displayLabel="Outside Diameter" category="PileProperties_Pile" priority="-14" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_WallThickness" typeName="double" displayLabel="Wall Thickness" category="PileProperties_Pile" priority="-15" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_EmbedDepth" typeName="double" displayLabel="Embed Length" category="PileProperties_Pile" priority="-16" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_ThicknessOutside" typeName="double" displayLabel="Flange Thickness" category="PileProperties_Pile" priority="-17" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_ThicknessInside" typeName="double" displayLabel="Web Thickness" category="PileProperties_Pile" priority="-18" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_RotationAngle" typeName="double" displayLabel="Rotation" category="PileProperties_Pile" priority="-19" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="PierPile_Template" typeName="string" displayLabel="Template" category="PileProperties_Pile" priority="-20"/>
+        <ECProperty propertyName="PierPile_X" typeName="double" displayLabel="X" category="PileProperties_Pile" priority="-21" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_Y" typeName="double" displayLabel="Y" category="PileProperties_Pile" priority="-22" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_PileWeight" typeName="double" displayLabel="Pile Weight" category="PileProperties_Pile" priority="-23" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_EncasementShape" typeName="string" displayLabel="Encasement Shape" category="PileProperties_Pile" priority="-24"/>
+        <ECProperty propertyName="PierPile_EncasementDimension" typeName="double" displayLabel="Encasement Dimension" category="PileProperties_Pile" priority="-25" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_EncasementLength" typeName="double" displayLabel="Encasement Length" category="PileProperties_Pile" priority="-26" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PierPile_Station" typeName="double" displayLabel="Station" category="PileProperties_Pile" priority="-27" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="PierPile_Offset" typeName="double" displayLabel="Offset" category="PileProperties_Pile" priority="-28" kindOfQuantity="cifu:LENGTH"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsPierPileAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="PierPileAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="PierRockSocketAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="PierRockSocket_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_General" priority="299950"/>
         <ECProperty propertyName="PierRockSocket_SupportName" typeName="string" displayLabel="Support Name" category="BridgeModelerAttributes_General" priority="299940"/>
+        <ECProperty propertyName="PierRockSocket_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
         <ECProperty propertyName="PierRockSocket_Diameter" typeName="double" displayLabel="Rock Socket Diameter" category="RockSocketProperties_Rock_Socket" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierRockSocket_Length" typeName="double" displayLabel="Rock Socket Length" category="RockSocketProperties_Rock_Socket" priority="-1" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="PierRockSocket_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPierRockSocketAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -2478,6 +2716,7 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="PierStrut_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_General" priority="299950"/>
         <ECProperty propertyName="PierStrut_SupportName" typeName="string" displayLabel="Support Name" category="BridgeModelerAttributes_General" priority="299940"/>
+        <ECProperty propertyName="PierStrut_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
         <ECProperty propertyName="PierStrut_Height" typeName="double" displayLabel="Height" category="StrutProperties_Strut" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierStrut_Depth" typeName="double" displayLabel="Depth" category="StrutProperties_Strut" priority="-1" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierStrut_OffsetFromCap" typeName="double" displayLabel="Offset From Cap" category="StrutProperties_Strut" priority="-2" kindOfQuantity="cifu:LENGTH"/>
@@ -2485,7 +2724,6 @@
         <ECProperty propertyName="PierStrut_ExtensionLength" typeName="double" displayLabel="Extension Length" category="StrutProperties_Strut" priority="-4" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PierStrut_StartCol" typeName="int" displayLabel="Start Column" category="StrutProperties_Strut" priority="-5"/>
         <ECProperty propertyName="PierStrut_EndCol" typeName="int" displayLabel="End Column" category="StrutProperties_Strut" priority="-6"/>
-        <ECProperty propertyName="PierStrut_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPierStrutAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -2739,7 +2977,11 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SegmentalBalance_Name" typeName="string" displayLabel="Name" category="SegmentalBalancedCategory_Segmental_Cantilever" priority="400000"/>
         <ECProperty propertyName="SegmentalBalance_Description" typeName="string" displayLabel="Description" category="SegmentalBalancedCategory_Segmental_Cantilever" priority="399999"/>
-        <ECProperty propertyName="SegmentalBalance_TemplateName" typeName="string" displayLabel="Template Name" category="SegmentalBalancedCategory_Segmental_Cantilever" priority="399998"/>
+        <ECProperty propertyName="SegmentalBalance_TemplateName" typeName="string" displayLabel="Template Name" category="SegmentalBalancedCategory_Segmental_Cantilever" priority="399998">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
         <ECProperty propertyName="SegmentalBalance_NumberOfSeg" typeName="int" displayLabel="Number Of Segments" category="SegmentalBalancedCategory_Segmental_Cantilever" priority="399916"/>
         <ECProperty propertyName="SegmentalBalance_Volume" typeName="double" displayLabel="Volume" category="SegmentalBalancedCategory_Segmental_Cantilever" priority="399906" kindOfQuantity="cifu:VOLUME"/>
         <ECProperty propertyName="SegmentalBalance_SurfaceArea" typeName="double" displayLabel="Surface Area" category="SegmentalBalancedCategory_Segmental_Cantilever" priority="399896" kindOfQuantity="cifu:AREA"/>
@@ -2999,6 +3241,7 @@
         <ECProperty propertyName="ShearConnectorsHolder_Diameter" typeName="double" displayLabel="Stud Diameter" category="ShearConnectorTemplateProperties_Shear_Stud_Template_Properties" priority="299992" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ShearConnectorsHolder_HeadDiameter" typeName="double" displayLabel="Head Diameter" category="ShearConnectorTemplateProperties_Shear_Stud_Template_Properties" priority="299991" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ShearConnectorsHolder_Length" typeName="double" displayLabel="&lt;- TotalLength -&gt;" category="ShearConnectorTemplateProperties_Shear_Stud_Template_Properties" priority="299990" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="ShearConnectorsHolder_TotalNumber" typeName="int" displayLabel="Total Studs Number" category="ConnectorGroupArrangementProperties_Shear_Studs_Group_Properties" priority="299989"/>
         <ECProperty propertyName="ShearConnectorsHolder_TotalWeight" typeName="double" displayLabel="Total Components Weight" category="ConnectorGroupArrangementProperties_Shear_Studs_Group_Properties" priority="299988" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ShearConnectorsHolder_TotalVolume" typeName="double" displayLabel="Total Components Volume" category="ConnectorGroupArrangementProperties_Shear_Studs_Group_Properties" priority="299987" kindOfQuantity="cifu:VOLUME"/>
         <ECProperty propertyName="ShearConnectorsHolder_LayoutDefinition" typeName="string" displayLabel="Shear Studs Placement" category="ConnectorGroupArrangementProperties_Shear_Studs_Group_Properties" priority="299986"/>
@@ -3007,7 +3250,6 @@
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="ShearConnectorsHolder_TotalNumber" typeName="int" displayLabel="Total Studs Number" category="ConnectorGroupArrangementProperties_Shear_Studs_Group_Properties" priority="299989"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsShearConnectorsHolderAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -3022,7 +3264,11 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SleeperSlab_Name" typeName="string" displayLabel="Name" category="SleeperSlabProperties_Sleeper_Slab" priority="400000"/>
         <ECProperty propertyName="SleeperSlab_Description" typeName="string" displayLabel="Description" category="SleeperSlabProperties_Sleeper_Slab" priority="399999"/>
-        <ECProperty propertyName="SleeperSlab_TemplateName" typeName="string" displayLabel="Template Name" category="SleeperSlabProperties_Sleeper_Slab" priority="200000"/>
+        <ECProperty propertyName="SleeperSlab_TemplateName" typeName="string" displayLabel="Template Name" category="SleeperSlabProperties_Sleeper_Slab" priority="200000">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
         <ECProperty propertyName="SleeperSlab_Length" typeName="double" displayLabel="Length" category="SleeperSlabProperties_Sleeper_Slab" priority="199999" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="SleeperSlab_Width" typeName="double" displayLabel="Width" category="SleeperSlabProperties_Sleeper_Slab" priority="199998" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="SleeperSlab_Height" typeName="double" displayLabel="Height" category="SleeperSlabProperties_Sleeper_Slab" priority="199997" kindOfQuantity="cifu:LENGTH"/>
@@ -3051,6 +3297,7 @@
     </ECRelationshipClass>
     <ECEntityClass typeName="SleeperSlabByApproachRuleAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="SleeperSlabByApproachRuleLocation" typeName="SleeperSlabByApproachRuleAspect_SleeperSlabByApproachRuleLocation_Enum" displayLabel="Location" category="SleeperSlabProperties_Sleeper_Slab" priority="300000"/>
         <ECProperty propertyName="SleeperSlabByApproachRuleTemplateXmlFragment" typeName="string" displayLabel="Sleeper Slab Template" category="SleeperSlabProperties_Sleeper_Slab" priority="299999"/>
         <ECProperty propertyName="SleeperSlabByApproachRule_ElevationConstraints" typeName="string" displayLabel="Elevation Constraints" category="SleeperSlabProperties_Sleeper_Slab" priority="299998"/>
         <ECProperty propertyName="SleeperSlabByApproachRuleHorizontalOffset" typeName="double" displayLabel="Horizontal Offset" category="SleeperSlabProperties_Sleeper_Slab" priority="299997" kindOfQuantity="cifu:LENGTH"/>
@@ -3061,7 +3308,6 @@
         <ECProperty propertyName="SleeperSlabByApproachRuleVertOffsetFromApproachSlabBot" typeName="double" displayLabel="Vertical Offset From Slab Bottom" category="SleeperSlabProperties_Sleeper_Slab" priority="299992" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="SleeperSlabByApproachRule_LengthAdjustment" typeName="SleeperSlabByApproachRuleAspect_SleeperSlabByApproachRule_LengthAdjustment_Enum" displayLabel="Sleeper Length Adjustment" category="SleeperSlabProperties_Sleeper_Slab" priority="299991"/>
         <ECProperty propertyName="SleeperSlabByApproachRuleApplySkewToSolids" typeName="boolean" displayLabel="Apply Skew To Solids" category="SleeperSlabProperties_Sleeper_Slab" priority="299990"/>
-        <ECProperty propertyName="SleeperSlabByApproachRuleLocation" typeName="SleeperSlabByApproachRuleAspect_SleeperSlabByApproachRuleLocation_Enum" displayLabel="Location" category="SleeperSlabProperties_Sleeper_Slab" priority="300000"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsSleeperSlabByApproachRuleAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -3107,9 +3353,10 @@
         <ECProperty propertyName="SteelBeamConcreteDiaphragmRule_BlockOutHeight" typeName="double" displayLabel="BlockOut Height" category="ConcreteSteelBeamDiaphragmProperties_Concrete_Diaphragm" priority="299992" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="SteelBeamConcreteDiaphragmRule_BlockOutLength" typeName="double" displayLabel="BlockOut Length" category="ConcreteSteelBeamDiaphragmProperties_Concrete_Diaphragm" priority="299991" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="SteelBeamConcreteDiaphragmRule_BlockOutWidth" typeName="double" displayLabel="BlockOut Offset" category="ConcreteSteelBeamDiaphragmProperties_Concrete_Diaphragm" priority="299990" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="SteelBeamConcreteDiaphragmRule_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299907"/>
         <ECProperty propertyName="SteelBeamConcreteDiaphragmRule_BottomSlope" typeName="SteelBeamConcreteDiaphragmRuleAspect_SteelBeamConcreteDiaphragmRule_BottomSlope_Enum" displayLabel="Bottom Slope" category="ConcreteSteelBeamDiaphragmProperties_Concrete_Diaphragm" priority="299989"/>
         <ECProperty propertyName="SteelBeamConcreteDiaphragmRule_ChamferDim" typeName="double" displayLabel="Chamfer Dim" category="ConcreteSteelBeamDiaphragmProperties_Concrete_Diaphragm" priority="299988" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="SteelBeamConcreteDiaphragmRule_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299907"/>
+        <ECProperty propertyName="SteelBeamConcreteDiaphragmRule_ApplySkewToSolid" typeName="boolean" displayLabel="Apply Skew To Solid" category="ConcreteSteelBeamDiaphragmProperties_Concrete_Diaphragm" priority="299987"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsSteelBeamConcreteDiaphragmRuleAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -3164,6 +3411,21 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SupportLine_Name" typeName="string" displayLabel="Name" category="SupportLineProperties_SupportLine" priority="299950"/>
         <ECProperty propertyName="SupportLine_Description" typeName="string" displayLabel="Description" category="SupportLineProperties_SupportLine" priority="299940"/>
+        <ECProperty propertyName="SupportLine_SyncId" typeName="string" displayLabel="SyncId" category="SupportLineProperties_SupportLine" priority="299930"/>
+        <ECProperty propertyName="SupportLine_Length" typeName="double" displayLabel="Length" category="SupportLineProperties_SupportLine" priority="299999" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="SupportLine_Offset" typeName="double" displayLabel="Horizontal Offset" category="SupportLineProperties_SupportLine" priority="299998" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="SupportLine_DirectionInputMode" typeName="SupportLineAspect_SupportLine_DirectionInputMode_Enum" displayLabel="Direction Mode" category="SupportLineProperties_SupportLine" priority="299996"/>
+        <ECProperty propertyName="SupportLine_Direction" typeName="double" displayLabel="Direction" category="SupportLineProperties_SupportLine" priority="299995" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="SupportLine_DistanceAlong" typeName="double" displayLabel="&lt;- DistanceAlong -&gt;" category="SupportLineProperties_SupportLine" priority="299992" kindOfQuantity="cifu:LENGTH">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
+        <ECProperty propertyName="SupportLine_Station" typeName="double" displayLabel="Station" category="SupportLineProperties_SupportLine" priority="299997" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="SupportLine_Skew" typeName="double" displayLabel="Skew" category="SupportLineProperties_SupportLine" priority="299994" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="SupportLine_TargetLineStartPoint" typeName="point3d" displayLabel="Start Point" category="SupportLineProperties_SupportLine" priority="299993"/>
+        <ECProperty propertyName="SupportLine_BackSpanLength" typeName="double" displayLabel="Back Span Length" category="SupportLineProperties_SupportLine" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="SupportLine_AheadSpanLength" typeName="double" displayLabel="Ahead Span Length" category="SupportLineProperties_SupportLine" priority="299992" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsSupportLineAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -3177,13 +3439,17 @@
     <ECEntityClass typeName="SupportLineBtMidPointRuleAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SupportLineBtMidPointRule_Length" typeName="double" displayLabel="Length" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299999" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="SupportLineBtMidPointRule_DirectionInputMode" typeName="SupportLineBtMidPointRuleAspect_SupportLineBtMidPointRule_DirectionInputMode_Enum" displayLabel="Direction Mode" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299996"/>
+        <ECProperty propertyName="SupportLineBtMidPointRule_DirectionInputMode" typeName="SupportLineBtMidPointRuleAspect_SupportLineBtMidPointRule_DirectionInputMode_Enum" displayLabel="Direction Mode" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299996">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
         <ECProperty propertyName="SupportLineBtMidPointRule_Direction" typeName="double" displayLabel="Direction" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299995" kindOfQuantity="cifu:BEARING"/>
         <ECProperty propertyName="SupportLineBtMidPointRule_StationAlong" typeName="double" displayLabel="Distance Along" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299998" kindOfQuantity="cifu:LENGTH">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
-        </ECProperty>        
+        </ECProperty>
         <ECProperty propertyName="SupportLineBtMidPointRule_StationAlong_DistanceAlong" typeName="double" kindOfQuantity="cifu:STATION">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
@@ -3192,15 +3458,30 @@
                 </Deprecated>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="SupportLineBtMidPointRule_Skew" typeName="double" displayLabel="Skew" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299994" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="SupportLineBtMidPointRule_Skew" typeName="double" displayLabel="Skew" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299994" kindOfQuantity="cifu:ANGLE">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
         <ECProperty propertyName="SupportLineBtMidPointRule_TargetLineStartPoint" typeName="point3d" displayLabel="Start Point" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299993" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="SupportLineBtMidPointRule_DistanceAlong" typeName="double" displayLabel="&lt;- DistanceAlong -&gt;" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299992" kindOfQuantity="cifu:LENGTH">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+                <Deprecated xmlns="CoreCustomAttributes.01.00.04">
+                    <Description>Unnecessary duplicate-property. Use 'SupportLineBtMidPointRule_StationAlong' directly</Description>
+                </Deprecated>
+            </ECCustomAttributes>
+        </ECProperty>
+        <ECProperty propertyName="SupportLineBtMidPointRule_Offset" typeName="double" displayLabel="Horizontal Offset" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299998" kindOfQuantity="cifu:LENGTH">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
+        <ECProperty propertyName="SupportLineBtMidPointRule_Station" typeName="double" displayLabel="Station" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299997" kindOfQuantity="cifu:STATION">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="SupportLineBtMidPointRule_Station" typeName="double" displayLabel="Station" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299997" kindOfQuantity="cifu:STATION"/>
-        <ECProperty propertyName="SupportLineBtMidPointRule_Offset" typeName="double" displayLabel="Horizontal Offset" category="SupportLineRuleAttributes_SupportLine_Rule" priority="299998" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsSupportLineBtMidPointRuleAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -3380,11 +3661,33 @@
             <Class class="TransverseStiffenerGroupAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECEntityClass typeName="TubGirderAspect">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="TubGirder_Definition" typeName="string" displayLabel="Tub Girder Definition" category="BridgeModelerAttributes_Tub_Girder" priority="299999"/>
+        <ECProperty propertyName="TubGirder_Rotation" typeName="double" displayLabel="Rotation" category="BridgeModelerAttributes_Tub_Girder" priority="299998" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="TubGirder_ProjectedLength" typeName="double" displayLabel="Projected Length" category="BridgeModelerAttributes_Tub_Girder" priority="299997" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="TubGirder_SpanName" typeName="string" displayLabel="Span Name" category="BridgeModelerAttributes_Tub_Girder" priority="299996"/>
+        <ECProperty propertyName="TubGirder_Name" typeName="string" displayLabel="Beam Name" category="BridgeModelerAttributes_Tub_Girder" priority="299995"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsTubGirderAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="TubGirderAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="TubGirderGroupAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="TubGirderGroup_Name" typeName="string" displayLabel="Name" category="TubGirderGroupProperties_Tub_Girder_Group_Properties" priority="299950"/>
         <ECProperty propertyName="TubGirderGroup_Description" typeName="string" displayLabel="Description" category="TubGirderGroupProperties_Tub_Girder_Group_Properties" priority="299949"/>
         <ECProperty propertyName="TubGirderGroup_GirderDefinition" typeName="string" displayLabel="Tub Girder Definition" category="TubGirderGroupProperties_Tub_Girder_Group_Properties" priority="299930"/>
+        <ECProperty propertyName="TubGirderGroup_BridgeName" typeName="string" displayLabel="Bridge Name" category="BridgeModelerAttributes_General" priority="299910"/>
+        <ECProperty propertyName="TubGirderGroup_BridgeDescription" typeName="string" displayLabel="Bridge Description" category="BridgeModelerAttributes_General" priority="299909"/>
+        <ECProperty propertyName="TubGirderGroup_BridgeStructureNumber" typeName="string" displayLabel="Bridge Structure #" category="BridgeModelerAttributes_General" priority="299908"/>
+        <ECProperty propertyName="TubGirderGroup_StateID" typeName="string" displayLabel="State Element Number" category="BridgeModelerAttributes_General" priority="299907"/>
+        <ECProperty propertyName="TubGirderGroup_NBIID" typeName="string" displayLabel="NBI Element Number" category="BridgeModelerAttributes_General" priority="299906"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsTubGirderGroupAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -3512,6 +3815,7 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Wingwall_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_General" priority="299950"/>
         <ECProperty propertyName="Wingwall_SupportName" typeName="string" displayLabel="Support Name" category="BridgeModelerAttributes_General" priority="299940"/>
+        <ECProperty propertyName="Wingwall_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
         <ECProperty propertyName="Wingwall_Length" typeName="double" displayLabel="Length" category="WingwallProperties_Wingwall" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Wingwall_Height" typeName="double" displayLabel="Height" category="WingwallProperties_Wingwall" priority="-1" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Wingwall_TopHorizontalOffset" typeName="double" displayLabel="Top Horizontal Offset" category="WingwallProperties_Wingwall" priority="-2" kindOfQuantity="cifu:LENGTH"/>
@@ -3522,7 +3826,6 @@
         <ECProperty propertyName="Wingwall_BtmThickness" typeName="double" displayLabel="Bottom Thickness" category="WingwallProperties_Wingwall" priority="-7" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Wingwall_AdditionalBtmVertOffset" typeName="double" displayLabel="Additional Bottom Vertical Offset" category="WingwallProperties_Wingwall" priority="-8" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Wingwall_FootingOffset" typeName="double" displayLabel="Footing Offset" category="WingwallProperties_Wingwall" priority="-9" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="Wingwall_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
         <ECProperty propertyName="Wingwall_UseTopSlope" typeName="boolean" displayLabel="Use Top Slope" category="WingwallProperties_Wingwall" priority="-10"/>
         <ECProperty propertyName="Wingwall_TopSlope" typeName="string" displayLabel="Top Slope" category="WingwallProperties_Wingwall" priority="-11"/>
         <ECProperty propertyName="Wingwall_TopElevation" typeName="double" displayLabel="Top Elevation" category="WingwallProperties_Wingwall" priority="-12" kindOfQuantity="cifu:LENGTH"/>
@@ -3558,9 +3861,13 @@
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="WingWallByAbutmentRuleTemplateName" typeName="string" displayLabel="Template Name" category="AbutmentWingWallRuleAttributes_Abutment_Wingwall_Placement_Rule" priority="299983"/>
         <ECProperty propertyName="WingWallByAbutmentRuleAlignWithFrontFaceOfBackWall" typeName="boolean" displayLabel="Align With FFBW" category="AbutmentWingWallRuleAttributes_Abutment_Wingwall_Placement_Rule" priority="299995"/>
         <ECProperty propertyName="WingWallByAbutmentRuleUseSlopeFromProfile" typeName="boolean" displayLabel="Use Slope From Profile" category="AbutmentWingWallRuleAttributes_Abutment_Wingwall_Placement_Rule" priority="299992"/>
+        <ECProperty propertyName="WingWallByAbutmentRuleTemplateName" typeName="string" displayLabel="Template Name" category="AbutmentWingWallRuleAttributes_Abutment_Wingwall_Placement_Rule" priority="299983">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsWingWallByAbutmentRuleAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -3575,6 +3882,7 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="WingwallFooting_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_General" priority="299950"/>
         <ECProperty propertyName="WingwallFooting_SupportName" typeName="string" displayLabel="Support Name" category="BridgeModelerAttributes_General" priority="299940"/>
+        <ECProperty propertyName="WingwallFooting_Material" typeName="string" displayLabel="Footing Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
         <ECProperty propertyName="WingwallFooting_TopElevation" typeName="double" displayLabel="Top Elevation" category="FootingProperties_Footing" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="WingwallFooting_Sloped" typeName="boolean" displayLabel="Sloped" category="FootingProperties_Footing" priority="-1"/>
         <ECProperty propertyName="WingwallFooting_Width" typeName="double" displayLabel="Width" category="FootingProperties_Footing" priority="-2" kindOfQuantity="cifu:LENGTH"/>
@@ -3583,7 +3891,8 @@
         <ECProperty propertyName="WingwallFooting_SlopeHeight" typeName="double" displayLabel="Slope Depth" category="FootingProperties_Footing" priority="-5" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="WingwallFooting_SlopedTopWidth" typeName="double" displayLabel="Top Width" category="FootingProperties_Footing" priority="-6" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="WingwallFooting_SlopedTopLength" typeName="double" displayLabel="Top Length" category="FootingProperties_Footing" priority="-7" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="WingwallFooting_Material" typeName="string" displayLabel="Footing Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
+        <ECProperty propertyName="WingwallFooting_Station" typeName="double" displayLabel="Station" category="FootingProperties_Footing" priority="-8" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="WingwallFooting_Offset" typeName="double" displayLabel="Offset" category="FootingProperties_Footing" priority="-9" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsWingwallFootingAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -3601,6 +3910,50 @@
         <ECProperty propertyName="Pile_ThicknessOutside" typeName="double" displayLabel="Flange Thickness" category="BridgeModelerAttributes_Pier" priority="-16" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Pile_ThicknessInside" typeName="double" displayLabel="Web Thickness" category="BridgeModelerAttributes_Pier" priority="-17" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
+    <ECEntityClass typeName="WingwallPileAspect">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="WingwallPile_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_General" priority="299950"/>
+        <ECProperty propertyName="WingwallPile_SupportName" typeName="string" displayLabel="Support Name" category="BridgeModelerAttributes_General" priority="299940"/>
+        <ECProperty propertyName="WingwallPile_Material" typeName="string" displayLabel="Material" category="BridgeModelerAttributes_Material_Material" priority="299930"/>
+        <ECProperty propertyName="WingwallPile_PileType" typeName="WingwallPileAspect_WingwallPile_PileType_Enum" displayLabel="Pile Shape" category="PileProperties_Pile" priority="0"/>
+        <ECProperty propertyName="WingwallPile_PileTypeText" typeName="string" displayLabel="Pile Shape Text" category="PileProperties_Pile" priority="-1"/>
+        <ECProperty propertyName="WingwallPile_PileLength" typeName="double" displayLabel="Pile Length" category="PileProperties_Pile" priority="-2" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_TopMargin" typeName="double" displayLabel="Top Margin" category="PileProperties_Pile" priority="-3" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_BottomMargin" typeName="double" displayLabel="Bottom Margin" category="PileProperties_Pile" priority="-4" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_LeftMargin" typeName="double" displayLabel="Left Margin" category="PileProperties_Pile" priority="-5" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_RightMargin" typeName="double" displayLabel="Right Margin" category="PileProperties_Pile" priority="-6" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_TopElevation" typeName="double" displayLabel="Top Elevation" category="PileProperties_Pile" priority="-7" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_BottomElevation" typeName="double" displayLabel="Bottom Elevation" category="PileProperties_Pile" priority="-8" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_BottomAngleXAdjustment" typeName="double" displayLabel="Longitudinal Angle" category="PileProperties_Pile" priority="-9" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="WingwallPile_BottomAngleYAdjustment" typeName="double" displayLabel="Transverse Angle" category="PileProperties_Pile" priority="-10" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="WingwallPile_PileWidth" typeName="double" displayLabel="Pile Width" category="PileProperties_Pile" priority="-11" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_PileDepth" typeName="double" displayLabel="Pile Depth" category="PileProperties_Pile" priority="-12" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_PileDiameter" typeName="double" displayLabel="Pile Diameter" category="PileProperties_Pile" priority="-13" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_OutsideDiameter" typeName="double" displayLabel="Outside Diameter" category="PileProperties_Pile" priority="-14" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_WallThickness" typeName="double" displayLabel="Wall Thickness" category="PileProperties_Pile" priority="-15" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_EmbedDepth" typeName="double" displayLabel="Embed Length" category="PileProperties_Pile" priority="-16" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_ThicknessOutside" typeName="double" displayLabel="Flange Thickness" category="PileProperties_Pile" priority="-17" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_ThicknessInside" typeName="double" displayLabel="Web Thickness" category="PileProperties_Pile" priority="-18" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_RotationAngle" typeName="double" displayLabel="Rotation" category="PileProperties_Pile" priority="-19" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="WingwallPile_Template" typeName="string" displayLabel="Template" category="PileProperties_Pile" priority="-20"/>
+        <ECProperty propertyName="WingwallPile_X" typeName="double" displayLabel="X" category="PileProperties_Pile" priority="-21" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_Y" typeName="double" displayLabel="Y" category="PileProperties_Pile" priority="-22" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_PileWeight" typeName="double" displayLabel="Pile Weight" category="PileProperties_Pile" priority="-23" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_EncasementShape" typeName="string" displayLabel="Encasement Shape" category="PileProperties_Pile" priority="-24"/>
+        <ECProperty propertyName="WingwallPile_EncasementDimension" typeName="double" displayLabel="Encasement Dimension" category="PileProperties_Pile" priority="-25" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_EncasementLength" typeName="double" displayLabel="Encasement Length" category="PileProperties_Pile" priority="-26" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="WingwallPile_Station" typeName="double" displayLabel="Station" category="PileProperties_Pile" priority="-27" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="WingwallPile_Offset" typeName="double" displayLabel="Offset" category="PileProperties_Pile" priority="-28" kindOfQuantity="cifu:LENGTH"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsWingwallPileAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="WingwallPileAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <PropertyCategory typeName="AbutmentWingWallRuleAttributes_Abutment_Wingwall_Placement_Rule" description="AbutmentWingWallRuleAttributes" displayLabel="Abutment Wingwall Placement Rule" priority="300000"/>
     <PropertyCategory typeName="AccessoryProperties_Accessory" description="AccessoryProperties" displayLabel="Accessory" priority="399999"/>
     <PropertyCategory typeName="AnalyticalProperties_Analytical" description="AnalyticalProperties" displayLabel="Analytical" priority="600"/>
@@ -3608,7 +3961,7 @@
     <PropertyCategory typeName="ApproachRefLineRuleAttributes_Approach_Reference_Line_Rule" description="ApproachRefLineRuleAttributes" displayLabel="Approach Reference Line Rule" priority="0"/>
     <PropertyCategory typeName="ApproachRefLineRuleAttributes_ApproachRefLineRule" description="ApproachRefLineRuleAttributes" displayLabel="&lt;- ApproachRefLineRule -&gt;" priority="0"/>
     <PropertyCategory typeName="ApproachSlabBreakbackProperties_Approach_Slab_Breakbacks" description="ApproachSlabBreakbackProperties" displayLabel="Approach Slab Breakbacks" priority="399997"/>
-    <PropertyCategory typeName="ApproachSlabProperties_Approach_Slab" description="ApproachSlabProperties" displayLabel="Approach Slab" priority="399999"/>
+    <PropertyCategory typeName="ApproachSlabProperties_Approach_Slab" description="ApproachSlabProperties" displayLabel="Approach Slab" priority="399998"/>
     <PropertyCategory typeName="AuxObjectRuleAttributes_Rule_Property" description="AuxObjectRuleAttributes" displayLabel="Rule Property" priority="300000"/>
     <PropertyCategory typeName="BarrierProperties_Barrier" description="BarrierProperties" displayLabel="Barrier" priority="300000"/>
     <PropertyCategory typeName="BeamGroupProperties_Beam_Group_Properties" description="BeamGroupProperties" displayLabel="Beam Group Properties" priority="300000"/>
@@ -3632,10 +3985,12 @@
     <PropertyCategory typeName="BridgeModelerAttributes_Custom_Pier" description="BridgeModelerAttributes" displayLabel="Custom Pier" priority="300000"/>
     <PropertyCategory typeName="BridgeModelerAttributes_Deck_Properties" description="BridgeModelerAttributes" displayLabel="Deck Properties" priority="300000"/>
     <PropertyCategory typeName="BridgeModelerAttributes_Excavation_Properties" description="BridgeModelerAttributes" displayLabel="Excavation Properties" priority="300000"/>
-    <PropertyCategory typeName="BridgeModelerAttributes_General" description="BridgeModelerAttributes" displayLabel="General" priority="300000"/>
+    <PropertyCategory typeName="BridgeModelerAttributes_General" description="BridgeModelerAttributes" displayLabel="General" priority="400000"/>
+    <PropertyCategory typeName="BridgeModelerAttributes_Geometric_Component" description="BridgeModelerAttributes" displayLabel="Geometric Component" priority="399999"/>
     <PropertyCategory typeName="BridgeModelerAttributes_Material_Material" description="BridgeModelerAttributes-Material" displayLabel="Material" priority="100000"/>
     <PropertyCategory typeName="BridgeModelerAttributes_Pier" description="BridgeModelerAttributes" displayLabel="Pier" priority="300000"/>
     <PropertyCategory typeName="BridgeModelerAttributes_SupportLine" description="BridgeModelerAttributes" displayLabel="SupportLine" priority="300000"/>
+    <PropertyCategory typeName="BridgeModelerAttributes_Tub_Girder" description="BridgeModelerAttributes" displayLabel="Tub Girder" priority="300000"/>
     <PropertyCategory typeName="BridgeModelerAttributes_Unit" description="BridgeModelerAttributes" displayLabel="Unit" priority="300000"/>
     <PropertyCategory typeName="CapProperties_Cap" description="CapProperties" displayLabel="Cap" priority="399999"/>
     <PropertyCategory typeName="CheekWallProperties_Cheek_Wall" description="CheekWallProperties" displayLabel="Cheek Wall" priority="399999"/>
@@ -3653,7 +4008,7 @@
     <PropertyCategory typeName="CustomPierRuleAttributes_Rule_Property" description="CustomPierRuleAttributes" displayLabel="Rule Property" priority="300000"/>
     <PropertyCategory typeName="DeckBreakbackProperties_Deck_Breakbacks" description="DeckBreakbackProperties" displayLabel="Deck Breakbacks" priority="399998"/>
     <PropertyCategory typeName="DeckByMultiTemplateRuleAttributes_Rule_Property" description="DeckByMultiTemplateRuleAttributes" displayLabel="Rule Property" priority="300000"/>
-    <PropertyCategory typeName="DeckProperties_Deck" description="DeckProperties" displayLabel="Deck" priority="300000"/>
+    <PropertyCategory typeName="DeckProperties_Deck" description="DeckProperties" displayLabel="Deck" priority="399999"/>
     <PropertyCategory typeName="ExcavationRuleAttributes_Excavation_Rule" description="ExcavationRuleAttributes" displayLabel="Excavation Rule" priority="299999"/>
     <PropertyCategory typeName="FieldSpliceComponentProperties_Field_Splice_Component_Properties" description="FieldSpliceComponentProperties" displayLabel="Field Splice Component Properties" priority="300000"/>
     <PropertyCategory typeName="FieldSpliceGroupProperties_Field_Splice_Group" description="FieldSpliceGroupProperties" displayLabel="Field Splice Group" priority="300000"/>
diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
index 8b6d4cdf2..9b235e76a 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
@@ -4,9 +4,9 @@
 |  * See LICENSE.md in the project root for license terms and full copyright notice.
 ======================================================================================= -->
 <ECSchema schemaName="CifCommon" alias="cifcmn" version="01.00.16" description="iModel Connector schema containing aspect classes with common properties from Civil Infrastructure Framework (CIF) applications." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-    <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
+    <ECSchemaReference name="BisCore" version="01.00.25" alias="bis"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
-    <ECSchemaReference name="CifUnits" version="01.00.08" alias="cifu"/>
+    <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECCustomAttributes>
         <ProductionStatus xmlns="CoreCustomAttributes.01.00.04">
@@ -153,7 +153,7 @@
     <ECEntityClass typeName="CivilPresentation" modifier="Abstract">
         <BaseClass>bis:ElementUniqueAspect</BaseClass>
     </ECEntityClass>
-    <ECEntityClass typeName="ApplyTemplateCorridorAspect">
+    <ECEntityClass typeName="ApplyTemplateCorridorAspect" displayLabel="Apply Template Corridor">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="Corridor_Corridor" priority="299999"/>
         <ECProperty propertyName="HorizontalName" typeName="string" displayLabel="Horizontal Name" category="Corridor_Corridor" priority="299998"/>
@@ -162,7 +162,7 @@
         <ECProperty propertyName="Mirror" typeName="ApplyTemplateCorridorAspect_Mirror_BoolEnum" displayLabel="Mirror" category="Corridor_Corridor" priority="-5"/>
         <ECProperty propertyName="Reflect" typeName="ApplyTemplateCorridorAspect_Reflect_BoolEnum" displayLabel="Reflect" category="Corridor_Corridor" priority="-6"/>
     </ECEntityClass>
-    <ECEntityClass typeName="LinearElementAspect">
+    <ECEntityClass typeName="LinearElementAspect" displayLabel="Linear Element">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="LinearElement_Length" typeName="double" displayLabel="Length" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_StartPoint" typeName="point3d" displayLabel="Start Point" category="GeometryAttributes_Geometry" priority="299990" kindOfQuantity="cifu:LENGTH"/>
@@ -173,7 +173,7 @@
             </ECCustomAttributes>
         </ECProperty>
     </ECEntityClass>
-    <ECEntityClass typeName="BSplineAspect">
+    <ECEntityClass typeName="BSplineAspect" displayLabel="BSpline">
         <BaseClass>LinearElementAspect</BaseClass>
         <ECProperty propertyName="BSpline_IsRational" typeName="int" displayLabel="BSpline_IsRational" category="Miscellaneous_BSpline" priority="0"/>
         <ECProperty propertyName="BSpline_KnotsCount" typeName="int" displayLabel="BSpline_KnotsCount" category="Miscellaneous_BSpline" priority="0"/>
@@ -197,45 +197,46 @@
         <ECProperty propertyName="LinearElement_CircularArc_Chord" typeName="double" displayLabel="Chord" category="GeometryAttributes_Geometry" priority="299950" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_CircularArc_StartDirection" typeName="double" displayLabel="Start Direction" category="GeometryAttributes_Geometry" priority="299900" kindOfQuantity="cifu:BEARING"/>
         <ECProperty propertyName="LinearElement_CircularArc_EndDirection" typeName="double" displayLabel="End Direction" category="GeometryAttributes_Geometry" priority="299890" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="LinearElement_CircularArc_Hand" typeName="string" displayLabel="Hand" category="GeometryAttributes_Geometry" priority="299880"/>
         <ECProperty propertyName="LinearElement_CircularArc_DegreeOfCurve" typeName="double" displayLabel="Degree of Curvature" category="GeometryAttributes_Geometry" priority="299870" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="LinearElement_CircularArc_DegreeOfCurveDefinition" typeName="CircularArcAspect_LinearElement_CircularArc_DegreeOfCurveDefinition_Enum" displayLabel="Degree of Curvature Definition" category="GeometryAttributes_Geometry" priority="299880"/>
         <ECProperty propertyName="LinearElement_CircularArc_CenterPoint" typeName="point3d" displayLabel="Center Point" category="GeometryAttributes_Geometry" priority="299860" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="LinearElement_CircularArc_Hand" typeName="string" displayLabel="Hand" category="GeometryAttributes_Geometry" priority="299880"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CivilCellAspect">
+    <ECEntityClass typeName="CivilCellAspect" displayLabel="Civil Cell">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="Name_General_Category" priority="299999"/>
         <ECProperty propertyName="IsValid" typeName="CivilCellAspect_IsValid_BoolEnum" displayLabel="Valid for Placement" category="Name_General_Category" priority="299998"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CivilCellReferenceAspect">
+    <ECEntityClass typeName="CivilCellReferenceAspect" displayLabel="Civil Cell Reference">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="Name_General_Category" priority="0"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CivilObjectAspect">
+    <ECEntityClass typeName="CivilObjectAspect" displayLabel="Civil Object">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="Name_General_Category" priority="0"/>
     </ECEntityClass>
-    <ECEntityClass typeName="ReadOnlyLinearComplexAspect">
+    <ECEntityClass typeName="LinearComplexAspect" displayLabel="Linear Complex">
         <BaseClass>LinearElementAspect</BaseClass>
+        <ECProperty propertyName="LinearElement_CurveSetNumber" typeName="int" displayLabel="Curve Set Number" category="GeometryAttributes_Geometry" priority="299880"/>
     </ECEntityClass>
-    <ECEntityClass typeName="ClosedLinearComplexAspect">
+    <ECEntityClass typeName="ClosedLinearComplexAspect" displayLabel="Closed Linear Complex">
         <BaseClass>ReadOnlyLinearComplexAspect</BaseClass>
         <ECProperty propertyName="ClosedLinearComplex_IsClockWise" typeName="ClosedLinearComplexAspect_ClosedLinearComplex_IsClockWise_BoolEnum" displayLabel="Clockwise" category="GeometryAttributes_Geometry" priority="299960"/>
         <ECProperty propertyName="ClosedLinearComplex_Area" typeName="double" displayLabel="Area" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:AREA"/>
     </ECEntityClass>
-    <ECEntityClass typeName="LineStringAspect">
+    <ECEntityClass typeName="LineStringAspect" displayLabel="Line String">
         <BaseClass>LinearElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_LineString_VerticesCount" typeName="int" displayLabel="Count" category="GeometryAttributes_Geometry" priority="299900"/>
     </ECEntityClass>
-    <ECEntityClass typeName="ClosedLineStringAspect">
+    <ECEntityClass typeName="ClosedLineStringAspect" displayLabel="Closed Line String">
         <BaseClass>LineStringAspect</BaseClass>
         <ECProperty propertyName="LinearElement_LineString_VerticesCount" typeName="int" displayLabel="Count" category="GeometryAttributes_Geometry" priority="299900"/>
         <ECProperty propertyName="LinearElement_ClosedLineString_IsClockWise" typeName="ClosedLineStringAspect_LinearElement_ClosedLineString_IsClockWise_Enum" displayLabel="Clockwise" category="GeometryAttributes_Geometry" priority="299000"/>
     </ECEntityClass>
-    <ECEntityClass typeName="ProfiledElementAspect">
+    <ECEntityClass typeName="ProfiledElementAspect" displayLabel="Profiled Element">
         <BaseClass>LinearElementAspect</BaseClass>
     </ECEntityClass>
-    <ECEntityClass typeName="SpiralAspect">
+    <ECEntityClass typeName="SpiralAspect" displayLabel="Spiral">
         <BaseClass>ProfiledElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Spiral_StartRadius" typeName="double" displayLabel="Start Radius" category="GeometryAttributes_Geometry" priority="299975" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_Spiral_EndRadius" typeName="double" displayLabel="End Radius" category="GeometryAttributes_Geometry" priority="299974" kindOfQuantity="cifu:LENGTH"/>
@@ -255,7 +256,7 @@
         <ECProperty propertyName="LinearElement_Spiral_EndArcCenterPoint" typeName="point3d" displayLabel="End Arc Center Point" category="GeometryAttributes_Geometry" priority="299680" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_Spiral_Hand" typeName="string" displayLabel="Hand" category="GeometryAttributes_Geometry" priority="299760"/>
     </ECEntityClass>
-    <ECEntityClass typeName="ClothoidAspect">
+    <ECEntityClass typeName="ClothoidAspect" displayLabel="Clothoid">
         <BaseClass>SpiralAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Spiral_StartRadius" typeName="double" displayLabel="Start Radius" category="GeometryAttributes_Geometry" priority="299975" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_Spiral_EndRadius" typeName="double" displayLabel="End Radius" category="GeometryAttributes_Geometry" priority="299974" kindOfQuantity="cifu:LENGTH"/>
@@ -275,10 +276,15 @@
         <ECProperty propertyName="LinearElement_Spiral_EndArcCenterPoint" typeName="point3d" displayLabel="End Arc Center Point" category="GeometryAttributes_Geometry" priority="299680" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_Spiral_Hand" typeName="string" displayLabel="Hand" category="GeometryAttributes_Geometry" priority="299760"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CompoundElementAspect">
+    <ECEntityClass typeName="ComponentStationPropertiesClassAspect" displayLabel="&lt;- ComponentStationPropertiesClass -&gt;">
+        <BaseClass>CivilPresentation</BaseClass>
+        <ECProperty propertyName="StartStation" typeName="double" displayLabel="Start Station" category="GeometryAttributes_Geometry" priority="2020"/>
+        <ECProperty propertyName="EndStation" typeName="double" displayLabel="End Station" category="GeometryAttributes_Geometry" priority="2000"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="CompoundElementAspect" displayLabel="Compound Element">
         <BaseClass>ProfiledElementAspect</BaseClass>
     </ECEntityClass>
-    <ECEntityClass typeName="CorridorAspect">
+    <ECEntityClass typeName="CorridorAspect" displayLabel="Corridor">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="Corridor_Corridor" priority="299999"/>
         <ECProperty propertyName="HorizontalName" typeName="string" displayLabel="Horizontal Name" category="Corridor_Corridor" priority="299998"/>
@@ -325,7 +331,7 @@
             </ECCustomAttributes>
         </ECProperty>
     </ECEntityClass>
-    <ECEntityClass typeName="CurveWideningAspect">
+    <ECEntityClass typeName="CurveWideningAspect" displayLabel="Curve Widening">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="CurveWidening_Enabled" typeName="CurveWideningAspect_CurveWidening_Enabled_BoolEnum" displayLabel="Enabled" category="CurveWidening_Curve_Widening" priority="299999"/>
         <ECProperty propertyName="CurveWidening_Description" typeName="string" displayLabel="Description" category="CurveWidening_Curve_Widening" priority="299998"/>
@@ -336,7 +342,7 @@
         <ECProperty propertyName="CurveWidening_Priority" typeName="int" displayLabel="Priority" category="CurveWidening_Curve_Widening" priority="299993"/>
         <ECProperty propertyName="CurveWidening_WideningTableFileName" typeName="string" displayLabel="Widening Table" category="CurveWidening_Curve_Widening" priority="299992"/>
     </ECEntityClass>
-    <ECEntityClass typeName="DistanceAlongSlopeEntityAspect">
+    <ECEntityClass typeName="DistanceAlongSlopeEntityAspect" displayLabel="Distance Along Slope Entity">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="ReferenceDistanceAlongEntry" typeName="double" displayLabel="Reference Distance" category="DistanceAlongSlopeEntityProperties_Distance_Along_Slope_Entity" priority="299996" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ReferenceDistanceAlongEntry_DistanceAlong" typeName="double" kindOfQuantity="cifu:STATION">
@@ -376,17 +382,17 @@
         <ECProperty propertyName="ReferenceArcLength2Entry" typeName="double" displayLabel="Arc Length 2" category="DistanceAlongSlopeEntityProperties_Distance_Along_Slope_Entity" priority="299985" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="SlopeStyle" typeName="DistanceAlongSlopeEntityAspect_SlopeStyle_Enum" displayLabel="Slope Style" category="DistanceAlongSlopeEntityProperties_Distance_Along_Slope_Entity" priority="299997"/>
     </ECEntityClass>
-    <ECEntityClass typeName="DTMEntityAspect">
+    <ECEntityClass typeName="DTMEntityAspect" displayLabel="Terrain Model">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="VolumeOption" typeName="DTMEntityAspect_VolumeOption_Enum" displayLabel="Volume Option" category="MeshSurfaceEntity_Component_Layer" priority="299925"/>
         <ECProperty propertyName="TerrainSurfaceEntity_SlopedArea" typeName="double" displayLabel="Top Sloped Area" category="MeshQuantities_Civil_Quantities" priority="299920" kindOfQuantity="cifu:AREA"/>
         <ECProperty propertyName="TerrainSurfaceEntity_PlanarArea" typeName="double" displayLabel="Planar Area" category="MeshQuantities_Civil_Quantities" priority="299910" kindOfQuantity="cifu:AREA"/>
     </ECEntityClass>
-    <ECEntityClass typeName="DTMEntityBySelectedElementsSourceProviderAspect">
+    <ECEntityClass typeName="DTMEntityBySelectedElementsSourceProviderAspect" displayLabel="Terrain By Selected Elements">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="FeatureType" typeName="DTMEntityBySelectedElementsSourceProviderAspect_FeatureType_Enum" displayLabel="FeatureType" category="TerrainModelBySelectedElementAttributes_Create_from_Elements_UnLinked" priority="300000"/>
     </ECEntityClass>
-    <ECEntityClass typeName="DTMEntityImportSourcePropertyProviderAspect">
+    <ECEntityClass typeName="DTMEntityImportSourcePropertyProviderAspect" displayLabel="Terrain Import">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="DTM_ObjectSetting" typeName="string" displayLabel="Feature Definition" category="FeatureDefinition_Feature_Definition" priority="299980"/>
         <ECProperty propertyName="DTM_NamePrefix" typeName="string" displayLabel="Name" category="FeatureDefinition_Feature_Definition" priority="299975"/>
@@ -475,6 +481,15 @@
             <Class class="ClothoidAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsComponentStationPropertiesClassAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="ComponentStationPropertiesClassAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsCompoundElementAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -538,7 +553,7 @@
             <Class class="DTMEntityImportSourcePropertyProviderAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="EndConditionExceptionsAspect">
+    <ECEntityClass typeName="EndConditionExceptionsAspect" displayLabel="End Condition Exceptions">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Description" typeName="string" displayLabel="Description" category="EndConditionException_End_Condition_Exception" priority="299998"/>
         <ECProperty propertyName="Enabled" typeName="EndConditionExceptionsAspect_Enabled_BoolEnum" displayLabel="Enabled" category="EndConditionException_End_Condition_Exception" priority="299999"/>
@@ -553,11 +568,11 @@
             <Class class="EndConditionExceptionsAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="FeatureBaseAspect">
+    <ECEntityClass typeName="FeatureBaseAspect" displayLabel="Feature Base">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="DefinitionName" typeName="string" displayLabel="Feature Definition" category="FeatureProperties_Feature" priority="299999"/>
     </ECEntityClass>
-    <ECEntityClass typeName="FeatureAspect">
+    <ECEntityClass typeName="FeatureAspect" displayLabel="Feature">
         <BaseClass>FeatureBaseAspect</BaseClass>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsFeatureAspect" modifier="None" strength="embedding">
@@ -578,7 +593,7 @@
             <Class class="FeatureBaseAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="FeatureWithNameAspect">
+    <ECEntityClass typeName="FeatureWithNameAspect" displayLabel="Feature With Name">
         <BaseClass>FeatureBaseAspect</BaseClass>
         <ECProperty propertyName="FeatureName" typeName="string" displayLabel="Feature Name" category="FeatureProperties_Feature" priority="299999"/>
     </ECEntityClass>
@@ -591,7 +606,7 @@
             <Class class="FeatureWithNameAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="FlowLineEntityAspect">
+    <ECEntityClass typeName="FlowLineEntityAspect" displayLabel="Flow Line">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="FlowLineEntity_Formula" typeName="FlowLineEntityAspect_FlowLineEntity_Formula_Enum" displayLabel="Formula" category="FlowLineEntity_Aquaplaning" priority="299980"/>
         <ECProperty propertyName="FlowLineEntity_RainfallIntensity" typeName="double" displayLabel="Rainfall Intensity" category="FlowLineEntity_Aquaplaning" priority="299970" kindOfQuantity="cifu:LENGTH"/>
@@ -605,7 +620,7 @@
             <Class class="FlowLineEntityAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="GeographicCoordinateSystemAspect">
+    <ECEntityClass typeName="GeographicCoordinateSystemAspect" displayLabel="Geographic Coordinate System">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="GeographicCoordinateSystem_ImageCoordinateMethodName" typeName="string" displayLabel="Source" category="ProjectionProperties_Geographical_Coordinate_Systems" priority="299990"/>
         <ECProperty propertyName="GeographicCoordinateSystem_ImageCoordinateDescription" typeName="string" displayLabel="Source Description" category="ProjectionProperties_Geographical_Coordinate_Systems" priority="299980"/>
@@ -620,7 +635,7 @@
             <Class class="GeographicCoordinateSystemAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="InternalStationEquationAspect">
+    <ECEntityClass typeName="InternalStationEquationAspect" displayLabel="Internal Station Equation">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="BackLocation" typeName="double" displayLabel="BackLocation" category="Miscellaneous_Internal_Station_Equation" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BackLocation_DistanceAlong" typeName="double" kindOfQuantity="cifu:STATION">
@@ -644,7 +659,7 @@
             <Class class="InternalStationEquationAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="IntersectionPointStruct">
+    <ECEntityClass typeName="IntersectionPointStruct" displayLabel="Intersection Point">
         <BaseClass>bis:ElementUniqueAspect</BaseClass>
         <ECProperty propertyName="IntersectionPointStation" typeName="double" displayLabel="Station" category="Miscellaneous_Intersection_Point" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="IntersectionPointSkewAngle" typeName="double" displayLabel="SkewAngle" category="Miscellaneous_Intersection_Point" priority="0" kindOfQuantity="cifu:ANGLE"/>
@@ -659,7 +674,7 @@
             <Class class="IntersectionPointStruct"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="KeyStationAspect">
+    <ECEntityClass typeName="KeyStationAspect" displayLabel="Key Station">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Station" typeName="double" displayLabel="Station" category="KeyStation_Key_Station" priority="299999" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="Station_DistanceAlong" typeName="double" kindOfQuantity="cifu:STATION">
@@ -680,7 +695,7 @@
             <Class class="KeyStationAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="Line3dAspect">
+    <ECEntityClass typeName="Line3dAspect" displayLabel="Line 3d">
         <BaseClass>ProfiledElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Length" typeName="double" displayLabel="Length" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_StartPoint" typeName="point3d" displayLabel="Start Point" category="GeometryAttributes_Geometry" priority="299990" kindOfQuantity="cifu:LENGTH"/>
@@ -717,7 +732,7 @@
             <Class class="LinearElementAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="LineAspect">
+    <ECEntityClass typeName="LineAspect" displayLabel="Line">
         <BaseClass>LinearElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Line_Direction" typeName="double" displayLabel="Direction" category="GeometryAttributes_Geometry" priority="299900" kindOfQuantity="cifu:BEARING"/>
     </ECEntityClass>
@@ -730,7 +745,7 @@
             <Class class="LineAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="LineString3dAspect">
+    <ECEntityClass typeName="LineString3dAspect" displayLabel="Line String 3d">
         <BaseClass>ProfiledElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_LineString3d_VerticesCount" typeName="int" displayLabel="Count" category="GeometryAttributes_Geometry" priority="299900"/>
     </ECEntityClass>
@@ -752,7 +767,7 @@
             <Class class="LineStringAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="MeshSurfaceEntityAspect">
+    <ECEntityClass typeName="MeshSurfaceEntityAspect" displayLabel="Mesh Surface">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="MeshSurfaceEntity_Volume" typeName="double" displayLabel="Volume" category="MeshSurfaceEntity_Component_Layer" priority="300000" kindOfQuantity="cifu:VOLUME">
             <ECCustomAttributes>
@@ -813,7 +828,6 @@
             <Class class="MeshSurfaceEntityAspect"/>
         </Target>
     </ECRelationshipClass>
-    <!-- Base class for mesh -->
     <ECEntityClass typeName="MeshSurfaceEntityBaseAspect" modifier="Abstract">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="MeshSurfaceEntity_SlopedArea" typeName="double" displayLabel="Top Sloped Area" category="MeshQuantities_Civil_Quantities" priority="299920" kindOfQuantity="cifu:AREA"/>
@@ -1094,17 +1108,12 @@
             <Class class="PointControlAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="PointEntity2dAspect">
+    <ECEntityClass typeName="PointEntity2dAspect" displayLabel="Construction Point">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="PointEntity2dPoint" typeName="point3d" displayLabel="Point" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299999"/>
-        <ECProperty propertyName="PointEntity2d_X" typeName="double" displayLabel="X" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299990" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="PointEntity2d_Y" typeName="double" displayLabel="Y" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299980" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="PointEntity2d_Elevation" typeName="double" displayLabel="Elevation" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299970" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="PointEntity2d_Rotation" typeName="double" displayLabel="Rotation" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299960" kindOfQuantity="cifu:BEARING"/>
-        <ECProperty propertyName="PointEntity2d_RotationOffset" typeName="double" displayLabel="Rotation Offset" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299955" kindOfQuantity="cifu:BEARING"/>
-        <ECProperty propertyName="PointEntity2d_RotationReference" typeName="string" displayLabel="Rotation Reference" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299953"/>
-        <ECProperty propertyName="PointEntity2d_AbsoluteAngle" typeName="boolean" displayLabel="Absolute Angle" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299950"/>
-        <ECProperty propertyName="PointEntity2d_Description" typeName="string" displayLabel="Description" category="FeatureProperties_Feature" priority="299910"/>
+        <ECProperty propertyName="PointEntity2d_X" typeName="double" displayLabel="X" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299960" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PointEntity2d_Y" typeName="double" displayLabel="Y" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299940" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PointEntity2d_Rotation" typeName="double" displayLabel="Rotation" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299840" kindOfQuantity="cifu:BEARING"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPointEntity2dAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -1115,7 +1124,29 @@
             <Class class="PointEntity2dAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="PointGroupAspect">
+    <ECEntityClass typeName="PointEntity2dInPlanAspect" displayLabel="2D Point">
+        <BaseClass>CivilPresentation</BaseClass>
+        <ECProperty propertyName="PointEntity2dPoint" typeName="point3d" displayLabel="Point" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299999"/>
+        <ECProperty propertyName="PointEntity2d_X" typeName="double" displayLabel="X" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299960" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PointEntity2d_Y" typeName="double" displayLabel="Y" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299940" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PointEntity2d_Rotation" typeName="double" displayLabel="Rotation" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299840" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="PointEntity2d_Elevation" typeName="double" displayLabel="Elevation" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299900" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PointEntity2d_RotationOffset" typeName="double" displayLabel="Rotation Offset" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299860" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="PointEntity2d_Description" typeName="string" displayLabel="Description" category="FeatureProperties_Feature" priority="299820"/>
+        <ECProperty propertyName="PointEntity2d_HorizontalConstraint" typeName="string" displayLabel="Horizontal Constraint" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299980"/>
+        <ECProperty propertyName="PointEntity2d_VerticalConstraint" typeName="string" displayLabel="Elevation Constraint" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299920"/>
+        <ECProperty propertyName="PointEntity2d_RotationConstraint" typeName="string" displayLabel="Rotation Constraint" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299880"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsPointEntity2dInPlanAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="PointEntity2dInPlanAspect"/>
+        </Target>
+    </ECRelationshipClass>
+    <ECEntityClass typeName="PointGroupAspect" displayLabel="Point Group">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="PointGroup_NumberOfPoints" typeName="int" displayLabel="Number Of Points" category="PointGroupCategoryAttributes_Point_Group" priority="299999"/>
     </ECEntityClass>
@@ -1128,7 +1159,7 @@
             <Class class="PointGroupAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="PointOrderedListAspect">
+    <ECEntityClass typeName="PointOrderedListAspect" displayLabel="Point Ordered List">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="PointOrderedList_Elevation" typeName="double" displayLabel="Elevation" category="PointOrderedListAttributes_Point_Ordered_List" priority="299989" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
@@ -1141,7 +1172,7 @@
             <Class class="PointOrderedListAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="PortalEntityAspect">
+    <ECEntityClass typeName="PortalEntityAspect" displayLabel="Portal">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="Portal_Portal" priority="299999"/>
         <ECProperty propertyName="ParametricCell" typeName="string" displayLabel="Parametric Cell" category="Portal_Portal" priority="299990"/>
@@ -1155,11 +1186,22 @@
             <Class class="PortalEntityAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ProfileElementAspect">
+    <ECEntityClass typeName="ReadOnlyLinearElementAspect" displayLabel="Read Only Linear Element">
+        <BaseClass>CivilPresentation</BaseClass>
+        <ECProperty propertyName="LinearElement_Length" typeName="double" displayLabel="Length" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="LinearElement_StartPoint" typeName="point3d" displayLabel="Start Point" category="GeometryAttributes_Geometry" priority="299990"/>
+        <ECProperty propertyName="LinearElement_EndPoint" typeName="point3d" displayLabel="End Point" category="GeometryAttributes_Geometry" priority="299980"/>
+        <ECProperty propertyName="LinearElement_Length3d" typeName="double" displayLabel="Length 3d" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:LENGTH">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
+    </ECEntityClass>
+    <ECEntityClass typeName="ProfileElementAspect" displayLabel="Profile Element">
         <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_ProfileElement_DeltaX" typeName="double" displayLabel="DeltaX" category="GeometryAttributes_Geometry" priority="299900" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
-    <ECEntityClass typeName="ProfileCircularArcAspect">
+    <ECEntityClass typeName="ProfileCircularArcAspect" displayLabel="Profile Circular Arc">
         <BaseClass>ProfileElementAspect</BaseClass>
         <ECProperty propertyName="ProfileCircularArc_EndSlope" typeName="double" displayLabel="Slope End" category="GeometryAttributes_Geometry" priority="298950"/>
         <ECProperty propertyName="ProfileCircularArc_StartSlope" typeName="double" displayLabel="Slope Start" category="GeometryAttributes_Geometry" priority="298960"/>
@@ -1185,7 +1227,7 @@
             <Class class="ProfileCircularArcAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ProfileComplexAspect">
+    <ECEntityClass typeName="ProfileComplexAspect" displayLabel="Profile Complex">
         <BaseClass>ProfileElementAspect</BaseClass>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsProfileComplexAspect" modifier="None" strength="embedding">
@@ -1215,7 +1257,7 @@
             <Class class="ProfileElementAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ProfileLineAspect">
+    <ECEntityClass typeName="ProfileLineAspect" displayLabel="Profile Line">
         <BaseClass>ProfileElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_ProfileLine_Slope" typeName="double" displayLabel="Slope" category="GeometryAttributes_Geometry" priority="299900"/>
     </ECEntityClass>
@@ -1228,7 +1270,7 @@
             <Class class="ProfileLineAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ProfileLineStringAspect">
+    <ECEntityClass typeName="ProfileLineStringAspect" displayLabel="Profile Line String">
         <BaseClass>ProfileElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_ProfileLineString_VerticesCount" typeName="int" displayLabel="Count" category="GeometryAttributes_Geometry" priority="299000"/>
     </ECEntityClass>
@@ -1241,7 +1283,7 @@
             <Class class="ProfileLineStringAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ProfileParabolaAspect">
+    <ECEntityClass typeName="ProfileParabolaAspect" displayLabel="Profile Parabola">
         <BaseClass>ProfileElementAspect</BaseClass>
         <ECProperty propertyName="ProfileParabola_VPIPoint" typeName="point3d" displayLabel="VPI Point" category="GeometryAttributes_Geometry" priority="298950" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ProfileParabola_SummitPoint" typeName="point3d" displayLabel="Summit Point" category="GeometryAttributes_Geometry" priority="298940" kindOfQuantity="cifu:LENGTH"/>
@@ -1260,7 +1302,7 @@
             <Class class="ProfileParabolaAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ProfilePointbyIntersectionRuleAspect">
+    <ECEntityClass typeName="ProfilePointbyIntersectionRuleAspect" displayLabel="Profile Intersection Point">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Station" typeName="double" displayLabel="Station" category="ProfilePointbyIntersectionRuleAttributes_Profile_Intersection_Point" priority="299800" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="Elevation" typeName="double" displayLabel="Elevation" category="ProfilePointbyIntersectionRuleAttributes_Profile_Intersection_Point" priority="299700" kindOfQuantity="cifu:LENGTH"/>
@@ -1283,7 +1325,7 @@
             <Class class="ProfilePointbyIntersectionRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="RadiusTransitionAspect">
+    <ECEntityClass typeName="RadiusTransitionAspect" displayLabel="Radius Transition">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="ParameterName" typeName="string" displayLabel="Name" category="Radius_Transition_Setting_Attributes_Radius_Transition_Settings" priority="300000"/>
         <ECProperty propertyName="ParameterDefaultTransitionLength" typeName="double" displayLabel="Default Transition Length" category="Radius_Transition_Setting_Attributes_Radius_Transition_Settings" priority="300000" kindOfQuantity="cifu:LENGTH"/>
@@ -1299,7 +1341,7 @@
             <Class class="RadiusTransitionAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyBSplineAspect">
+    <ECEntityClass typeName="ReadOnlyBSplineAspect" displayLabel="Read Only BSpline">
         <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
         <ECProperty propertyName="BSpline_IsRational" typeName="int" displayLabel="BSpline_IsRational" category="Miscellaneous_Read_Only_BSpline" priority="0"/>
         <ECProperty propertyName="BSpline_KnotsCount" typeName="int" displayLabel="BSpline_KnotsCount" category="Miscellaneous_Read_Only_BSpline" priority="0"/>
@@ -1313,18 +1355,18 @@
             <Class class="ReadOnlyBSplineAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyCircularArcAspect">
-        <BaseClass>LinearElementAspect</BaseClass>
+    <ECEntityClass typeName="ReadOnlyCircularArcAspect" displayLabel="Read Only Circular Arc">
+        <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_CircularArc_Radius" typeName="double" displayLabel="Radius" category="GeometryAttributes_Geometry" priority="299975" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_CircularArc_SweepAngle" typeName="double" displayLabel="Sweep Angle" category="GeometryAttributes_Geometry" priority="299974" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="LinearElement_CircularArc_Tangent" typeName="double" displayLabel="Tangent" category="GeometryAttributes_Geometry" priority="299960" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_CircularArc_Chord" typeName="double" displayLabel="Chord" category="GeometryAttributes_Geometry" priority="299950" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_CircularArc_StartDirection" typeName="double" displayLabel="Start Direction" category="GeometryAttributes_Geometry" priority="299900" kindOfQuantity="cifu:BEARING"/>
         <ECProperty propertyName="LinearElement_CircularArc_EndDirection" typeName="double" displayLabel="End Direction" category="GeometryAttributes_Geometry" priority="299890" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="LinearElement_CircularArc_Hand" typeName="string" displayLabel="Hand" category="GeometryAttributes_Geometry" priority="299880"/>
         <ECProperty propertyName="LinearElement_CircularArc_DegreeOfCurve" typeName="double" displayLabel="Degree of Curvature" category="GeometryAttributes_Geometry" priority="299870" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="LinearElement_CircularArc_DegreeOfCurveDefinition" typeName="ReadOnlyCircularArcAspect_LinearElement_CircularArc_DegreeOfCurveDefinition_Enum" displayLabel="Degree of Curvature Definition" category="GeometryAttributes_Geometry" priority="299880"/>
         <ECProperty propertyName="LinearElement_CircularArc_CenterPoint" typeName="point3d" displayLabel="Center Point" category="GeometryAttributes_Geometry" priority="299860" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="LinearElement_CircularArc_Hand" typeName="string" displayLabel="Hand" category="GeometryAttributes_Geometry" priority="299880"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsReadOnlyCircularArcAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -1335,8 +1377,12 @@
             <Class class="ReadOnlyCircularArcAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyClosedLinearComplexAspect">
-        <BaseClass>LinearComplexAspect</BaseClass>
+    <ECEntityClass typeName="ReadOnlyLinearComplexAspect" displayLabel="Read Only Linear Complex">
+        <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
+        <ECProperty propertyName="LinearElement_CurveSetNumber" typeName="int" displayLabel="Curve Set Number" category="GeometryAttributes_Geometry" priority="299880"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="ReadOnlyClosedLinearComplexAspect" displayLabel="Read Only Closed Linear Complex">
+        <BaseClass>ReadOnlyLinearComplexAspect</BaseClass>
         <ECProperty propertyName="ClosedLinearComplex_IsClockWise" typeName="ReadOnlyClosedLinearComplexAspect_ClosedLinearComplex_IsClockWise_BoolEnum" displayLabel="Clockwise" category="GeometryAttributes_Geometry" priority="299960"/>
         <ECProperty propertyName="ClosedLinearComplex_Area" typeName="double" displayLabel="Area" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:AREA"/>
     </ECEntityClass>
@@ -1349,11 +1395,11 @@
             <Class class="ReadOnlyClosedLinearComplexAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyLineStringAspect">
+    <ECEntityClass typeName="ReadOnlyLineStringAspect" displayLabel="Read Only Line String">
         <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_LineString_VerticesCount" typeName="int" displayLabel="Count" category="GeometryAttributes_Geometry" priority="299900"/>
     </ECEntityClass>
-    <ECEntityClass typeName="ReadOnlyClosedLineStringAspect">
+    <ECEntityClass typeName="ReadOnlyClosedLineStringAspect" displayLabel="Read Only Closed Line String">
         <BaseClass>ReadOnlyLineStringAspect</BaseClass>
         <ECProperty propertyName="LinearElement_LineString_VerticesCount" typeName="int" displayLabel="Count" category="GeometryAttributes_Geometry" priority="299900"/>
         <ECProperty propertyName="LinearElement_ClosedLineString_IsClockWise" typeName="ReadOnlyClosedLineStringAspect_LinearElement_ClosedLineString_IsClockWise_Enum" displayLabel="Clockwise" category="GeometryAttributes_Geometry" priority="299000"/>
@@ -1370,7 +1416,7 @@
     <ECEntityClass typeName="ReadOnlyProfiledElementAspect">
         <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
     </ECEntityClass>
-    <ECEntityClass typeName="ReadOnlySpiralAspect">
+    <ECEntityClass typeName="ReadOnlySpiralAspect" displayLabel="Read Only Spiral">
         <BaseClass>ReadOnlyProfiledElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Spiral_StartRadius" typeName="double" displayLabel="Start Radius" category="GeometryAttributes_Geometry" priority="299975" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_Spiral_EndRadius" typeName="double" displayLabel="End Radius" category="GeometryAttributes_Geometry" priority="299974" kindOfQuantity="cifu:LENGTH"/>
@@ -1385,12 +1431,12 @@
         <ECProperty propertyName="LinearElement_Spiral_KValue" typeName="double" displayLabel="K" category="GeometryAttributes_Geometry" priority="299790" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_Spiral_StartDirection" typeName="double" displayLabel="Start Direction" category="GeometryAttributes_Geometry" priority="299780" kindOfQuantity="cifu:BEARING"/>
         <ECProperty propertyName="LinearElement_Spiral_EndDirection" typeName="double" displayLabel="End Direction" category="GeometryAttributes_Geometry" priority="299770" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="LinearElement_Spiral_Hand" typeName="string" displayLabel="Hand" category="GeometryAttributes_Geometry" priority="299760"/>
         <ECProperty propertyName="LinearElement_Spiral_IntrinsicPoint" typeName="point3d" displayLabel="Intrinsic Point" category="GeometryAttributes_Geometry" priority="299700"/>
         <ECProperty propertyName="LinearElement_Spiral_StartArcCenterPoint" typeName="point3d" displayLabel="Start Arc Center Point" category="GeometryAttributes_Geometry" priority="299690"/>
         <ECProperty propertyName="LinearElement_Spiral_EndArcCenterPoint" typeName="point3d" displayLabel="End Arc Center Point" category="GeometryAttributes_Geometry" priority="299680"/>
-        <ECProperty propertyName="LinearElement_Spiral_Hand" typeName="string" displayLabel="Hand" category="GeometryAttributes_Geometry" priority="299760"/>
     </ECEntityClass>
-    <ECEntityClass typeName="ReadOnlyClothoidAspect">
+    <ECEntityClass typeName="ReadOnlyClothoidAspect" displayLabel="Read Only Clothoid">
         <BaseClass>ReadOnlySpiralAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Spiral_StartRadius" typeName="double" displayLabel="Start Radius" category="GeometryAttributes_Geometry" priority="299975" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_Spiral_EndRadius" typeName="double" displayLabel="End Radius" category="GeometryAttributes_Geometry" priority="299974" kindOfQuantity="cifu:LENGTH"/>
@@ -1419,7 +1465,10 @@
             <Class class="ReadOnlyClothoidAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyCompoundElementAspect">
+    <ECEntityClass typeName="ReadOnlyProfiledElementAspect" displayLabel="Read Only Profiled Element">
+        <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
+    </ECEntityClass>
+    <ECEntityClass typeName="ReadOnlyCompoundElementAspect" displayLabel="Read Only Compound Element">
         <BaseClass>ReadOnlyProfiledElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Length" typeName="double" displayLabel="Length" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_StartPoint" typeName="point3d" displayLabel="Start Point" category="GeometryAttributes_Geometry" priority="299990" kindOfQuantity="cifu:LENGTH"/>
@@ -1434,7 +1483,7 @@
             <Class class="ReadOnlyCompoundElementAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyLine3dAspect">
+    <ECEntityClass typeName="ReadOnlyLine3dAspect" displayLabel="Read Only Line 3d">
         <BaseClass>ReadOnlyProfiledElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Line3d_Direction" typeName="double" displayLabel="Direction" category="GeometryAttributes_Geometry" priority="299900" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
@@ -1465,7 +1514,7 @@
             <Class class="ReadOnlyLinearElementAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyLineAspect">
+    <ECEntityClass typeName="ReadOnlyLineAspect" displayLabel="Read Only Line">
         <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Line_Direction" typeName="double" displayLabel="Direction" category="GeometryAttributes_Geometry" priority="299900" kindOfQuantity="cifu:BEARING"/>
     </ECEntityClass>
@@ -1478,7 +1527,7 @@
             <Class class="ReadOnlyLineAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyLineString3dAspect">
+    <ECEntityClass typeName="ReadOnlyLineString3dAspect" displayLabel="Read Only Line String 3d">
         <BaseClass>ReadOnlyProfiledElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_LineString3d_VerticesCount" typeName="int" displayLabel="Count" category="GeometryAttributes_Geometry" priority="299900"/>
     </ECEntityClass>
@@ -1500,7 +1549,7 @@
             <Class class="ReadOnlyLineStringAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyProfileCircularArcAspect">
+    <ECEntityClass typeName="ReadOnlyProfileCircularArcAspect" displayLabel="Read Only Profile Circular Arc">
         <BaseClass>ProfileElementAspect</BaseClass>
         <ECProperty propertyName="ProfileCircularArc_EndSlope" typeName="double" displayLabel="Slope End" category="GeometryAttributes_Geometry" priority="298950"/>
         <ECProperty propertyName="ProfileCircularArc_StartSlope" typeName="double" displayLabel="Slope Start" category="GeometryAttributes_Geometry" priority="298960"/>
@@ -1526,7 +1575,7 @@
             <Class class="ReadOnlyProfileCircularArcAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyProfileComplexAspect">
+    <ECEntityClass typeName="ReadOnlyProfileComplexAspect" displayLabel="Read Only Profile Complex">
         <BaseClass>ProfileElementAspect</BaseClass>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsReadOnlyProfileComplexAspect" modifier="None" strength="embedding">
@@ -1547,7 +1596,7 @@
             <Class class="ReadOnlyProfiledElementAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyProfileLineAspect">
+    <ECEntityClass typeName="ReadOnlyProfileLineAspect" displayLabel="Read Only Profile Line">
         <BaseClass>ProfileElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_ProfileLine_Slope" typeName="double" displayLabel="Slope" category="GeometryAttributes_Geometry" priority="299900"/>
     </ECEntityClass>
@@ -1560,7 +1609,7 @@
             <Class class="ReadOnlyProfileLineAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyProfileLineStringAspect">
+    <ECEntityClass typeName="ReadOnlyProfileLineStringAspect" displayLabel="Read Only Profile Line String">
         <BaseClass>ProfileElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_ProfileLineString_VerticesCount" typeName="int" displayLabel="Count" category="GeometryAttributes_Geometry" priority="299000"/>
     </ECEntityClass>
@@ -1573,7 +1622,7 @@
             <Class class="ReadOnlyProfileLineStringAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyProfileParabolaAspect">
+    <ECEntityClass typeName="ReadOnlyProfileParabolaAspect" displayLabel="Read Only Profile Parabola">
         <BaseClass>ProfileElementAspect</BaseClass>
         <ECProperty propertyName="ProfileParabola_VPIPoint" typeName="point3d" displayLabel="VPI Point" category="GeometryAttributes_Geometry" priority="298950" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ProfileParabola_SummitPoint" typeName="point3d" displayLabel="Summit Point" category="GeometryAttributes_Geometry" priority="298940" kindOfQuantity="cifu:LENGTH"/>
@@ -1655,7 +1704,7 @@
             <Class class="SpiralAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="StationEquationAspect">
+    <ECEntityClass typeName="StationEquationAspect" displayLabel="Station Equation">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="BackLocation" typeName="double" displayLabel="BackLocation" category="Miscellaneous_Station_Equation" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BackLocation_DistanceAlong" typeName="double" kindOfQuantity="cifu:STATION">
@@ -1678,7 +1727,7 @@
             <Class class="StationEquationAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="StationingEntityAspect">
+    <ECEntityClass typeName="StationingEntityAspect" displayLabel="Stationing">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="AssignedStation" typeName="string" displayLabel="Assigned Station" category="StationingProperties_Stationing" priority="299999"/>
         <ECProperty propertyName="AssignedLocation" typeName="double" displayLabel="Assigned Location" category="StationingProperties_Stationing" priority="299999" kindOfQuantity="cifu:LENGTH"/>
@@ -1702,7 +1751,7 @@
             <Class class="StationingEntityAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="StrokingPropertiesClassAspect">
+    <ECEntityClass typeName="StrokingPropertiesClassAspect" displayLabel="Stroking Properties Class">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="StrokingStepMethod" typeName="StrokingPropertiesClassAspect_StrokingStepMethod_Enum" displayLabel="Stroking Step Method" category="StrokingDefinition_Stroking_Definition" priority="0"/>
         <ECProperty propertyName="LinearStroking" typeName="double" displayLabel="Linear Stroking" category="StrokingDefinition_Stroking_Definition" priority="0" kindOfQuantity="cifu:LENGTH"/>
@@ -1718,7 +1767,7 @@
             <Class class="StrokingPropertiesClassAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="TargetAliasAspect">
+    <ECEntityClass typeName="TargetAliasAspect" displayLabel="Target Alias">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="TargetAlias_Target_Alias" priority="299999"/>
         <ECProperty propertyName="Type" typeName="string" displayLabel="Type" category="TargetAlias_Target_Alias" priority="299998"/>
@@ -1734,7 +1783,7 @@
             <Class class="TargetAliasAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="TemplateDropAspect">
+    <ECEntityClass typeName="TemplateDropAspect" displayLabel="Template Drop">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="HorizontalName" typeName="string" displayLabel="Horizontal Name" category="TemplateDrop_Template_Drop" priority="-3"/>
         <ECProperty propertyName="TemplateName" typeName="string" displayLabel="Template Name" category="TemplateDrop_Template_Drop" priority="0"/>
@@ -1750,7 +1799,7 @@
             <Class class="TemplateDropAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="TemplateTransitionAspect">
+    <ECEntityClass typeName="TemplateTransitionAspect" displayLabel="Template Transition">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="StartTemplateName" typeName="string" displayLabel="Start Template Name" category="TemplateTransitionRuleAttributes_Template_Transition" priority="299999"/>
         <ECProperty propertyName="EndTemplateName" typeName="string" displayLabel="End Template Name" category="TemplateTransitionRuleAttributes_Template_Transition" priority="299998"/>
@@ -1766,7 +1815,7 @@
             <Class class="TemplateTransitionAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ThreeDCutViewAspect">
+    <ECEntityClass typeName="ThreeDCutViewAspect" displayLabel="3d Cut Volume">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="StartStation" typeName="double" displayLabel="Start Station" category="ClipVolume_Clip_Volume" priority="299998"/>
         <ECProperty propertyName="EndStation" typeName="double" displayLabel="End Station" category="ClipVolume_Clip_Volume" priority="299994"/>
@@ -1787,7 +1836,7 @@
             <Class class="ThreeDCutViewAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="VerticalCurveAspect">
+    <ECEntityClass typeName="VerticalCurveAspect" displayLabel="Vertical Curve">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="Vertical_Curve_Setting_Attributes_VerticalCurveSettings" priority="300000"/>
         <ECProperty propertyName="SagMinimum" typeName="double" displayLabel="Sag Minimum" category="Vertical_Curve_Setting_Attributes_VerticalCurveSettings" priority="300000"/>
@@ -1805,7 +1854,7 @@
             <Class class="VerticalCurveAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="VerticalDesignStandardAspect">
+    <ECEntityClass typeName="VerticalDesignStandardAspect" displayLabel="Vertical Design Standard">
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="MinimumSlope" typeName="double" displayLabel="Minimum Slope" category="Design_Standard_Attributes_Vertical_Design_Standard" priority="299998" kindOfQuantity="cifu:SLOPE"/>
         <ECProperty propertyName="MaximumSlope" typeName="double" displayLabel="Maximum Slope" category="Design_Standard_Attributes_Vertical_Design_Standard" priority="299997" kindOfQuantity="cifu:SLOPE"/>
diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml
index 313643b31..460c865c1 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml
@@ -4,10 +4,10 @@
 |  * See LICENSE.md in the project root for license terms and full copyright notice.
 ======================================================================================= -->
 <ECSchema schemaName="CifGeometricRules" alias="cifgr" version="01.00.07" description="iModel Connector schema containing aspect classes with common Geometric-rule properties from Civil Infrastructure Framework (CIF) applications." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-    <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
+    <ECSchemaReference name="BisCore" version="01.00.25" alias="bis"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
-    <ECSchemaReference name="CifCommon" version="01.00.10" alias="cifcmn"/>
-    <ECSchemaReference name="CifUnits" version="01.00.08" alias="cifu"/>
+    <ECSchemaReference name="CifCommon" version="01.00.15" alias="cifcmn"/>
+    <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECSchemaReference name="SchemaUpgradeCustomAttributes" version="01.00.00" alias="SchemaUpgradeCA"/>
     <ECCustomAttributes>
@@ -18,6 +18,15 @@
             <Value>Application</Value>
         </SchemaLayerInfo>
     </ECCustomAttributes>
+    <ECEnumeration typeName="ArcBetweenElementArcRuleAspect_AheadTransitionAheadSpiralDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="None" value="6" displayLabel="None"/>
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="7" displayLabel="Tangential Length"/>
+    </ECEnumeration>
     <ECEnumeration typeName="ArcBetweenElementArcRuleAspect_AheadTransitionDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="None" value="6" displayLabel="None"/>
         <ECEnumerator name="Length" value="1" displayLabel="Length"/>
@@ -33,6 +42,15 @@
         <ECEnumerator name="Length_Offset" value="2" displayLabel="Length Offset"/>
         <ECEnumerator name="Ratio_Offset" value="3" displayLabel="Ratio-Offset"/>
     </ECEnumeration>
+    <ECEnumeration typeName="ArcBetweenElementArcRuleAspect_BackTransitionDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="None" value="6" displayLabel="None"/>
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="7" displayLabel="Tangential Length"/>
+    </ECEnumeration>
     <ECEnumeration typeName="ArcBetweenElementArcRuleBaseAspect_BackTransitionDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="None" value="6" displayLabel="None"/>
         <ECEnumerator name="Length" value="1" displayLabel="Length"/>
@@ -57,6 +75,24 @@
         <ECEnumerator name="Offset" value="5" displayLabel="DeltaR"/>
         <ECEnumerator name="Tangential_Length" value="7" displayLabel="Tangential Length"/>
     </ECEnumeration>
+    <ECEnumeration typeName="ArcBetweenElementsRuleAspect_AheadTransitionDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="None" value="6" displayLabel="None"/>
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="7" displayLabel="Tangential Length"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="ArcBetweenElementsRuleAspect_BackTransitionAheadSpiralDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="None" value="6" displayLabel="None"/>
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="7" displayLabel="Tangential Length"/>
+    </ECEnumeration>
     <ECEnumeration typeName="ArcBetweenElementsRuleAheadTransitionAspect_AheadTransitionDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="None" value="6" displayLabel="None"/>
         <ECEnumerator name="Length" value="1" displayLabel="Length"/>
@@ -114,6 +150,26 @@
         <ECEnumerator name="Spiral" value="1" displayLabel="Spiral"/>
         <ECEnumerator name="Curve" value="2" displayLabel="Curve"/>
     </ECEnumeration>
+    <ECEnumeration typeName="ArcFromElementRuleAspect_BackTransitionDefinitionMethodArc_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="Deflection" value="2" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="3" displayLabel="DeltaR"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="ArcFromElementRuleAspect_BackTransitionDefinitionMethodRatio_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Arc_Ratio" value="3" displayLabel="Arc Ratio"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="ArcFromElementRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="6" displayLabel="Tangential Length"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="ArcFromElementRuleAspect_Hand_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Clockwise" value="1" displayLabel="Clockwise"/>
+        <ECEnumerator name="Counter_Clockwise" value="-1" displayLabel="Counter Clockwise"/>
+    </ECEnumeration>
     <ECEnumeration typeName="ArcFromElementRuleBaseAspect_Hand_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Clockwise" value="1" displayLabel="Clockwise"/>
         <ECEnumerator name="Counter_Clockwise" value="-1" displayLabel="Counter Clockwise"/>
@@ -146,6 +202,26 @@
         <ECEnumerator name="Spiral" value="1" displayLabel="Spiral"/>
         <ECEnumerator name="Curve" value="2" displayLabel="Curve"/>
     </ECEnumeration>
+    <ECEnumeration typeName="ArcToElementRuleAspect_BackTransitionDefinitionMethodArc_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="Deflection" value="2" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="3" displayLabel="DeltaR"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="ArcToElementRuleAspect_BackTransitionDefinitionMethodRatio_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Arc_Ratio" value="3" displayLabel="Arc Ratio"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="ArcToElementRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="6" displayLabel="Tangential Length"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="ArcToElementRuleAspect_Hand_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Clockwise" value="1" displayLabel="Clockwise"/>
+        <ECEnumerator name="Counter_Clockwise" value="-1" displayLabel="Counter Clockwise"/>
+    </ECEnumeration>
     <ECEnumeration typeName="ArcToElementRuleBaseAspect_Hand_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Clockwise" value="1" displayLabel="Clockwise"/>
         <ECEnumerator name="Counter_Clockwise" value="-1" displayLabel="Counter Clockwise"/>
@@ -249,6 +325,60 @@
         <ECEnumerator name="Offset" value="5" displayLabel="DeltaR"/>
         <ECEnumerator name="Tangential_Length" value="6" displayLabel="Tangential Length"/>
     </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_AheadTaperDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="None" value="0" displayLabel="None"/>
+        <ECEnumerator name="Length_Ratio" value="1" displayLabel="Length Ratio"/>
+        <ECEnumerator name="Length_Offset" value="2" displayLabel="Length Offset"/>
+        <ECEnumerator name="Ratio_Offset" value="3" displayLabel="Ratio-Offset"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_AheadTransitionDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="None" value="0" displayLabel="None"/>
+        <ECEnumerator name="Spiral" value="1" displayLabel="Spiral"/>
+        <ECEnumerator name="Curve" value="3" displayLabel="Curve"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_AheadTransitionDefinitionMethodArc_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="Deflection" value="2" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="3" displayLabel="DeltaR"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_AheadTransitionDefinitionMethodRatio_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Arc_Ratio" value="4" displayLabel="Arc Ratio"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_AheadTransitionDefinitionMethodSpiral_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="6" displayLabel="Tangential Length"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_BackTaperDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="None" value="0" displayLabel="None"/>
+        <ECEnumerator name="Length_Ratio" value="1" displayLabel="Length Ratio"/>
+        <ECEnumerator name="Length_Offset" value="2" displayLabel="Length Offset"/>
+        <ECEnumerator name="Ratio_Offset" value="3" displayLabel="Ratio-Offset"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_BackTransitionDefinitionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="None" value="0" displayLabel="None"/>
+        <ECEnumerator name="Spiral" value="1" displayLabel="Spiral"/>
+        <ECEnumerator name="Curve" value="3" displayLabel="Curve"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_BackTransitionDefinitionMethodArc_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="Deflection" value="2" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="3" displayLabel="DeltaR"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_BackTransitionDefinitionMethodRatio_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Arc_Ratio" value="4" displayLabel="Arc Ratio"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="FilletRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="6" displayLabel="Tangential Length"/>
+    </ECEnumeration>
     <ECEnumeration typeName="FilletRuleAspect_TruncateOption_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="None" value="1" displayLabel="None"/>
         <ECEnumerator name="Back" value="2" displayLabel="Back"/>
@@ -314,7 +444,20 @@
         <ECEnumerator name="Spiral" value="1" displayLabel="Spiral"/>
         <ECEnumerator name="Curve" value="2" displayLabel="Curve"/>
     </ECEnumeration>
-    <ECEnumeration typeName="LineFromElementRuleBaseAspect_TruncateOption_Enum" backingTypeName="int" isStrict="true">
+    <ECEnumeration typeName="LineFromElementRuleAspect_BackTransitionDefinitionMethodArc_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="Deflection" value="2" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="3" displayLabel="DeltaR"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="LineFromElementRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="6" displayLabel="Tangential Length"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="LineFromElementRuleAspect_TruncateOption_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="None" value="1" displayLabel="None"/>
         <ECEnumerator name="Back" value="2" displayLabel="Back"/>
     </ECEnumeration>
@@ -361,7 +504,20 @@
         <ECEnumerator name="Spiral" value="1" displayLabel="Spiral"/>
         <ECEnumerator name="Curve" value="2" displayLabel="Curve"/>
     </ECEnumeration>
-    <ECEnumeration typeName="LineToElementRuleBaseAspect_TruncateOption_Enum" backingTypeName="int" isStrict="true">
+    <ECEnumeration typeName="LineToElementRuleAspect_BackTransitionDefinitionMethodArc_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="Deflection" value="2" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="3" displayLabel="DeltaR"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="LineToElementRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Length" value="1" displayLabel="Length"/>
+        <ECEnumerator name="A_Value" value="2" displayLabel="A-Value"/>
+        <ECEnumerator name="RL" value="3" displayLabel="RL"/>
+        <ECEnumerator name="Deflection" value="4" displayLabel="Deflection"/>
+        <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
+        <ECEnumerator name="Tangential_Length" value="6" displayLabel="Tangential Length"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="LineToElementRuleAspect_TruncateOption_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="None" value="1" displayLabel="None"/>
         <ECEnumerator name="Back" value="2" displayLabel="Back"/>
     </ECEnumeration>
@@ -472,6 +628,9 @@
         <ECEnumerator name="Reverse_Cubic" value="8" displayLabel="Reverse Cubic"/>
         <ECEnumerator name="Extension" value="10" displayLabel="Extension"/>
     </ECEnumeration>
+    <ECEnumeration typeName="ProfileByProjectingLinEnt3dSlopeRuleAspect_SlopeStyleExt_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Extension" value="10" displayLabel="Extension"/>
+    </ECEnumeration>
     <ECEnumeration typeName="ProfileCurveBetweenElementsRuleAspect_CrestSagSelection_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Crest" value="1" displayLabel="Crest"/>
         <ECEnumerator name="Sag" value="2" displayLabel="Sag"/>
@@ -814,6 +973,48 @@
     <ECEntityClass typeName="ArcFromElementRuleArcRatioAspect">
         <BaseClass>ArcFromElementRuleBaseAspect</BaseClass>
     </ECEntityClass>
+    <ECEntityClass typeName="ArcBetweenElementsRuleAspect" displayLabel="Arc Between Arcs Rule">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="CurveTypeAtEnd" typeName="ArcBetweenElementsRuleAspect_CurveTypeAtEnd_Enum" displayLabel="Curve Type At End" category="ArcBetweenElementsRuleAttributes_Arc_Between_Arcs_Rule" priority="299998"/>
+        <ECProperty propertyName="Radius" typeName="double" displayLabel="Radius" category="ArcBetweenElementsRuleAttributes_Arc_Between_Arcs_Rule" priority="299996" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackOffset" typeName="double" displayLabel="Back Offset" category="ArcBetweenElementsRuleAttributes_Arc_Between_Arcs_Rule" priority="299995" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadOffset" typeName="double" displayLabel="Ahead Offset" category="ArcBetweenElementsRuleAttributes_Arc_Between_Arcs_Rule" priority="299994" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="ArcBetweenElementsRuleBackTransitionAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Method" category="BackTransitionAttributes_Back_Transition" priority="299993"/>
+        <ECProperty propertyName="BackTransitionLength" typeName="double" displayLabel="Length" category="BackTransitionAttributes_Back_Transition" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionLink" typeName="double" displayLabel="A-Value" category="BackTransitionAttributes_Back_Transition" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionRL" typeName="double" displayLabel="RL" category="BackTransitionAttributes_Back_Transition" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionDeflection" typeName="double" displayLabel="Deflection" category="BackTransitionAttributes_Back_Transition" priority="299992" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="BackTransitionDeltaR" typeName="double" displayLabel="DeltaR" category="BackTransitionAttributes_Back_Transition" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionTangentialLength" typeName="double" displayLabel="Tangential Length" category="BackTransitionAttributes_Back_Transition" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionIntermediateElementLength" typeName="double" displayLabel="Tangent Length" category="BackTransitionAttributes_Back_Transition" priority="299987" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionAheadSpiralDefinitionMethod" typeName="ArcBetweenElementsRuleAspect_BackTransitionAheadSpiralDefinitionMethod_Enum" displayLabel="Ahead Spiral Method" category="BackTransitionAttributes_Back_Transition" priority="299986"/>
+        <ECProperty propertyName="BackTransitionAheadSpiralLength" typeName="double" displayLabel="Back Transition Spiral Length" category="BackTransitionAttributes_Back_Transition" priority="299985" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionAheadSpiralLink" typeName="double" displayLabel="Back Transition Spiral A-Value" category="BackTransitionAttributes_Back_Transition" priority="299985" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionAheadSpiralRL" typeName="double" displayLabel="Back Transition Spiral RL" category="BackTransitionAttributes_Back_Transition" priority="299985" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionAheadSpiralDeflection" typeName="double" displayLabel="Back Transition Spiral Deflection" category="BackTransitionAttributes_Back_Transition" priority="299985" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="BackTransitionAheadSpiralDeltaR" typeName="double" displayLabel="Back Transition Spiral DeltaR" category="BackTransitionAttributes_Back_Transition" priority="299985" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionAheadSpiralTangentialLength" typeName="double" displayLabel="Back Transition Spiral Tangential Length" category="BackTransitionAttributes_Back_Transition" priority="299985" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionDefinitionMethod" typeName="ArcBetweenElementsRuleAspect_AheadTransitionDefinitionMethod_Enum" displayLabel="Method" category="AheadTransitionAttributes_Ahead_Transition" priority="299980"/>
+        <ECProperty propertyName="AheadTransitionLength" typeName="double" displayLabel="Length" category="AheadTransitionAttributes_Ahead_Transition" priority="299979" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionLink" typeName="double" displayLabel="A-Value" category="AheadTransitionAttributes_Ahead_Transition" priority="299979" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionRL" typeName="double" displayLabel="RL" category="AheadTransitionAttributes_Ahead_Transition" priority="299979" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionDeflection" typeName="double" displayLabel="Deflection" category="AheadTransitionAttributes_Ahead_Transition" priority="299979" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="AheadTransitionDeltaR" typeName="double" displayLabel="DeltaR" category="AheadTransitionAttributes_Ahead_Transition" priority="299979" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionTangentialLength" typeName="double" displayLabel="Tangential Length" category="AheadTransitionAttributes_Ahead_Transition" priority="299979" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionIntermediateElementLength" typeName="double" displayLabel="Tangent Length" category="AheadTransitionAttributes_Ahead_Transition" priority="299974" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionAheadSpiralDefinitionMethod" typeName="ArcBetweenElementArcRuleSpiralAspect_AheadTransitionAheadSpiralDefinitionMethod_Enum" displayLabel="Ahead Spiral Method" category="AheadTransitionAttributes_Ahead_Transition" priority="299973"/>
+        <ECProperty propertyName="AheadTransitionAheadSpiralLength" typeName="double" displayLabel="Ahead Transition Spiral Length" category="AheadTransitionAttributes_Ahead_Transition" priority="299972" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionAheadSpiralLink" typeName="double" displayLabel="Ahead Transition Spiral A-Value" category="AheadTransitionAttributes_Ahead_Transition" priority="299972" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionAheadSpiralRL" typeName="double" displayLabel="Ahead Transition Spiral RL" category="AheadTransitionAttributes_Ahead_Transition" priority="299972" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionAheadSpiralDeflection" typeName="double" displayLabel="Ahead Transition Spiral Deflection" category="AheadTransitionAttributes_Ahead_Transition" priority="299972" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="AheadTransitionAheadSpiralDeltaR" typeName="double" displayLabel="Ahead Transition Spiral DeltaR" category="AheadTransitionAttributes_Ahead_Transition" priority="299972" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionAheadSpiralTangentialLength" typeName="double" displayLabel="Ahead Transition Spiral Tangential Length" category="AheadTransitionAttributes_Ahead_Transition" priority="299972" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="ArcLength" typeName="double" displayLabel="Arc Length" category="GeometryAttributes_Geometry" priority="299960" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="Start" typeName="point3d" displayLabel="Start" category="GeometryAttributes_Geometry" priority="299959"/>
+        <ECProperty propertyName="End" typeName="point3d" displayLabel="End" category="GeometryAttributes_Geometry" priority="299958"/>
+        <ECProperty propertyName="ThruPoint" typeName="point3d" displayLabel="Through Point" category="GeometryAttributes_Geometry" priority="299957"/>
+        <ECProperty propertyName="TruncateOption" typeName="ArcBetweenElementsRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="ArcBetweenElementsRuleAttributes_Arc_Between_Arcs_Rule" priority="299950"/>
+    </ECEntityClass>
     <ECEntityClass typeName="ArcFromElementRuleAspect">
         <BaseClass>ArcFromElementRuleBaseAspect</BaseClass>
     </ECEntityClass>
@@ -1065,6 +1266,15 @@
             <Class class="ArcBetweenElementArcRuleAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsArcBetweenElementsRuleAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="ArcBetweenElementsRuleAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsArcBetweenElementArcRuleSpiralAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -1353,6 +1563,71 @@
             <Class class="DTMSlopeTraceRuleAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECEntityClass typeName="FilletRuleAspect" displayLabel="Fillet Rule">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="Radius" typeName="double" displayLabel="Radius" category="FilletRuleAttributes_Fillet_Rule" priority="299998" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="ThruPoint" typeName="point3d" displayLabel="Through Point" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299997"/>
+        <ECProperty propertyName="BackOffset" typeName="double" displayLabel="Back Offset" category="FilletRuleAttributes_Fillet_Rule" priority="299996" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadOffset" typeName="double" displayLabel="Ahead Offset" category="FilletRuleAttributes_Fillet_Rule" priority="299995" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTaperDefinitionMethod" typeName="FilletRuleAspect_BackTaperDefinitionMethod_Enum" displayLabel="Method" category="BackTaperAttributes_Back_Taper" priority="299994"/>
+        <ECProperty propertyName="BackTaperLength" typeName="double" displayLabel="Length" category="BackTaperAttributes_Back_Taper" priority="299993" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTaperOffset" typeName="double" displayLabel="Offset" category="BackTaperAttributes_Back_Taper" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTaperRatio" typeName="double" displayLabel="Ratio" category="BackTaperAttributes_Back_Taper" priority="299991" kindOfQuantity="cifu:PERCENT"/>
+        <ECProperty propertyName="BackTransitionRadiusRatio" typeName="double" displayLabel="Back Radius Ratio" category="BackTransitionAttributes_Back_Transition" priority="299973" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTaperEndOffsetRelativeToBaseElement" typeName="boolean" displayLabel="End Offset along base element" category="BackTaperAttributes_Back_Taper" priority="299990"/>
+        <ECProperty propertyName="AheadTaperDefinitionMethod" typeName="FilletRuleAspect_AheadTaperDefinitionMethod_Enum" displayLabel="Method" category="AheadTaperAttributes_Ahead_Taper" priority="299989"/>
+        <ECProperty propertyName="AheadTaperLength" typeName="double" displayLabel="Length" category="AheadTaperAttributes_Ahead_Taper" priority="299988" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTaperOffset" typeName="double" displayLabel="Offset" category="AheadTaperAttributes_Ahead_Taper" priority="299987" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTaperRatio" typeName="double" displayLabel="Ratio" category="AheadTaperAttributes_Ahead_Taper" priority="299986" kindOfQuantity="cifu:PERCENT"/>
+        <ECProperty propertyName="AheadTransitionRadiusRatio" typeName="double" displayLabel="Ahead Radius Ratio" category="AheadTransitionAttributes_Ahead_Transition" priority="299959" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTaperEndOffsetRelativeToBaseElement" typeName="boolean" displayLabel="End Offset along base element" category="AheadTaperAttributes_Ahead_Taper" priority="299985"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="FilletRuleAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Type" category="BackTransitionAttributes_Back_Transition" priority="299984"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethodRatio" typeName="FilletRuleAspect_BackTransitionDefinitionMethodRatio_Enum" displayLabel="Back Type (Ratio)" category="BackTransitionAttributes_Back_Transition" priority="299983"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethodSpiral" typeName="FilletRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" displayLabel="Back Spiral Method" category="BackTransitionAttributes_Back_Transition" priority="299982"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethodArc" typeName="FilletRuleAspect_BackTransitionDefinitionMethodArc_Enum" displayLabel="Back Arc Method" category="BackTransitionAttributes_Back_Transition" priority="299981"/>
+        <ECProperty propertyName="BackTransitionSpiralLength" typeName="double" displayLabel="Back Spiral Length" category="BackTransitionAttributes_Back_Transition" priority="299980" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralParameter" typeName="double" displayLabel="A-Value" category="BackTransitionAttributes_Back_Transition" priority="299980" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralRL" typeName="double" displayLabel="RL" category="BackTransitionAttributes_Back_Transition" priority="299980" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralDeflection" typeName="double" displayLabel="Back Spiral Deflection" category="BackTransitionAttributes_Back_Transition" priority="299980" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="BackTransitionSpiralDeltaR" typeName="double" displayLabel="Back Spiral DeltaR" category="BackTransitionAttributes_Back_Transition" priority="299980" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralTangentialLength" typeName="double" displayLabel="Tangential Length" category="BackTransitionAttributes_Back_Transition" priority="299980" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionRadius" typeName="double" displayLabel="Radius" category="BackTransitionAttributes_Back_Transition" priority="299975" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionCurveLength" typeName="double" displayLabel="Back Curve Length" category="BackTransitionAttributes_Back_Transition" priority="299974" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionCurveDeflection" typeName="double" displayLabel="Back Curve Deflection" category="BackTransitionAttributes_Back_Transition" priority="299974" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="BackTransitionCurveDeltaR" typeName="double" displayLabel="Back Curve DeltaR" category="BackTransitionAttributes_Back_Transition" priority="299974" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionDefinitionMethod" typeName="FilletRuleAspect_AheadTransitionDefinitionMethod_Enum" displayLabel="Type" category="AheadTransitionAttributes_Ahead_Transition" priority="299972"/>
+        <ECProperty propertyName="AheadTransitionDefinitionMethodRatio" typeName="FilletRuleAspect_AheadTransitionDefinitionMethodRatio_Enum" displayLabel="Ahead Type (Ratio)" category="AheadTransitionAttributes_Ahead_Transition" priority="299971"/>
+        <ECProperty propertyName="AheadTransitionDefinitionMethodSpiral" typeName="FilletRuleAspect_AheadTransitionDefinitionMethodSpiral_Enum" displayLabel="Ahead Spiral Method" category="AheadTransitionAttributes_Ahead_Transition" priority="299970"/>
+        <ECProperty propertyName="AheadTransitionDefinitionMethodArc" typeName="FilletRuleAspect_AheadTransitionDefinitionMethodArc_Enum" displayLabel="Ahead Arc Method" category="AheadTransitionAttributes_Ahead_Transition" priority="299969"/>
+        <ECProperty propertyName="AheadTransitionSpiralLength" typeName="double" displayLabel="Ahead Spiral Length" category="AheadTransitionAttributes_Ahead_Transition" priority="299968" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionSpiralParameter" typeName="double" displayLabel="A-Value" category="AheadTransitionAttributes_Ahead_Transition" priority="299968" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionSpiralRL" typeName="double" displayLabel="RL" category="AheadTransitionAttributes_Ahead_Transition" priority="299968" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionSpiralDeflection" typeName="double" displayLabel="Ahead Spiral Deflection" category="AheadTransitionAttributes_Ahead_Transition" priority="299968" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="AheadTransitionSpiralDeltaR" typeName="double" displayLabel="Ahead Spiral DeltaR" category="AheadTransitionAttributes_Ahead_Transition" priority="299968" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionSpiralTangentialLength" typeName="double" displayLabel="Tangential Length" category="AheadTransitionAttributes_Ahead_Transition" priority="299968" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionRadius" typeName="double" displayLabel="Radius" category="AheadTransitionAttributes_Ahead_Transition" priority="299963" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionCurveLength" typeName="double" displayLabel="Ahead Curve Length" category="AheadTransitionAttributes_Ahead_Transition" priority="299962" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="AheadTransitionCurveDeflection" typeName="double" displayLabel="Ahead Curve Deflection" category="AheadTransitionAttributes_Ahead_Transition" priority="299961" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="AheadTransitionCurveDeltaR" typeName="double" displayLabel="Ahead Curve DeltaR" category="AheadTransitionAttributes_Ahead_Transition" priority="299960" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="TotalLength" typeName="double" displayLabel="Total Length" category="GeometryAttributes_Geometry" priority="299958" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="ArcSweepAngle" typeName="double" displayLabel="Arc Sweep Angle" category="GeometryAttributes_Geometry" priority="299957" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="ArcTangent" typeName="double" displayLabel="Arc Tangent" category="GeometryAttributes_Geometry" priority="299956" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="TotalTangent" typeName="double" displayLabel="Total Tangent" category="GeometryAttributes_Geometry" priority="299955" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="ArcDeflection" typeName="double" displayLabel="Arc Deflection" category="GeometryAttributes_Geometry" priority="299954" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="TotalDeflection" typeName="double" displayLabel="Total Deflection" category="GeometryAttributes_Geometry" priority="299953" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="StartDirection" typeName="double" displayLabel="Start Direction" category="GeometryAttributes_Geometry" priority="299952" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="EndDirection" typeName="double" displayLabel="End Direction" category="GeometryAttributes_Geometry" priority="299951" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="TruncateOption" typeName="FilletRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="FilletRuleAttributes_Fillet_Rule" priority="299950"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsFilletRuleAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="FilletRuleAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="EqualSpacePointAlongElementRuleAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="EqualSpacePointAlongElementRule_NoOfPoints" typeName="int" displayLabel="Number Of Points" category="EqualSpacePointAlongElementRuleAttributes_Equal_Space_Point_Along_Element_Rule" priority="299998"/>
@@ -1766,6 +2041,37 @@
             <Class class="LineBetweenElementsRuleAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECEntityClass typeName="LineFromElementRuleAspect" displayLabel="Line From Element Rule">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="StartPoint" typeName="point3d" displayLabel="Start Point" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299954"/>
+        <ECProperty propertyName="BackOffset" typeName="double" displayLabel="Offset" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299996" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="Skew" typeName="double" displayLabel="Skew" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299994" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299993" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="EndDistance" typeName="double" displayLabel="End Distance" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="TruncateOption" typeName="LineFromElementRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299952"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="LineFromElementRuleBaseAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Type" category="BackTransitionAttributes_Back_Transition" priority="299986"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethodSpiral" typeName="LineFromElementRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" displayLabel="Spiral Method" category="BackTransitionAttributes_Back_Transition" priority="299985"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethodArc" typeName="LineFromElementRuleAspect_BackTransitionDefinitionMethodArc_Enum" displayLabel="Arc Method" category="BackTransitionAttributes_Back_Transition" priority="299984"/>
+        <ECProperty propertyName="BackTransitionSpiralLength" typeName="double" displayLabel="Spiral Length" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralParameter" typeName="double" displayLabel="A-Value" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralRL" typeName="double" displayLabel="RL" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralDeflection" typeName="double" displayLabel="Spiral Deflection" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="BackTransitionSpiralDeltaR" typeName="double" displayLabel="Spiral DeltaR" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralTangentialLength" typeName="double" displayLabel="Tangential Length" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionRadius" typeName="double" displayLabel="Radius" category="BackTransitionAttributes_Back_Transition" priority="299978" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionCurveLength" typeName="double" displayLabel="Curve Length" category="BackTransitionAttributes_Back_Transition" priority="299977" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionCurveDeflection" typeName="double" displayLabel="Curve Deflection" category="BackTransitionAttributes_Back_Transition" priority="299976" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="BackTransitionCurveDeltaR" typeName="double" displayLabel="Curve DeltaR" category="BackTransitionAttributes_Back_Transition" priority="299975" kindOfQuantity="cifu:LENGTH"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsLineFromElementRuleAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="LineFromElementRuleAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="LineFromElementRuleBaseAspect" modifier="Abstract">
         <BaseClass>bis:ElementUniqueAspect</BaseClass>
         <ECProperty propertyName="StartPoint" typeName="point3d" displayLabel="Start Point" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299954" kindOfQuantity="cifu:LENGTH"/>
@@ -1773,7 +2079,7 @@
         <ECProperty propertyName="Skew" typeName="double" displayLabel="Skew" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299994" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299993" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="EndDistance" typeName="double" displayLabel="End Distance" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299992" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="TruncateOption" typeName="LineFromElementRuleBaseAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299952"/>
+        <ECProperty propertyName="TruncateOption" typeName="LineFromElementRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299952"/>
         <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="LineFromElementRuleBaseAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Type" category="BackTransitionAttributes_Back_Transition" priority="299986"/>
     </ECEntityClass>
     <ECEntityClass typeName="LineFromElementRuleCurveAspect">
@@ -2244,13 +2550,43 @@
             <Class class="LineSegmentRuleAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECEntityClass typeName="LineToElementRuleAspect" displayLabel="Line To Element Rule">
+        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <ECProperty propertyName="StartPoint" typeName="point3d" displayLabel="Start Point" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299954"/>
+        <ECProperty propertyName="BackOffset" typeName="double" displayLabel="Offset" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299996" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="Skew" typeName="double" displayLabel="Skew" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299994" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299992" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="TruncateOption" typeName="LineToElementRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299952"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="LineToElementRuleBaseAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Type" category="BackTransitionAttributes_Back_Transition" priority="299986"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethodSpiral" typeName="LineToElementRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" displayLabel="Spiral Method" category="BackTransitionAttributes_Back_Transition" priority="299985"/>
+        <ECProperty propertyName="BackTransitionDefinitionMethodArc" typeName="LineToElementRuleAspect_BackTransitionDefinitionMethodArc_Enum" displayLabel="Arc Method" category="BackTransitionAttributes_Back_Transition" priority="299984"/>
+        <ECProperty propertyName="BackTransitionSpiralLength" typeName="double" displayLabel="Spiral Length" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralParameter" typeName="double" displayLabel="A-Value" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralRL" typeName="double" displayLabel="RL" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralDeflection" typeName="double" displayLabel="Spiral Deflection" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="BackTransitionSpiralDeltaR" typeName="double" displayLabel="Spiral DeltaR" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionSpiralTangentialLength" typeName="double" displayLabel="Tangential Length" category="BackTransitionAttributes_Back_Transition" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionRadius" typeName="double" displayLabel="Radius" category="BackTransitionAttributes_Back_Transition" priority="299978" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionCurveLength" typeName="double" displayLabel="Curve Length" category="BackTransitionAttributes_Back_Transition" priority="299977" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BackTransitionCurveDeflection" typeName="double" displayLabel="Curve Deflection" category="BackTransitionAttributes_Back_Transition" priority="299976" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="BackTransitionCurveDeltaR" typeName="double" displayLabel="Curve DeltaR" category="BackTransitionAttributes_Back_Transition" priority="299975" kindOfQuantity="cifu:LENGTH"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsLineToElementRuleAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="LineToElementRuleAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="LineToElementRuleBaseAspect" modifier="Abstract">
         <BaseClass>bis:ElementUniqueAspect</BaseClass>
         <ECProperty propertyName="StartPoint" typeName="point3d" displayLabel="Start Point" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299954" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BackOffset" typeName="double" displayLabel="Offset" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299996" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Skew" typeName="double" displayLabel="Skew" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299994" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299992" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="TruncateOption" typeName="LineToElementRuleBaseAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299952"/>
+        <ECProperty propertyName="TruncateOption" typeName="LineToElementRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299952"/>
         <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="LineToElementRuleBaseAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Type" category="BackTransitionAttributes_Back_Transition" priority="299986"/>
     </ECEntityClass>
     <ECEntityClass typeName="LineToElementRuleCurveAspect">
diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeotechnical.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeotechnical.ecschema.xml
index 5d570ffc1..9136f91df 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeotechnical.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeotechnical.ecschema.xml
@@ -4,9 +4,9 @@
 |  * See LICENSE.md in the project root for license terms and full copyright notice.
 ======================================================================================= -->
 <ECSchema schemaName="CifGeotechnical" alias="cifgeotechnical" version="01.00.02" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-    <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
-    <ECSchemaReference name="CifCommon" version="01.00.10" alias="cifcmn"/>
-    <ECSchemaReference name="CifUnits" version="01.00.08" alias="cifu"/>
+    <ECSchemaReference name="BisCore" version="01.00.25" alias="bis"/>
+    <ECSchemaReference name="CifCommon" version="01.00.15" alias="cifcmn"/>
+    <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
     <ECCustomAttributes>
diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml
index 754a64e68..d514e257f 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml
@@ -4,10 +4,10 @@
 |  * See LICENSE.md in the project root for license terms and full copyright notice.
 ======================================================================================= -->
 <ECSchema schemaName="CifHydraulicAnalysis" alias="cifhydan" version="01.00.10" description="iModel Connector schema containing aspect classes with input properties from the Subsurface Utilities Design and Analysis module as part of Civil Designer applications." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-    <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
+    <ECSchemaReference name="BisCore" version="01.00.25" alias="bis"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
-    <ECSchemaReference name="CifCommon" version="01.00.10" alias="cifcmn"/>
-    <ECSchemaReference name="CifUnits" version="01.00.08" alias="cifu"/>
+    <ECSchemaReference name="CifCommon" version="01.00.16" alias="cifcmn"/>
+    <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECCustomAttributes>
         <ProductionStatus xmlns="CoreCustomAttributes.01.00.04">
@@ -43,6 +43,7 @@
         <ECEnumerator name="Irregular" value="2" displayLabel="Irregular"/>
         <ECEnumerator name="Parabolic" value="3" displayLabel="Parabolic"/>
         <ECEnumerator name="V_Shaped" value="4" displayLabel="V-Shaped"/>
+        <ECEnumerator name="Composite" value="6" displayLabel="Composite"/>
     </ECEnumeration>
     <ECEnumeration typeName="CatchBasin_Physical_InletGutterTypeAspect_InletGutterType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="User_Defined" value="0" displayLabel="User Defined"/>
@@ -67,6 +68,18 @@
         <ECEnumerator name="S" value="3" displayLabel="S"/>
         <ECEnumerator name="T" value="4" displayLabel="T"/>
     </ECEnumeration>
+    <ECEnumeration typeName="CatchBasin_WaterQualityAspect_TreatmentUnits_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="US_Units___CFS__ft__sq_ft" value="27" displayLabel="US Units - CFS, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___GPM__ft__sq_ft" value="84" displayLabel="US Units - GPM, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___MGD__ft__sq_ft" value="158" displayLabel="US Units - MGD, ft, sq.ft"/>
+        <ECEnumerator name="SI_Units___CMS__m__sq_m" value="48" displayLabel="SI Units - CMS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___LPS__m__sq_m" value="141" displayLabel="SI Units - LPS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___MLD__m__sq_m" value="275" displayLabel="SI Units - MLD, m, sq.m"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="Catchment_HydrologicAspect_DelineationType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Manual" value="0" displayLabel="Manual"/>
+        <ECEnumerator name="Automatic" value="1" displayLabel="Automatic"/>
+    </ECEnumeration>
     <ECEnumeration typeName="Catchment_Hydrologic_ApplyGroundWater_True_GwBottomElevationAspect_Hydrologic_GwBottomElevationUseAquiferData_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Use_Aquifer_Data" value="0" displayLabel="Use Aquifer Data"/>
         <ECEnumerator name="User_Defined" value="1" displayLabel="User Defined"/>
@@ -154,12 +167,12 @@
     </ECEnumeration>
     <ECEnumeration typeName="Conduit_InfiltrationAndInflow_TypeAspect_InfiltrationLoadType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="None" value="0" displayLabel="None"/>
-        <ECEnumerator name="Pipe_Length" value="1" displayLabel="Link Length"/>
+        <ECEnumerator name="Pipe_Length" value="1" displayLabel="Pipe Length"/>
         <ECEnumerator name="Pipe_Rise_Length" value="2" displayLabel="Pipe Rise-Length"/>
-        <ECEnumerator name="Pipe_Surface_Area" value="3" displayLabel="Surface Area"/>
+        <ECEnumerator name="Pipe_Surface_Area" value="3" displayLabel="Pipe Surface Area"/>
         <ECEnumerator name="Count_Based" value="4" displayLabel="Count Based"/>
         <ECEnumerator name="Hydrograph" value="5" displayLabel="Hydrograph"/>
-        <ECEnumerator name="Pattern_Load" value="6" displayLabel="Infiltration Pattern Load"/>
+        <ECEnumerator name="Pattern_Load" value="6" displayLabel="Pattern Load"/>
     </ECEnumeration>
     <ECEnumeration typeName="Conduit_OutputAspect_OutputOptionsType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Summary_Results" value="0" displayLabel="Summary Results"/>
@@ -189,7 +202,7 @@
     </ECEnumeration>
     <ECEnumeration typeName="Conduit_PhysicalAspect_HeadwaterMaximumType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Use_Elevation_Ground" value="0" displayLabel="Use Elevation (Ground)"/>
-        <ECEnumerator name="UserDefined" value="1" displayLabel="UserDefined"/>
+        <ECEnumerator name="UserDefined" value="1" displayLabel="User Defined"/>
     </ECEnumeration>
     <ECEnumeration typeName="Conduit_Shape_ArchAspect_ArchDataType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Rise_and_Span" value="0" displayLabel="Rise and Span"/>
@@ -219,7 +232,7 @@
         <ECEnumerator name="Catenary" value="13" displayLabel="Catenary"/>
         <ECEnumerator name="Gothic" value="14" displayLabel="Gothic"/>
         <ECEnumerator name="Modified_Basket_Handle" value="15" displayLabel="Modified Basket-Handle"/>
-        <ECEnumerator name="Rectangular_Round" value="16" displayLabel="Rectangular-Round"/>
+        <ECEnumerator name="Rectangular_Round" value="16" displayLabel="Rectangular-Round Channel"/>
         <ECEnumerator name="Rectangular_Triangle" value="17" displayLabel="Rectangular-Triangle"/>
         <ECEnumerator name="Power_Channel" value="18" displayLabel="Power Channel"/>
         <ECEnumerator name="Parabolic_Channel" value="19" displayLabel="Parabolic Channel"/>
@@ -228,6 +241,15 @@
         <ECEnumerator name="Irregular_Closed_Section" value="22" displayLabel="Irregular Closed Section"/>
         <ECEnumerator name="Virtual" value="11" displayLabel="Virtual"/>
         <ECEnumerator name="Arch" value="30" displayLabel="Arch"/>
+        <ECEnumerator name="Rectangular_Round_Pipe" value="31" displayLabel="Rectangular-Round Pipe"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="Conduit_PhysicalAspect_OpenChannelWeightingMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Pavlovskii_Method" value="0" displayLabel="Pavlovskii Method"/>
+        <ECEnumerator name="Horton_Method" value="1" displayLabel="Horton Method"/>
+        <ECEnumerator name="Colebatch_Method" value="2" displayLabel="Colebatch Method"/>
+        <ECEnumerator name="Cox_Method" value="3" displayLabel="Cox Method"/>
+        <ECEnumerator name="Lotter_Method" value="4" displayLabel="Lotter Method"/>
+        <ECEnumerator name="Improved_Lotter_Method" value="5" displayLabel="Improved Lotter Method"/>
     </ECEnumeration>
     <ECEnumeration typeName="ConduitCxRoughness_PhysicalAspect_RoughnessType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Single_Roughness" value="0" displayLabel="Single Roughness"/>
@@ -241,6 +263,25 @@
         <ECEnumerator name="Catalog_Cross_Section" value="1" displayLabel="Catalog Cross Section"/>
         <ECEnumerator name="From_Surface" value="2" displayLabel="From Surface"/>
     </ECEnumeration>
+    <ECEnumeration typeName="CrossSectionNode_PhysicalAspect_CxDataType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Trapezoidal_Cross_Section" value="0" displayLabel="Trapezoidal Cross Section"/>
+        <ECEnumerator name="Irregular_Channel" value="1" displayLabel="Irregular Channel"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="CrossSectionNode_PhysicalAspect_OpenChannelWeightingMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Pavlovskii_Method" value="0" displayLabel="Pavlovskii Method"/>
+        <ECEnumerator name="Horton_Method" value="1" displayLabel="Horton Method"/>
+        <ECEnumerator name="Colebatch_Method" value="2" displayLabel="Colebatch Method"/>
+        <ECEnumerator name="Cox_Method" value="3" displayLabel="Cox Method"/>
+        <ECEnumerator name="Lotter_Method" value="4" displayLabel="Lotter Method"/>
+        <ECEnumerator name="Improved_Lotter_Method" value="5" displayLabel="Improved Lotter Method"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="CrossSectionNode_PhysicalAspect_RoughnessType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Single_Roughness" value="0" displayLabel="Single Roughness"/>
+        <ECEnumerator name="Roughness_Depth" value="1" displayLabel="Roughness Depth"/>
+        <ECEnumerator name="Roughness_Flow" value="2" displayLabel="Roughness Flow"/>
+        <ECEnumerator name="Horizontal_Segment" value="3" displayLabel="Horizontal Segment"/>
+        <ECEnumerator name="Bank_Channel" value="4" displayLabel="Bank Channel"/>
+    </ECEnumeration>
     <ECEnumeration typeName="CrossSectionNode_PhysicalAspect_TransitionType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Gradual" value="0" displayLabel="Gradual"/>
         <ECEnumerator name="Abrupt" value="1" displayLabel="Abrupt"/>
@@ -316,6 +357,7 @@
         <ECEnumerator name="Irregular" value="2" displayLabel="Irregular"/>
         <ECEnumerator name="Parabolic" value="3" displayLabel="Parabolic"/>
         <ECEnumerator name="V_Shaped" value="4" displayLabel="V-Shaped"/>
+        <ECEnumerator name="Composite" value="6" displayLabel="Composite"/>
     </ECEnumeration>
     <ECEnumeration typeName="Headwall_BoundaryConditionAspect_BoundaryConditionType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Free_Outfall" value="0" displayLabel="Free Outfall"/>
@@ -348,6 +390,114 @@
         <ECEnumerator name="Lotter_Method" value="4" displayLabel="Lotter Method"/>
         <ECEnumerator name="Improved_Lotter_Method" value="5" displayLabel="Improved Lotter Method"/>
     </ECEnumeration>
+    <ECEnumeration typeName="Headwall_PhysicalAspect_CxDataType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Trapezoidal_Cross_Section" value="0" displayLabel="Trapezoidal Cross Section"/>
+        <ECEnumerator name="Irregular_Channel" value="1" displayLabel="Irregular Channel"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="Headwall_PhysicalAspect_OpenChannelWeightingMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Pavlovskii_Method" value="0" displayLabel="Pavlovskii Method"/>
+        <ECEnumerator name="Horton_Method" value="1" displayLabel="Horton Method"/>
+        <ECEnumerator name="Colebatch_Method" value="2" displayLabel="Colebatch Method"/>
+        <ECEnumerator name="Cox_Method" value="3" displayLabel="Cox Method"/>
+        <ECEnumerator name="Lotter_Method" value="4" displayLabel="Lotter Method"/>
+        <ECEnumerator name="Improved_Lotter_Method" value="5" displayLabel="Improved Lotter Method"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="Headwall_PhysicalAspect_RoughnessType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Single_Roughness" value="0" displayLabel="Single Roughness"/>
+        <ECEnumerator name="Roughness_Depth" value="1" displayLabel="Roughness Depth"/>
+        <ECEnumerator name="Roughness_Flow" value="2" displayLabel="Roughness Flow"/>
+        <ECEnumerator name="Horizontal_Segment" value="3" displayLabel="Horizontal Segment"/>
+        <ECEnumerator name="Bank_Channel" value="4" displayLabel="Bank Channel"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_AverageVelocityMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Actual_Uniform_Flow_Velocity" value="0" displayLabel="Actual Uniform Flow Velocity"/>
+        <ECEnumerator name="Full_Depth_Velocity" value="1" displayLabel="Full Depth Velocity"/>
+        <ECEnumerator name="Simple_Average_Velocity" value="2" displayLabel="Simple Average Velocity"/>
+        <ECEnumerator name="Weighted_Average_Velocity" value="3" displayLabel="Weighted Average Velocity"/>
+        <ECEnumerator name="Full_Flow_Velocity" value="4" displayLabel="Full Flow Velocity"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_DarcyFrictionFactorMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Swamee_Jain" value="0" displayLabel="Swamee-Jain"/>
+        <ECEnumerator name="Colebrook_White" value="1" displayLabel="Colebrook-White"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_EngineSummaryStatus_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="No_Problems" value="0" displayLabel="No Problems"/>
+        <ECEnumerator name="Warnings_Generated" value="1" displayLabel="Warnings Generated"/>
+        <ECEnumerator name="Errors_Generated" value="2" displayLabel="Errors Generated"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_EpaSummaryStatus_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="No_Problems" value="0" displayLabel="No Problems"/>
+        <ECEnumerator name="Warnings_Generated" value="1" displayLabel="Warnings Generated"/>
+        <ECEnumerator name="Errors_Generated" value="2" displayLabel="Errors Generated"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_EpaTimeStepStatus_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="No_Problems" value="0" displayLabel="No Problems"/>
+        <ECEnumerator name="Warnings_Generated" value="1" displayLabel="Warnings Generated"/>
+        <ECEnumerator name="Errors_Generated" value="2" displayLabel="Errors Generated"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_FlowProfileMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Capacity_Analysis" value="0" displayLabel="Capacity Analysis"/>
+        <ECEnumerator name="Backwater_Analysis" value="1" displayLabel="Backwater Analysis"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_GvfCalculationType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Analysis" value="0" displayLabel="Analysis"/>
+        <ECEnumerator name="Design" value="1" displayLabel="Design"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_HmFrictionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Manning_s" value="0" displayLabel="Manning's"/>
+        <ECEnumerator name="Hazen_Williams" value="1" displayLabel="Hazen-Williams"/>
+        <ECEnumerator name="Darcy_Weisbach" value="2" displayLabel="Darcy-Weisbach"/>
+        <ECEnumerator name="Kutters" value="3" displayLabel="Kutters"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_OverrideReportingTimeStep_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="All" value="0" displayLabel="&lt;All&gt;"/>
+        <ECEnumerator name="Constant" value="1" displayLabel="Constant"/>
+        <ECEnumerator name="Variable" value="2" displayLabel="Variable"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_PressureFrictionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Mannings" value="0" displayLabel="Mannings"/>
+        <ECEnumerator name="Hazen_Williams" value="1" displayLabel="Hazen-Williams"/>
+        <ECEnumerator name="Darcy_Weisbach" value="2" displayLabel="Darcy-Weisbach"/>
+        <ECEnumerator name="Kutters" value="3" displayLabel="Kutters"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_SteadyStateHydrographEquivalent_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Peak" value="0" displayLabel="Peak"/>
+        <ECEnumerator name="Average" value="1" displayLabel="Average"/>
+        <ECEnumerator name="Minimum" value="2" displayLabel="Minimum"/>
+        <ECEnumerator name="Zero" value="3" displayLabel="Zero"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_StructureLossMode_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Hydraulic_Grade" value="0" displayLabel="Hydraulic Grade"/>
+        <ECEnumerator name="Energy_Grade" value="1" displayLabel="Energy Grade"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_SwmmCalcSummary_FlowRoutingMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Uniform" value="0" displayLabel="Uniform"/>
+        <ECEnumerator name="Kinematic_Wave" value="1" displayLabel="Kinematic Wave"/>
+        <ECEnumerator name="Dynamic_Wave" value="2" displayLabel="Dynamic Wave"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_SwmmCalcSummary_SwmmInfiltrationMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Horton" value="0" displayLabel="Horton"/>
+        <ECEnumerator name="Green_and_Ampt" value="1" displayLabel="Green and Ampt"/>
+        <ECEnumerator name="SCS_CN" value="2" displayLabel="SCS CN"/>
+        <ECEnumerator name="Horton_Modified" value="3" displayLabel="Horton (Modified)"/>
+        <ECEnumerator name="Green_and_Ampt__Modified" value="4" displayLabel="Green and Ampt  (Modified)"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_SwmmDefaultInfiltration_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Horton" value="0" displayLabel="Horton"/>
+        <ECEnumerator name="Green_and_Ampt" value="1" displayLabel="Green and Ampt"/>
+        <ECEnumerator name="SCS_CN" value="2" displayLabel="SCS CN"/>
+        <ECEnumerator name="Horton_Modified" value="3" displayLabel="Horton (Modified)"/>
+        <ECEnumerator name="Green_and_Ampt_Modified" value="4" displayLabel="Green and Ampt (Modified)"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_TimeAnalysisType_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Steady_State" value="0" displayLabel="Steady State"/>
+        <ECEnumerator name="EPS" value="1" displayLabel="EPS"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="HmiScenarioResultRecordAspect_UpstreamPipeSelectionMethod_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Pipe_with_Maximum_QV" value="0" displayLabel="Pipe with Maximum QV"/>
+        <ECEnumerator name="Pipe_with_Minimum_Bend_Angle" value="1" displayLabel="Pipe with Minimum Bend Angle"/>
+        <ECEnumerator name="Pipe_with_Maximum_Velocity_Head" value="2" displayLabel="Pipe with Maximum Velocity Head"/>
+    </ECEnumeration>
     <ECEnumeration typeName="LID_OutputAspect_OutputOptionsType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Summary_Results" value="0" displayLabel="Summary Results"/>
         <ECEnumerator name="Detailed_Results" value="1" displayLabel="Detailed Results"/>
@@ -360,6 +510,14 @@
         <ECEnumerator name="SI_Units___LPS__m__sq_m" value="141" displayLabel="SI Units - LPS, m, sq.m"/>
         <ECEnumerator name="SI_Units___MLD__m__sq_m" value="275" displayLabel="SI Units - MLD, m, sq.m"/>
     </ECEnumeration>
+    <ECEnumeration typeName="Manhole_WaterQualityAspect_TreatmentUnits_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="US_Units___CFS__ft__sq_ft" value="27" displayLabel="US Units - CFS, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___GPM__ft__sq_ft" value="84" displayLabel="US Units - GPM, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___MGD__ft__sq_ft" value="158" displayLabel="US Units - MGD, ft, sq.ft"/>
+        <ECEnumerator name="SI_Units___CMS__m__sq_m" value="48" displayLabel="SI Units - CMS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___LPS__m__sq_m" value="141" displayLabel="SI Units - LPS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___MLD__m__sq_m" value="275" displayLabel="SI Units - MLD, m, sq.m"/>
+    </ECEnumeration>
     <ECEnumeration typeName="Outfall_BoundaryConditionAspect_BoundaryConditionType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Free_Outfall" value="0" displayLabel="Free Outfall"/>
         <ECEnumerator name="Time_Elevation_Curve" value="1" displayLabel="Time-Elevation Curve"/>
@@ -370,6 +528,14 @@
         <ECEnumerator name="Tidal" value="6" displayLabel="Tidal"/>
         <ECEnumerator name="Crown" value="10" displayLabel="Crown"/>
     </ECEnumeration>
+    <ECEnumeration typeName="Outfall_WaterQualityAspect_TreatmentUnits_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="US_Units___CFS__ft__sq_ft" value="27" displayLabel="US Units - CFS, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___GPM__ft__sq_ft" value="84" displayLabel="US Units - GPM, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___MGD__ft__sq_ft" value="158" displayLabel="US Units - MGD, ft, sq.ft"/>
+        <ECEnumerator name="SI_Units___CMS__m__sq_m" value="48" displayLabel="SI Units - CMS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___LPS__m__sq_m" value="141" displayLabel="SI Units - LPS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___MLD__m__sq_m" value="275" displayLabel="SI Units - MLD, m, sq.m"/>
+    </ECEnumeration>
     <ECEnumeration typeName="Pond_InitialSettingsAspect_StartingWSType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Invert" value="0" displayLabel="Invert"/>
         <ECEnumerator name="User_Defined_Initial_Elevation" value="1" displayLabel="User Defined Initial Elevation"/>
@@ -392,6 +558,14 @@
         <ECEnumerator name="Elliptical_or_Circular_Cylinder" value="10" displayLabel="Elliptical or Circular Cylinder"/>
         <ECEnumerator name="Elliptical_Paraboloid" value="11" displayLabel="Elliptical Paraboloid"/>
     </ECEnumeration>
+    <ECEnumeration typeName="Pond_WaterQualityAspect_TreatmentUnits_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="US_Units___CFS__ft__sq_ft" value="27" displayLabel="US Units - CFS, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___GPM__ft__sq_ft" value="84" displayLabel="US Units - GPM, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___MGD__ft__sq_ft" value="158" displayLabel="US Units - MGD, ft, sq.ft"/>
+        <ECEnumerator name="SI_Units___CMS__m__sq_m" value="48" displayLabel="SI Units - CMS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___LPS__m__sq_m" value="141" displayLabel="SI Units - LPS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___MLD__m__sq_m" value="275" displayLabel="SI Units - MLD, m, sq.m"/>
+    </ECEnumeration>
     <ECEnumeration typeName="PondOutletStructure_PhysicalAspect_PondOutletDataType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Yes" value="0" displayLabel="Yes"/>
         <ECEnumerator name="No" value="1" displayLabel="No"/>
@@ -521,6 +695,19 @@
         <ECEnumerator name="Elevation" value="0" displayLabel="Elevation"/>
         <ECEnumerator name="Level" value="1" displayLabel="Level"/>
     </ECEnumeration>
+    <ECEnumeration typeName="WetWell_WaterQualityAspect_TreatmentUnits_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="US_Units___CFS__ft__sq_ft" value="27" displayLabel="US Units - CFS, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___GPM__ft__sq_ft" value="84" displayLabel="US Units - GPM, ft, sq.ft"/>
+        <ECEnumerator name="US_Units___MGD__ft__sq_ft" value="158" displayLabel="US Units - MGD, ft, sq.ft"/>
+        <ECEnumerator name="SI_Units___CMS__m__sq_m" value="48" displayLabel="SI Units - CMS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___LPS__m__sq_m" value="141" displayLabel="SI Units - LPS, m, sq.m"/>
+        <ECEnumerator name="SI_Units___MLD__m__sq_m" value="275" displayLabel="SI Units - MLD, m, sq.m"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="SUDAConflictDataSet_HMIStandardResultRecordAspect_FlowDirection_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="flowdirection_noflow" value="0" displayLabel="#flowdirection_noflow"/>
+        <ECEnumerator name="flowdirection_positive" value="1" displayLabel="#flowdirection_positive"/>
+        <ECEnumerator name="flowdirection_negative" value="-1" displayLabel="#flowdirection_negative"/>
+    </ECEnumeration>
     <ECEntityClass typeName="AirValve_PhysicalAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Physical_TreatAirValveAsJunction" typeName="boolean" displayLabel="Treat Air Valve as Junction?" category="Physical_Drainage_Physical_Drainage" priority="0"/>
@@ -568,7 +755,7 @@
     </ECEntityClass>
     <ECEntityClass typeName="BaseLink_HmiDataSetGeometryAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
-        <ECProperty propertyName="HMIGeometryScaledLength" typeName="double" displayLabel="Length (Scaled)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="HMIGeometryScaledLength" typeName="double" displayLabel="Length (Scaled)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
     <ECEntityClass typeName="BaseLink_HMIUserDefinedExtensionsAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -585,6 +772,11 @@
     </ECEntityClass>
     <ECEntityClass typeName="BaseLink_PhysicalAspect">
         <BaseClass>BaseLink_PhysicalBaseAspect</BaseClass>
+        <ECProperty propertyName="Physical_IsUserDefinedLength" typeName="boolean" displayLabel="Has User Defined Length?" category="Physical_Drainage_Physical_Drainage" priority="0"/>
+        <ECProperty propertyName="Physical_UserDefinedLength" typeName="double" displayLabel="Length (User Defined)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="LinkMicroStationID" typeName="string" displayLabel="MicroStation 3D ID" category="General_Drainage_General_Drainage" priority="0"/>
+        <ECProperty propertyName="LinkMicroStation2dID" typeName="string" displayLabel="MicroStation 2D ID" category="General_Drainage_General_Drainage" priority="0"/>
+        <ECProperty propertyName="LinkFeatureDefinitionShort" typeName="string" displayLabel="Feature Definition (Short)" category="General_Drainage_General_Drainage" priority="0"/>
     </ECEntityClass>
     <ECEntityClass typeName="BaseLinkAspect">
         <BaseClass>GlobalBase_Washington_Aspect</BaseClass>
@@ -687,6 +879,10 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="HMIGeometryScaledArea" typeName="double" displayLabel="Scaled Area" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:AREA"/>
     </ECEntityClass>
+    <ECEntityClass typeName="BasePolygon_PhysicalAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="PolygonFeatureDefinitionShort" typeName="string" displayLabel="Feature Definition (Short)" category="General_Drainage_General_Drainage" priority="0"/>
+    </ECEntityClass>
     <ECEntityClass typeName="BasePolygonAspect">
         <BaseClass>GlobalBase_Washington_Aspect</BaseClass>
     </ECEntityClass>
@@ -820,6 +1016,12 @@
     <ECEntityClass typeName="BoundaryPoint2DAspect">
         <BaseClass>GlobalBase_Washington_Aspect</BaseClass>
     </ECEntityClass>
+    <ECEntityClass typeName="CatchBasin_HMIUserDefinedExtensionsAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="ChamberWallThickness" typeName="double" displayLabel="Wall Thickness" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH_SHORT"/>
+        <ECProperty propertyName="ChamberBaseThickness" typeName="double" displayLabel="Base Thickness" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH_SHORT"/>
+        <ECProperty propertyName="ChamberBaseOverhang" typeName="double" displayLabel="Base Overhang" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH_SHORT"/>
+    </ECEntityClass>
     <ECEntityClass typeName="CatchBasin_Design_LocalConstraintsAspect" modifier="Abstract">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Design_SpecifyLocalInletConstraints" typeName="boolean" displayLabel="Specify Local Inlet Constraints?" category="Design_Drainage_Design_Drainage" priority="0"/>
@@ -928,10 +1130,29 @@
     </ECEntityClass>
     <ECEntityClass typeName="CatchBasin_PhysicalAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="InletType" typeName="CatchBasin_Physical_InletTypeAspect_InletType_Enum" displayLabel="Inlet Type" category="Inlet_Drainage_Inlet_Drainage" priority="0"/>
+        <ECProperty propertyName="MaximumCapacityType_MaximumInflow" typeName="double" displayLabel="Flow (Maximum in)" category="Inlet_Drainage_Inlet_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="PercentCaptureType_PercentCaptureEfficiency" typeName="double" displayLabel="Capture Efficiency" category="Inlet_Drainage_Inlet_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
+        <ECProperty propertyName="InletGutterType" typeName="CatchBasin_Physical_InletGutterTypeAspect_InletGutterType_Enum" displayLabel="Gutter Type" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="Physical_CurbOpeningLength" typeName="double" displayLabel="Curb Opening Length" category="Inlet_Opening_Drainage_Inlet_Opening_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Physical_GrateLength" typeName="double" displayLabel="Grate Length" category="Inlet_Opening_Drainage_Inlet_Opening_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Physical_GrateCloggingFactor" typeName="double" displayLabel="Clogging Factor" category="Inlet_Opening_Drainage_Inlet_Opening_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
         <ECProperty propertyName="Physical_SlotLength" typeName="double" displayLabel="Slot Length" category="Inlet_Opening_Drainage_Inlet_Opening_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="InletLocation" typeName="CatchBasin_Physical_InletLocationAspect_InletLocation_Enum" displayLabel="Inlet Location" category="Inlet_Location_Drainage_Inlet_Location_Drainage" priority="0"/>
+        <ECProperty propertyName="OnGradeType_LongitudinalSlope" typeName="double" displayLabel="Longitudinal Slope (Inlet)" category="Inlet_Location_Drainage_Inlet_Location_Drainage" priority="0" kindOfQuantity="cifu:SLOPE"/>
+        <ECProperty propertyName="OnGradeType_ManningsN" typeName="double" displayLabel="Manning's n (Inlet)" category="Inlet_Location_Drainage_Inlet_Location_Drainage" priority="0" kindOfQuantity="cifu:ROUGHNESS_MANNINGS"/>
+        <ECProperty propertyName="GutterShape" typeName="CatchBasin_Physical_GutterShapeAspect_GutterShape_Enum" displayLabel="Gutter Shape" category="Physical_Drainage_Physical_Drainage" priority="0"/>
+        <ECProperty propertyName="GutterShapeType_RightSideSlope" typeName="double" displayLabel="Right Side Slope" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:SIDESLOPE"/>
+        <ECProperty propertyName="GutterShapeType_LeftSideSlope" typeName="double" displayLabel="Left Side Slope" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:SIDESLOPE"/>
+        <ECProperty propertyName="VShapedGutterType_CurbCrossSlope" typeName="double" displayLabel="Curb Cross Slope" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:SLOPE"/>
+        <ECProperty propertyName="Physical_MaximumGutterDepth" typeName="double" displayLabel="Maximum Gutter Depth" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:DEPTH_LARGE"/>
+        <ECProperty propertyName="Physical_DitchBottomWidth" typeName="double" displayLabel="Bottom Width (Ditch)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="Physical_RoadCrossSlope" typeName="double" displayLabel="Road Cross Slope" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:SLOPE"/>
+        <ECProperty propertyName="Physical_DepressedGutter" typeName="boolean" displayLabel="Depressed Gutter?" category="Physical_Drainage_Physical_Drainage" priority="0"/>
+        <ECProperty propertyName="Physical_GutterCrossSlope" typeName="double" displayLabel="Gutter Cross Slope" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:SLOPE"/>
+        <ECProperty propertyName="Physical_GutterWidth" typeName="double" displayLabel="Gutter Width" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="ParabolicGutterType_Height" typeName="double" displayLabel="Height" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="ParabolicGutterType_Width" typeName="double" displayLabel="Width (Parabolic Gutter)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Physical_MaintenanceFactor" typeName="double" displayLabel="Maintenance Factor (United Kingdom)" category="Inlet_Opening_Drainage_Inlet_Opening_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
         <ECProperty propertyName="Physical_GratingType" typeName="CatchBasin_PhysicalAspect_Physical_GratingType_Enum" displayLabel="Grating Type" category="Inlet_Opening_Drainage_Inlet_Opening_Drainage" priority="0"/>
     </ECEntityClass>
@@ -941,6 +1162,11 @@
         <ECProperty propertyName="SystemFlows_ExternalCArea" typeName="double" displayLabel="External CA" category="Flows_Drainage_Flows_Drainage" priority="0" kindOfQuantity="cifu:AREA"/>
         <ECProperty propertyName="SystemFlows_ExternalTc" typeName="double" displayLabel="External Tc" category="Flows_Drainage_Flows_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
     </ECEntityClass>
+    <ECEntityClass typeName="CatchBasin_WaterQualityAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="WaterQuality_ApplyTreatment" typeName="boolean" displayLabel="Apply Treatment?" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0"/>
+        <ECProperty propertyName="TreatmentUnits" typeName="CatchBasin_WaterQualityAspect_TreatmentUnits_Enum" displayLabel="Treatment Units" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0"/>
+    </ECEntityClass>
     <ECEntityClass typeName="GravityNodeAspect">
         <BaseClass>BaseNodeAspect</BaseClass>
     </ECEntityClass>
@@ -1023,6 +1249,7 @@
         <ECProperty propertyName="CustomGwDeepwaterEqn" typeName="string" displayLabel="Custom Deep Flow Equation" category="SWMM_Extended_Data_Drainage_SWMM_Extended_Data_Drainage" priority="0"/>
         <ECProperty propertyName="Hydrologic_ApplyGwLateralEqn" typeName="boolean" displayLabel="Apply Custom Lateral Flow Equation?" category="SWMM_Extended_Data_Drainage_SWMM_Extended_Data_Drainage" priority="0"/>
         <ECProperty propertyName="CustomGwLateralEqn" typeName="string" displayLabel="Custom Groundwater Lateral Equation" category="SWMM_Extended_Data_Drainage_SWMM_Extended_Data_Drainage" priority="0"/>
+        <ECProperty propertyName="DelineationType" typeName="Catchment_HydrologicAspect_DelineationType_Enum" displayLabel="Delineation Type" category="Catchment_Drainage_Catchment_Drainage" priority="0"/>
         <ECProperty propertyName="Hydrologic_UseScaledArea" typeName="boolean" displayLabel="Use Scaled Area?" category="Geometry_Drainage_Geometry_Drainage" priority="0"/>
         <ECProperty propertyName="Hydrologic_Area" typeName="double" displayLabel="Area (User Defined)" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:AREA"/>
         <ECProperty propertyName="AreaDefinitionType" typeName="Catchment_HydrologicAspect_AreaDefinitionType_Enum" displayLabel="Area Defined By" category="Runoff_Drainage_Runoff_Drainage" priority="0"/>
@@ -1286,6 +1513,7 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="InfiltrationAndInflow_InfiltrationFlow" typeName="double" displayLabel="Flow (Additional Infiltration)" category="Infiltration_Inflow_And_Seepage__Drainage_Infiltration_Inflow_And_Seepage__Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
         <ECProperty propertyName="InfiltrationAndInflow_ConduitSeepRate" typeName="double" displayLabel="Seepage Loss Rate" category="Infiltration_Inflow_And_Seepage__Drainage_Infiltration_Inflow_And_Seepage__Drainage" priority="0" kindOfQuantity="cifu:RAINFALL_INTENSITY"/>
+        <ECProperty propertyName="InfiltrationLoadingUnit" typeName="int" displayLabel="Infiltration Loading Unit" category="Infiltration_Inflow_And_Seepage__Drainage_Infiltration_Inflow_And_Seepage__Drainage" priority="0"/>
     </ECEntityClass>
     <ECEntityClass typeName="Conduit_OutputAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -1304,11 +1532,11 @@
     </ECEntityClass>
     <ECEntityClass typeName="Conduit_Physical_CatalogTypeAspect">
         <BaseClass>Conduit_Physical_ConduitTypeAspect</BaseClass>
-        <ECProperty propertyName="CatalogPipeType_CatalogPipeSize" typeName="string" displayLabel="Size" category="Physical_Drainage_Physical_Drainage" priority="0">
-            <ECCustomAttributes>
-                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
-            </ECCustomAttributes>
-        </ECProperty>
+        <ECProperty propertyName="CatalogPipeType_CatalogPipeSize" typeName="string" displayLabel="Size" category="Physical_Drainage_Physical_Drainage" priority="0">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
     </ECEntityClass>
     <ECEntityClass typeName="Conduit_Physical_CutoffDiversionAspect">
         <BaseClass>Conduit_Physical_DiversionTypeAspect</BaseClass>
@@ -1421,12 +1649,301 @@
     <ECEntityClass typeName="Conduit_Physical_UserDefinedTypeAspect">
         <BaseClass>Conduit_Physical_ConduitTypeAspect</BaseClass>
     </ECEntityClass>
+    <ECEntityClass typeName="CulvertStatisticsAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="CulvertStatistics_HeadwaterMaximumDepth" typeName="double" displayLabel="Depth (Maximum Headwater)" category="Results_Maximum_Values_Drainage_Results_Maximum_Values_Drainage" priority="0" kindOfQuantity="cifu:DEPTH_LARGE"/>
+        <ECProperty propertyName="CulvertStatistics_HeadwaterMaximumElevation" typeName="double" displayLabel="Elevation (Maximum Headwater)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
+        <ECProperty propertyName="CulvertStatistics_MaximumRoadwayOvertopping" typeName="double" displayLabel="Flow (Maximum Roadway Overtopping)" category="Results_Maximum_Values_Drainage_Results_Maximum_Values_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="DerivedInletResultsAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="DerivedInletResults_GrateWidth" typeName="double" displayLabel="Grate Width" category="Inlet_Opening_Drainage_Inlet_Opening_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="DerivedInletResults_LocalDepression" typeName="double" displayLabel="Local Depression" category="Inlet_Location_Drainage_Inlet_Location_Drainage" priority="0" kindOfQuantity="cifu:LENGTH_SHORT"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="GravityStructure_HeadlossAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="HeadlossMethod" typeName="GravityStructure_HeadlossAspect_HeadlossMethod_Enum" displayLabel="Headloss Method" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0"/>
+        <ECProperty propertyName="Hec22BenchingMethod" typeName="GravityStructure_Headloss_Hec22EnergyBaseAspect_Hec22BenchingMethod_Enum" displayLabel="HEC-22 Benching Method" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0"/>
+        <ECProperty propertyName="AbsoluteType_AbsoluteHeadloss" typeName="double" displayLabel="Absolute Headloss" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
+        <ECProperty propertyName="GenericType_DownstreamHeadlossCoefficient" typeName="double" displayLabel="Headloss Coefficient (Downstream)" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GenericType_UpstreamHeadlossCoefficient" typeName="double" displayLabel="Headloss Coefficient (Upstream)" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="StandardType_StandardHeadlossCoefficient" typeName="double" displayLabel="Headloss Coefficient (Standard)" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="AashtoShapingMethod" typeName="GravityStructure_Headloss_AashtoAspect_AashtoShapingMethod_Enum" displayLabel="AASHTO Shaping Method" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="GutterDownstreamDepthResultsAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="GutterDownstreamDepthResults_DownstreamInletGutterDepth" typeName="double" displayLabel="Depth (Downstream Inlet)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:DEPTH_LARGE"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="HmiScenarioResultRecordAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="HmiScenarioResultRecord_ContinuityError" typeName="double" displayLabel="Continuity Error" category="Results_Drainage_Results_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalInflowVolume" typeName="double" displayLabel="Total Inflow Volume" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalSystemOutflowVolume" typeName="double" displayLabel="Total System Outflow Volume" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalSystemOverflowVolume" typeName="double" displayLabel="Total System Overflow Volume" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalGutterVolumeChange" typeName="double" displayLabel="Total Gutter Volume Change" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalSystemVolumeChange" typeName="double" displayLabel="Total System Volume Change" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalNRIterations" typeName="int" displayLabel="Total N-R Iterations" category="Results_Drainage_Results_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_ElapsedTime" typeName="double" displayLabel="Elapsed Time" category="Results_Drainage_Results_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalInfiltrationVolume" typeName="double" displayLabel="Total Pond Infiltration Volume" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_Storage" typeName="double" displayLabel="Storage" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_Outflow" typeName="double" displayLabel="Outflow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_PrecipitationIntensity" typeName="double" displayLabel="Precipitation Intensity" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:INFILTRATION_RATE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_LossesRate" typeName="double" displayLabel="Losses Rate" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:INFILTRATION_RATE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_Flooding" typeName="double" displayLabel="Flooding" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalInflow" typeName="double" displayLabel="Total Inflow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_DirectInflow" typeName="double" displayLabel="Direct Inflow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_InfiltrationAndInflow" typeName="double" displayLabel="Infiltration and Inflow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_SnowDepth" typeName="double" displayLabel="Snow Depth" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:DEPTH_LARGE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_DryWeatherInflow" typeName="double" displayLabel="Dry Weather Inflow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_GroundwaterInflow" typeName="double" displayLabel="Groundwater Inflow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_Runoff" typeName="double" displayLabel="Runoff" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_Temperature" typeName="double" displayLabel="Temperature" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:TEMPERATURE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_RunCompleted" typeName="dateTime" displayLabel="Run Completed" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="EngineSummaryStatus" typeName="HmiScenarioResultRecordAspect_EngineSummaryStatus_Enum" displayLabel="Engine Summary Status" category="Generic_Drainage_Generic_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_FlowSupplied" typeName="double" displayLabel="Subnetwork Loads" category="Flow_Summary_Drainage_Flow_Summary_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_FlowDemanded" typeName="double" displayLabel="Outflow" category="Flow_Summary_Drainage_Flow_Summary_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_FlowStored" typeName="double" displayLabel="Flow Stored" category="Flow_Summary_Drainage_Flow_Summary_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_RelativeFlowChange" typeName="double" displayLabel="Relative Flow Change" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_IsBalanced" typeName="boolean" displayLabel="Balanced?" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_Trials" typeName="int" displayLabel="Trials" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_SummaryFlowSupplied" typeName="double" displayLabel="Summary Inflow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_SummaryFlowDemanded" typeName="double" displayLabel="Summary Outflow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_SummaryFlowStored" typeName="double" displayLabel="Summary Flow Stored" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_MaximumRelativeFlowChange" typeName="double" displayLabel="Maximum Relative Flow Change" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_SummaryTotalIterations" typeName="int" displayLabel="Total Iterations" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_SummaryIsBalanced" typeName="boolean" displayLabel="Summary Is Balanced?" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_CalcFinishedTimeStamp" typeName="dateTime" displayLabel="Calculation Finished Time Stamp" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="EpaTimeStepStatus" typeName="HmiScenarioResultRecordAspect_EpaTimeStepStatus_Enum" displayLabel="Time Step Status" category="Generic_Drainage_Generic_Drainage" priority="0"/>
+        <ECProperty propertyName="EpaSummaryStatus" typeName="HmiScenarioResultRecordAspect_EpaSummaryStatus_Enum" displayLabel="EPA Summary Status" category="Generic_Drainage_Generic_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_CalculationOptionsLabel" typeName="string" displayLabel="Label" category="General_Drainage_General_Drainage" priority="0"/>
+        <ECProperty propertyName="BaseDate" typeName="dateTime" displayLabel="Simulation Start Date" category="General_Drainage_General_Drainage" priority="0"/>
+        <ECProperty propertyName="AnalysisStartTime" typeName="dateTime" displayLabel="Simulation Start Time" category="General_Drainage_General_Drainage" priority="0"/>
+        <ECProperty propertyName="EpsType_Duration" typeName="double" displayLabel="Duration" category="General_Drainage_General_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="PondPackNumericalEngine_MiniumumTc" typeName="double" displayLabel="Minimum Tc" category="General_Drainage_General_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="EpsType_HydrologicTimeStep" typeName="double" displayLabel="Hydrologic Routing Time Step" category="General_Drainage_General_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="GVFPressureEngine_PeakFlowRatio" typeName="double" displayLabel="Peak Flow Ratio" category="Pressure_Drainage_Pressure_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
+        <ECProperty propertyName="GVFEngine_MaximumNetworkTraversals" typeName="int" displayLabel="Maximum Network Traversals" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="GVFEngine_FlowConvergenceTest" typeName="double" displayLabel="Flow Convergence Test" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFPressureEngine_GlobalMinimumTractiveStress" typeName="double" displayLabel="Tractive Stress (Global Minimum)" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0" kindOfQuantity="cifu:STRESS"/>
+        <ECProperty propertyName="GVFEngine_NumberOfFlowProfileSteps" typeName="int" displayLabel="Number of Flow Profile Steps" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="GVFEngine_HydraulicGradeConvergenceTest" typeName="double" displayLabel="Hydraulic Grade Convergence Test" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
+        <ECProperty propertyName="GVFEngine_MinimumStructureHeadloss" typeName="double" displayLabel="Minimum Structure Headloss" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0" kindOfQuantity="cifu:HEADLOSS"/>
+        <ECProperty propertyName="GVFPressureEngine_ReportHydrologicTimeStep" typeName="boolean" displayLabel="Report Hydrologic Time Step?" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="GVFPressureEngine_HasDetailHeadlossReportForEps" typeName="boolean" displayLabel="Save Detailed Headloss Data?" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="GVFEngine_LiquidLabel" typeName="string" displayLabel="Liquid Label" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="GVFEngine_LiquidKinematicViscosity" typeName="double" displayLabel="Liquid Kinematic Viscosity" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="GVFEngine_UseExplicitDepthSlopeEquations" typeName="boolean" displayLabel="Use Explicit Depth and Slope Equations?" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="GVFPressureEngine_WetWellIncrement" typeName="double" displayLabel="Wet Well Convergence Increment" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="GVFPressureEngine_UsePumpedLoads" typeName="boolean" displayLabel="Use Pumped Flows?" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="PressureEngine_Accuracy" typeName="double" displayLabel="Pressure Subnetwork Accuracy" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="PressureEngine_Trials" typeName="int" displayLabel="Pressure Subnetwork Trials" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="PressureEngine_UseMultiPointPumpInterpolation" typeName="boolean" displayLabel="Use Linear Interpolation For Multipoint Pumps?" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="SteadyStateType_UseSimpleControls" typeName="boolean" displayLabel="Use Controls During Steady State?" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="EpaNetEngine_LiquidSpecificGravity" typeName="double" displayLabel="Liquid Specific Gravity" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="GVFEngine_ExpansionFactor" typeName="double" displayLabel="Expansion, Ke" category="Headloss_AASHTO_Drainage_Headloss_AASHTO_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_ContractionFactor" typeName="double" displayLabel="Contraction, Kc" category="Headloss_AASHTO_Drainage_Headloss_AASHTO_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_ShapingAdjustment" typeName="double" displayLabel="Shaping Adjustment, Cs" category="Headloss_AASHTO_Drainage_Headloss_AASHTO_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_NonPipedFlowAdjustment" typeName="double" displayLabel="Non-Piped Flow Adjustment, Cn" category="Headloss_AASHTO_Drainage_Headloss_AASHTO_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_ElevationEqualWithin" typeName="double" displayLabel="Elevations Considered Equal Within" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
+        <ECProperty propertyName="GVFEngine_NonPipePlungingFlow" typeName="boolean" displayLabel="Consider Non-Piped Plunging Flow?" category="HEC_22_Energy_Losses_Drainage_HEC_22_Energy_Losses_Drainage" priority="0"/>
+        <ECProperty propertyName="GVFEngine_FlatUnsubmerged" typeName="double" displayLabel="Flat Unsubmerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_FlatSubmerged" typeName="double" displayLabel="Flat Submerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_DepressedUnsubmerged" typeName="double" displayLabel="Depressed Unsubmerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_DepressedSubmerged" typeName="double" displayLabel="Depressed Submerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_HalfBenchUnsubmerged" typeName="double" displayLabel="Half Bench Unsubmerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_HalfBenchSubmerged" typeName="double" displayLabel="Half Bench Submerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_FullBenchUnsubmerged" typeName="double" displayLabel="Full Bench Unsubmerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_FullBenchSubmerged" typeName="double" displayLabel="Full Bench Submerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_ImprovedBenchUnsubmerged" typeName="double" displayLabel="Improved Bench Unsubmerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_ImprovedBenchSubmerged" typeName="double" displayLabel="Improved Bench Submerged Factor" category="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_FlatSubmergedCoefficient" typeName="double" displayLabel="Flat Submerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_FlatUnsubmergedCoefficient" typeName="double" displayLabel="Flat Unsubmerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_DepressedSubmergedCoefficient" typeName="double" displayLabel="Depressed Submerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_DepressedUnsubmergedCoefficient" typeName="double" displayLabel="Depressed Unsubmerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_HalfBenchSubmergedCoefficient" typeName="double" displayLabel="Half Bench Submerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_HalfBenchUnsubmergedCoefficient" typeName="double" displayLabel="Half Bench Unsubmerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_FullBenchSubmergedCoefficient" typeName="double" displayLabel="Full Bench Submerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_FullBenchUnsubmergedCoefficient" typeName="double" displayLabel="Full Bench Unsubmerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_ImprovedSubmergedCoefficient" typeName="double" displayLabel="Improved Submerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="GVFEngine_ImprovedUnsubmergedCoefficient" typeName="double" displayLabel="Improved Unsubmerged Coefficient" category="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="SwmmCalcOptionsType_SwmmHydrologicIncrement" typeName="double" displayLabel="SWMM Hydrologic Increment" category="SWMM_Hydrology_Drainage_SWMM_Hydrology_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="GVFPressureEngine_MinConvexC" typeName="double" displayLabel="Minimum Convex C For Adverse Conduits" category="Pressure_Drainage_Pressure_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
+        <ECProperty propertyName="EpsType_HydraulicTimeStep" typeName="double" displayLabel="Hydraulic Time Step" category="General_Drainage_General_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="DarcyWeisbachType_KinematicViscosity" typeName="double" displayLabel="Kinematic Viscosity" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="NeglectGutterCrossSlopeForSideFlow" typeName="boolean" displayLabel="Neglect Gutter Cross Slope For Side Flow?" category="Inlets_Drainage_Inlets_Drainage" priority="0"/>
+        <ECProperty propertyName="EpaNetEngine_MinPossiblePressure" typeName="double" displayLabel="Pressure Subnetwork Minimum Possible Pressure" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0" kindOfQuantity="cifu:PRESSURE"/>
+        <ECProperty propertyName="TimeAnalysisType" typeName="HmiScenarioResultRecordAspect_TimeAnalysisType_Enum" displayLabel="Time Analysis Type" category="General_Drainage_General_Drainage" priority="0"/>
+        <ECProperty propertyName="GvfCalculationType" typeName="HmiScenarioResultRecordAspect_GvfCalculationType_Enum" displayLabel="Calculation Type" category="General_Drainage_General_Drainage" priority="0"/>
+        <ECProperty propertyName="OverrideReportingTimeStep" typeName="HmiScenarioResultRecordAspect_OverrideReportingTimeStep_Enum" displayLabel="Reporting Time Step Type" category="General_Drainage_General_Drainage" priority="0"/>
+        <ECProperty propertyName="FlowProfileMethod" typeName="HmiScenarioResultRecordAspect_FlowProfileMethod_Enum" displayLabel="Flow Profile Method" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="AverageVelocityMethod" typeName="HmiScenarioResultRecordAspect_AverageVelocityMethod_Enum" displayLabel="Average Velocity Method" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="UpstreamPipeSelectionMethod" typeName="HmiScenarioResultRecordAspect_UpstreamPipeSelectionMethod_Enum" displayLabel="Governing Upstream Pipe Selection Method" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="StructureLossMode" typeName="HmiScenarioResultRecordAspect_StructureLossMode_Enum" displayLabel="Structure Loss Mode" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="HmFrictionMethod" typeName="HmiScenarioResultRecordAspect_HmFrictionMethod_Enum" displayLabel="Gravity Friction Method" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="DarcyFrictionFactorMethod" typeName="HmiScenarioResultRecordAspect_DarcyFrictionFactorMethod_Enum" displayLabel="Friction Factor Method" category="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="PressureFrictionMethod" typeName="HmiScenarioResultRecordAspect_PressureFrictionMethod_Enum" displayLabel="Pressure Friction Method" category="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" priority="0"/>
+        <ECProperty propertyName="SteadyStateHydrographEquivalent" typeName="HmiScenarioResultRecordAspect_SteadyStateHydrographEquivalent_Enum" displayLabel="Steady State Hydrograph Equivalent" category="Pressure_Drainage_Pressure_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmDefaultInfiltration" typeName="HmiScenarioResultRecordAspect_SwmmDefaultInfiltration_Enum" displayLabel="Default Infiltration Method" category="SWMM_Hydrology_Drainage_SWMM_Hydrology_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_StartDate" typeName="dateTime" displayLabel="Start Date" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_StartTime" typeName="dateTime" displayLabel="Start Time" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_StopDate" typeName="dateTime" displayLabel="Stop Date" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_StopTime" typeName="dateTime" displayLabel="Stop Time" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_Duration" typeName="double" displayLabel="Duration" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="SwmmCalcSummary_StartDryDays" typeName="double" displayLabel="Start Dry Time" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="SwmmCalcSummary_OutputIncrement" typeName="double" displayLabel="Output Increment" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0" kindOfQuantity="cifu:TIME_FLOW"/>
+        <ECProperty propertyName="SwmmCalcSummary_SwmmHydrologicIncrement" typeName="double" displayLabel="Hydrologic Increment" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0" kindOfQuantity="cifu:TIME_FLOW"/>
+        <ECProperty propertyName="SwmmCalcSummary_DryStep" typeName="double" displayLabel="Dry Step" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0" kindOfQuantity="cifu:TIME_FLOW"/>
+        <ECProperty propertyName="SwmmCalcSummary_RouteStep" typeName="double" displayLabel="Route Step" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0" kindOfQuantity="cifu:TIME_SHORT"/>
+        <ECProperty propertyName="SwmmCalcSummary_MaxTrials" typeName="int" displayLabel="Maximum Trials" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_HeadTolerance" typeName="double" displayLabel="Head Tolerance" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
+        <ECProperty propertyName="SwmmCalcSummary_SwmmInfiltrationMethod" typeName="HmiScenarioResultRecordAspect_SwmmCalcSummary_SwmmInfiltrationMethod_Enum" displayLabel="Infiltration Method" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_FlowRoutingMethod" typeName="HmiScenarioResultRecordAspect_SwmmCalcSummary_FlowRoutingMethod_Enum" displayLabel="Flow Routing Method" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_RunsRainfallRunoff" typeName="boolean" displayLabel="Catchment Rainfall\Runoff?" category="Process_Models_Drainage_Process_Models_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_RunsRDII" typeName="boolean" displayLabel="RDII?" category="Process_Models_Drainage_Process_Models_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_RunsSnowmelt" typeName="boolean" displayLabel="Snowmelt?" category="Process_Models_Drainage_Process_Models_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_RunsGroundwater" typeName="boolean" displayLabel="Groundwater" category="Process_Models_Drainage_Process_Models_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_RunsFlowRouting" typeName="boolean" displayLabel="Flow Routing?" category="Process_Models_Drainage_Process_Models_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_AllowsPonding" typeName="boolean" displayLabel="Allows Ponding?" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_RunsQuality" typeName="boolean" displayLabel="Water Quality?" category="Process_Models_Drainage_Process_Models_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmCalcSummary_HasVariableTimeStep" typeName="boolean" displayLabel="Has Variable Time Step?" category="Analysis_Options_Drainage_Analysis_Options_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmSysStats_MinimumTimeStep" typeName="double" displayLabel="Time Step (Minimum)" category="System_Stats_Drainage_System_Stats_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="SwmmSysStats_AverageTimeStep" typeName="double" displayLabel="Time Step (Average)" category="System_Stats_Drainage_System_Stats_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="SwmmSysStats_MaxTimeStep" typeName="double" displayLabel="Time Step (Maximum)" category="System_Stats_Drainage_System_Stats_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="SwmmSysStats_PercentSteadyState" typeName="double" displayLabel="Steady State" category="System_Stats_Drainage_System_Stats_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
+        <ECProperty propertyName="SwmmSysStats_AverageIterationPerStep" typeName="int" displayLabel="Average Iterations Per Step" category="System_Stats_Drainage_System_Stats_Drainage" priority="0"/>
+        <ECProperty propertyName="SwmmSysStats_PercentNotConverging" typeName="double" displayLabel="Not Converging" category="System_Stats_Drainage_System_Stats_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
+        <ECProperty propertyName="SwmmFlowRouting_DryWeatherInflow" typeName="double" displayLabel="Dry Weather Inflow" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_WetWeatherInflow" typeName="double" displayLabel="Wet Weather Inflow" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_GroundwaterInflow" typeName="double" displayLabel="Groundwater Inflow" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_RDIIInflow" typeName="double" displayLabel="RDII Inflow" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_ExtInflow" typeName="double" displayLabel="External Inflow" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_ExtOutflow" typeName="double" displayLabel="External Outflow" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_FloodLoss" typeName="double" displayLabel="Overflow Losses" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_EvapLoss" typeName="double" displayLabel="Evaporation Losses" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_ExfilLoss" typeName="double" displayLabel="Exfiltration Losses" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_InitialStoredVolume" typeName="double" displayLabel="Stored Volume (Initial)" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_FinalStoredVolume" typeName="double" displayLabel="Stored Volume (Final)" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmFlowRouting_FlowContinuityError" typeName="double" displayLabel="Flow Continuity Error" category="Routing_Quantity_Drainage_Routing_Quantity_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
+        <ECProperty propertyName="SwmmRunoff_TotalCatchmentArea" typeName="double" displayLabel="Total Catchment Area" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:AREA_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_InitialLIDStorage" typeName="double" displayLabel="Storage (Initial LID)" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_InitialSnowCover" typeName="double" displayLabel="Snow Cover (Initial)" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_TotalPrecipitation" typeName="double" displayLabel="Precipitation (Total)" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_OutfallRunon" typeName="double" displayLabel="Outfall Runon" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_EvapLoss" typeName="double" displayLabel="Evaporation Losses" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_InfilLoss" typeName="double" displayLabel="Infiltration Losses" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_SurfaceRunoff" typeName="double" displayLabel="Surface Runoff" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_LIDDrain" typeName="double" displayLabel="LID Drain" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_SnowRemoved" typeName="double" displayLabel="Snow Removed" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_FinalSnowCover" typeName="double" displayLabel="Snow Cover (Final)" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_FinalStorage" typeName="double" displayLabel="Storage (Final)" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="SwmmRunoff_RunoffQuantityContinuity" typeName="double" displayLabel="Runoff Continuity Error" category="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_PumpEnergyUsed" typeName="double" displayLabel="Pump Energy Used" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:ENERGY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_VolumePumped" typeName="double" displayLabel="Volume Pumped" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_VolumeStored" typeName="double" displayLabel="Volume Stored" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalPumpCost" typeName="double" displayLabel="Pump Cost" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_VolumeUnitPrice" typeName="double" displayLabel="Volume Unit Price" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:COST_PER_UNITVOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalStorageCost" typeName="double" displayLabel="Storage Cost" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_UsageCost" typeName="double" displayLabel="Usage Cost" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_EnergyUsageDailyCost" typeName="double" displayLabel="Energy Usage Daily Cost" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_PeakDemandDailyCost" typeName="double" displayLabel="Peak Energy Demand Daily Cost" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalDailyCost" typeName="double" displayLabel="Daily Cost" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TimeChange" typeName="double" displayLabel="Time Change" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_EnergyDischarge" typeName="double" displayLabel="Energy Discharge Flow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_IncrementalVolumePumped" typeName="double" displayLabel="Volume Pumped (Incremental)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_CumulativeVolumePumped" typeName="double" displayLabel="Volume Pumped (Cumulative)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_WirePower" typeName="double" displayLabel="Wire Power" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:POWER"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_IncrementalEnergyUsed" typeName="double" displayLabel="Energy Used (Incremental)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:ENERGY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_CumulativeEnergyUsed" typeName="double" displayLabel="Energy Used (Cumulative)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:ENERGY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_IncrementalEnergyCost" typeName="double" displayLabel="Energy Cost (Incremental)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_CumulativeEnergyCost" typeName="double" displayLabel="Energy Cost (Cumulative)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_OverallEnergyUse" typeName="double" displayLabel="Overall Energy Used" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_OverallUnitCost" typeName="double" displayLabel="Overall Unit Energy Cost" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:COST_PER_UNITVOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalCarbonEmission" typeName="double" displayLabel="Total Carbon Emission" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TurbinesEnergyGenerated" typeName="double" displayLabel="Energy Generated" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:ENERGY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_VolumePassed" typeName="double" displayLabel="Volume" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalTurbinesBenefit" typeName="double" displayLabel="Value" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_DailyTurbinesBenefit" typeName="double" displayLabel="Daily Value" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TurbinesFlow" typeName="double" displayLabel="Turbines Flow" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_IncrementalVolumePassed" typeName="double" displayLabel="Volume (Incremental)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_CumulativeVolumePassed" typeName="double" displayLabel="Volume (Cumulative)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:VOLUME_LARGE"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TurbinesWirePower" typeName="double" displayLabel="Turbines Wire Power" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:POWER"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_IncrementalEnergyGenerated" typeName="double" displayLabel="Energy Generated (Incremental)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:ENERGY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_CumulativeEnergyGenerated" typeName="double" displayLabel="Energy Generated (Cumulative)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:ENERGY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_IncrementalEnergyBenefit" typeName="double" displayLabel="Energy Value (Incremental)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_CumulativeEnergyBenefit" typeName="double" displayLabel="Energy Value (Cumulative)" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:CURRENCY"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_TotalCarbonBonus" typeName="double" displayLabel="Total Carbon Bonus" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_UnitEnergyGenerated" typeName="double" displayLabel="Unit Energy Generated" category="Category_Drainage_Category_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_OverallUnitBenefit" typeName="double" displayLabel="Overall Unit Energy Value" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:COST_PER_UNITVOLUME"/>
+        <ECProperty propertyName="HmiScenarioResultRecord_RunDuration" typeName="double" displayLabel="Run Duration" category="Category_Drainage_Category_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="UrbanFlood_InitialGridVolume" typeName="double" displayLabel="2D Volume (Initial)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_FinalGridVolume" typeName="double" displayLabel="2D Volume (Final)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_TwoDInflowVolume" typeName="double" displayLabel="2D Inflows" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_RainfallOnGridVolume" typeName="double" displayLabel="Rainfall on Grid" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_BoundaryOutflowVolume" typeName="double" displayLabel="Net Inflow (2D Boundaries)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_TotalInflowVolume" typeName="double" displayLabel="Total 2D Inflow Volume" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_TotalOutflowVolume" typeName="double" displayLabel="Total 2D Outflow Volume" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_InfiltrationVolume" typeName="double" displayLabel="2D Infiltration Loss" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_VolumeBalanceError" typeName="double" displayLabel="1D-2D Volume Balance Error" category="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_NetInflowTotal" typeName="double" displayLabel="Net 2D Inflow" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_PercentBalanceError" typeName="double" displayLabel="1D-2D Volume Balance Error Percent" category="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
+        <ECProperty propertyName="UrbanFlood_CatchmentOutflowVolume" typeName="double" displayLabel="Catchment Outflow Volume" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_PondInitialVolume" typeName="double" displayLabel="Pond Volume (Initial)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_PondFinalVolume" typeName="double" displayLabel="Pond Volume (Final)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_PondOutflowVolume" typeName="double" displayLabel="Pond Total Outflow Volume" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_1DDrainageNetworkInitialVolume" typeName="double" displayLabel="1D Volume (Initial)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_1DDrainageNetworkFinalVolume" typeName="double" displayLabel="1D Volume (Final)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_1D2DInterchangeVolume" typeName="double" displayLabel="Total Volume of 1D-2D Exchange" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_1DUncoupledInflowVolume" typeName="double" displayLabel="Uncoupled 1D Inflow" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_1DUncoupledOutflowVolume" typeName="double" displayLabel="Uncoupled 1D Outflow" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_1DUncoupledOverflowVolume" typeName="double" displayLabel="Uncoupled 1D Overflow Losses" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_PondSeepageVolume" typeName="double" displayLabel="1D Infiltration Loss" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_Max1DVolume" typeName="double" displayLabel="1D Volume (Maximum)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_TimeOfMax1DVolume" typeName="double" displayLabel="Time of Maximum 1D Volume" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="UrbanFlood_Max2DVolume" typeName="double" displayLabel="2D Volume (Maximum)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_TimeOfMax2DVolume" typeName="double" displayLabel="Time of Maximum 2D Volume" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="UrbanFlood_Max1D2DVolume" typeName="double" displayLabel="Total System Volume (Maximum)" category="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_TimeOfMax1D2DVolume" typeName="double" displayLabel="Time of Maximum System Volume" category="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="UrbanFlood_Initial1D2DVolume" typeName="double" displayLabel="Total System Volume (Initial)" category="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_Final1D2DVolume" typeName="double" displayLabel="Total System Volume (Final)" category="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_SystemInflowVolume" typeName="double" displayLabel="Total System Inflow Volume" category="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_SystemOutflowVolume" typeName="double" displayLabel="Total System Outflow Volume" category="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_SystemInfiltrationVolume" typeName="double" displayLabel="Total System Infiltration Loss" category="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_BoundaryVolumeOut" typeName="double" displayLabel="Outflow (2D Boundaries)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFlood_BoundaryVolumeIn" typeName="double" displayLabel="Inflow (2D Boundaries)" category="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
+        <ECProperty propertyName="UrbanFloodCalcSummary_RunsTwoD" typeName="boolean" displayLabel="2D Grid?" category="Process_Models_2D_Drainage_Process_Models_2D_Drainage" priority="0"/>
+        <ECProperty propertyName="UrbanFloodCalcSummary_RunsRainOnGrid" typeName="boolean" displayLabel="Rainfall on Grid?" category="Process_Models_2D_Drainage_Process_Models_2D_Drainage" priority="0"/>
+        <ECProperty propertyName="UrbanFloodCalcSummary_RunsGridInfiltration" typeName="boolean" displayLabel="2D Infiltration?" category="Process_Models_2D_Drainage_Process_Models_2D_Drainage" priority="0"/>
+        <ECProperty propertyName="UrbanFloodSysStats_TotalRunTime" typeName="double" displayLabel="Total Elapsed Time" category="System_Stats_2D_Drainage_System_Stats_2D_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="UrbanFloodSysStats_TotalCPUTime" typeName="double" displayLabel="Total CPU Time" category="System_Stats_2D_Drainage_System_Stats_2D_Drainage" priority="0" kindOfQuantity="cifu:TIME_EXTENDED"/>
+        <ECProperty propertyName="UrbanFloodSysStats_PercentCPUUsage" typeName="double" displayLabel="CPU Usage" category="System_Stats_2D_Drainage_System_Stats_2D_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="Manhole_HMIUserDefinedExtensionsAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="ChamberWallThickness" typeName="double" displayLabel="Wall Thickness" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH_SHORT"/>
+        <ECProperty propertyName="ChamberBaseThickness" typeName="double" displayLabel="Base Thickness" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH_SHORT"/>
+        <ECProperty propertyName="ChamberBaseOverhang" typeName="double" displayLabel="Base Overhang" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH_SHORT"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="Manhole_WaterQualityAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="WaterQuality_ApplyTreatment" typeName="boolean" displayLabel="Apply Treatment?" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0"/>
+        <ECProperty propertyName="TreatmentUnits" typeName="Manhole_WaterQualityAspect_TreatmentUnits_Enum" displayLabel="Treatment Units" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="Outfall_WaterQualityAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="WaterQuality_ApplyTreatment" typeName="boolean" displayLabel="Apply Treatment?" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0"/>
+        <ECProperty propertyName="TreatmentUnits" typeName="Outfall_WaterQualityAspect_TreatmentUnits_Enum" displayLabel="Treatment Units" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="PropertyConnection_WaterQualityAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="WaterQuality_H2S" typeName="double" displayLabel="H2S (Local Inflow)" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0" kindOfQuantity="cifu:CONCENTRATION"/>
+        <ECProperty propertyName="WaterQuality_BOD" typeName="double" displayLabel="BOD (Local Inflow)" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0" kindOfQuantity="cifu:CONCENTRATION"/>
+    </ECEntityClass>
     <ECEntityClass typeName="Conduit_PhysicalAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Physical_HasFlapGate" typeName="boolean" displayLabel="Flap Gate?" category="Physical_Control_Structure_Drainage_Physical_Control_Structure_Drainage" priority="0"/>
         <ECProperty propertyName="Physical_NumberOfBarrels" typeName="int" displayLabel="Number of Barrels" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="Physical_ConduitShapeLabel" typeName="string" displayLabel="Conduit Description" category="Physical_Drainage_Physical_Drainage" priority="0"/>
-        <ECProperty propertyName="Physical_ConduitSize" typeName="string" displayLabel="Size" category="Physical_Drainage_Physical_Drainage" priority="0"/>
+        <ECProperty propertyName="Physical_ConduitSize" typeName="string" displayLabel="Size" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="Physical_UseLocalConduitShapeLabel" typeName="boolean" displayLabel="Use Local Conduit Description?" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="MultiBarrelGapDistance" typeName="double" displayLabel="Multiple Barrel Gap Distance" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="HeadwaterMaxUserDefined" typeName="double" displayLabel="Elevation (Maximum Headwater)" category="Physical_Culvert_Drainage_Physical_Culvert_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
@@ -1581,11 +2098,11 @@
         <ECProperty propertyName="TransitionType" typeName="CrossSectionNode_PhysicalAspect_TransitionType_Enum" displayLabel="Transition Type" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="GradualType_TransitionLength" typeName="double" displayLabel="Transition Length" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="CrossSectionType" typeName="CrossSectionNode_PhysicalAspect_CrossSectionType_Enum" displayLabel="Cross Section Type" category="Physical_Drainage_Physical_Drainage" priority="0"/>
-        <ECProperty propertyName="CatalogCrossSectionType_CatalogConduitSIze" typeName="string" displayLabel="Size" category="Physical_Drainage_Physical_Drainage" priority="0">
-            <ECCustomAttributes>
-                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
-            </ECCustomAttributes>
-        </ECProperty>
+        <ECProperty propertyName="CatalogCrossSectionType_CatalogConduitSIze" typeName="string" displayLabel="Size" category="Physical_Drainage_Physical_Drainage" priority="0">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
         <ECProperty propertyName="Physical_InvertElevation" typeName="double" displayLabel="Elevation (Invert)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
     </ECEntityClass>
     <ECEntityClass typeName="CrossSectionNodeAspect">
@@ -1911,6 +2428,15 @@
             <Class class="BasePump_PhysicalAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsBasePolygon_PhysicalAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="BasePolygon_PhysicalAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsBasePumpAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -1992,6 +2518,15 @@
             <Class class="BoundaryPoint2DAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsCatchBasin_HMIUserDefinedExtensionsAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="CatchBasin_HMIUserDefinedExtensionsAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsCatchBasin_Design_LocalConstraints_FalseAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -2487,6 +3022,15 @@
             <Class class="Catchment_Hydrologic_RunoffMethod_UserDefinedHydrographAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsCatchBasin_WaterQualityAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="CatchBasin_WaterQualityAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsCatchment_HydrologicAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -2550,6 +3094,15 @@
             <Class class="ChannelAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsConduit_DesignAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="Conduit_DesignAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsConduit_Design_FalseAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -3144,6 +3697,24 @@
             <Class class="CrossSectionNodeAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsCulvertStatisticsAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="CulvertStatisticsAspect"/>
+        </Target>
+    </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsDerivedInletResultsAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="DerivedInletResultsAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsCxPhysical_CxDataType_GenericAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -3638,6 +4209,15 @@
             <Class class="Grid2DAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsGutterDownstreamDepthResultsAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="GutterDownstreamDepthResultsAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="GutterLink_PhysicalAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Physical_GutterManningsN" typeName="double" displayLabel="Manning's n (Gutter)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:ROUGHNESS_MANNINGS"/>
@@ -3718,15 +4298,17 @@
     </ECRelationshipClass>
     <ECEntityClass typeName="Headwall_PhysicalAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="CxDataType" typeName="Headwall_PhysicalAspect_CxDataType_Enum" displayLabel="Section Type" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="TransitionType" typeName="Headwall_PhysicalAspect_TransitionType_Enum" displayLabel="Transition Type" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="GradualType_TransitionLength" typeName="double" displayLabel="Transition Length" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="CrossSectionType" typeName="Headwall_PhysicalAspect_CrossSectionType_Enum" displayLabel="Cross Section Type" category="Physical_Drainage_Physical_Drainage" priority="0"/>
-        <ECProperty propertyName="CatalogCrossSectionType_CatalogConduitSIze" typeName="string" displayLabel="Size" category="Physical_Drainage_Physical_Drainage" priority="0">
-            <ECCustomAttributes>
-                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
-            </ECCustomAttributes>
-        </ECProperty>
+        <ECProperty propertyName="CatalogCrossSectionType_CatalogConduitSIze" typeName="string" displayLabel="Size" category="Physical_Drainage_Physical_Drainage" priority="0">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
         <ECProperty propertyName="Physical_InvertElevation" typeName="double" displayLabel="Elevation (Invert)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
+        <ECProperty propertyName="RoughnessType" typeName="Headwall_PhysicalAspect_RoughnessType_Enum" displayLabel="Roughness Type" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="Physical_HeadwallHasCrossSection" typeName="boolean" displayLabel="Has Cross Section?" category="Physical_Drainage_Physical_Drainage" priority="0"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsHeadwall_PhysicalAspect" modifier="None" strength="embedding">
@@ -3793,6 +4375,15 @@
             <Class class="IrregularChannel_PhysicalAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsHmiScenarioResultRecordAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="HmiScenarioResultRecordAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="JunctionChamber_PhysicalAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Physical_TransitionLength" typeName="double" displayLabel="Transition Length" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
@@ -3910,6 +4501,15 @@
             <Class class="LIDAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsManhole_HMIUserDefinedExtensionsAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="Manhole_HMIUserDefinedExtensionsAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="Manhole_InfiltrationAndInflowAspect" modifier="Abstract">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="InfiltrationAndInflow_ApplySWMMRTKUnitHydrographSet" typeName="boolean" displayLabel="Apply SWMM RTK Unit Hydrograph Set?" category="Infiltration_Inflow_And_Seepage__Drainage_Infiltration_Inflow_And_Seepage__Drainage" priority="0"/>
@@ -3980,6 +4580,15 @@
             <Class class="ManholeAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsManhole_WaterQualityAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="Manhole_WaterQualityAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="Node_WaterQualityAspect" modifier="Abstract">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="WaterQuality_ApplyTreatment" typeName="boolean" displayLabel="Apply Treatment?" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0"/>
@@ -4066,6 +4675,15 @@
             <Class class="Outfall_RainfallRunoffAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsOutfall_WaterQualityAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="Outfall_WaterQualityAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="OutfallAspect">
         <BaseClass>GravityNodeAspect</BaseClass>
     </ECEntityClass>
@@ -4241,6 +4859,9 @@
     </ECRelationshipClass>
     <ECEntityClass typeName="Pond_Physical_VolumeType_PipeVolumeAspect">
         <BaseClass>Pond_Physical_VolumeTypeAspect</BaseClass>
+        <ECProperty propertyName="VolumeType_MajorAxisLength" typeName="double" displayLabel="Major Axis Length" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="VolumeType_MinorAxisLength" typeName="double" displayLabel="Minor Axis Length" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="VolumeType_PondSideSlope" typeName="double" displayLabel="Side Slope (Pond)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:SIDESLOPE"/>
         <ECProperty propertyName="Physical_UseVoidSpace" typeName="boolean" displayLabel="Use Void Space?" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="Physical_VoidSpace" typeName="double" displayLabel="Void Space" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
         <ECProperty propertyName="PipeVolumeType_UpstreamInvert" typeName="double" displayLabel="Invert (Start)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
@@ -4275,6 +4896,7 @@
         <ECProperty propertyName="StorageChamberSystemType_IncludeHeader" typeName="boolean" displayLabel="Chamber System Includes Header?" category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="StorageChamberSystemType_ChambersInHeader" typeName="int" displayLabel="Chambers In Header " category="Physical_Drainage_Physical_Drainage" priority="0"/>
         <ECProperty propertyName="StorageChamberSystemType_HeaderDistance" typeName="double" displayLabel="Chamber System Header Distance" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="ParabolicType_ParabolicVolumeHeight" typeName="double" displayLabel="Height of Axis Surface (Parabolic)" category="Physical_Drainage_Physical_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPond_Physical_VolumeType_StorageChamberSystemAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -4332,6 +4954,7 @@
     </ECRelationshipClass>
     <ECEntityClass typeName="Pond_WaterQualityAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="TreatmentUnits" typeName="Pond_WaterQualityAspect_TreatmentUnits_Enum" displayLabel="Treatment Units" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0"/>
         <ECProperty propertyName="WaterQuality_H2S" typeName="double" displayLabel="H2S (Local Inflow)" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0" kindOfQuantity="cifu:CONCENTRATION"/>
         <ECProperty propertyName="WaterQuality_BOD" typeName="double" displayLabel="BOD (Local Inflow)" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0" kindOfQuantity="cifu:CONCENTRATION"/>
         <ECProperty propertyName="WaterQuality_H2SRrate" typeName="double" displayLabel="Reaction Rate (H2S)" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0" kindOfQuantity="cifu:REACTION_RATE"/>
@@ -4521,6 +5144,15 @@
             <Class class="PropertyConnection_SanitaryLoadingAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsPropertyConnection_WaterQualityAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="PropertyConnection_WaterQualityAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECEntityClass typeName="PropertyConnectionAspect">
         <BaseClass>BaseNodeAspect</BaseClass>
     </ECEntityClass>
@@ -4548,7 +5180,7 @@
     </ECRelationshipClass>
     <ECEntityClass typeName="ScadaElement_ScadaAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
-        <ECProperty propertyName="Scada_TargetElementStorageUnit" typeName="int" displayLabel="Model Element (Storage Unit)" category="SCADA_Drainage_SCADA_Drainage" priority="0"/>
+        <ECProperty propertyName="Scada_TargetElementStorageUnit" typeName="int" displayLabel="Target Element (Storage Unit)" category="SCADA_Drainage_SCADA_Drainage" priority="0"/>
         <ECProperty propertyName="TargetAttribute" typeName="ScadaElement_ScadaAspect_TargetAttribute_Enum" displayLabel="Field" category="SCADA_Drainage_SCADA_Drainage" priority="0"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsScadaElement_ScadaAspect" modifier="None" strength="embedding">
@@ -5008,6 +5640,7 @@
     </ECRelationshipClass>
     <ECEntityClass typeName="WetWell_WaterQualityAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="TreatmentUnits" typeName="WetWell_WaterQualityAspect_TreatmentUnits_Enum" displayLabel="Treatment Units" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0"/>
         <ECProperty propertyName="WaterQuality_H2SRrate" typeName="double" displayLabel="Reaction Rate (H2S)" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0" kindOfQuantity="cifu:REACTION_RATE"/>
         <ECProperty propertyName="WaterQuality_H2SNodeTemperature" typeName="double" displayLabel="Temperature (H2S)" category="Water_Quality_Drainage_Water_Quality_Drainage" priority="0" kindOfQuantity="cifu:TEMPERATURE"/>
     </ECEntityClass>
@@ -5032,24 +5665,62 @@
             <Class class="WetWellAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECEntityClass typeName="SUDAConflictDataSet_HMIStandardResultRecordAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="Time" typeName="double" displayLabel="Time" category="Utilities_Utilities" priority="0"/>
+        <ECProperty propertyName="FlowDirection" typeName="SUDAConflictDataSet_HMIStandardResultRecordAspect_FlowDirection_Enum" displayLabel="Flow Direction" category="Utilities_Utilities" priority="0"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsSUDAConflictDataSet_HMIStandardResultRecordAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="SUDAConflictDataSet_HMIStandardResultRecordAspect"/>
+        </Target>
+    </ECRelationshipClass>
+    <ECEntityClass typeName="SUDAConflictDataSet_ReferenceDomainElement_HmiDataSetGeometryAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="HMIGeometryOpenNumberModified" typeName="int" displayLabel="Geometry modified counter" category="Geometry_Utilities_Geometry_Utilities" priority="0"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsSUDAConflictDataSet_ReferenceDomainElement_HmiDataSetGeometryAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="SUDAConflictDataSet_ReferenceDomainElement_HmiDataSetGeometryAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <PropertyCategory typeName="Active_Topology_Drainage_Active_Topology_Drainage" description="Active Topology [Drainage]" displayLabel="Active Topology [Drainage]" priority="4294891236"/>
     <PropertyCategory typeName="Active_Topology_Hydraulic_Analysis_Active_Topology_Hydraulic_Analysis" description="Active Topology [Hydraulic Analysis]" displayLabel="Active Topology [Hydraulic Analysis]" priority="4294891236"/>
+    <PropertyCategory typeName="Analysis_Options_Drainage_Analysis_Options_Drainage" description="Analysis Options [Drainage]" displayLabel="Analysis Options [Drainage]" priority="4294890326"/>
     <PropertyCategory typeName="Boundary_Condition_Drainage_Boundary_Condition_Drainage" description="Boundary Condition [Drainage]" displayLabel="Boundary Condition [Drainage]" priority="4294889026"/>
     <PropertyCategory typeName="Boundary_Condition_Hydraulic_Analysis_Boundary_Condition_Hydraulic_Analysis" description="Boundary Condition [Hydraulic Analysis]" displayLabel="Boundary Condition [Hydraulic Analysis]" priority="4294889026"/>
     <PropertyCategory typeName="Connecting_Links_Drainage_Connecting_Links_Drainage" description="Connecting Links [Drainage]" displayLabel="Connecting Links [Drainage]" priority="4294888096"/>
+    <PropertyCategory typeName="Catchment_Drainage_Catchment_Drainage" description="Catchment [Drainage]" displayLabel="Catchment [Drainage]" priority="4294889436"/>
+    <PropertyCategory typeName="Category_Drainage_Category_Drainage" description="Category [Drainage]" displayLabel="Category [Drainage]" priority="4294889436"/>
     <PropertyCategory typeName="Defaults_2D_Drainage_Defaults_2D_Drainage" description="Defaults (2D) [Drainage]" displayLabel="Defaults (2D) [Drainage]" priority="4294888176"/>
     <PropertyCategory typeName="Design_Drainage_Design_Drainage" description="Design [Drainage]" displayLabel="Design [Drainage]" priority="4294888046"/>
     <PropertyCategory typeName="Design_Hydraulic_Analysis_Design_Hydraulic_Analysis" description="Design [Hydraulic Analysis]" displayLabel="Design [Hydraulic Analysis]" priority="4294888046"/>
     <PropertyCategory typeName="Diversion_Drainage_Diversion_Drainage" description="Diversion [Drainage]" displayLabel="Diversion [Drainage]" priority="4294887616"/>
     <PropertyCategory typeName="Diversion_Hydraulic_Analysis_Diversion_Hydraulic_Analysis" description="Diversion [Hydraulic Analysis]" displayLabel="Diversion [Hydraulic Analysis]" priority="4294887616"/>
+    <PropertyCategory typeName="Flow_Summary_Drainage_Flow_Summary_Drainage" description="Flow Summary [Drainage]" displayLabel="Flow Summary [Drainage]" priority="4294885386"/>
     <PropertyCategory typeName="Flows_Drainage_Flows_Drainage" description="Flows [Drainage]" displayLabel="Flows [Drainage]" priority="4294885386"/>
     <PropertyCategory typeName="Flows_Hydraulic_Analysis_Flows_Hydraulic_Analysis" description="Flows [Hydraulic Analysis]" displayLabel="Flows [Hydraulic Analysis]" priority="4294885386"/>
     <PropertyCategory typeName="General_Drainage_General_Drainage" description="&lt;General&gt; [Drainage]" displayLabel="&lt;General&gt; [Drainage]" priority="4294899186"/>
     <PropertyCategory typeName="General_Hydraulic_Analysis_General_Hydraulic_Analysis" description="&lt;General&gt; [Hydraulic Analysis]" displayLabel="&lt;General&gt; [Hydraulic Analysis]" priority="4294899186"/>
+    <PropertyCategory typeName="Generic_Drainage_Generic_Drainage" description="Generic [Drainage]" displayLabel="Generic [Drainage]" priority="4294885096"/>
     <PropertyCategory typeName="Geometry_Drainage_Geometry_Drainage" description="&lt;Geometry&gt; [Drainage]" displayLabel="&lt;Geometry&gt; [Drainage]" priority="4294899186"/>
     <PropertyCategory typeName="Geometry_Hydraulic_Analysis_Geometry_Hydraulic_Analysis" description="&lt;Geometry&gt; [Hydraulic Analysis]" displayLabel="&lt;Geometry&gt; [Hydraulic Analysis]" priority="4294899186"/>
+    <PropertyCategory typeName="Geometry_Utilities_Geometry_Utilities" description="&lt;Geometry&gt; [Utilities]" displayLabel="&lt;Geometry&gt; [Utilities]" priority="4294899186"/>
+    <PropertyCategory typeName="Gravity_Hydraulics_Drainage_Gravity_Hydraulics_Drainage" description="Gravity Hydraulics [Drainage]" displayLabel="Gravity Hydraulics [Drainage]" priority="4294883926"/>
+    <PropertyCategory typeName="Headloss_AASHTO_Drainage_Headloss_AASHTO_Drainage" description="Headloss (AASHTO) [Drainage]" displayLabel="Headloss (AASHTO) [Drainage]" priority="4294884226"/>
     <PropertyCategory typeName="Headlosses_Drainage_Headlosses_Drainage" description="Headlosses [Drainage]" displayLabel="Headlosses [Drainage]" priority="4294884226"/>
     <PropertyCategory typeName="Headlosses_Hydraulic_Analysis_Headlosses_Hydraulic_Analysis" description="Headlosses [Hydraulic Analysis]" displayLabel="Headlosses [Hydraulic Analysis]" priority="4294884226"/>
+    <PropertyCategory typeName="HEC_22_Energy_Losses_Drainage_HEC_22_Energy_Losses_Drainage" description="HEC-22 Energy Losses [Drainage]" displayLabel="HEC-22 Energy Losses [Drainage]" priority="4294887726"/>
+    <PropertyCategory typeName="HEC_22_Energy_Losses_Second_Edition_Drainage_HEC_22_Energy_Losses_Second_Edition_Drainage" description="HEC-22 Energy Losses (Second Edition) [Drainage]" displayLabel="HEC-22 Energy Losses (Second Edition) [Drainage]" priority="4294887726"/>
+    <PropertyCategory typeName="HEC_22_Energy_Losses_Third_Edition_Drainage_HEC_22_Energy_Losses_Third_Edition_Drainage" description="HEC-22 Energy Losses (Third Edition) [Drainage]" displayLabel="HEC-22 Energy Losses (Third Edition) [Drainage]" priority="4294887726"/>
     <PropertyCategory typeName="Hydrology_Drainage_Hydrology_Drainage" description="Hydrology [Drainage]" displayLabel="Hydrology [Drainage]" priority="4294882196"/>
     <PropertyCategory typeName="Hydrology_Hydraulic_Analysis_Hydrology_Hydraulic_Analysis" description="Hydrology [Hydraulic Analysis]" displayLabel="Hydrology [Hydraulic Analysis]" priority="4294882196"/>
     <PropertyCategory typeName="ILSAX_Hydrologic_Model_Drainage_ILSAX_Hydrologic_Model_Drainage" description="ILSAX Hydrologic Model [Drainage]" displayLabel="ILSAX Hydrologic Model [Drainage]" priority="4294885866"/>
@@ -5064,7 +5735,10 @@
     <PropertyCategory typeName="Inlet_Location_Hydraulic_Analysis_Inlet_Location_Hydraulic_Analysis" description="Inlet Location [Hydraulic Analysis]" displayLabel="Inlet Location [Hydraulic Analysis]" priority="4294882216"/>
     <PropertyCategory typeName="Inlet_Opening_Drainage_Inlet_Opening_Drainage" description="Inlet Opening [Drainage]" displayLabel="Inlet Opening [Drainage]" priority="4294882216"/>
     <PropertyCategory typeName="Inlet_Opening_Hydraulic_Analysis_Inlet_Opening_Hydraulic_Analysis" description="Inlet Opening [Hydraulic Analysis]" displayLabel="Inlet Opening [Hydraulic Analysis]" priority="4294882216"/>
+    <PropertyCategory typeName="Inlets_Drainage_Inlets_Drainage" description="Inlets [Drainage]" displayLabel="Inlets [Drainage]" priority="4294882216"/>
     <PropertyCategory typeName="Land_Cover_Drainage_Land_Cover_Drainage" description="Land Cover [Drainage]" displayLabel="Land Cover [Drainage]" priority="4294880496"/>
+    <PropertyCategory typeName="OneD_2D_Volume_Balance_Report_Drainage_1D_2D_Volume_Balance_Report_Drainage" description="1D-2D Volume Balance Report [Drainage]" displayLabel="1D-2D Volume Balance Report [Drainage]" priority="4294911046"/>
+    <PropertyCategory typeName="OneD_2D_Volume_Details_Drainage_1D_2D_Volume_Details_Drainage" description="1D-2D Volume Details [Drainage]" displayLabel="1D-2D Volume Details [Drainage]" priority="4294911046"/>
     <PropertyCategory typeName="Operating_Range_Drainage_Operating_Range_Drainage" description="Operating Range [Drainage]" displayLabel="Operating Range [Drainage]" priority="4294876086"/>
     <PropertyCategory typeName="Operating_Range_Hydraulic_Analysis_Operating_Range_Hydraulic_Analysis" description="Operating Range [Hydraulic Analysis]" displayLabel="Operating Range [Hydraulic Analysis]" priority="4294876086"/>
     <PropertyCategory typeName="Operational_Drainage_Operational_Drainage" description="Operational [Drainage]" displayLabel="Operational [Drainage]" priority="4294876086"/>
@@ -5076,24 +5750,34 @@
     <PropertyCategory typeName="Physical_Control_Structure_Hydraulic_Analysis_Physical_Control_Structure_Hydraulic_Analysis" description="Physical (Control Structure) [Hydraulic Analysis]" displayLabel="Physical (Control Structure) [Hydraulic Analysis]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Culvert_Drainage_Physical_Culvert_Drainage" description="Physical (Culvert) [Drainage]" displayLabel="Physical (Culvert) [Drainage]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Culvert_Hydraulic_Analysis_Physical_Culvert_Hydraulic_Analysis" description="Physical (Culvert) [Hydraulic Analysis]" displayLabel="Physical (Culvert) [Hydraulic Analysis]" priority="4294875686"/>
+    <PropertyCategory typeName="Physical_Culvert_Overtopping_Drainage_Physical_Culvert_Overtopping_Drainage" description="Physical (Culvert Overtopping) [Drainage]" displayLabel="Physical (Culvert Overtopping) [Drainage]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Drainage_Physical_Drainage" description="Physical [Drainage]" displayLabel="Physical [Drainage]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Hydraulic_Analysis_Physical_Hydraulic_Analysis" description="Physical [Hydraulic Analysis]" displayLabel="Physical [Hydraulic Analysis]" priority="4294875686"/>
+    <PropertyCategory typeName="Physical_Hydraulic_Analysis_Physical_Hydraulic_Analysis" description="Physical [Hydraulic Analysis]" displayLabel="Physical [Hydraulic Analysis]" priority="4294899186"/>
     <PropertyCategory typeName="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" description="Physical (Structure Losses) [Drainage]" displayLabel="Physical (Structure Losses) [Drainage]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Structure_Losses_Hydraulic_Analysis_Physical_Structure_Losses_Hydraulic_Analysis" description="Physical (Structure Losses) [Hydraulic Analysis]" displayLabel="Physical (Structure Losses) [Hydraulic Analysis]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Surface_Storage_Drainage_Physical_Surface_Storage_Drainage" description="Physical (Surface Storage) [Drainage]" displayLabel="Physical (Surface Storage) [Drainage]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Surface_Storage_Hydraulic_Analysis_Physical_Surface_Storage_Hydraulic_Analysis" description="Physical (Surface Storage) [Hydraulic Analysis]" displayLabel="Physical (Surface Storage) [Hydraulic Analysis]" priority="4294875686"/>
     <PropertyCategory typeName="Pond_Outlet_Drainage_Pond_Outlet_Drainage" description="Pond Outlet [Drainage]" displayLabel="Pond Outlet [Drainage]" priority="4294875096"/>
     <PropertyCategory typeName="Pond_Outlet_Hydraulic_Analysis_Pond_Outlet_Hydraulic_Analysis" description="Pond Outlet [Hydraulic Analysis]" displayLabel="Pond Outlet [Hydraulic Analysis]" priority="4294875096"/>
+    <PropertyCategory typeName="Pressure_Drainage_Pressure_Drainage" description="Pressure [Drainage]" displayLabel="Pressure [Drainage]" priority="4294874886"/>
+    <PropertyCategory typeName="Pressure_Hydraulics_Drainage_Pressure_Hydraulics_Drainage" description="Pressure Hydraulics [Drainage]" displayLabel="Pressure Hydraulics [Drainage]" priority="4294874886"/>
+    <PropertyCategory typeName="Process_Models_2D_Drainage_Process_Models_2D_Drainage" description="Process Models (2D) [Drainage]" displayLabel="Process Models (2D) [Drainage]" priority="4294874786"/>
+    <PropertyCategory typeName="Process_Models_Drainage_Process_Models_Drainage" description="Process Models [Drainage]" displayLabel="Process Models [Drainage]" priority="4294874786"/>
     <PropertyCategory typeName="Rainfall_Drainage_Rainfall_Drainage" description="Rainfall [Drainage]" displayLabel="Rainfall [Drainage]" priority="4294874546"/>
     <PropertyCategory typeName="Rainfall_Hydraulic_Analysis_Rainfall_Hydraulic_Analysis" description="Rainfall [Hydraulic Analysis]" displayLabel="Rainfall [Hydraulic Analysis]" priority="4294874546"/>
     <PropertyCategory typeName="References_Drainage_References_Drainage" description="References [Drainage]" displayLabel="References [Drainage]" priority="4294874176"/>
     <PropertyCategory typeName="References_Hydraulic_Analysis_References_Hydraulic_Analysis" description="References [Hydraulic Analysis]" displayLabel="References [Hydraulic Analysis]" priority="4294874176"/>
     <PropertyCategory typeName="Results_Connecting_Links___Extended_Drainage_Results_Connecting_Links___Extended_Drainage" description="Results (Connecting Links - Extended) [Drainage]" displayLabel="Results (Connecting Links - Extended) [Drainage]" priority="4294874046"/>
+    <PropertyCategory typeName="Results_Drainage_Results_Drainage" description="Results [Drainage]" displayLabel="Results [Drainage]" priority="4294874046"/>
     <PropertyCategory typeName="Results_Energy_Costs_Drainage_Results_Energy_Costs_Drainage" description="Results (Energy Costs) [Drainage]" displayLabel="Results (Energy Costs) [Drainage]" priority="4294874046"/>
     <PropertyCategory typeName="Results_Energy_Costs_Hydraulic_Analysis_Results_Energy_Costs_Hydraulic_Analysis" description="Results (Energy Costs) [Hydraulic Analysis]" displayLabel="Results (Energy Costs) [Hydraulic Analysis]" priority="4294874046"/>
+    <PropertyCategory typeName="Results_Maximum_Values_Drainage_Results_Maximum_Values_Drainage" description="Results (Maximum Values) [Drainage]" displayLabel="Results (Maximum Values) [Drainage]" priority="4294874046"/>
     <PropertyCategory typeName="Results_Profile_Drainage_Results_Profile_Drainage" description="Results (Profile) [Drainage]" displayLabel="Results (Profile) [Drainage]" priority="4294874046"/>
+    <PropertyCategory typeName="Routing_Quantity_Drainage_Routing_Quantity_Drainage" description="Routing Quantity [Drainage]" displayLabel="Routing Quantity [Drainage]" priority="4294873026"/>
     <PropertyCategory typeName="Runoff_Drainage_Runoff_Drainage" description="Runoff [Drainage]" displayLabel="Runoff [Drainage]" priority="4294872496"/>
-    <PropertyCategory typeName="Runoff_Hydraulic_Analysis_Runoff_Hydraulic_Analysis" description="Runoff [Hydraulic Analysis]" displayLabel="Runoff [Hydraulic Analysis]" priority="4294872496"/>
+        <PropertyCategory typeName="Runoff_Hydraulic_Analysis_Runoff_Hydraulic_Analysis" description="Runoff [Hydraulic Analysis]" displayLabel="Runoff [Hydraulic Analysis]" priority="4294872496"/>
+    <PropertyCategory typeName="Runoff_Quantity_Drainage_Runoff_Quantity_Drainage" description="Runoff Quantity [Drainage]" displayLabel="Runoff Quantity [Drainage]" priority="4294872496"/>
     <PropertyCategory typeName="Sanitary_Pattern_Load_Drainage_Sanitary_Pattern_Load_Drainage" description="Sanitary (Pattern Load) [Drainage]" displayLabel="Sanitary (Pattern Load) [Drainage]" priority="4294873496"/>
     <PropertyCategory typeName="Sanitary_Pattern_Load_Hydraulic_Analysis_Sanitary_Pattern_Load_Hydraulic_Analysis" description="Sanitary (Pattern Load) [Hydraulic Analysis]" displayLabel="Sanitary (Pattern Load) [Hydraulic Analysis]" priority="4294873496"/>
     <PropertyCategory typeName="Sanitary_Unit_Loads_Drainage_Sanitary_Unit_Loads_Drainage" description="Sanitary (Unit Loads) [Drainage]" displayLabel="Sanitary (Unit Loads) [Drainage]" priority="4294873496"/>
@@ -5108,10 +5792,14 @@
     <PropertyCategory typeName="SWMM_Extended_Data_Hydraulic_Analysis_SWMM_Extended_Data_Hydraulic_Analysis" description="SWMM Extended Data [Hydraulic Analysis]" displayLabel="SWMM Extended Data [Hydraulic Analysis]" priority="4294874826"/>
     <PropertyCategory typeName="SWMM_Extended_Data_Water_Quality_Drainage_SWMM_Extended_Data_Water_Quality_Drainage" description="SWMM Extended Data (Water Quality) [Drainage]" displayLabel="SWMM Extended Data (Water Quality) [Drainage]" priority="4294874826"/>
     <PropertyCategory typeName="SWMM_Extended_Data_Water_Quality_Hydraulic_Analysis_SWMM_Extended_Data_Water_Quality_Hydraulic_Analysis" description="SWMM Extended Data (Water Quality) [Hydraulic Analysis]" displayLabel="SWMM Extended Data (Water Quality) [Hydraulic Analysis]" priority="4294874826"/>
+    <PropertyCategory typeName="SWMM_Hydrology_Drainage_SWMM_Hydrology_Drainage" description="SWMM Hydrology [Drainage]" displayLabel="SWMM Hydrology [Drainage]" priority="4294874826"/>
+    <PropertyCategory typeName="System_Stats_2D_Drainage_System_Stats_2D_Drainage" description="System Stats (2D) [Drainage]" displayLabel="System Stats (2D) [Drainage]" priority="4294871046"/>
+    <PropertyCategory typeName="System_Stats_Drainage_System_Stats_Drainage" description="System Stats [Drainage]" displayLabel="System Stats [Drainage]" priority="4294871046"/>
     <PropertyCategory typeName="Tractive_Stress_Drainage_Tractive_Stress_Drainage" description="Tractive Stress [Drainage]" displayLabel="Tractive Stress [Drainage]" priority="4294870926"/>
     <PropertyCategory typeName="Tractive_Stress_Hydraulic_Analysis_Tractive_Stress_Hydraulic_Analysis" description="Tractive Stress [Hydraulic Analysis]" displayLabel="Tractive Stress [Hydraulic Analysis]" priority="4294870926"/>
     <PropertyCategory typeName="TwoD_Solver_Drainage_2D_Solver_Drainage" description="2D Solver [Drainage]" displayLabel="2D Solver [Drainage]" priority="4294910176"/>
     <PropertyCategory typeName="Type_Operations_Drainage_Type_Operations_Drainage" description="Type/Operations [Drainage]" displayLabel="Type/Operations [Drainage]" priority="4294870076"/>
+    <PropertyCategory typeName="Utilities_Utilities" description="# [Utilities]" displayLabel="# [Utilities]" priority="4294928186"/>
     <PropertyCategory typeName="Water_Quality_Drainage_Water_Quality_Drainage" description="Water Quality [Drainage]" displayLabel="Water Quality [Drainage]" priority="4294869436"/>
     <PropertyCategory typeName="Water_Quality_Hydraulic_Analysis_Water_Quality_Hydraulic_Analysis" description="Water Quality [Hydraulic Analysis]" displayLabel="Water Quality [Hydraulic Analysis]" priority="4294869436"/>
 </ECSchema>
diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicResults.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicResults.ecschema.xml
index 165dc0778..de547f6c8 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicResults.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicResults.ecschema.xml
@@ -4,10 +4,10 @@
 |  * See LICENSE.md in the project root for license terms and full copyright notice.
 ======================================================================================= -->
 <ECSchema schemaName="CifHydraulicResults" alias="cifhydrs" version="01.00.08" description="iModel Connector schema containing aspect classes with result properties from the Subsurface Utilities Design and Analysis module as part of Civil Designer applications." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-    <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
+    <ECSchemaReference name="BisCore" version="01.00.25" alias="bis"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
-    <ECSchemaReference name="CifCommon" version="01.00.10" alias="cifcmn"/>
-    <ECSchemaReference name="CifUnits" version="01.00.08" alias="cifu"/>
+    <ECSchemaReference name="CifCommon" version="01.00.15" alias="cifcmn"/>
+    <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECCustomAttributes>
         <ProductionStatus xmlns="CoreCustomAttributes.01.00.04">
@@ -161,6 +161,35 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="AverageDepthResults_AverageDepth" typeName="double" displayLabel="Depth (Average)" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
     </ECEntityClass>
+    <ECEntityClass typeName="BaseDirectedNode_HmiDataSetGeometryAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="HMIGeometryOpenNumberModified" typeName="int" displayLabel="Geometry modified counter" category="Geometry_Drainage_Geometry_Drainage" priority="0"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="BaseNode_HmiDataSetGeometryAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="HMIGeometryOpenNumberModified" typeName="int" displayLabel="Geometry modified counter" category="Geometry_Drainage_Geometry_Drainage" priority="0"/>
+        <ECProperty propertyName="HmiDataSetGeometry_NodeRotation" typeName="double" displayLabel="Node Rotation" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="LocationPointX" typeName="double" displayLabel="Location Point X" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="LocationPointY" typeName="double" displayLabel="Location Point Y" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="LocationPointFeature" typeName="string" displayLabel="Location Point Feature" category="References_Drainage_References_Drainage" priority="0"/>
+        <ECProperty propertyName="LocationPointStation" typeName="double" displayLabel="Location Point Station" category="References_Drainage_References_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="LocationPointOffset" typeName="double" displayLabel="Location Point Offset" category="References_Drainage_References_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="VerticalOffset" typeName="double" displayLabel="Vertical Offset" category="References_Drainage_References_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="RotationFeature" typeName="string" displayLabel="Rotation Feature" category="References_Drainage_References_Drainage" priority="0"/>
+        <ECProperty propertyName="AbsoluteRotation" typeName="double" displayLabel="Absolute Rotation" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:ANGLE"/>
+    </ECEntityClass>
+    <ECEntityClass typeName="BasePump_HmiDataSetGeometryAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="HmiDataSetGeometry_NodeRotation" typeName="double" displayLabel="Node Rotation" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="LocationPointX" typeName="double" displayLabel="Location Point X" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="LocationPointY" typeName="double" displayLabel="Location Point Y" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="LocationPointFeature" typeName="string" displayLabel="Location Point Feature" category="References_Drainage_References_Drainage" priority="0"/>
+        <ECProperty propertyName="LocationPointStation" typeName="double" displayLabel="Location Point Station" category="References_Drainage_References_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="LocationPointOffset" typeName="double" displayLabel="Location Point Offset" category="References_Drainage_References_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="VerticalOffset" typeName="double" displayLabel="Vertical Offset" category="References_Drainage_References_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="RotationFeature" typeName="string" displayLabel="Rotation Feature" category="References_Drainage_References_Drainage" priority="0"/>
+        <ECProperty propertyName="AbsoluteRotation" typeName="double" displayLabel="Absolute Rotation" category="Geometry_Drainage_Geometry_Drainage" priority="0" kindOfQuantity="cifu:ANGLE"/>
+    </ECEntityClass>
     <ECEntityClass typeName="BasicDepthResultsAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="BasicDepthResults_Depth" typeName="double" displayLabel="Depth (Node)" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:DEPTH_LARGE"/>
@@ -217,6 +246,10 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="BasicVolumeResults_Volume" typeName="double" displayLabel="Volume" category="Results_Extended_Node_Drainage_Results_Extended_Node_Drainage" priority="0" kindOfQuantity="cifu:VOLUME"/>
     </ECEntityClass>
+    <ECEntityClass typeName="BoundaryPoint2D_HmiDataSetGeometryAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="HMIGeometryOpenNumberModified" typeName="int" displayLabel="Geometry modified counter" category="Geometry_Drainage_Geometry_Drainage" priority="0"/>
+    </ECEntityClass>
     <ECEntityClass typeName="BoundingDepthResultsAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="BoundingDepthResults_DepthIn" typeName="double" displayLabel="Depth (In)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:DEPTH_LARGE"/>
@@ -246,6 +279,9 @@
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="BoundingTopWidthResults_StartTopWidth" typeName="double" displayLabel="Spread / Top Width (Start)" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BoundingTopWidthResults_StopTopWidth" typeName="double" displayLabel="Spread / Top Width (Stop)" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BoundingTopWidthResults_InTopWidth" typeName="double" displayLabel="Spread / Top Width (In)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BoundingTopWidthResults_OutTopWidth" typeName="double" displayLabel="Spread / Top Width (Out)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="BoundingTopWidthResults_DownstreamTopWidth" typeName="double" displayLabel="Spread / Top Width (Downstream Inlet)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
     <ECEntityClass typeName="BoundingVelocityResultsAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -298,6 +334,10 @@
     </ECEntityClass>
     <ECEntityClass typeName="CulvertResultsAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="CulvertResults_HeadwaterElevation" typeName="double" displayLabel="Elevation (Headwater)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
+        <ECProperty propertyName="CulvertResults_HeadwaterDepth" typeName="double" displayLabel="Depth (Headwater)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:DEPTH_LARGE"/>
+        <ECProperty propertyName="CulvertResults_TailwaterElevation" typeName="double" displayLabel="Elevation (Tailwater)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
+        <ECProperty propertyName="CulvertResults_TailwaterDepth" typeName="double" displayLabel="Depth (Tailwater)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:DEPTH_LARGE"/>
         <ECProperty propertyName="CulvertControlType" typeName="CulvertResultsAspect_CulvertControlType_Enum" displayLabel="Culvert Control Type" category="Results_Profile_Summary_Drainage_Results_Profile_Summary_Drainage" priority="0"/>
         <ECProperty propertyName="CulvertFlowType" typeName="CulvertResultsAspect_CulvertFlowType_Enum" displayLabel="Culvert Flow Type" category="Results_Profile_Summary_Drainage_Results_Profile_Summary_Drainage" priority="0"/>
     </ECEntityClass>
@@ -382,6 +422,33 @@
             <Class class="AverageDepthResultsAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsBaseDirectedNode_HmiDataSetGeometryAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="BaseDirectedNode_HmiDataSetGeometryAspect"/>
+        </Target>
+    </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsBaseNode_HmiDataSetGeometryAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="BaseNode_HmiDataSetGeometryAspect"/>
+        </Target>
+    </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsBasePump_HmiDataSetGeometryAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="BasePump_HmiDataSetGeometryAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsBasicDepthResultsAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -490,6 +557,15 @@
             <Class class="BasicVolumeResultsAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECRelationshipClass typeName="ElementOwnsBoundaryPoint2D_HmiDataSetGeometryAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="BoundaryPoint2D_HmiDataSetGeometryAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsBoundingDepthResultsAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -779,6 +855,32 @@
         <ECProperty propertyName="FlowClassificationResults_TimeNormalFlowLimited" typeName="double" displayLabel="Time (Normal Depth) / Time (Simulation)" category="Results_Flow_Classification_Drainage_Results_Flow_Classification_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
         <ECProperty propertyName="FlowClassificationResults_TimeSpentStartCriticalDepth" typeName="double" displayLabel="Time (Upstream Critical Depth) / Time (Simulation)" category="Results_Flow_Classification_Drainage_Results_Flow_Classification_Drainage" priority="0" kindOfQuantity="cifu:PERCENT"/>
     </ECEntityClass>
+    <ECEntityClass typeName="ScadaElement_HmiDataSetGeometryAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="HMIGeometryOpenNumberModified" typeName="int" displayLabel="Geometry modified counter" category="Geometry_Drainage_Geometry_Drainage" priority="0"/>
+    </ECEntityClass>
+    <ECRelationshipClass typeName="ElementOwnsScadaElement_HmiDataSetGeometryAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="ScadaElement_HmiDataSetGeometryAspect"/>
+        </Target>
+    </ECRelationshipClass>
+    <ECEntityClass typeName="SurfacePoint_HmiDataSetGeometryAspect">
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="HMIGeometryOpenNumberModified" typeName="int" displayLabel="Geometry modified counter" category="Geometry_Drainage_Geometry_Drainage" priority="0"/>
+    </ECEntityClass>
+<ECRelationshipClass typeName="ElementOwnsSurfacePoint_HmiDataSetGeometryAspect" modifier="None" strength="embedding">
+        <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
+        <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
+            <Class class="bis:GeometricElement3d"/>
+        </Source>
+        <Target multiplicity="(0..1)" roleLabel="is owned by" polymorphic="false">
+            <Class class="SurfacePoint_HmiDataSetGeometryAspect"/>
+        </Target>
+    </ECRelationshipClass>
     <ECRelationshipClass typeName="ElementOwnsFlowClassificationResultsAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -1068,7 +1170,9 @@
     </ECRelationshipClass>
     <ECEntityClass typeName="GutterFlowResultsAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
-        <ECProperty propertyName="GutterFlowResults_StartFlow" typeName="double" displayLabel="Flow (Start)" category="Results_Flow_Drainage_Results_Flow_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="GutterFlowResults_StartFlow" typeName="double" displayLabel="Flow (In)" category="Results_Flow_Drainage_Results_Flow_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="GutterFlowResults_StopFlow" typeName="double" displayLabel="Flow (Out)" category="Results_Flow_Drainage_Results_Flow_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="GutterFlowResults_DownstreamFlow" typeName="double" displayLabel="Flow (Downstream Inlet)" category="Results_Flow_Drainage_Results_Flow_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsGutterFlowResultsAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -2432,6 +2536,7 @@
     <ECEntityClass typeName="StandardConduitResultsAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="StandardConduitResults_RoadwayOvertoppingFlow" typeName="double" displayLabel="Flow (Roadway Overtopping)" category="Results_Drainage_Results_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
+        <ECProperty propertyName="StandardConduitResults_RoadwayCapacityFlow" typeName="double" displayLabel="Discharge (No Overtopping, Maximum)" category="Results_Maximum_Values_Drainage_Results_Maximum_Values_Drainage" priority="0" kindOfQuantity="cifu:FLOW"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsStandardConduitResultsAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -2776,6 +2881,7 @@
     <PropertyCategory typeName="Physical_Headwall_Drainage_Physical_Headwall_Drainage" description="Physical (Headwall) [Drainage]" displayLabel="Physical (Headwall) [Drainage]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Headwall_Hydraulic_Analysis_Physical_Headwall_Hydraulic_Analysis" description="Physical (Headwall) [Hydraulic Analysis]" displayLabel="Physical (Headwall) [Hydraulic Analysis]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Hydraulic_Analysis_Physical_Hydraulic_Analysis" description="Physical [Hydraulic Analysis]" displayLabel="Physical [Hydraulic Analysis]" priority="4294875686"/>
+    <PropertyCategory typeName="References_Drainage_References_Drainage" description="References [Drainage]" displayLabel="References [Drainage]" priority="4294874176"/>
     <PropertyCategory typeName="Results_AASHTO_Drainage_Results_AASHTO_Drainage" description="Results (AASHTO) [Drainage]" displayLabel="Results (AASHTO) [Drainage]" priority="4294874046"/>
     <PropertyCategory typeName="Results_AASHTO_Hydraulic_Analysis_Results_AASHTO_Hydraulic_Analysis" description="Results (AASHTO) [Hydraulic Analysis]" displayLabel="Results (AASHTO) [Hydraulic Analysis]" priority="4294874046"/>
     <PropertyCategory typeName="Results_Carryover_Flow_Drainage_Results_Carryover_Flow_Drainage" description="Results (Carryover Flow) [Drainage]" displayLabel="Results (Carryover Flow) [Drainage]" priority="4294874046"/>
diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifRail.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifRail.ecschema.xml
index 15c0217a5..57558482d 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifRail.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifRail.ecschema.xml
@@ -6,8 +6,8 @@
 <ECSchema schemaName="CifRail" alias="cifrl" version="01.00.13" description="iModel Connector schema containing aspect classes with properties from OpenRail Designer." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
     <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
-    <ECSchemaReference name="CifCommon" version="01.00.10" alias="cifcmn"/>
-    <ECSchemaReference name="CifUnits" version="01.00.08" alias="cifu"/>
+    <ECSchemaReference name="CifCommon" version="01.00.15" alias="cifcmn"/>
+    <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECCustomAttributes>
         <ProductionStatus xmlns="CoreCustomAttributes.01.00.04">
@@ -77,6 +77,16 @@
         <ECEnumerator name="ProjectedCantAndLocation" value="18" displayLabel="Projected Cant And Location"/>
     </ECEnumeration>
     <ECEnumeration typeName="CantEntityAspect_CantEntity_RotateAbout_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Reset" value="-1" displayLabel="Reset"/>
+        <ECEnumerator name="Inside_Rail" value="0" displayLabel="Inside Rail"/>
+        <ECEnumerator name="Center" value="1" displayLabel="Center"/>
+        <ECEnumerator name="Outside_Rail" value="2" displayLabel="Outside Rail"/>
+        <ECEnumerator name="Left_Rail" value="3" displayLabel="Left Rail"/>
+        <ECEnumerator name="Right_Rail" value="4" displayLabel="Right Rail"/>
+        <ECEnumerator name="Force_Positive" value="5" displayLabel="Force Positive"/>
+    </ECEnumeration>
+    <ECEnumeration typeName="CantStationPointAspect_CantStationPoint_RotateAbout_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="Reset" value="-1" displayLabel="Reset"/>
         <ECEnumerator name="Inside_Rail" value="0" displayLabel="Inside Rail"/>
         <ECEnumerator name="Center" value="1" displayLabel="Center"/>
         <ECEnumerator name="Outside_Rail" value="2" displayLabel="Outside Rail"/>
@@ -289,11 +299,11 @@
         <ECEnumerator name="True" value="1" displayLabel="Yes"/>
         <ECEnumerator name="False" value="0" displayLabel="No"/>
     </ECEnumeration>
-    <ECEntityClass typeName="AlongGeometryTrenchPointRuleAspect">
+    <ECEntityClass typeName="AlongGeometryTrenchPointRuleAspect" displayLabel="Along Geometry Trench Point Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="AlongGeometryTrenchPointRulePropertyProvider_DistanceAlong" typeName="double" displayLabel="&lt;- Distance along -&gt;" category="Miscellaneous_Along_Geometry_Trench_Point_Rule" priority="299950" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
-    <ECEntityClass typeName="BaseRegressionPointsRuleAspect">
+    <ECEntityClass typeName="BaseRegressionPointsRuleAspect" displayLabel="Regression Points Base Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -303,7 +313,7 @@
         </ECCustomAttributes>
         <ECProperty propertyName="SlewExaggeration" typeName="double" displayLabel="Slew Exaggeration" category="HorizontalRegression_Horizontal_Regression" priority="299990"/>
     </ECEntityClass>
-    <ECEntityClass typeName="BaseTurnoutBranchesObjectSettings">
+    <ECEntityClass typeName="BaseTurnoutBranchesObjectSettings" displayLabel="Base Turnout Branches Feature">
         <BaseClass>bis:ElementUniqueAspect</BaseClass>
         <ECProperty propertyName="BaseTurnoutBranchesObjectSettings_BranchTheoreticalToActual" typeName="double" displayLabel="Theoretical To Actual" category="Miscellaneous_Base_Turnout_Branches_Feature" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BaseTurnoutBranchesObjectSettings_BranchLengthAlongMainline" typeName="double" displayLabel="Length Along Mainline" category="Miscellaneous_Base_Turnout_Branches_Feature" priority="299980" kindOfQuantity="cifu:LENGTH"/>
@@ -315,13 +325,13 @@
         <ECProperty propertyName="BaseTurnoutBranchesObjectSettings_BranchLeadingLinear" typeName="boolean" displayLabel="Leading Linear" category="Miscellaneous_Base_Turnout_Branches_Feature" priority="299900"/>
         <ECProperty propertyName="BaseTurnoutBranchesObjectSettings_BranchNumberOfElements" typeName="int" displayLabel="Number Of Elements" category="Miscellaneous_Base_Turnout_Branches_Feature" priority="299890"/>
     </ECEntityClass>
-    <ECEntityClass typeName="BaseTurnoutElementsObjectSettings">
+    <ECEntityClass typeName="BaseTurnoutElementsObjectSettings" displayLabel="Base Turnout Elements Feature">
         <BaseClass>bis:ElementUniqueAspect</BaseClass>
         <ECProperty propertyName="BaseTurnoutElementsObjectSettings_ElementLength" typeName="double" displayLabel="Length" category="Miscellaneous_Base_Turnout_Elements_Feature" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BaseTurnoutElementsObjectSettings_ElementEntranceRadius" typeName="double" displayLabel="Entrance Radius" category="Miscellaneous_Base_Turnout_Elements_Feature" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="BaseTurnoutElementsObjectSettings_ElementExitRadius" typeName="double" displayLabel="Exit Radius" category="Miscellaneous_Base_Turnout_Elements_Feature" priority="0" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
-    <ECEntityClass typeName="BaseTurnoutObjectSettingsAspect">
+    <ECEntityClass typeName="BaseTurnoutObjectSettingsAspect" displayLabel="Base Turnout Feature">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="BaseTurnoutObjectSettings_Name" typeName="string" displayLabel="Name" category="FeatureDetailsProperties_Feature_Details" priority="299990"/>
         <ECProperty propertyName="BaseTurnoutObjectSettings_Description" typeName="string" displayLabel="Description" category="FeatureDetailsProperties_Feature_Details" priority="299980"/>
@@ -330,7 +340,7 @@
         <ECProperty propertyName="BaseTurnoutObjectSettings_MininumBendingRadius" typeName="double" displayLabel="Minimum Bending Radius" category="FeatureDetailsProperties_Feature_Details" priority="299950"/>
         <ECProperty propertyName="BaseTurnoutObjectSettings_NumberOfBranches" typeName="BaseTurnoutObjectSettingsAspect_BaseTurnoutObjectSettings_NumberOfBranches_Enum" displayLabel="Number Of Branches" category="FeatureGeometryProperties_Feature_Geometry" priority="299945"/>
     </ECEntityClass>
-    <ECEntityClass typeName="BaseVerticalRegressionPointsRuleAspect">
+    <ECEntityClass typeName="BaseVerticalRegressionPointsRuleAspect" displayLabel="Vertical Regression Points Base Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -340,7 +350,7 @@
         </ECCustomAttributes>
         <ECProperty propertyName="SlewExaggeration" typeName="double" displayLabel="Lift\Lower Exaggeration" category="VerticalRegression_Vertical_Regression" priority="299990"/>
     </ECEntityClass>
-    <ECEntityClass typeName="BendingAxisTableEntryAspect">
+    <ECEntityClass typeName="BendingAxisTableEntryAspect" displayLabel="Bending Axis Table Entry">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Radius" typeName="double" displayLabel="Radius" category="TableEntry_Bending_Axis_Table_Entry" priority="299999" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Correction" typeName="double" displayLabel="Correction" category="TableEntry_Bending_Axis_Table_Entry" priority="299998" kindOfQuantity="cifu:LENGTH"/>
@@ -358,6 +368,8 @@
         <ECProperty propertyName="CantEntity_AppliedConstant" typeName="double" displayLabel="Applied Constant" category="Cant_Cant" priority="299997"/>
         <ECProperty propertyName="CantEntity_EquilibriumConstant" typeName="double" displayLabel="Equilibrium Constant" category="Cant_Cant" priority="299996"/>
         <ECProperty propertyName="CantEntity_RotateAbout" typeName="CantEntityAspect_CantEntity_RotateAbout_Enum" displayLabel="Rotate About" category="Cant_Cant" priority="299994"/>
+        <ECProperty propertyName="CantEntity_VirtualLength" typeName="double" displayLabel="Virtual Length" category="Cant_Cant" priority="299993" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="CantEntity_OnLinear" typeName="double" displayLabel="On Linear (%)" category="Cant_Cant" priority="299992"/>
         <ECProperty propertyName="CantEntity_SpeedScheme" typeName="string" displayLabel="Speed Scheme" category="Cant_Cant" priority="299998"/>
     </ECEntityClass>
     <ECEntityClass typeName="CantProjectionRuleAspect" displayLabel="&lt;- CantProjectionRule -&gt;">
@@ -433,13 +445,18 @@
             </ECCustomAttributes>
         </ECProperty>
         <ECProperty propertyName="CantStationPoint_Status_Enum" typeName="CantStationPointAspect_CantStationPoint_Status_Enum" displayLabel="Status" category="CantStationPoint_Cant_Station_Point" priority="299984"/>
+        <ECProperty propertyName="CantStationPoint_PointModifiers" typeName="int" displayLabel="&lt;- PointModifiers -&gt;" category="CantStationPoint_Cant_Station_Point" priority="299975">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+            </ECCustomAttributes>
+        </ECProperty>
     </ECEntityClass>
-    <ECEntityClass typeName="CantTableEntryAspect">
+    <ECEntityClass typeName="CantTableEntryAspect" displayLabel="Cant Table Entry">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Radius" typeName="double" displayLabel="Radius" category="TableEntry_Cant_Table_Entry" priority="299999" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Cant" typeName="double" displayLabel="Cant" category="TableEntry_Cant_Table_Entry" priority="299998" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CoachAspect">
+    <ECEntityClass typeName="CoachAspect" displayLabel="Coach">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="CoachAtStationRule_Station" typeName="double" displayLabel="Station" category="LocationProperties_Location" priority="299990" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CoachAtStationRule_TemplateName" typeName="string" displayLabel="Template Name" category="CoachProperties_Coach" priority="299980"/>
@@ -450,7 +467,7 @@
         <ECProperty propertyName="CoachAtStationRule_Width" typeName="double" displayLabel="Width" category="CoachProperties_Coach" priority="299930" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="CoachAtStationRule_Elevation" typeName="double" displayLabel="Elevation" category="CoachProperties_Coach" priority="299920" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CrossingRuleAspect">
+    <ECEntityClass typeName="CrossingRuleAspect" displayLabel="Crossing Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="CrossingRule_Hand" typeName="CrossingRuleAspect_CrossingRule_Hand_Enum" displayLabel="Hand" category="CrossingProperties_Crossing" priority="299960"/>
         <ECProperty propertyName="CrossingRule_Orientation" typeName="CrossingRuleAspect_CrossingRule_Orientation_Enum" displayLabel="Orientation" category="CrossingProperties_Crossing" priority="299950"/>
@@ -464,6 +481,7 @@
         <ECProperty propertyName="CrossingRule_Branch1Nose" typeName="point3d" displayLabel="Branch1 Nose" category="CrossingPointsProperties_Crossing_Points" priority="299760"/>
         <ECProperty propertyName="CrossingRule_Branch1Common" typeName="point3d" displayLabel="Branch1 Common" category="CrossingPointsProperties_Crossing_Points" priority="299750"/>
         <ECProperty propertyName="CrossingRule_Branch1Obtuse" typeName="point3d" displayLabel="Branch1 Obtuse" category="CrossingPointsProperties_Crossing_Points" priority="299740"/>
+        <ECProperty propertyName="CrossingRule_Branch1LLS" typeName="point3d" displayLabel="Branch 1 LLS" category="CrossingPointsProperties_Crossing_Points" priority="299735"/>
         <ECProperty propertyName="CrossingRule_Branch2P0" typeName="point3d" displayLabel="Branch2 P0" category="CrossingPointsProperties_Crossing_Points" priority="299730"/>
         <ECProperty propertyName="CrossingRule_Branch2P1" typeName="point3d" displayLabel="Branch2 P1" category="CrossingPointsProperties_Crossing_Points" priority="299720"/>
         <ECProperty propertyName="CrossingRule_Branch2P2" typeName="point3d" displayLabel="Branch2 P2" category="CrossingPointsProperties_Crossing_Points" priority="299710"/>
@@ -471,6 +489,7 @@
         <ECProperty propertyName="CrossingRule_Branch2Nose" typeName="point3d" displayLabel="Branch2 Nose" category="CrossingPointsProperties_Crossing_Points" priority="299690"/>
         <ECProperty propertyName="CrossingRule_Branch2Common" typeName="point3d" displayLabel="Branch2 Common" category="CrossingPointsProperties_Crossing_Points" priority="299680"/>
         <ECProperty propertyName="CrossingRule_Branch2Obtuse" typeName="point3d" displayLabel="Branch2 Obtuse" category="CrossingPointsProperties_Crossing_Points" priority="299670"/>
+        <ECProperty propertyName="CrossingRule_Branch2LLS" typeName="point3d" displayLabel="Branch 2 LLS" category="CrossingPointsProperties_Crossing_Points" priority="299665"/>
         <ECProperty propertyName="CrossingRule_Branch1P0Station" typeName="double" displayLabel="Branch1 P0 Station" category="CrossingPointsProperties_Crossing_Points" priority="299400" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch1P1Station" typeName="double" displayLabel="Branch1 P1 Station" category="CrossingPointsProperties_Crossing_Points" priority="299390" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch1P2Station" typeName="double" displayLabel="Branch1 P2 Station" category="CrossingPointsProperties_Crossing_Points" priority="299380" kindOfQuantity="cifu:STATION"/>
@@ -478,6 +497,7 @@
         <ECProperty propertyName="CrossingRule_Branch1NoseStation" typeName="double" displayLabel="Branch1 Nose Station" category="CrossingPointsProperties_Crossing_Points" priority="299360" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch1CommonStation" typeName="double" displayLabel="Branch1 Common Station" category="CrossingPointsProperties_Crossing_Points" priority="299350" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch1ObtuseStation" typeName="double" displayLabel="Branch1 Obtuse Station" category="CrossingPointsProperties_Crossing_Points" priority="299340" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="CrossingRule_Branch1LLSStation" typeName="double" displayLabel="Branch1 LLS Extension Station" category="CrossingPointsProperties_Crossing_Points" priority="299335" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch2P0Station" typeName="double" displayLabel="Branch2 P0 Station" category="CrossingPointsProperties_Crossing_Points" priority="299330" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch2P1Station" typeName="double" displayLabel="Branch2 P1 Station" category="CrossingPointsProperties_Crossing_Points" priority="299320" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch2P2Station" typeName="double" displayLabel="Branch2 P2 Station" category="CrossingPointsProperties_Crossing_Points" priority="299310" kindOfQuantity="cifu:STATION"/>
@@ -485,12 +505,9 @@
         <ECProperty propertyName="CrossingRule_Branch2NoseStation" typeName="double" displayLabel="Branch2 Nose Station" category="CrossingPointsProperties_Crossing_Points" priority="299290" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch2CommonStation" typeName="double" displayLabel="Branch2 Common Station" category="CrossingPointsProperties_Crossing_Points" priority="299280" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch2ObtuseStation" typeName="double" displayLabel="Branch2 Obtuse Station" category="CrossingPointsProperties_Crossing_Points" priority="299270" kindOfQuantity="cifu:STATION"/>
-        <ECProperty propertyName="CrossingRule_Branch1LLS" typeName="point3d" displayLabel="Branch 1 LLS" category="CrossingPointsProperties_Crossing_Points" priority="299735"/>
-        <ECProperty propertyName="CrossingRule_Branch2LLS" typeName="point3d" displayLabel="Branch 2 LLS" category="CrossingPointsProperties_Crossing_Points" priority="299665"/>
-        <ECProperty propertyName="CrossingRule_Branch1LLSStation" typeName="double" displayLabel="Branch1 LLS Extension Station" category="CrossingPointsProperties_Crossing_Points" priority="299335" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossingRule_Branch2LLSStation" typeName="double" displayLabel="Branch2 LLS Extension Station" category="CrossingPointsProperties_Crossing_Points" priority="299265" kindOfQuantity="cifu:STATION"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CrossoverRuleAspect">
+    <ECEntityClass typeName="CrossoverRuleAspect" displayLabel="Crossover Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="CrossoverRule_Orientation" typeName="CrossoverRuleAspect_CrossoverRule_Orientation_Enum" displayLabel="Orientation" category="CrossoverProperties_Crossover" priority="299950"/>
         <ECProperty propertyName="CrossoverRule_PlacementPoint" typeName="CrossoverRuleAspect_CrossoverRule_PlacementPoint_Enum" displayLabel="Placement Point" category="CrossoverProperties_Crossover" priority="299940"/>
@@ -538,24 +555,24 @@
         <ECProperty propertyName="CrossoverRule_Turnout2Branch2P3Station" typeName="double" displayLabel="Second Turnout Branch2 P3 Station" category="CrossoverPointsProperties_Crossover_Points" priority="299220" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="CrossoverRule_Turnout2Branch2TheoreticalP1Station" typeName="double" displayLabel="Second Turnout Branch2 Theoretical P1 Station" category="CrossoverPointsProperties_Crossover_Points" priority="299210" kindOfQuantity="cifu:STATION"/>
     </ECEntityClass>
-    <ECEntityClass typeName="DistanceKeeperComponentAspect">
+    <ECEntityClass typeName="DistanceKeeperComponentAspect" displayLabel="Distance Keeper Component">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="DistanceKeepersProperties_Distance_Keepers" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="EndDistance" typeName="double" displayLabel="End Distance" category="DistanceKeepersProperties_Distance_Keepers" priority="299980" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="IntervalDistance" typeName="double" displayLabel="Interval Distance" category="DistanceKeepersProperties_Distance_Keepers" priority="299970" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="MinDistanceBetweenKeeper" typeName="double" displayLabel="Minimum Distance Between Keepers" category="DistanceKeepersProperties_Distance_Keepers" priority="299950" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="MaxDistanceBetweenKeeper" typeName="double" displayLabel="Maximum Distance Between Keepers" category="DistanceKeepersProperties_Distance_Keepers" priority="299940" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="DistFromStartPoint" typeName="double" displayLabel="Distance From Start Point" category="DistanceKeepersProperties_Distance_Keepers" priority="299930" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="DistFromEndPoint" typeName="double" displayLabel="Distance From End Point" category="DistanceKeepersProperties_Distance_Keepers" priority="299920" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="RemainderLengthOption" typeName="double" displayLabel="Remainder Length Option [Deprecated]" category="DistanceKeepersProperties_Distance_Keepers" priority="299960" kindOfQuantity="cifu:LENGTH">
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
                 <Deprecated xmlns="CoreCustomAttributes.01.00.04">
-                    <Description>Use 'RemainderLengthOptionValue' instead</Description>
+                    <Description>Use 'RemainderLengthOptionValue' instead.</Description>
                 </Deprecated>
             </ECCustomAttributes>
         </ECProperty>
         <ECProperty propertyName="RemainderLengthOptionValue" typeName="DistanceKeeperComponentAspect_RemainderLengthOption_Enum" displayLabel="Remainder Length Option" category="DistanceKeepersProperties_Distance_Keepers" priority="299960"/>
+        <ECProperty propertyName="MinDistanceBetweenKeeper" typeName="double" displayLabel="Minimum Distance Between Keepers" category="DistanceKeepersProperties_Distance_Keepers" priority="299950" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="MaxDistanceBetweenKeeper" typeName="double" displayLabel="Maximum Distance Between Keepers" category="DistanceKeepersProperties_Distance_Keepers" priority="299940" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="DistFromStartPoint" typeName="double" displayLabel="Distance From Start Point" category="DistanceKeepersProperties_Distance_Keepers" priority="299930" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="DistFromEndPoint" typeName="double" displayLabel="Distance From End Point" category="DistanceKeepersProperties_Distance_Keepers" priority="299920" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsAlongGeometryTrenchPointRuleAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -701,7 +718,7 @@
             <Class class="DistanceKeeperComponentAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="EquipmentAspect">
+    <ECEntityClass typeName="EquipmentAspect" displayLabel="Equipment">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Equipment_ReferenceCenterline" typeName="string" displayLabel="Reference Centerline" category="EquipmentProperties_Equipment" priority="299995"/>
         <ECProperty propertyName="Equipment_ElevationType" typeName="EquipmentAspect_Equipment_ElevationType_Enum" displayLabel="Elevation Mode" category="EquipmentProperties_Equipment" priority="299900"/>
@@ -709,8 +726,17 @@
         <ECProperty propertyName="Equipment_ConnectingEquipmentLength" typeName="double" displayLabel="Connecting Equipment Length" category="EquipmentProperties_Equipment" priority="299888" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Equipment_TopElevation" typeName="double" displayLabel="Top Equipment Elevation" category="EquipmentProperties_Equipment" priority="299882" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Equipment_RotationType" typeName="EquipmentAspect_Equipment_RotationType_Enum" displayLabel="Rotation Mode" category="EquipmentProperties_Equipment" priority="299880"/>
-        <ECProperty propertyName="Equipment_Rotation" typeName="double" displayLabel="Rotation" category="EquipmentProperties_Equipment" priority="299870" kindOfQuantity="cifu:BEARING"/>
-        <ECProperty propertyName="Equipment_OriginID" typeName="string" displayLabel="Origin ID" category="EquipmentProperties_Equipment" priority="299860"/>
+        <ECProperty propertyName="Equipment_Rotation" typeName="double" displayLabel="Rotation [Deprecated]" category="EquipmentProperties_Equipment" priority="299875" kindOfQuantity="cifu:BEARING">
+            <ECCustomAttributes>
+                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
+                <Deprecated xmlns="CoreCustomAttributes.01.00.04">
+                    <Description>Use 'Equipment_RotationAbsolute' instead.</Description>
+                </Deprecated>
+            </ECCustomAttributes>
+        </ECProperty>
+        <ECProperty propertyName="Equipment_RotationOffset" typeName="double" displayLabel="Rotation Offset" category="EquipmentProperties_Equipment" priority="299870" kindOfQuantity="cifu:ANGLE"/>
+        <ECProperty propertyName="Equipment_RotationAbsolute" typeName="double" displayLabel="Rotation Absolute" category="EquipmentProperties_Equipment" priority="299860" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="Equipment_OriginID" typeName="string" displayLabel="Origin ID" category="EquipmentProperties_Equipment" priority="299850"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsEquipmentAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -721,7 +747,7 @@
             <Class class="EquipmentAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="EquipmentObjectSettingsAspect">
+    <ECEntityClass typeName="EquipmentObjectSettingsAspect" displayLabel="Equipment Object Settings">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Category" typeName="EquipmentObjectSettingsAspect_Category_Enum" displayLabel="Category" category="FeatureDetailsProperties_Feature_Details" priority="299990"/>
         <ECProperty propertyName="Subcategory" typeName="string" displayLabel="Subcategory" category="FeatureDetailsProperties_Feature_Details" priority="299980"/>
@@ -744,7 +770,7 @@
             <Class class="EquipmentObjectSettingsAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="EquipmentSettingsAspect">
+    <ECEntityClass typeName="EquipmentSettingsAspect" displayLabel="Equipment Settings">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="EquipmentSettings_LocationType" typeName="EquipmentSettingsAspect_EquipmentSettings_LocationType_Enum" displayLabel="Location Type" category="Settings_Settings" priority="299990"/>
         <ECProperty propertyName="EquipmentSettings_LocationPointOffset" typeName="double" displayLabel="Point Offset" category="Settings_Settings" priority="299980" kindOfQuantity="cifu:LENGTH"/>
@@ -760,7 +786,7 @@
             <Class class="EquipmentSettingsAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ItalianCantTableEntryAspect">
+    <ECEntityClass typeName="ItalianCantTableEntryAspect" displayLabel="Italian Cant Table Entry">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="MaxCant" typeName="double" displayLabel="Maximum Cant" category="TableEntry_Italian_Cant_Table_Entry" priority="299999" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Deficiency" typeName="double" displayLabel="Deficiency" category="TableEntry_Italian_Cant_Table_Entry" priority="299998" kindOfQuantity="cifu:LENGTH"/>
@@ -813,7 +839,7 @@
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
                 <Deprecated xmlns="CoreCustomAttributes.01.00.04">
-                    <Description>Use 'DirectionValue' instead</Description>
+                    <Description>Use 'DirectionValue' instead.</Description>
                 </Deprecated>
             </ECCustomAttributes>
         </ECProperty>
@@ -828,7 +854,7 @@
             <Class class="PathwayRouteAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="Pnt2dToRailBaseRuleAspect">
+    <ECEntityClass typeName="Pnt2dToRailBaseRuleAspect" displayLabel="Pnt2d To Rail BaseRule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Pnt2dToRailBaseRule_OffsetType" typeName="Pnt2dToRailBaseRuleAspect_Pnt2dToRailBaseRule_OffsetType_Enum" displayLabel="Offset Mode" category="EquipmentProperties_Equipment" priority="299950"/>
         <ECProperty propertyName="Pnt2dToRailBaseRule_Offset" typeName="double" displayLabel="Offset" category="EquipmentProperties_Equipment" priority="299940" kindOfQuantity="cifu:LENGTH"/>
@@ -842,7 +868,7 @@
             <Class class="Pnt2dToRailBaseRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="Pnt2dToRailCenterOffsetRuleAspect">
+    <ECEntityClass typeName="Pnt2dToRailCenterOffsetRuleAspect" displayLabel="Pnt2d To Rail Center Offset Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Pnt2dToRailCenterOffsetRule_DistanceAlong" typeName="double" displayLabel="Centerline Distance" category="EquipmentProperties_Equipment" priority="299945" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
@@ -855,7 +881,7 @@
             <Class class="Pnt2dToRailCenterOffsetRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="Pnt2dToRailPointOffsetRuleAspect">
+    <ECEntityClass typeName="Pnt2dToRailPointOffsetRuleAspect" displayLabel="Pnt2d To Rail Point Offset Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Pnt2dToRailPointOffsetRule_PointOffset" typeName="double" displayLabel="Point Offset" category="EquipmentProperties_Equipment" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Pnt2dToRailPointOffsetRule_DistanceAlong" typeName="double" displayLabel="Centerline Distance" category="EquipmentProperties_Equipment" priority="299945" kindOfQuantity="cifu:LENGTH"/>
@@ -869,7 +895,7 @@
             <Class class="Pnt2dToRailPointOffsetRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="PointControlExtensionAspect">
+    <ECEntityClass typeName="PointControlExtensionAspect" displayLabel="Point Control Extension">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Cant" typeName="string" displayLabel="Cant" category="CantPoints_Cant_Points" priority="299977"/>
         <ECProperty propertyName="CenterCantPoint" typeName="string" displayLabel="Center Cant Point" category="CantPoints_Cant_Points" priority="299976"/>
@@ -924,7 +950,7 @@
             <Class class="ProjectedSweptCoachRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="RailJointAspect">
+    <ECEntityClass typeName="RailJointAspect" displayLabel="&lt;- RailJoint -&gt;">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Length" typeName="double" displayLabel="Length" category="Joint_Joint" priority="299930" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Station" typeName="double" displayLabel="Station" category="Joint_Joint" priority="299920" kindOfQuantity="cifu:STATION"/>
@@ -934,7 +960,7 @@
             <ECCustomAttributes>
                 <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
                 <Deprecated xmlns="CoreCustomAttributes.01.00.04">
-                    <Description>Use RailJointAspect:RailHand instead</Description>
+                    <Description>Use RailJointAspect:RailHand instead.</Description>
                 </Deprecated>
             </ECCustomAttributes>
         </ECProperty>
@@ -949,7 +975,7 @@
             <Class class="RailJointAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="RailKeyPointsComponentForJointAspect">
+    <ECEntityClass typeName="RailKeyPointsComponentForJointAspect" displayLabel="&lt;- RailKeyPointsComponentForJoint -&gt;">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="MinRailLength" typeName="double" displayLabel="Min Rail Length" category="JointGroup_Joint_Group" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="MaxRailLength" typeName="double" displayLabel="Max Rail Length" category="JointGroup_Joint_Group" priority="299980" kindOfQuantity="cifu:LENGTH"/>
@@ -965,7 +991,7 @@
             <Class class="RailKeyPointsComponentForJointAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="RailOffsetRuleAspect">
+    <ECEntityClass typeName="RailOffsetRuleAspect" displayLabel="Rail Offset Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="RailOffsetRule_StartDistance" typeName="double" displayLabel="Start Distance" category="RailProperties_Rail" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="RailOffsetRule_EndDistance" typeName="double" displayLabel="End Distance" category="RailProperties_Rail" priority="299980" kindOfQuantity="cifu:LENGTH"/>
@@ -984,7 +1010,7 @@
             <Class class="RailOffsetRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="RailTrackComponentAspect">
+    <ECEntityClass typeName="RailTrackComponentAspect" displayLabel="&lt;- RailTrackComponent -&gt;">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="RailTrackComponent_StartDistance" typeName="double" displayLabel="Start Distance" category="RailProperties_Rail" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="RailTrackComponent_EndDistance" typeName="double" displayLabel="End Distance" category="RailProperties_Rail" priority="299980" kindOfQuantity="cifu:LENGTH"/>
@@ -1020,7 +1046,7 @@
         </Target>
     </ECRelationshipClass>
     <ECEntityClass typeName="RailwayEdgeSegmentClass">
-        <BaseClass>bis:ElementUniqueAspect</BaseClass>
+        <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SegmentName" typeName="string" displayLabel="Name" category="Miscellaneous_RailwayEdgeSegmentClass" priority="0"/>
         <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Distance Along Edge" category="Miscellaneous_RailwayEdgeSegmentClass" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Length" typeName="double" displayLabel="Length" category="Miscellaneous_RailwayEdgeSegmentClass" priority="0" kindOfQuantity="cifu:LENGTH"/>
@@ -1050,7 +1076,7 @@
             <Class class="RailwayNodeAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="RegressionCurvatureRuleAspect">
+    <ECEntityClass typeName="RegressionCurvatureRuleAspect" displayLabel="Regression Curvature Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -1070,7 +1096,7 @@
             <Class class="RegressionCurvatureRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="RegressionDetailsEntityAspect">
+    <ECEntityClass typeName="RegressionDetailsEntityAspect" displayLabel="Regression Details">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -1079,13 +1105,13 @@
             <HiddenClass xmlns="CoreCustomAttributes.01.00.04"/>
         </ECCustomAttributes>
         <ECProperty propertyName="RegressionDetailsEntity_Slew" typeName="double" displayLabel="Slew" category="RegressionPoint_Regression_Point" priority="299990" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="RegressionDetailsEntity_Weight" typeName="double" displayLabel="Weight" category="RegressionPoint_Regression_Point" priority="299940"/>
-        <ECProperty propertyName="RegressionDetailsEntity_Status" typeName="RegressionDetailsEntityAspect_RegressionDetailsEntity_Status_Enum" displayLabel="Status" category="RegressionPoint_Regression_Point" priority="299930"/>
-        <ECProperty propertyName="RegressionDetailsEntity_Offset" typeName="double" displayLabel="Offset" category="RegressionPoint_Regression_Point" priority="299920" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="RegressionDetailsEntity_LiftLower" typeName="double" displayLabel="Lift \ Lower" category="RegressionPoint_Regression_Point" priority="299980"/>
         <ECProperty propertyName="RegressionDetailsEntity_Cant" typeName="double" displayLabel="Cant" category="RegressionPoint_Regression_Point" priority="299970" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
         <ECProperty propertyName="RegressionDetailsEntity_ExistingCant" typeName="double" displayLabel="Existing Cant" category="RegressionPoint_Regression_Point" priority="299960" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
         <ECProperty propertyName="RegressionDetailsEntity_InstantaneousRadius" typeName="double" displayLabel="Instantaneous Radius" category="RegressionPoint_Regression_Point" priority="299950"/>
+        <ECProperty propertyName="RegressionDetailsEntity_Weight" typeName="double" displayLabel="Weight" category="RegressionPoint_Regression_Point" priority="299940"/>
+        <ECProperty propertyName="RegressionDetailsEntity_Status" typeName="RegressionDetailsEntityAspect_RegressionDetailsEntity_Status_Enum" displayLabel="Status" category="RegressionPoint_Regression_Point" priority="299930"/>
+        <ECProperty propertyName="RegressionDetailsEntity_Offset" typeName="double" displayLabel="Offset" category="RegressionPoint_Regression_Point" priority="299920" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="RegressionDetailsEntity_UnacceptableSlewLeft" typeName="double" displayLabel="Unacceptable Slew Left" category="RegressionPoint_Regression_Point" priority="299910"/>
         <ECProperty propertyName="RegressionDetailsEntity_UnacceptableSlewRight" typeName="double" displayLabel="Unacceptable Slew Right" category="RegressionPoint_Regression_Point" priority="299900"/>
         <ECProperty propertyName="RegressionDetailsEntity_Geometry" typeName="string" displayLabel="Geometry" category="RegressionPoint_Regression_Point" priority="299870"/>
@@ -1102,18 +1128,20 @@
             <Class class="RegressionDetailsEntityAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="RegressionDetailsProfileEntityAspect" displayLabel="Regression Details">
+    <ECEntityClass typeName="RegressionDetailsProfileEntityAspect" displayLabel="Regression Details Vertical">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="RegressionDetailsEntity_Slew" typeName="double" displayLabel="Slew" category="RegressionPoint_Regression_Point" priority="299990"/>
-        <ECProperty propertyName="RegressionDetailsEntity_Weight" typeName="double" displayLabel="Weight" category="RegressionPoint_Regression_Point" priority="299940"/>
-        <ECProperty propertyName="RegressionDetailsEntity_Status" typeName="RegressionDetailsProfileEntityAspect_RegressionDetailsEntity_Status_Enum" displayLabel="Status" category="RegressionPoint_Regression_Point" priority="299930"/>
-        <ECProperty propertyName="RegressionDetailsEntity_Offset" typeName="double" displayLabel="Offset" category="RegressionPoint_Regression_Point" priority="299920" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="RegressionDetailsEntity_LiftLower" typeName="double" displayLabel="Lift \ Lower" category="RegressionPoint_Regression_Point" priority="299980"/>
         <ECProperty propertyName="RegressionDetailsEntity_Cant" typeName="double" displayLabel="Cant" category="RegressionPoint_Regression_Point" priority="299970" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
         <ECProperty propertyName="RegressionDetailsEntity_ExistingCant" typeName="double" displayLabel="Existing Cant" category="RegressionPoint_Regression_Point" priority="299960" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
+        <ECProperty propertyName="RegressionDetailsEntity_Weight" typeName="double" displayLabel="Weight" category="RegressionPoint_Regression_Point" priority="299940"/>
+        <ECProperty propertyName="RegressionDetailsEntity_Status" typeName="RegressionDetailsProfileEntityAspect_RegressionDetailsEntity_Status_Enum" displayLabel="Status" category="RegressionPoint_Regression_Point" priority="299930"/>
+        <ECProperty propertyName="RegressionDetailsEntity_Offset" typeName="double" displayLabel="Offset" category="RegressionPoint_Regression_Point" priority="299920" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="RegressionDetailsEntity_InstantaneousRadius" typeName="double" displayLabel="Instantaneous Radius" category="RegressionPoint_Regression_Point" priority="299950"/>
         <ECProperty propertyName="RegressionDetailsEntity_MaximumLift" typeName="double" displayLabel="Maximum Lift" category="RegressionPoint_Regression_Point" priority="299890"/>
         <ECProperty propertyName="RegressionDetailsEntity_MaximumLower" typeName="double" displayLabel="Maximum Lower" category="RegressionPoint_Regression_Point" priority="299880"/>
+        <ECProperty propertyName="RegressionDetailsEntity_Geometry" typeName="string" displayLabel="Geometry" category="RegressionPoint_Regression_Point" priority="299870"/>
+        <ECProperty propertyName="RegressionDetailsEntity_GeometryType" typeName="string" displayLabel="Geometry Type" category="RegressionPoint_Regression_Point" priority="299860"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsRegressionDetailsProfileEntityAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -1184,7 +1212,7 @@
             <Class class="SchemaPathwayNodeRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SingleElementFromCurvatureRuleAspect">
+    <ECEntityClass typeName="SingleElementFromCurvatureRuleAspect" displayLabel="Single Element From Curvature Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -1204,7 +1232,7 @@
             <Class class="SingleElementFromCurvatureRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SingleElementHorizontalRegressionRuleAspect">
+    <ECEntityClass typeName="SingleElementHorizontalRegressionRuleAspect" displayLabel="Single Element Horizontal Regression Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -1227,7 +1255,7 @@
             <Class class="SingleElementHorizontalRegressionRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SingleElementSectionFromCurvatureRuleAspect">
+    <ECEntityClass typeName="SingleElementSectionFromCurvatureRuleAspect" displayLabel="Single Element Section From Curvature Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -1250,7 +1278,7 @@
             <Class class="SingleElementSectionFromCurvatureRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SingleElementVerticalRegressionRuleAspect">
+    <ECEntityClass typeName="SingleElementVerticalRegressionRuleAspect" displayLabel="Single Element Vertical Regression Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -1273,7 +1301,7 @@
             <Class class="SingleElementVerticalRegressionRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SingleProfileFromCurvatureRuleAspect">
+    <ECEntityClass typeName="SingleProfileFromCurvatureRuleAspect" displayLabel="Single Profile From Curvature Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -1293,7 +1321,7 @@
             <Class class="SingleProfileFromCurvatureRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SleeperComponentAspect">
+    <ECEntityClass typeName="SleeperComponentAspect" displayLabel="&lt;- SleeperComponent -&gt;">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="RailProperties_Rail" priority="299990" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="EndDistance" typeName="double" displayLabel="End Distance" category="RailProperties_Rail" priority="299980" kindOfQuantity="cifu:STATION"/>
@@ -1313,9 +1341,9 @@
             <Class class="SleeperComponentAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SleepersStub">
+    <ECEntityClass typeName="SleepersStub" displayLabel="LLS Extension">
         <BaseClass>BaseTurnoutElementsObjectSettings</BaseClass>
-        <ECProperty propertyName="BaseTurnoutElementsObjectSettings_SleepersStub_Fixed" typeName="boolean" displayLabel="Fixed" category="Miscellaneous_LLS_Extension" priority="0"/>
+        <ECProperty propertyName="BaseTurnoutElementsObjectSettings_SleepersStub_Fixed" typeName="boolean" displayLabel="Status" category="Miscellaneous_LLS_Extension" priority="0"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsSleepersStub" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -1326,7 +1354,7 @@
             <Class class="SleepersStub"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SweptCoachAspect">
+    <ECEntityClass typeName="SweptCoachAspect" displayLabel="Swept Coach">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SweptCoachRule_StartStation" typeName="double" displayLabel="Start Distance" category="SweepPathProperties_Swept_Path" priority="299990" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="SweptCoachRule_EndStation" typeName="double" displayLabel="End Distance" category="SweepPathProperties_Swept_Path" priority="299980" kindOfQuantity="cifu:STATION"/>
@@ -1349,7 +1377,7 @@
             <Class class="SweptCoachAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="TrackSleeperRuleAspect">
+    <ECEntityClass typeName="TrackSleeperRuleAspect" displayLabel="Track Widening Table Entry">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -1391,6 +1419,8 @@
     </ECRelationshipClass>
     <ECEntityClass typeName="TrenchAspect" displayLabel="Trench">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="Trench_StartReferenceCenterline" typeName="string" displayLabel="Start Reference Centerline" category="TrenchProperties_Trench" priority="299995"/>
+        <ECProperty propertyName="Trench_EndReferenceCenterline" typeName="string" displayLabel="End Reference Centerline" category="TrenchProperties_Trench" priority="299993"/>
         <ECProperty propertyName="Trench_StartDistance" typeName="double" displayLabel="Start Distance" category="TrenchProperties_Trench" priority="299970" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Trench_EndDistance" typeName="double" displayLabel="End Distance " category="TrenchProperties_Trench" priority="299960" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Trench_StartPointOffset" typeName="double" displayLabel="Start Point Offset" category="TrenchProperties_Trench" priority="299950" kindOfQuantity="cifu:LENGTH"/>
@@ -1401,6 +1431,7 @@
         <ECProperty propertyName="Trench_StartOffset" typeName="double" displayLabel="Start Offset" category="TrenchProperties_Trench" priority="299900" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Trench_EndOffsetType" typeName="TrenchAspect_Trench_EndOffsetType_Enum" displayLabel="End Offset Mode" category="TrenchProperties_Trench" priority="299890"/>
         <ECProperty propertyName="Trench_EndOffset" typeName="double" displayLabel="End Offset" category="TrenchProperties_Trench" priority="299880" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="Trench_VerticalReference" typeName="string" displayLabel="Elevation Reference" category="TrenchProperties_Trench" priority="299875"/>
         <ECProperty propertyName="Trench_ElevationType" typeName="TrenchAspect_Trench_ElevationType_Enum" displayLabel="Elevation Mode" category="TrenchProperties_Trench" priority="299870"/>
         <ECProperty propertyName="Trench_Elevation" typeName="double" displayLabel="Elevation" category="TrenchProperties_Trench" priority="299860" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Trench_StartObject" typeName="string" displayLabel="Start Object" category="TrenchProperties_Trench" priority="299850"/>
@@ -1416,7 +1447,7 @@
             <Class class="TrenchAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="TrenchChannelsObjectSettings">
+    <ECEntityClass typeName="TrenchChannelsObjectSettings" displayLabel="&lt;- TrenchChannelsObjectSettings -&gt;">
         <BaseClass>bis:ElementUniqueAspect</BaseClass>
         <ECProperty propertyName="Gauge" typeName="double" displayLabel="Gauge" category="Miscellaneous_TrenchChannelsObjectSettings" priority="299990" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
@@ -1429,7 +1460,7 @@
             <Class class="TrenchChannelsObjectSettings"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="TrenchSettingsAspect">
+    <ECEntityClass typeName="TrenchSettingsAspect" displayLabel="Trench Settings">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="TrenchSettings_OffsetType" typeName="TrenchSettingsAspect_TrenchSettings_OffsetType_Enum" displayLabel="Offset Type" category="Settings_Settings" priority="299970"/>
         <ECProperty propertyName="TrenchSettings_Offset" typeName="double" displayLabel="Offset" category="Settings_Settings" priority="299960" kindOfQuantity="cifu:LENGTH"/>
@@ -1445,7 +1476,7 @@
             <Class class="TrenchSettingsAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="TurnoutGeometryItemPropertyProviderAspect">
+    <ECEntityClass typeName="TurnoutGeometryItemPropertyProviderAspect" displayLabel="Turnout Geometry Properties">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="TurnoutGeometryItemPropertyProvider_StartPoint" typeName="point3d" displayLabel="Start Point" category="TurnoutGeometryProperties_Geometry" priority="299990" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="TurnoutGeometryItemPropertyProvider_EndPoint" typeName="point3d" displayLabel="End Point" category="TurnoutGeometryProperties_Geometry" priority="299980" kindOfQuantity="cifu:LENGTH"/>
@@ -1464,9 +1495,9 @@
     </ECRelationshipClass>
     <ECEntityClass typeName="TurnoutObjectSettingsAspect" displayLabel="Turnout Feature">
         <BaseClass>BaseTurnoutObjectSettingsAspect</BaseClass>
+        <ECProperty propertyName="TurnoutObjectSettings_LinearGeometryAspect" typeName="string" displayLabel="Linear Feature Symbology" category="FeatureSymbologyProperties_Feature_Symbology" priority="299950"/>
         <ECProperty propertyName="TurnoutObjectSettings_AnnotationGroup_Plan" typeName="string" displayLabel="Plan" category="AnnotationGroup_Annotation_Group" priority="299930"/>
         <ECProperty propertyName="TurnoutObjectSettings_AnnotationGroup_Profile" typeName="string" displayLabel="Profile" category="AnnotationGroup_Annotation_Group" priority="299920"/>
-        <ECProperty propertyName="TurnoutObjectSettings_LinearGeometryAspect" typeName="string" displayLabel="Linear Feature Symbology" category="FeatureSymbologyProperties_Feature_Symbology" priority="299950"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsTurnoutObjectSettingsAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -1477,7 +1508,7 @@
             <Class class="TurnoutObjectSettingsAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="TurnoutRuleAspect">
+    <ECEntityClass typeName="TurnoutRuleAspect" displayLabel="Turnout Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="TurnoutRule_Hand" typeName="TurnoutRuleAspect_TurnoutRule_Hand_Enum" displayLabel="Hand" category="TurnoutProperties_Turnout" priority="299960"/>
         <ECProperty propertyName="TurnoutRule_Orientation" typeName="TurnoutRuleAspect_TurnoutRule_Orientation_Enum" displayLabel="Orientation" category="TurnoutProperties_Turnout" priority="299950"/>
@@ -1490,24 +1521,24 @@
         <ECProperty propertyName="TurnoutRule_Branch1P2" typeName="point3d" displayLabel="Branch1 P2" category="TurnoutPointsProperties_Turnout_Points" priority="299780"/>
         <ECProperty propertyName="TurnoutRule_Branch1P3" typeName="point3d" displayLabel="Branch1 P3" category="TurnoutPointsProperties_Turnout_Points" priority="299770"/>
         <ECProperty propertyName="TurnoutRule_Branch1TheoreticalP1" typeName="point3d" displayLabel="Branch1 Theoretical P1" category="TurnoutPointsProperties_Turnout_Points" priority="299760"/>
+        <ECProperty propertyName="TurnoutRule_Branch1LLS" typeName="point3d" displayLabel="Branch 1 LLS" category="TurnoutPointsProperties_Turnout_Points" priority="299755"/>
         <ECProperty propertyName="TurnoutRule_Branch2P0" typeName="point3d" displayLabel="Branch2 P0" category="TurnoutPointsProperties_Turnout_Points" priority="299750"/>
         <ECProperty propertyName="TurnoutRule_Branch2P1" typeName="point3d" displayLabel="Branch2 P1" category="TurnoutPointsProperties_Turnout_Points" priority="299740"/>
         <ECProperty propertyName="TurnoutRule_Branch2P2" typeName="point3d" displayLabel="Branch2 P2" category="TurnoutPointsProperties_Turnout_Points" priority="299730"/>
         <ECProperty propertyName="TurnoutRule_Branch2P3" typeName="point3d" displayLabel="Branch2 P3" category="TurnoutPointsProperties_Turnout_Points" priority="299720"/>
         <ECProperty propertyName="TurnoutRule_Branch2TheoreticalP1" typeName="point3d" displayLabel="Branch2 Theoretical P1" category="TurnoutPointsProperties_Turnout_Points" priority="299710"/>
+        <ECProperty propertyName="TurnoutRule_Branch2LLS" typeName="point3d" displayLabel="Branch 2 LLS" category="TurnoutPointsProperties_Turnout_Points" priority="299705"/>
         <ECProperty propertyName="TurnoutRule_Branch1P0Station" typeName="double" displayLabel="Branch1 P0 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299400" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch1P1Station" typeName="double" displayLabel="Branch1 P1 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299390" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch1P2Station" typeName="double" displayLabel="Branch1 P2 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299380" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch1P3Station" typeName="double" displayLabel="Branch1 P3 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299370" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch1TheoreticalP1Station" typeName="double" displayLabel="Branch1 Theoretical P1 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299360" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="TurnoutRule_Branch1LLSStation" typeName="double" displayLabel="Branch1 LLS Extension Station" category="TurnoutPointsProperties_Turnout_Points" priority="299359" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch2P0Station" typeName="double" displayLabel="Branch2 P0 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299350" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch2P1Station" typeName="double" displayLabel="Branch2 P1 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299340" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch2P2Station" typeName="double" displayLabel="Branch2 P2 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299330" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch2P3Station" typeName="double" displayLabel="Branch2 P3 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299320" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch2TheoreticalP1Station" typeName="double" displayLabel="Branch2 Theoretical P1 Station" category="TurnoutPointsProperties_Turnout_Points" priority="299310" kindOfQuantity="cifu:STATION"/>
-        <ECProperty propertyName="TurnoutRule_Branch1LLS" typeName="point3d" displayLabel="Branch 1 LLS" category="TurnoutPointsProperties_Turnout_Points" priority="299755"/>
-        <ECProperty propertyName="TurnoutRule_Branch2LLS" typeName="point3d" displayLabel="Branch 2 LLS" category="TurnoutPointsProperties_Turnout_Points" priority="299705"/>
-        <ECProperty propertyName="TurnoutRule_Branch1LLSStation" typeName="double" displayLabel="Branch1 LLS Extension Station" category="TurnoutPointsProperties_Turnout_Points" priority="299359" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="TurnoutRule_Branch2LLSStation" typeName="double" displayLabel="Branch2 LLS Extension Station" category="TurnoutPointsProperties_Turnout_Points" priority="299309" kindOfQuantity="cifu:STATION"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsTurnoutRuleAspect" modifier="None" strength="embedding">
@@ -1542,7 +1573,7 @@
             <Class class="TurnoutSleeperRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="VerticalRegressionCurvatureRuleAspect">
+    <ECEntityClass typeName="VerticalRegressionCurvatureRuleAspect" displayLabel="Vertical Regression Curvature Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECCustomAttributes>
             <Deprecated xmlns="CoreCustomAttributes.01.00.04">
@@ -1572,7 +1603,7 @@
     <PropertyCategory typeName="CenterlineProfile_Centerline_Profile" description="CenterlineProfile" displayLabel="Centerline Profile" priority="4294967286"/>
     <PropertyCategory typeName="CenterlineProfile_Track_Centerline_Profile" description="CenterlineProfile" displayLabel="Track Centerline Profile" priority="4294967286"/>
     <PropertyCategory typeName="CenterPoint_General_Category" description="CenterPoint" displayLabel="General Category" priority="200000"/>
-    <PropertyCategory typeName="CoachProperties_Coach" description="CoachProperties" displayLabel="Coach" priority="4294967286"/>
+    <PropertyCategory typeName="CoachProperties_Coach" description="CoachProperties" displayLabel="Coach" priority="4294967285"/>
     <PropertyCategory typeName="CrossingPointsProperties_Crossing_Points" description="CrossingPointsProperties" displayLabel="Crossing Points" priority="4294967276"/>
     <PropertyCategory typeName="CrossingProperties_Crossing" description="CrossingProperties" displayLabel="Crossing" priority="4294967286"/>
     <PropertyCategory typeName="CrossoverPointsProperties_Crossover_Points" description="CrossoverPointsProperties" displayLabel="Crossover Points" priority="4294967276"/>
diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifRoads.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifRoads.ecschema.xml
index 758ab3a09..1842a973a 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifRoads.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifRoads.ecschema.xml
@@ -4,10 +4,10 @@
 |  * See LICENSE.md in the project root for license terms and full copyright notice.
 ======================================================================================= -->
 <ECSchema schemaName="CifRoads" alias="cifrd" version="01.00.05" description="iModel Connector schema containing aspect classes with properties from OpenRoads Designer." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-    <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
+    <ECSchemaReference name="BisCore" version="01.00.25" alias="bis"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
-    <ECSchemaReference name="CifCommon" version="01.00.10" alias="cifcmn"/>
-    <ECSchemaReference name="CifUnits" version="01.00.08" alias="cifu"/>
+    <ECSchemaReference name="CifCommon" version="01.00.15" alias="cifcmn"/>
+    <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECCustomAttributes>
         <ProductionStatus xmlns="CoreCustomAttributes.01.00.04">
@@ -52,7 +52,7 @@
         <ECEnumerator name="Reverse_Parabolic_Nonsymmetrical_1" value="6" displayLabel="Reverse Parabolic Nonsymmetrical 1"/>
         <ECEnumerator name="Reverse_Parabolic_Nonsymmetrical_2" value="7" displayLabel="Reverse Parabolic Nonsymmetrical 2"/>
     </ECEnumeration>
-    <ECEntityClass typeName="SightVisibilitySectionNamedEntityPropertyProviderAspect">
+    <ECEntityClass typeName="SightVisibilitySectionNamedEntityPropertyProviderAspect" displayLabel="Sight Visibility Section Properties">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="SightVisibility_Sight_Visibility" priority="300000"/>
         <ECProperty propertyName="ExistingSurfaceName" typeName="string" displayLabel="Existing Surface Name" category="SightVisibility_Sight_Visibility" priority="299999"/>
@@ -70,7 +70,7 @@
             <Class class="SightVisibilitySectionNamedEntityPropertyProviderAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SpeedLimitAspect">
+    <ECEntityClass typeName="SpeedLimitAspect" displayLabel="Speed Limit">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SpeedLimit_StartStation" typeName="double" displayLabel="Start Station" category="SpeedSection_Speed_Limit" priority="299999" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="SpeedLimit_StartStation_DistanceAlong" typeName="double" kindOfQuantity="cifu:STATION">
@@ -102,7 +102,7 @@
             <Class class="SpeedLimitAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SpeedSectionAspect">
+    <ECEntityClass typeName="SpeedSectionAspect" displayLabel="Speed Section">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SpeedSection_StartStation" typeName="double" displayLabel="Start Station" category="SpeedSection_Speed_Section" priority="299998" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="SpeedSection_StartStation_DistanceAlong" typeName="double" kindOfQuantity="cifu:STATION">
@@ -147,7 +147,7 @@
             <Class class="SpeedSectionAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SuperElevationNamedEntityAspect">
+    <ECEntityClass typeName="SuperElevationNamedEntityAspect" displayLabel="Super Elevation">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SuperElevationNamedEntity_Name" typeName="string" displayLabel="Name" category="Superelevation_Superelevation" priority="299999"/>
     </ECEntityClass>
@@ -160,7 +160,7 @@
             <Class class="SuperElevationNamedEntityAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SuperElevationSectionNamedEntityAspect">
+    <ECEntityClass typeName="SuperElevationSectionNamedEntityAspect" displayLabel="Super Elevation Section">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SuperElevationSectionNamedEntity_Name" typeName="string" displayLabel="Name" category="SuperElevationSection_Superelevation_Section" priority="299999"/>
     </ECEntityClass>
@@ -173,7 +173,7 @@
             <Class class="SuperElevationSectionNamedEntityAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="SuperElevationTransitionEntityAspect">
+    <ECEntityClass typeName="SuperElevationTransitionEntityAspect" displayLabel="Super Elevation Transition">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="SuperElevationTransitionEntity_Super" typeName="string" displayLabel="Superelevation" category="SuperElevationTransition_Superelevation_Transition" priority="299999"/>
         <ECProperty propertyName="SuperElevationTransitionEntity_Name" typeName="string" displayLabel="Name" category="SuperElevationTransition_Superelevation_Transition" priority="299998"/>
diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifSubsurface.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifSubsurface.ecschema.xml
index a667cbf44..fb207e85b 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifSubsurface.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifSubsurface.ecschema.xml
@@ -4,10 +4,10 @@
 |  * See LICENSE.md in the project root for license terms and full copyright notice.
 ======================================================================================= -->
 <ECSchema schemaName="CifSubsurface" alias="cifssuf" version="01.00.11" description="iModel Connector schema containing aspect classes with properties from the Subsurface Utilities module as part of Civil Designer applications." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-    <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
+    <ECSchemaReference name="BisCore" version="01.00.25" alias="bis"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
-    <ECSchemaReference name="CifCommon" version="01.00.10" alias="cifcmn"/>
-    <ECSchemaReference name="CifUnits" version="01.00.08" alias="cifu"/>
+    <ECSchemaReference name="CifCommon" version="01.00.15" alias="cifcmn"/>
+    <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECCustomAttributes>
         <ProductionStatus xmlns="CoreCustomAttributes.01.00.04">
@@ -31,12 +31,13 @@
         <ECEnumerator name="Triangle" value="2" displayLabel="Triangle"/>
         <ECEnumerator name="Cell" value="3" displayLabel="Cell"/>
         <ECEnumerator name="Slice" value="4" displayLabel="Slice"/>
+        <ECEnumerator name="Box_with_Walls_and_Base" value="5" displayLabel="Box (with Walls and Base)"/>
     </ECEnumeration>
     <ECEnumeration typeName="TapNodeToTrunkLineAspect_ConnectionType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Center" value="0" displayLabel="Center"/>
         <ECEnumerator name="Soffit___Crown" value="1" displayLabel="Soffit / Crown"/>
     </ECEnumeration>
-    <ECEntityClass typeName="CLASS_ConduitDefaultsEntityAspect">
+    <ECEntityClass typeName="CLASS_ConduitDefaultsEntityAspect" displayLabel="Conduit Defaults">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="NominalDiameter" typeName="double" displayLabel="Nominal Diameter" category="CategoryInstance_Category_Instance" priority="300000"/>
         <ECProperty propertyName="InsideDiameter" typeName="double" displayLabel="Inside Diameter" category="CategoryInstance_Category_Instance" priority="299999"/>
@@ -62,17 +63,23 @@
         <ECProperty propertyName="Description" typeName="string" displayLabel="Description" category="CategoryInstance_Category_Instance" priority="300000"/>
         <ECProperty propertyName="ForDesign" typeName="boolean" displayLabel="For Design?" category="CategoryInstance_Category_Instance" priority="299987"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CLASS_IrregularChannelSectionAspect">
+    <ECEntityClass typeName="CLASS_IrregularChannelSectionAspect" displayLabel="Irregular Channel Section">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="PROP_Offset" typeName="double" displayLabel="Offset" category="StationElevationEntries_StationElevationEntries" priority="300000" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PROP_Elevation" typeName="double" displayLabel="Elevation (Relative)" category="StationElevationEntries_StationElevationEntries" priority="299999"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CLASS_SU_LateralLinkRuleAspect">
+    <ECEntityClass typeName="CLASS_SU_LateralLinkRuleAspect" displayLabel="Utility Lateral Link">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="PROP_SU_Skew" typeName="double" displayLabel="Skew to Trunk" category="Utility_Drainage_and_Utilities" priority="0" kindOfQuantity="cifu:ANGLE"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CLASS_SU_LinkAspect">
+    <ECEntityClass typeName="CLASS_SU_LinkAspect" displayLabel="Utility Link">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="ElementType" typeName="string" displayLabel="Conduit Type" category="Utility_Drainage_and_Utilities" priority="299214"/>
+        <ECProperty propertyName="UserDefinedElementType" typeName="string" displayLabel="Conduit Type (User Defined)" category="Utility_Drainage_and_Utilities" priority="299213"/>
+        <ECProperty propertyName="NetworkType" typeName="string" displayLabel="Network Type" category="Utility_Drainage_and_Utilities" priority="299212"/>
+        <ECProperty propertyName="UserDefinedNetworkType" typeName="string" displayLabel="Network Type (User Defined)" category="Utility_Drainage_and_Utilities" priority="299211"/>
+        <ECProperty propertyName="Function" typeName="string" displayLabel="Function" category="Utility_Drainage_and_Utilities" priority="299210"/>
+        <ECProperty propertyName="UserDefinedFunction" typeName="string" displayLabel="Function (User Defined)" category="Utility_Drainage_and_Utilities" priority="299209"/>
         <ECProperty propertyName="PROP_SU_StartNode" typeName="string" displayLabel="Start Node" category="Utility_Drainage_and_Utilities" priority="299208"/>
         <ECProperty propertyName="PROP_SU_StopNode" typeName="string" displayLabel="Stop Node" category="Utility_Drainage_and_Utilities" priority="299207"/>
         <ECProperty propertyName="PROP_SU_SetInvertToStart" typeName="boolean" displayLabel="Set Invert to Start?" category="Utility_Drainage_and_Utilities" priority="299206"/>
@@ -87,17 +94,29 @@
                 </Deprecated>
             </ECCustomAttributes>
         </ECProperty>
-        <ECProperty propertyName="PROP_SU_InterpolateElevations" typeName="boolean" displayLabel="Single Gradient" category="Utility_Drainage_and_Utilities" priority="299185"/>
-        <ECProperty propertyName="PROP_SU_Description" typeName="string" displayLabel="Description" category="FeatureProperties_Feature" priority="0"/>
-        <ECProperty propertyName="PROP_SU_CreateTrench" typeName="CLASS_SU_LinkAspect_PROP_SU_CreateTrench_BoolEnum" displayLabel="Create Trench" category="FeatureProperties_Feature" priority="-10"/>
-        <ECProperty propertyName="CIF_ID" typeName="int" displayLabel="Utility ID" category="Utility_Drainage_and_Utilities" priority="299200"/>
+        <ECProperty propertyName="PROP_SU_Rise" typeName="double" displayLabel="Rise" category="Utility_Drainage_and_Utilities" priority="299200" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
+        <ECProperty propertyName="PROP_SU_Span" typeName="double" displayLabel="Span" category="Utility_Drainage_and_Utilities" priority="299199" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
+        <ECProperty propertyName="BottomRadius" typeName="double" displayLabel="Bottom Radius" category="Utility_Drainage_and_Utilities" priority="299198" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
+        <ECProperty propertyName="BottomWidth" typeName="double" displayLabel="Bottom Width" category="Utility_Drainage_and_Utilities" priority="299198" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
+        <ECProperty propertyName="TriangleHeight" typeName="double" displayLabel="Triangle Height" category="Utility_Drainage_and_Utilities" priority="299198" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
+        <ECProperty propertyName="SideSlopeLeft" typeName="double" displayLabel="Side Slope (Left)" category="Utility_Drainage_and_Utilities" priority="299198" kindOfQuantity="cifu:SLOPE"/>
+        <ECProperty propertyName="SideSlopeRight" typeName="double" displayLabel="Side Slope (Right)" category="Utility_Drainage_and_Utilities" priority="299198" kindOfQuantity="cifu:SLOPE"/>
         <ECProperty propertyName="PROP_SU_NumberOfBarrels" typeName="int" displayLabel="Number of Barrels" category="Utility_Drainage_and_Utilities" priority="299197"/>
         <ECProperty propertyName="CalculatedSlope" typeName="double" displayLabel="Slope (Calculated)" category="Utility_Drainage_and_Utilities" priority="299196" kindOfQuantity="cifu:SLOPE_DRAINAGE"/>
         <ECProperty propertyName="PROP_SU_ConstructionSlope" typeName="double" displayLabel="Slope (Construction)" category="Utility_Drainage_and_Utilities" priority="299195" kindOfQuantity="cifu:SLOPE_DRAINAGE"/>
         <ECProperty propertyName="PROP_SU_ConstructionLength" typeName="double" displayLabel="Length (Construction)" category="Utility_Drainage_and_Utilities" priority="299194" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Length" typeName="double" displayLabel="Length (Unified)" category="Utility_Drainage_and_Utilities" priority="299193" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="StartActiveReference" typeName="string" displayLabel="Start Baseline Feature" category="Utility_Drainage_and_Utilities" priority="299192"/>
+        <ECProperty propertyName="StartBaselineStation" typeName="double" displayLabel="Start Baseline Station" category="Utility_Drainage_and_Utilities" priority="299191" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="StartBaselineOffset" typeName="double" displayLabel="Start Baseline Offset" category="Utility_Drainage_and_Utilities" priority="299190" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="StopActiveReference" typeName="string" displayLabel="Stop Baseline Feature" category="Utility_Drainage_and_Utilities" priority="299189"/>
+        <ECProperty propertyName="StopBaselineStation" typeName="double" displayLabel="Stop Baseline Station" category="Utility_Drainage_and_Utilities" priority="299188" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="StopBaselineOffset" typeName="double" displayLabel="Stop Baseline Offset" category="Utility_Drainage_and_Utilities" priority="299187" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PROP_SU_Material" typeName="string" displayLabel="Material" category="Utility_Drainage_and_Utilities" priority="299186"/>
+        <ECProperty propertyName="PROP_SU_InterpolateElevations" typeName="boolean" displayLabel="Single Gradient" category="Utility_Drainage_and_Utilities" priority="299185"/>
         <ECProperty propertyName="PROP_SU_Owner" typeName="string" displayLabel="Owner" category="Utility_Drainage_and_Utilities" priority="299184"/>
+        <ECProperty propertyName="IsActive" typeName="boolean" displayLabel="Is Active" category="Utility_Drainage_and_Utilities" priority="299181"/>
+        <ECProperty propertyName="PROP_SU_Description" typeName="string" displayLabel="Description" category="FeatureProperties_Feature" priority="0"/>
         <ECProperty propertyName="PROP_SU_Capacity" typeName="double" displayLabel="Capacity (Full Flow)" category="Results_Drainage_Results" priority="299200" kindOfQuantity="cifu:FLOW"/>
         <ECProperty propertyName="PROP_SU_Flow" typeName="double" displayLabel="Flow" category="Results_Drainage_Results" priority="299199" kindOfQuantity="cifu:FLOW"/>
         <ECProperty propertyName="PROP_SU_Depth" typeName="double" displayLabel="Depth (Normal)" category="Results_Drainage_Results" priority="299198" kindOfQuantity="cifu:LENGTH"/>
@@ -108,15 +127,10 @@
         <ECProperty propertyName="PROP_SU_DepthOut" typeName="double" displayLabel="Depth (Out)" category="Results_Drainage_Results" priority="299193" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PROP_SU_RationalFlow" typeName="double" displayLabel="Rational Flow (Gutter)" category="Results_Drainage_Results" priority="299192" kindOfQuantity="cifu:FLOW"/>
         <ECProperty propertyName="PROP_SU_DiameterValue" typeName="double" displayLabel="Diameter" category="Utility_Drainage_and_Utilities" priority="299202" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
-        <ECProperty propertyName="ElementType" typeName="string" displayLabel="Conduit Type" category="Utility_Drainage_and_Utilities" priority="299214"/>
-        <ECProperty propertyName="UserDefinedElementType" typeName="string" displayLabel="Conduit Type (User Defined)" category="Utility_Drainage_and_Utilities" priority="299213"/>
-        <ECProperty propertyName="NetworkType" typeName="string" displayLabel="Network Type" category="Utility_Drainage_and_Utilities" priority="299212"/>
-        <ECProperty propertyName="UserDefinedNetworkType" typeName="string" displayLabel="Network Type (User Defined)" category="Utility_Drainage_and_Utilities" priority="299211"/>
-        <ECProperty propertyName="Function" typeName="string" displayLabel="Function" category="Utility_Drainage_and_Utilities" priority="299210"/>
-        <ECProperty propertyName="UserDefinedFunction" typeName="string" displayLabel="Function (User Defined)" category="Utility_Drainage_and_Utilities" priority="299209"/>
-        <ECProperty propertyName="IsActive" typeName="boolean" displayLabel="Is Active" category="Utility_Drainage_and_Utilities" priority="299181"/>
+        <ECProperty propertyName="PROP_SU_CreateTrench" typeName="CLASS_SU_LinkAspect_PROP_SU_CreateTrench_BoolEnum" displayLabel="Create Trench" category="FeatureProperties_Feature" priority="-10"/>
+        <ECProperty propertyName="CIF_ID" typeName="int" displayLabel="Utility ID" category="Utility_Drainage_and_Utilities" priority="299200"/>
     </ECEntityClass>
-    <ECEntityClass typeName="DepthWidthEntityAspect">
+    <ECEntityClass typeName="DepthWidthEntityAspect" displayLabel="Depth Width">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Depth" typeName="double" displayLabel="Elevation (Relative)" category="DepthWidthCurve_Depth_Width_Curve" priority="300000" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Width" typeName="double" displayLabel="Width" category="DepthWidthCurve_Depth_Width_Curve" priority="299999"/>
@@ -166,7 +180,7 @@
             <Class class="DepthWidthEntityAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="LinkProfileByDTMRuleAspect">
+    <ECEntityClass typeName="LinkProfileByDTMRuleAspect" displayLabel="Link Profile By DTM Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="ElevationOffset" typeName="double" displayLabel="Vertical Offset" category="Utility_Drainage_and_Utilities" priority="299201" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ActiveReference" typeName="string" displayLabel="Elevation Reference" category="Utility_Drainage_and_Utilities" priority="299200"/>
@@ -180,26 +194,35 @@
             <Class class="LinkProfileByDTMRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="NodeAspect">
+    <ECEntityClass typeName="NodeAspect" displayLabel="Node">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="ElementType" typeName="string" displayLabel="Node Type" category="Utility_Drainage_and_Utilities" priority="299216"/>
+        <ECProperty propertyName="UserDefinedElementType" typeName="string" displayLabel="Node Type (User Defined)" category="Utility_Drainage_and_Utilities" priority="299215"/>
+        <ECProperty propertyName="NetworkType" typeName="string" displayLabel="Network Type" category="Utility_Drainage_and_Utilities" priority="299214"/>
+        <ECProperty propertyName="UserDefinedNetworkType" typeName="string" displayLabel="Network Type (User Defined)" category="Utility_Drainage_and_Utilities" priority="299213"/>
+        <ECProperty propertyName="ElevationIsInvert" typeName="boolean" displayLabel="Elevation is the Invert" category="Utility_Drainage_and_Utilities" priority="299212"/>
         <ECProperty propertyName="GroundElevation" typeName="double" displayLabel="Ground Elevation" category="Utility_Drainage_and_Utilities" priority="299211" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="RimElevation" typeName="double" displayLabel="Rim Elevation" category="Utility_Drainage_and_Utilities" priority="299210" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="InvertElevation" typeName="double" displayLabel="Invert Elevation" category="Utility_Drainage_and_Utilities" priority="299209" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="OrientTopToSurface" typeName="boolean" displayLabel="Use Slope of Surface" category="Utility_Drainage_and_Utilities" priority="299202"/>
         <ECProperty propertyName="ActiveReference" typeName="string" displayLabel="Elevation Reference" category="Utility_Drainage_and_Utilities" priority="299208"/>
-        <ECProperty propertyName="ActiveStationOffsetReference" typeName="string" displayLabel="Baseline Reference" category="Utility_Drainage_and_Utilities" priority="299195"/>
-        <ECProperty propertyName="IndependentConduitElevations" typeName="boolean" displayLabel="Independent Conduit Elevations" category="Utility_Drainage_and_Utilities" priority="299198"/>
-        <ECProperty propertyName="MatchSlopeofConduit" typeName="boolean" displayLabel="Match Slope of Conduit" category="Utility_Drainage_and_Utilities" priority="299199"/>
-        <ECProperty propertyName="CIF_ID" typeName="int" displayLabel="Utility ID" category="Utility_Drainage_and_Utilities" priority="299199"/>
-        <ECProperty propertyName="ElevationIsInvert" typeName="boolean" displayLabel="Elevation is the Invert" category="Utility_Drainage_and_Utilities" priority="299212"/>
-        <ECProperty propertyName="UseRoadCrossSlope" typeName="boolean" displayLabel="Use Road Cross Slope" category="Utility_Drainage_and_Utilities" priority="299201"/>
-        <ECProperty propertyName="RoadCrossSlopeDistance" typeName="double" displayLabel="Road Cross Slope Offset" category="Utility_Drainage_and_Utilities" priority="299200" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="PROP_OnlyIncludeContributingSlopes" typeName="boolean" displayLabel="Only Include Contributing Slopes" category="Utility_Drainage_and_Utilities" priority="299181"/>
-        <ECProperty propertyName="PROP_PROP_CrosssectionOffset" typeName="double" displayLabel="Maximum Offset" category="Utility_Drainage_and_Utilities" priority="299180" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="DelineationReference" typeName="string" displayLabel="Delineation Reference" category="Utility_Drainage_and_Utilities" priority="299207"/>
+        <ECProperty propertyName="FormationReference" typeName="string" displayLabel="Formation Elevation Reference" category="Utility_Drainage_and_Utilities" priority="299206"/>
         <ECProperty propertyName="SetOutElevation" typeName="double" displayLabel="Set Out Elevation" category="Utility_Drainage_and_Utilities" priority="299205" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="SetOutX" typeName="double" displayLabel="Set Out X" category="Utility_Drainage_and_Utilities" priority="299204" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="SetOutY" typeName="double" displayLabel="Set Out Y" category="Utility_Drainage_and_Utilities" priority="299203" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="OrientTopToSurface" typeName="boolean" displayLabel="Use Slope of Surface" category="Utility_Drainage_and_Utilities" priority="299202"/>
+        <ECProperty propertyName="UseRoadCrossSlope" typeName="boolean" displayLabel="Use Road Cross Slope" category="Utility_Drainage_and_Utilities" priority="299201"/>
+        <ECProperty propertyName="RoadCrossSlope" typeName="double" displayLabel="Road Cross Slope" category="Utility_Drainage_and_Utilities" priority="299200" kindOfQuantity="cifu:SLOPE"/>
+        <ECProperty propertyName="RoadCrossSlopeDistance" typeName="double" displayLabel="Road Cross Slope Offset" category="Utility_Drainage_and_Utilities" priority="299200" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="MatchSlopeofConduit" typeName="boolean" displayLabel="Match Slope of Conduit" category="Utility_Drainage_and_Utilities" priority="299199"/>
+        <ECProperty propertyName="IndependentConduitElevations" typeName="boolean" displayLabel="Independent Conduit Elevations" category="Utility_Drainage_and_Utilities" priority="299198"/>
+        <ECProperty propertyName="UseLongitudinalSlope" typeName="boolean" displayLabel="Use Longitudinal Slope" category="Utility_Drainage_and_Utilities" priority="299197"/>
+        <ECProperty propertyName="LongitudinalSlope" typeName="double" displayLabel="Longitudinal Slope" category="Utility_Drainage_and_Utilities" priority="299196" kindOfQuantity="cifu:SLOPE"/>
+        <ECProperty propertyName="ActiveStationOffsetReference" typeName="string" displayLabel="Baseline Reference" category="Utility_Drainage_and_Utilities" priority="299195"/>
         <ECProperty propertyName="BaselineStation" typeName="double" displayLabel="Baseline Station" category="Utility_Drainage_and_Utilities" priority="299194" kindOfQuantity="cifu:STATION"/>
         <ECProperty propertyName="BaselineOffset" typeName="double" displayLabel="Baseline Offset" category="Utility_Drainage_and_Utilities" priority="299193" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="SetOutPointStation" typeName="double" displayLabel="Baseline Station (Set Out)" category="Utility_Drainage_and_Utilities" priority="299192" kindOfQuantity="cifu:STATION"/>
+        <ECProperty propertyName="SetOutPointOffset" typeName="double" displayLabel="Baseline Offset (Set Out)" category="Utility_Drainage_and_Utilities" priority="299191" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Depth" typeName="double" displayLabel="Depth (Structure)" category="Utility_Drainage_and_Utilities" priority="299188" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Width" typeName="double" displayLabel="Width" category="Utility_Drainage_and_Utilities" priority="299187" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Length" typeName="double" displayLabel="Length" category="Utility_Drainage_and_Utilities" priority="299186" kindOfQuantity="cifu:LENGTH"/>
@@ -207,19 +230,14 @@
         <ECProperty propertyName="GrateLength" typeName="double" displayLabel="Grate Length" category="Utility_Drainage_and_Utilities" priority="299184" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="GrateWidth" typeName="double" displayLabel="Grate Width" category="Utility_Drainage_and_Utilities" priority="299183" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="CurbOpeningLength" typeName="double" displayLabel="Curb Opening Length" category="Utility_Drainage_and_Utilities" priority="299182" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="LongitudinalSlope" typeName="double" displayLabel="Longitudinal Slope" category="Utility_Drainage_and_Utilities" priority="299196" kindOfQuantity="cifu:SLOPE"/>
+        <ECProperty propertyName="PROP_OnlyIncludeContributingSlopes" typeName="boolean" displayLabel="Only Include Contributing Slopes" category="Utility_Drainage_and_Utilities" priority="299181"/>
+        <ECProperty propertyName="PROP_PROP_CrosssectionOffset" typeName="double" displayLabel="Maximum Offset" category="Utility_Drainage_and_Utilities" priority="299180" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PROP_Owner" typeName="string" displayLabel="Owner" category="Utility_Drainage_and_Utilities" priority="299179"/>
+        <ECProperty propertyName="IsActive" typeName="boolean" displayLabel="Is Active" category="Utility_Drainage_and_Utilities" priority="299176"/>
         <ECProperty propertyName="Spread" typeName="double" displayLabel="Spread / Top Width" category="Results_Drainage_Results" priority="299184" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="CapturedFlow" typeName="double" displayLabel="Flow (Captured)" category="Results_Drainage_Results" priority="299181" kindOfQuantity="cifu:FLOW"/>
         <ECProperty propertyName="BypassedFlow" typeName="double" displayLabel="Flow (Total Bypassed)" category="Results_Drainage_Results" priority="299180" kindOfQuantity="cifu:FLOW"/>
-        <ECProperty propertyName="DelineationReference" typeName="string" displayLabel="Delineation Reference" category="Utility_Drainage_and_Utilities" priority="299207"/>
-        <ECProperty propertyName="UseLongitudinalSlope" typeName="boolean" displayLabel="Use Longitudinal Slope" category="Utility_Drainage_and_Utilities" priority="299197"/>
-        <ECProperty propertyName="RimElevation" typeName="double" displayLabel="Rim Elevation" category="Utility_Drainage_and_Utilities" priority="299210" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="ElementType" typeName="string" displayLabel="Node Type" category="Utility_Drainage_and_Utilities" priority="299216"/>
-        <ECProperty propertyName="UserDefinedElementType" typeName="string" displayLabel="Node Type (User Defined)" category="Utility_Drainage_and_Utilities" priority="299215"/>
-        <ECProperty propertyName="NetworkType" typeName="string" displayLabel="Network Type" category="Utility_Drainage_and_Utilities" priority="299214"/>
-        <ECProperty propertyName="UserDefinedNetworkType" typeName="string" displayLabel="Network Type (User Defined)" category="Utility_Drainage_and_Utilities" priority="299213"/>
-        <ECProperty propertyName="IsActive" typeName="boolean" displayLabel="Is Active" category="Utility_Drainage_and_Utilities" priority="299176"/>
+        <ECProperty propertyName="CIF_ID" typeName="int" displayLabel="Utility ID" category="Utility_Drainage_and_Utilities" priority="299199"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsNodeAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -230,7 +248,7 @@
             <Class class="NodeAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="NodeInvertTo3dElementRuleAspect">
+    <ECEntityClass typeName="NodeInvertTo3dElementRuleAspect" displayLabel="Node Invert To 3D Element Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="PROP_InvertReferenceName" typeName="string" displayLabel="Invert Reference" category="InvertTo3dReferenceRule_Invert_To_3D_Reference_Rule" priority="300000"/>
     </ECEntityClass>
@@ -243,7 +261,7 @@
             <Class class="NodeInvertTo3dElementRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="NodeOffsetRuleAspect">
+    <ECEntityClass typeName="NodeOffsetRuleAspect" displayLabel="Node Offset Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Offset" typeName="double" displayLabel="Vertical Offset" category="Utility_Drainage_and_Utilities" priority="299980" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
@@ -256,7 +274,7 @@
             <Class class="NodeOffsetRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="NodeToPointAlongLinkRuleAspect">
+    <ECEntityClass typeName="NodeToPointAlongLinkRuleAspect" displayLabel="Node To Point Along Link Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="DistanceAlong" typeName="double" displayLabel="Distance along link" category="NodeToPointAlongRuleProperties_Node_To_Point_Along_Link_Rule" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="DistanceAlongFrom" typeName="NodeToPointAlongLinkRuleAspect_DistanceAlongFrom_Enum" displayLabel="Distance along measured from:" category="NodeToPointAlongRuleProperties_Node_To_Point_Along_Link_Rule" priority="0"/>
@@ -271,21 +289,21 @@
             <Class class="NodeToPointAlongLinkRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="PolygonAspect">
+    <ECEntityClass typeName="PolygonAspect" displayLabel="Polygon">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="OutflowElement" typeName="string" displayLabel="Outflow Element" category="Utility_Drainage_and_Utilities" priority="300000"/>
         <ECProperty propertyName="ActiveReference" typeName="string" displayLabel="Elevation Reference" category="Utility_Drainage_and_Utilities" priority="299990"/>
         <ECProperty propertyName="UseScaledArea" typeName="boolean" displayLabel="Use Scaled Area" category="Utility_Drainage_and_Utilities" priority="299989"/>
         <ECProperty propertyName="Area" typeName="double" displayLabel="Area (User Defined)" category="Utility_Drainage_and_Utilities" priority="299987" kindOfQuantity="cifu:AREA"/>
         <ECProperty propertyName="ScaledArea" typeName="double" displayLabel="Scaled Area" category="Utility_Drainage_and_Utilities" priority="299988" kindOfQuantity="cifu:AREA"/>
-        <ECProperty propertyName="CIF_ID" typeName="int" displayLabel="Utility ID" category="Utility_Drainage_and_Utilities" priority="299204"/>
         <ECProperty propertyName="UnifiedArea" typeName="double" displayLabel="Area (Unified)" category="Utility_Drainage_and_Utilities" priority="299986" kindOfQuantity="cifu:AREA"/>
         <ECProperty propertyName="TimeOfConcentration" typeName="double" displayLabel="Time of Concentration (Composite)" category="Utility_Drainage_and_Utilities" priority="299984" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="RunoffCoefficient" typeName="double" displayLabel="Runoff Coefficient (Rational)" category="Utility_Drainage_and_Utilities" priority="299983" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="IsActive" typeName="boolean" displayLabel="Is Active" category="Utility_Drainage_and_Utilities" priority="299982"/>
         <ECProperty propertyName="Intensity" typeName="double" displayLabel="Catchment Intensity" category="Results_Drainage_Results" priority="299986" kindOfQuantity="cifu:RAINFALL_INTENSITY"/>
         <ECProperty propertyName="RationalFlow" typeName="double" displayLabel="Catchment Rational Flow" category="Results_Drainage_Results" priority="299985" kindOfQuantity="cifu:FLOW"/>
         <ECProperty propertyName="CatchmentCA" typeName="double" displayLabel="Catchment CA" category="Results_Drainage_Results" priority="299984" kindOfQuantity="cifu:AREA_DRAINAGE"/>
-        <ECProperty propertyName="IsActive" typeName="boolean" displayLabel="Is Active" category="Utility_Drainage_and_Utilities" priority="299982"/>
+        <ECProperty propertyName="CIF_ID" typeName="int" displayLabel="Utility ID" category="Utility_Drainage_and_Utilities" priority="299204"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPolygonAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -296,7 +314,7 @@
             <Class class="PolygonAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="PolygonBySurfaceEntityRuleAspect">
+    <ECEntityClass typeName="PolygonBySurfaceEntityRuleAspect" displayLabel="Polygon By Surface Entity Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="MaxElevation" typeName="double" displayLabel="Top Elevation" category="PolygonBySurfaceEntityRuleAttributes_Polygon_By_Surface_Entity_Rule" priority="299202" kindOfQuantity="cifu:LENGTH"/>
     </ECEntityClass>
@@ -309,7 +327,7 @@
             <Class class="PolygonBySurfaceEntityRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ProfileByLinearEntity3dOffsetRuleAspect">
+    <ECEntityClass typeName="ProfileByLinearEntity3dOffsetRuleAspect" displayLabel="Utility Elevation Offset">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="ElevationOffset" typeName="double" displayLabel="Vertical Offset" category="Utility_Drainage_and_Utilities" priority="300000"/>
     </ECEntityClass>
@@ -322,11 +340,11 @@
             <Class class="ProfileByLinearEntity3dOffsetRuleAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReachAspect">
+    <ECEntityClass typeName="ReachAspect" displayLabel="Profile Run">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="Reach_Profile_Run" priority="299999"/>
-        <ECProperty propertyName="HasHaestadProfile" typeName="boolean" displayLabel="Has Extended Profiles" category="Reach_Profile_Run" priority="299997"/>
         <ECProperty propertyName="NodeDrawType" typeName="ReachAspect_NodeDrawType_Enum" displayLabel="Node Draw Type" category="Reach_Profile_Run" priority="299998"/>
+        <ECProperty propertyName="HasHaestadProfile" typeName="boolean" displayLabel="Has Extended Profiles" category="Reach_Profile_Run" priority="299997"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsReachAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
@@ -337,7 +355,7 @@
             <Class class="ReachAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="TapNodeToTrunkLineAspect">
+    <ECEntityClass typeName="TapNodeToTrunkLineAspect" displayLabel="Tap Node To Trunk Line Rule">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="ElevationOffset" typeName="double" displayLabel="Tap Elevation Offset" category="Utility_Drainage_and_Utilities" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="ConnectionType" typeName="TapNodeToTrunkLineAspect_ConnectionType_Enum" displayLabel="Tap Connection Type" category="Utility_Drainage_and_Utilities" priority="0"/>
diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifSubsurfaceConflictAnalysis.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifSubsurfaceConflictAnalysis.ecschema.xml
index 76e0168d0..569d7ce13 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifSubsurfaceConflictAnalysis.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifSubsurfaceConflictAnalysis.ecschema.xml
@@ -6,8 +6,8 @@
 <ECSchema schemaName="CifSubsurfaceConflictAnalysis" alias="cifsscfan" version="01.00.09" description="iModel Connector schema containing aspect classes with properties from the Subsurface Utilities Engineering module as part of Civil Designer applications." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
     <ECSchemaReference name="BisCore" version="01.00.16" alias="bis"/>
     <ECSchemaReference name="BisCustomAttributes" version="01.00.00" alias="bisCA"/>
-    <ECSchemaReference name="CifCommon" version="01.00.10" alias="cifcmn"/>
-    <ECSchemaReference name="CifUnits" version="01.00.08" alias="cifu"/>
+    <ECSchemaReference name="CifCommon" version="01.00.15" alias="cifcmn"/>
+    <ECSchemaReference name="CifUnits" version="01.00.07" alias="cifu"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.04" alias="CoreCA"/>
     <ECCustomAttributes>
         <ProductionStatus xmlns="CoreCustomAttributes.01.00.04">
@@ -43,6 +43,7 @@
         <ECEnumerator name="Under_Construction" value="5" displayLabel="Under Construction"/>
         <ECEnumerator name="Abandon_In_Place" value="6" displayLabel="Abandon In Place"/>
         <ECEnumerator name="Abandon_Filled_In" value="7" displayLabel="Abandon Filled In"/>
+        <ECEnumerator name="Existing" value="8" displayLabel="Existing"/>
     </ECEnumeration>
     <ECEnumeration typeName="BaseLink_Physical_SegmentShapeTypeAspect_SegmentShapeType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Circle" value="2" displayLabel="Circle"/>
@@ -85,6 +86,7 @@
         <ECEnumerator name="Under_Construction" value="5" displayLabel="Under Construction"/>
         <ECEnumerator name="Abandon_In_Place" value="6" displayLabel="Abandon In Place"/>
         <ECEnumerator name="Abandon_Filled_In" value="7" displayLabel="Abandon Filled In"/>
+        <ECEnumerator name="Existing" value="8" displayLabel="Existing"/>
     </ECEnumeration>
     <ECEnumeration typeName="CommunicationNode_NetworkDataAspect_CommNodeType_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Access_Point" value="0" displayLabel="Access Point"/>
@@ -534,15 +536,20 @@
     </ECEntityClass>
     <ECEntityClass typeName="BaseLink_PhysicalAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
+        <ECProperty propertyName="Physical_CalculatedSlope" typeName="double" displayLabel="Slope (Calculated)" category="Physical_Utilities_Physical_Utilities" priority="0" kindOfQuantity="cifu:SLOPE"/>
+        <ECProperty propertyName="Physical_SetInvertToUpstream" typeName="boolean" displayLabel="Set Invert to Start?" category="Physical_Utilities_Physical_Utilities" priority="0"/>
         <ECProperty propertyName="Physical_UpstreamInvert" typeName="double" displayLabel="Invert (Start)" category="Physical_Utilities_Physical_Utilities" priority="0" kindOfQuantity="cifu:ELEVATION"/>
+        <ECProperty propertyName="Physical_SetInvertToDownstream" typeName="boolean" displayLabel="Set Invert to Stop?" category="Physical_Utilities_Physical_Utilities" priority="0"/>
         <ECProperty propertyName="Physical_DownstreamInvert" typeName="double" displayLabel="Invert (Stop)" category="Physical_Utilities_Physical_Utilities" priority="0" kindOfQuantity="cifu:ELEVATION"/>
-        <ECProperty propertyName="Physical_CalculatedSlope" typeName="double" displayLabel="Slope (Calculated)" category="Physical_Utilities_Physical_Utilities" priority="0" kindOfQuantity="cifu:SLOPE"/>
         <ECProperty propertyName="Physical_ConduitUnitLength" typeName="double" displayLabel="Unit Length" category="Physical_Utilities_Physical_Utilities" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="SegmentShapeType" typeName="BaseLink_Physical_SegmentShapeTypeAspect_SegmentShapeType_Enum" displayLabel="Shape" category="Utility_Footprint_Utilities_Utility_Footprint_Utilities" priority="0"/>
+        <ECProperty propertyName="SegmentRise" typeName="double" displayLabel="Rise" category="Utility_Footprint_Utilities_Utility_Footprint_Utilities" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="SegmentSpan" typeName="double" displayLabel="Span" category="Utility_Footprint_Utilities_Utility_Footprint_Utilities" priority="0" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="SegmentDiameter" typeName="double" displayLabel="Diameter" category="Utility_Footprint_Utilities_Utility_Footprint_Utilities" priority="0" kindOfQuantity="cifu:LENGTH_DIAMETER"/>
         <ECProperty propertyName="LinkMicroStationID" typeName="string" displayLabel="MicroStation 3D ID" category="General_Utilities_General_Utilities" priority="0"/>
         <ECProperty propertyName="LinkWallThickness" typeName="double" displayLabel="Wall Thickness" category="Physical_Utilities_Physical_Utilities" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinkMicroStation2dID" typeName="string" displayLabel="MicroStation 2D ID" category="General_Utilities_General_Utilities" priority="0"/>
-        <ECProperty propertyName="Physical_SetInvertToDownstream" typeName="boolean" displayLabel="Set Invert to Stop?" category="Physical_Utilities_Physical_Utilities" priority="0"/>
-        <ECProperty propertyName="Physical_SetInvertToUpstream" typeName="boolean" displayLabel="Set Invert to Start?" category="Physical_Utilities_Physical_Utilities" priority="0"/>
+        <ECProperty propertyName="LinkFeatureDefinitionShort" typeName="string" displayLabel="Feature Definition (Short)" category="General_Utilities_General_Utilities" priority="0"/>
     </ECEntityClass>
     <ECEntityClass typeName="GlobalBase_SUE_Aspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
@@ -863,6 +870,7 @@
         <ECProperty propertyName="Outgoing8Invert" typeName="double" displayLabel="Outgoing 8 Invert" category="Connecting_Links_Utilities_Connecting_Links_Utilities" priority="0" kindOfQuantity="cifu:ELEVATION"/>
         <ECProperty propertyName="Outgoing8Angle" typeName="double" displayLabel="Outgoing 8 Angle" category="Connecting_Links_Utilities_Connecting_Links_Utilities" priority="0" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="Outgoing8UtilityID" typeName="int" displayLabel="Outgoing 8 Utility ID" category="Connecting_Links_Utilities_Connecting_Links_Utilities" priority="0"/>
+        <ECProperty propertyName="NodeFeatureDefinitionShort" typeName="string" displayLabel="Feature Definition (Short)" category="General_Utilities_General_Utilities" priority="0"/>
     </ECEntityClass>
     <ECEntityClass typeName="BaseNodeAspect">
         <BaseClass>GlobalBase_SUE_Aspect</BaseClass>

From 3153ed6cbfc24f4551999bf4d90c45e7affc30d9 Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 15:20:23 +0530
Subject: [PATCH 02/12] Update CifCommon schema to fix TS Validation Tests

---
 .../CifCommon.ecschema.xml                      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
index 9b235e76a..a13c77cd0 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
@@ -215,7 +215,7 @@
         <BaseClass>CivilPresentation</BaseClass>
         <ECProperty propertyName="Name" typeName="string" displayLabel="Name" category="Name_General_Category" priority="0"/>
     </ECEntityClass>
-    <ECEntityClass typeName="LinearComplexAspect" displayLabel="Linear Complex">
+    <ECEntityClass typeName="ReadOnlyLinearComplexAspect" displayLabel="Linear Complex">
         <BaseClass>LinearElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_CurveSetNumber" typeName="int" displayLabel="Curve Set Number" category="GeometryAttributes_Geometry" priority="299880"/>
     </ECEntityClass>
@@ -276,11 +276,6 @@
         <ECProperty propertyName="LinearElement_Spiral_EndArcCenterPoint" typeName="point3d" displayLabel="End Arc Center Point" category="GeometryAttributes_Geometry" priority="299680" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_Spiral_Hand" typeName="string" displayLabel="Hand" category="GeometryAttributes_Geometry" priority="299760"/>
     </ECEntityClass>
-    <ECEntityClass typeName="ComponentStationPropertiesClassAspect" displayLabel="&lt;- ComponentStationPropertiesClass -&gt;">
-        <BaseClass>CivilPresentation</BaseClass>
-        <ECProperty propertyName="StartStation" typeName="double" displayLabel="Start Station" category="GeometryAttributes_Geometry" priority="2020"/>
-        <ECProperty propertyName="EndStation" typeName="double" displayLabel="End Station" category="GeometryAttributes_Geometry" priority="2000"/>
-    </ECEntityClass>
     <ECEntityClass typeName="CompoundElementAspect" displayLabel="Compound Element">
         <BaseClass>ProfiledElementAspect</BaseClass>
     </ECEntityClass>
@@ -481,6 +476,11 @@
             <Class class="ClothoidAspect"/>
         </Target>
     </ECRelationshipClass>
+    <ECEntityClass typeName="ComponentStationPropertiesClassAspect" displayLabel="&lt;- ComponentStationPropertiesClass -&gt;">
+        <BaseClass>CivilPresentation</BaseClass>
+        <ECProperty propertyName="StartStation" typeName="double" displayLabel="Start Station" category="GeometryAttributes_Geometry" priority="2020"/>
+        <ECProperty propertyName="EndStation" typeName="double" displayLabel="End Station" category="GeometryAttributes_Geometry" priority="2000"/>
+    </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsComponentStationPropertiesClassAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
@@ -1113,7 +1113,12 @@
         <ECProperty propertyName="PointEntity2dPoint" typeName="point3d" displayLabel="Point" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299999"/>
         <ECProperty propertyName="PointEntity2d_X" typeName="double" displayLabel="X" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299960" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PointEntity2d_Y" typeName="double" displayLabel="Y" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299940" kindOfQuantity="cifu:LENGTH"/>
+        <ECProperty propertyName="PointEntity2d_Elevation" typeName="double" displayLabel="Elevation" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299970" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="PointEntity2d_Rotation" typeName="double" displayLabel="Rotation" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299840" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="PointEntity2d_RotationOffset" typeName="double" displayLabel="Rotation Offset" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299955" kindOfQuantity="cifu:BEARING"/>
+        <ECProperty propertyName="PointEntity2d_RotationReference" typeName="string" displayLabel="Rotation Reference" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299953"/>
+        <ECProperty propertyName="PointEntity2d_AbsoluteAngle" typeName="boolean" displayLabel="Absolute Angle" category="GeometryPointsCategoryAttributes_Geometry_Points" priority="299950"/>
+        <ECProperty propertyName="PointEntity2d_Description" typeName="string" displayLabel="Description" category="FeatureProperties_Feature" priority="299910"/>
     </ECEntityClass>
     <ECRelationshipClass typeName="ElementOwnsPointEntity2dAspect" modifier="None" strength="embedding">
         <BaseClass>bis:ElementOwnsUniqueAspect</BaseClass>

From 4e774261bf41fc1b919bab2bc7c525a563252222 Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 15:53:04 +0530
Subject: [PATCH 03/12] Update CifCommon schema to fix TS Validation Tests -
 2nd Attempt

---
 .../CifCommon.ecschema.xml                            | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
index a13c77cd0..44b40afab 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
@@ -1191,17 +1191,6 @@
             <Class class="PortalEntityAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyLinearElementAspect" displayLabel="Read Only Linear Element">
-        <BaseClass>CivilPresentation</BaseClass>
-        <ECProperty propertyName="LinearElement_Length" typeName="double" displayLabel="Length" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="LinearElement_StartPoint" typeName="point3d" displayLabel="Start Point" category="GeometryAttributes_Geometry" priority="299990"/>
-        <ECProperty propertyName="LinearElement_EndPoint" typeName="point3d" displayLabel="End Point" category="GeometryAttributes_Geometry" priority="299980"/>
-        <ECProperty propertyName="LinearElement_Length3d" typeName="double" displayLabel="Length 3d" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:LENGTH">
-            <ECCustomAttributes>
-                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
-            </ECCustomAttributes>
-        </ECProperty>
-    </ECEntityClass>
     <ECEntityClass typeName="ProfileElementAspect" displayLabel="Profile Element">
         <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_ProfileElement_DeltaX" typeName="double" displayLabel="DeltaX" category="GeometryAttributes_Geometry" priority="299900" kindOfQuantity="cifu:LENGTH"/>

From c1b1ab0e7098f6b582c17a8eb8342ca08ed97fef Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 16:05:35 +0530
Subject: [PATCH 04/12] Update CifCommon schema to fix TS Validation Tests -
 3rd Attempt

---
 .../CivilInfrastructureFramework/CifCommon.ecschema.xml    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
index 44b40afab..eb795bd15 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
@@ -1371,10 +1371,6 @@
             <Class class="ReadOnlyCircularArcAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyLinearComplexAspect" displayLabel="Read Only Linear Complex">
-        <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
-        <ECProperty propertyName="LinearElement_CurveSetNumber" typeName="int" displayLabel="Curve Set Number" category="GeometryAttributes_Geometry" priority="299880"/>
-    </ECEntityClass>
     <ECEntityClass typeName="ReadOnlyClosedLinearComplexAspect" displayLabel="Read Only Closed Linear Complex">
         <BaseClass>ReadOnlyLinearComplexAspect</BaseClass>
         <ECProperty propertyName="ClosedLinearComplex_IsClockWise" typeName="ReadOnlyClosedLinearComplexAspect_ClosedLinearComplex_IsClockWise_BoolEnum" displayLabel="Clockwise" category="GeometryAttributes_Geometry" priority="299960"/>
@@ -1459,9 +1455,6 @@
             <Class class="ReadOnlyClothoidAspect"/>
         </Target>
     </ECRelationshipClass>
-    <ECEntityClass typeName="ReadOnlyProfiledElementAspect" displayLabel="Read Only Profiled Element">
-        <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
-    </ECEntityClass>
     <ECEntityClass typeName="ReadOnlyCompoundElementAspect" displayLabel="Read Only Compound Element">
         <BaseClass>ReadOnlyProfiledElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_Length" typeName="double" displayLabel="Length" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:LENGTH"/>

From ff682d9ad6dbf14cf9983010413cd80a7083d6e8 Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 17:24:45 +0530
Subject: [PATCH 05/12] Update CifCBridge schema to fix TS Validation Tests

---
 .../CifBridge.ecschema.xml                    | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml
index e861abca6..065d3a104 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml
@@ -1163,23 +1163,6 @@
         <ECProperty propertyName="CrossFrameTubsGroup_Description" typeName="string" displayLabel="Description" category="CrossFrameGroupProperties_Cross_Frame_Group_Properties" priority="299950"/>
         <ECProperty propertyName="CrossFrameTubsGroup_LayoutDefinition" typeName="string" displayLabel="Cross-Frame Placement" category="CrossFrameGroupProperties_Cross_Frame_Group_Properties" priority="299930"/>
     </ECEntityClass>
-    <ECEntityClass typeName="CustomAbutmentAspect">
-        <BaseClass>bis:ElementUniqueAspect</BaseClass>
-        <ECProperty propertyName="Pier_Name" typeName="string" displayLabel="Name" category="BridgeModelerAttributes_Custom_Abutment" priority="299950"/>
-        <ECProperty propertyName="Pier_Description" typeName="string" displayLabel="Description" category="BridgeModelerAttributes_Custom_Abutment" priority="299949"/>
-        <ECProperty propertyName="Pier_TemplateName" typeName="string" displayLabel="Cell Name" category="BridgeModelerAttributes_Custom_Abutment" priority="299948"/>
-        <ECProperty propertyName="Pier_PierCapMaterial" typeName="string" displayLabel="Cap Material" category="BridgeModelerAttributes_Material_Material" priority="299950"/>
-        <ECProperty propertyName="Pier_ColumnMaterial" typeName="string" displayLabel="Column Material" category="BridgeModelerAttributes_Material_Material" priority="299949"/>
-        <ECProperty propertyName="Pier_FootingMaterial" typeName="string" displayLabel="Footing Material" category="BridgeModelerAttributes_Material_Material" priority="299948"/>
-        <ECProperty propertyName="Pier_ConcretePadMaterial" typeName="string" displayLabel="Concrete Pad Material" category="BridgeModelerAttributes_Material_Material" priority="299947"/>
-        <ECProperty propertyName="Pier_HPileEncasementMaterial" typeName="string" displayLabel="Pile Encasement Material" category="BridgeModelerAttributes_Material_Material" priority="299946"/>
-        <ECProperty propertyName="Pier_PileMaterial" typeName="string" displayLabel="Pile Material" category="BridgeModelerAttributes_Material_Material" priority="299945"/>
-        <ECProperty propertyName="Pier_PierCapBuildOrder" typeName="int" displayLabel="Pier Cap Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299950">
-            <ECCustomAttributes>
-                <HiddenProperty xmlns="CoreCustomAttributes.01.00.04"/>
-            </ECCustomAttributes>
-        </ECProperty>
-    </ECEntityClass>
     <ECEntityClass typeName="CustomAbutmentAnalyticalAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="Pier_AnalyticalLongOffset" typeName="double" displayLabel="Longitudinal Offset" category="AnalyticalProperties_Analytical" priority="299948" kindOfQuantity="cifu:LENGTH"/>
@@ -1194,6 +1177,8 @@
         <ECProperty propertyName="Pier_PierCapMaterial" typeName="string" displayLabel="Cap Material" category="BridgeModelerAttributes_Material_Material" priority="299950"/>
         <ECProperty propertyName="Pier_ColumnMaterial" typeName="string" displayLabel="Column Material" category="BridgeModelerAttributes_Material_Material" priority="299949"/>
         <ECProperty propertyName="Pier_FootingMaterial" typeName="string" displayLabel="Footing Material" category="BridgeModelerAttributes_Material_Material" priority="299948"/>
+        <ECProperty propertyName="Pier_ConcretePadMaterial" typeName="string" displayLabel="Concrete Pad Material" category="BridgeModelerAttributes_Material_Material" priority="299947"/>
+        <ECProperty propertyName="Pier_HPileEncasementMaterial" typeName="string" displayLabel="Pile Encasement Material" category="BridgeModelerAttributes_Material_Material" priority="299946"/>
         <ECProperty propertyName="Pier_PileMaterial" typeName="string" displayLabel="Pile Material" category="BridgeModelerAttributes_Material_Material" priority="299945"/>
         <ECProperty propertyName="Pier_PierCapBuildOrder" typeName="int" displayLabel="Pier Cap Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299950">
             <ECCustomAttributes>

From a5d00080471a141d08cc1d5858af5738328e6782 Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 17:33:03 +0530
Subject: [PATCH 06/12] Update CifHydraulicAnalysis schema to fix TS Validation
 Tests

---
 .../CifHydraulicAnalysis.ecschema.xml                  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml
index d514e257f..ccd166466 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml
@@ -1660,16 +1660,6 @@
         <ECProperty propertyName="DerivedInletResults_GrateWidth" typeName="double" displayLabel="Grate Width" category="Inlet_Opening_Drainage_Inlet_Opening_Drainage" priority="0" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="DerivedInletResults_LocalDepression" typeName="double" displayLabel="Local Depression" category="Inlet_Location_Drainage_Inlet_Location_Drainage" priority="0" kindOfQuantity="cifu:LENGTH_SHORT"/>
     </ECEntityClass>
-    <ECEntityClass typeName="GravityStructure_HeadlossAspect">
-        <BaseClass>cifcmn:CivilPresentation</BaseClass>
-        <ECProperty propertyName="HeadlossMethod" typeName="GravityStructure_HeadlossAspect_HeadlossMethod_Enum" displayLabel="Headloss Method" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0"/>
-        <ECProperty propertyName="Hec22BenchingMethod" typeName="GravityStructure_Headloss_Hec22EnergyBaseAspect_Hec22BenchingMethod_Enum" displayLabel="HEC-22 Benching Method" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0"/>
-        <ECProperty propertyName="AbsoluteType_AbsoluteHeadloss" typeName="double" displayLabel="Absolute Headloss" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0" kindOfQuantity="cifu:ELEVATION"/>
-        <ECProperty propertyName="GenericType_DownstreamHeadlossCoefficient" typeName="double" displayLabel="Headloss Coefficient (Downstream)" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
-        <ECProperty propertyName="GenericType_UpstreamHeadlossCoefficient" typeName="double" displayLabel="Headloss Coefficient (Upstream)" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
-        <ECProperty propertyName="StandardType_StandardHeadlossCoefficient" typeName="double" displayLabel="Headloss Coefficient (Standard)" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0" kindOfQuantity="cifu:COEFFICIENT"/>
-        <ECProperty propertyName="AashtoShapingMethod" typeName="GravityStructure_Headloss_AashtoAspect_AashtoShapingMethod_Enum" displayLabel="AASHTO Shaping Method" category="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" priority="0"/>
-    </ECEntityClass>
     <ECEntityClass typeName="GutterDownstreamDepthResultsAspect">
         <BaseClass>cifcmn:CivilPresentation</BaseClass>
         <ECProperty propertyName="GutterDownstreamDepthResults_DownstreamInletGutterDepth" typeName="double" displayLabel="Depth (Downstream Inlet)" category="Results_Profile_Drainage_Results_Profile_Drainage" priority="0" kindOfQuantity="cifu:DEPTH_LARGE"/>

From 23f882b5637e319d21f7c746a5a4fde3197abc46 Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 17:56:58 +0530
Subject: [PATCH 07/12] Update CifBridge schema to fix TS Validation Tests -
 2nd Attemp

---
 .../CivilInfrastructureFramework/CifBridge.ecschema.xml         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml
index 065d3a104..3205ad1dd 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifBridge.ecschema.xml
@@ -1177,8 +1177,6 @@
         <ECProperty propertyName="Pier_PierCapMaterial" typeName="string" displayLabel="Cap Material" category="BridgeModelerAttributes_Material_Material" priority="299950"/>
         <ECProperty propertyName="Pier_ColumnMaterial" typeName="string" displayLabel="Column Material" category="BridgeModelerAttributes_Material_Material" priority="299949"/>
         <ECProperty propertyName="Pier_FootingMaterial" typeName="string" displayLabel="Footing Material" category="BridgeModelerAttributes_Material_Material" priority="299948"/>
-        <ECProperty propertyName="Pier_ConcretePadMaterial" typeName="string" displayLabel="Concrete Pad Material" category="BridgeModelerAttributes_Material_Material" priority="299947"/>
-        <ECProperty propertyName="Pier_HPileEncasementMaterial" typeName="string" displayLabel="Pile Encasement Material" category="BridgeModelerAttributes_Material_Material" priority="299946"/>
         <ECProperty propertyName="Pier_PileMaterial" typeName="string" displayLabel="Pile Material" category="BridgeModelerAttributes_Material_Material" priority="299945"/>
         <ECProperty propertyName="Pier_PierCapBuildOrder" typeName="int" displayLabel="Pier Cap Build Order" category="BridgeModelerAttributes_BuildOrder_Build_Order" priority="299950">
             <ECCustomAttributes>

From 3990bc4dde9eab1cbfc0f5f8506156d4a45e4663 Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 19:12:05 +0530
Subject: [PATCH 08/12] Update CifHydraulicAnalysis schema to fix TS Validation
 Tests - 2nd Attempt

---
 .../CifHydraulicAnalysis.ecschema.xml                            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml
index ccd166466..cd94a8a30 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifHydraulicAnalysis.ecschema.xml
@@ -5743,7 +5743,6 @@
     <PropertyCategory typeName="Physical_Culvert_Overtopping_Drainage_Physical_Culvert_Overtopping_Drainage" description="Physical (Culvert Overtopping) [Drainage]" displayLabel="Physical (Culvert Overtopping) [Drainage]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Drainage_Physical_Drainage" description="Physical [Drainage]" displayLabel="Physical [Drainage]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Hydraulic_Analysis_Physical_Hydraulic_Analysis" description="Physical [Hydraulic Analysis]" displayLabel="Physical [Hydraulic Analysis]" priority="4294875686"/>
-    <PropertyCategory typeName="Physical_Hydraulic_Analysis_Physical_Hydraulic_Analysis" description="Physical [Hydraulic Analysis]" displayLabel="Physical [Hydraulic Analysis]" priority="4294899186"/>
     <PropertyCategory typeName="Physical_Structure_Losses_Drainage_Physical_Structure_Losses_Drainage" description="Physical (Structure Losses) [Drainage]" displayLabel="Physical (Structure Losses) [Drainage]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Structure_Losses_Hydraulic_Analysis_Physical_Structure_Losses_Hydraulic_Analysis" description="Physical (Structure Losses) [Hydraulic Analysis]" displayLabel="Physical (Structure Losses) [Hydraulic Analysis]" priority="4294875686"/>
     <PropertyCategory typeName="Physical_Surface_Storage_Drainage_Physical_Surface_Storage_Drainage" description="Physical (Surface Storage) [Drainage]" displayLabel="Physical (Surface Storage) [Drainage]" priority="4294875686"/>

From 59002e55cf0b391b8562759d97225521d4ee2246 Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 20:49:27 +0530
Subject: [PATCH 09/12] Update CifCommon schema to fix TS Validation Tests -
 4th Attempt

---
 .../CivilInfrastructureFramework/CifCommon.ecschema.xml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
index eb795bd15..9f596044c 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
@@ -1350,7 +1350,7 @@
         </Target>
     </ECRelationshipClass>
     <ECEntityClass typeName="ReadOnlyCircularArcAspect" displayLabel="Read Only Circular Arc">
-        <BaseClass>ReadOnlyLinearElementAspect</BaseClass>
+        <BaseClass>LinearElementAspect</BaseClass>
         <ECProperty propertyName="LinearElement_CircularArc_Radius" typeName="double" displayLabel="Radius" category="GeometryAttributes_Geometry" priority="299975" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="LinearElement_CircularArc_SweepAngle" typeName="double" displayLabel="Sweep Angle" category="GeometryAttributes_Geometry" priority="299974" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="LinearElement_CircularArc_Tangent" typeName="double" displayLabel="Tangent" category="GeometryAttributes_Geometry" priority="299960" kindOfQuantity="cifu:LENGTH"/>

From 11c93ebc7ae3a0f0ab918a29d6b833c1323b55eb Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 21:51:49 +0530
Subject: [PATCH 10/12] Update CifCommon schema to fix TS Validation Tests -
 5th Attempt

---
 .../CivilInfrastructureFramework/CifCommon.ecschema.xml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
index 9f596044c..4f29308a4 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifCommon.ecschema.xml
@@ -1372,7 +1372,7 @@
         </Target>
     </ECRelationshipClass>
     <ECEntityClass typeName="ReadOnlyClosedLinearComplexAspect" displayLabel="Read Only Closed Linear Complex">
-        <BaseClass>ReadOnlyLinearComplexAspect</BaseClass>
+        <BaseClass>LinearComplexAspect</BaseClass>
         <ECProperty propertyName="ClosedLinearComplex_IsClockWise" typeName="ReadOnlyClosedLinearComplexAspect_ClosedLinearComplex_IsClockWise_BoolEnum" displayLabel="Clockwise" category="GeometryAttributes_Geometry" priority="299960"/>
         <ECProperty propertyName="ClosedLinearComplex_Area" typeName="double" displayLabel="Area" category="GeometryAttributes_Geometry" priority="299970" kindOfQuantity="cifu:AREA"/>
     </ECEntityClass>

From a988c241e9f3faa73e6d997e6e16351229f31514 Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 22:21:05 +0530
Subject: [PATCH 11/12] Update CifGeometricRules schema to fix TS Validation
 Tests

---
 .../CifGeometricRules.ecschema.xml                   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml
index 460c865c1..89956f2a1 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml
@@ -444,6 +444,10 @@
         <ECEnumerator name="Spiral" value="1" displayLabel="Spiral"/>
         <ECEnumerator name="Curve" value="2" displayLabel="Curve"/>
     </ECEnumeration>
+    <ECEnumeration typeName="LineFromElementRuleBaseAspect_TruncateOption_Enum" backingTypeName="int" isStrict="true">
+        <ECEnumerator name="None" value="1" displayLabel="None"/>
+        <ECEnumerator name="Back" value="2" displayLabel="Back"/>
+    </ECEnumeration>
     <ECEnumeration typeName="LineFromElementRuleAspect_BackTransitionDefinitionMethodArc_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Length" value="1" displayLabel="Length"/>
         <ECEnumerator name="Deflection" value="2" displayLabel="Deflection"/>
@@ -457,10 +461,6 @@
         <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
         <ECEnumerator name="Tangential_Length" value="6" displayLabel="Tangential Length"/>
     </ECEnumeration>
-    <ECEnumeration typeName="LineFromElementRuleAspect_TruncateOption_Enum" backingTypeName="int" isStrict="true">
-        <ECEnumerator name="None" value="1" displayLabel="None"/>
-        <ECEnumerator name="Back" value="2" displayLabel="Back"/>
-    </ECEnumeration>
     <ECEnumeration typeName="LineFromElementRuleCurveAspect_BackTransitionDefinitionMethodArc_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="Length" value="1" displayLabel="Length"/>
         <ECEnumerator name="Deflection" value="2" displayLabel="Deflection"/>
@@ -2048,7 +2048,7 @@
         <ECProperty propertyName="Skew" typeName="double" displayLabel="Skew" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299994" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299993" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="EndDistance" typeName="double" displayLabel="End Distance" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299992" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="TruncateOption" typeName="LineFromElementRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299952"/>
+        <ECProperty propertyName="TruncateOption" typeName="LineFromElementRuleBaseAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299952"/>
         <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="LineFromElementRuleBaseAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Type" category="BackTransitionAttributes_Back_Transition" priority="299986"/>
         <ECProperty propertyName="BackTransitionDefinitionMethodSpiral" typeName="LineFromElementRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" displayLabel="Spiral Method" category="BackTransitionAttributes_Back_Transition" priority="299985"/>
         <ECProperty propertyName="BackTransitionDefinitionMethodArc" typeName="LineFromElementRuleAspect_BackTransitionDefinitionMethodArc_Enum" displayLabel="Arc Method" category="BackTransitionAttributes_Back_Transition" priority="299984"/>
@@ -2079,7 +2079,7 @@
         <ECProperty propertyName="Skew" typeName="double" displayLabel="Skew" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299994" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299993" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="EndDistance" typeName="double" displayLabel="End Distance" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299992" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="TruncateOption" typeName="LineFromElementRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299952"/>
+        <ECProperty propertyName="TruncateOption" typeName="LineFromElementRuleBaseAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineFromElementRuleAttributes_Line_From_Element_Rule" priority="299952"/>
         <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="LineFromElementRuleBaseAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Type" category="BackTransitionAttributes_Back_Transition" priority="299986"/>
     </ECEntityClass>
     <ECEntityClass typeName="LineFromElementRuleCurveAspect">

From 3ae729fcc561f6c9aae9df817685e2ce9dc3c18b Mon Sep 17 00:00:00 2001
From: Sachin Bhosale <Sachin.Bhosale@bentley.com>
Date: Fri, 6 Feb 2026 22:32:14 +0530
Subject: [PATCH 12/12] Update CifGeometricRules schema to fix TS Validation
 Tests - 2nd Attempt

---
 .../CifGeometricRules.ecschema.xml                          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml
index 89956f2a1..7ddc3438d 100644
--- a/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml
+++ b/Domains/4-Application/Connectors/CivilInfrastructureFramework/CifGeometricRules.ecschema.xml
@@ -517,7 +517,7 @@
         <ECEnumerator name="DeltaR" value="5" displayLabel="DeltaR"/>
         <ECEnumerator name="Tangential_Length" value="6" displayLabel="Tangential Length"/>
     </ECEnumeration>
-    <ECEnumeration typeName="LineToElementRuleAspect_TruncateOption_Enum" backingTypeName="int" isStrict="true">
+    <ECEnumeration typeName="LineToElementRuleBaseAspect_TruncateOption_Enum" backingTypeName="int" isStrict="true">
         <ECEnumerator name="None" value="1" displayLabel="None"/>
         <ECEnumerator name="Back" value="2" displayLabel="Back"/>
     </ECEnumeration>
@@ -2556,7 +2556,7 @@
         <ECProperty propertyName="BackOffset" typeName="double" displayLabel="Offset" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299996" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Skew" typeName="double" displayLabel="Skew" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299994" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299992" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="TruncateOption" typeName="LineToElementRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299952"/>
+        <ECProperty propertyName="TruncateOption" typeName="LineToElementRuleBaseAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299952"/>
         <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="LineToElementRuleBaseAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Type" category="BackTransitionAttributes_Back_Transition" priority="299986"/>
         <ECProperty propertyName="BackTransitionDefinitionMethodSpiral" typeName="LineToElementRuleAspect_BackTransitionDefinitionMethodSpiral_Enum" displayLabel="Spiral Method" category="BackTransitionAttributes_Back_Transition" priority="299985"/>
         <ECProperty propertyName="BackTransitionDefinitionMethodArc" typeName="LineToElementRuleAspect_BackTransitionDefinitionMethodArc_Enum" displayLabel="Arc Method" category="BackTransitionAttributes_Back_Transition" priority="299984"/>
@@ -2586,7 +2586,7 @@
         <ECProperty propertyName="BackOffset" typeName="double" displayLabel="Offset" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299996" kindOfQuantity="cifu:LENGTH"/>
         <ECProperty propertyName="Skew" typeName="double" displayLabel="Skew" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299994" kindOfQuantity="cifu:ANGLE"/>
         <ECProperty propertyName="StartDistance" typeName="double" displayLabel="Start Distance" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299992" kindOfQuantity="cifu:LENGTH"/>
-        <ECProperty propertyName="TruncateOption" typeName="LineToElementRuleAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299952"/>
+        <ECProperty propertyName="TruncateOption" typeName="LineToElementRuleBaseAspect_TruncateOption_Enum" displayLabel="Trim\Extend" category="LineToElementRuleAttributes_Line_To_Element_Rule" priority="299952"/>
         <ECProperty propertyName="BackTransitionDefinitionMethod" typeName="LineToElementRuleBaseAspect_BackTransitionDefinitionMethod_Enum" displayLabel="Type" category="BackTransitionAttributes_Back_Transition" priority="299986"/>
     </ECEntityClass>
     <ECEntityClass typeName="LineToElementRuleCurveAspect">