diff --git a/Domains/2-DisciplinePhysical/Civil/RoadRailUnits/RoadRailUnits.ecschema.xml b/Domains/2-DisciplinePhysical/Civil/RoadRailUnits/RoadRailUnits.ecschema.xml
index 87afb7b21..ccd523fad 100644
--- a/Domains/2-DisciplinePhysical/Civil/RoadRailUnits/RoadRailUnits.ecschema.xml
+++ b/Domains/2-DisciplinePhysical/Civil/RoadRailUnits/RoadRailUnits.ecschema.xml
@@ -24,10 +24,12 @@
     <KindOfQuantity typeName="ELEVATION" displayLabel="Road &amp; Rail Elevation" persistenceUnit="u:M" presentationUnits="f:DefaultRealU(2)[u:M];f:DefaultRealU(2)[u:FT]" relativeError="0.0001"/>
     <KindOfQuantity typeName="FLOW" displayLabel="Road &amp; Rail Flow" persistenceUnit="u:CUB_M_PER_SEC" presentationUnits="f:DefaultRealU(2)[u:CUB_M_PER_SEC];f:DefaultRealU(2)[u:CUB_FT_PER_SEC]" relativeError="0.0001"/>
     <KindOfQuantity typeName="LENGTH" displayLabel="Road &amp; Rail Length" persistenceUnit="u:M" presentationUnits="f:DefaultRealU(2)[u:M];f:DefaultRealU(2)[u:FT];f:DefaultRealU(2)[u:US_SURVEY_FT]" relativeError="0.0001"/>
-    <KindOfQuantity typeName="LENGTH_SHORT" displayLabel="Road &amp; Rail Short Length" persistenceUnit="u:M" presentationUnits="f:DefaultRealU(3)[u:M];f:AmerFI" relativeError="0.0001"/>
+    <KindOfQuantity typeName="LENGTH_SHORT" displayLabel="Road &amp; Rail Short Length" persistenceUnit="u:M" presentationUnits="f:DefaultRealU(1)[u:MM];f:DefaultRealU(1)[u:IN]" relativeError="0.0001"/>
     <KindOfQuantity typeName="SLOPE" displayLabel="Road &amp; Rail Slope" persistenceUnit="u:M_PER_M" presentationUnits="f:DefaultRealU(2)[u:PERCENT_SLOPE]" relativeError="0.0001" />
     <KindOfQuantity typeName="STATION" displayLabel="Road &amp; Rail Station" persistenceUnit="u:M" presentationUnits="f:StationZ_1000_3[u:M];f:StationZ_100_2[u:FT];f:StationZ_100_2[u:US_SURVEY_FT];f:DefaultRealU(2)[u:M];f:DefaultRealU(2)[u:FT];f:DefaultRealU(2)[u:US_SURVEY_FT]" relativeError="0.0001"/>
     <KindOfQuantity typeName="VELOCITY" displayLabel="Road &amp; Rail Velocity" persistenceUnit="u:M_PER_SEC" presentationUnits="f:DefaultRealU(2)[u:KM_PER_HR];f:DefaultRealU(2)[u:MPH]" relativeError="0.0001"/>
     <KindOfQuantity typeName="VOLUME" displayLabel="Road &amp; Rail Volume" persistenceUnit="u:CUB_M" presentationUnits="f:DefaultRealU(2)[u:CUB_M];f:DefaultRealU(2)[u:CUB_FT]" relativeError="0.0001"/>
     <KindOfQuantity typeName="PERCENTAGE" displayLabel="Road &amp; Rail Percentage" persistenceUnit="u:DECIMAL_PERCENT" presentationUnits="f:DefaultRealU(2)[u:PERCENT];f:DefaultRealU(4)[u:DECIMAL_PERCENT]" relativeError="0.0001"/>
+    <KindOfQuantity typeName="SIDE_SLOPE" displayLabel="Road &amp; Rail Side Slope" persistenceUnit="u:M_HORIZONTAL_PER_M_VERTICAL" presentationUnits="f:DefaultRealU(1)[u:HORIZONTAL_PER_VERTICAL]" relativeError="0.0001"/>
+    <KindOfQuantity typeName="INTENSITY_INFILTRATION" displayLabel="Road &amp; Rail Intensity/Infiltration" persistenceUnit="u:M_PER_SEC" presentationUnits="f:DefaultRealU(2)[u:MM_PER_HR];f:DefaultRealU(2)[u:IN_PER_HR]" relativeError="0.0001"/>
 </ECSchema>
diff --git a/Domains/3-DisciplineOther/Hydraulics/SewerHydraulicAnalysis.ecschema.xml b/Domains/3-DisciplineOther/Hydraulics/SewerHydraulicAnalysis.ecschema.xml
index 346dec715..2675a56e1 100644
--- a/Domains/3-DisciplineOther/Hydraulics/SewerHydraulicAnalysis.ecschema.xml
+++ b/Domains/3-DisciplineOther/Hydraulics/SewerHydraulicAnalysis.ecschema.xml
@@ -10,7 +10,7 @@
     <ECSchemaReference name="BisCore" version="01.00.10" alias="bis" />
     <ECSchemaReference name="Analytical" version="01.00.01" alias="anlyt" />
     <ECSchemaReference name="AecUnits" version="01.00.03" alias="AECU"/>
-    <ECSchemaReference name="RoadRailUnits" version="01.00.02" alias="rru"/>
+    <ECSchemaReference name="RoadRailUnits" version="01.00.03" alias="rru"/>
     <ECSchemaReference name="NetworkTopology" version="01.00.01" alias="net"/>
     <ECSchemaReference name="StormSewerPhysical" version="01.00.01" alias="stmswrphys"/>
 
@@ -885,8 +885,8 @@
     <ECEntityClass typeName="TrapezoidalShapeAspect" modifier="Sealed" displayLabel="Trapezoidal">
         <BaseClass>ChannelShapeAspect</BaseClass>
         <ECProperty propertyName="BottomWidth" typeName="double" displayLabel="Bottom Width" category="HydraulicData" kindOfQuantity="rru:LENGTH"/>
-        <ECProperty propertyName="LeftSideSlope" typeName="double" displayLabel="LeftSideSlope" category="HydraulicData" kindOfQuantity="rru:LENGTH"/>
-        <ECProperty propertyName="RightSideSlope" typeName="double" displayLabel="RightSideSlope" category="HydraulicData" kindOfQuantity="rru:LENGTH"/>
+        <ECProperty propertyName="LeftSideSlope" typeName="double" displayLabel="LeftSideSlope" category="HydraulicData" kindOfQuantity="rru:SIDE_SLOPE"/>
+        <ECProperty propertyName="RightSideSlope" typeName="double" displayLabel="RightSideSlope" category="HydraulicData" kindOfQuantity="rru:SIDE_SLOPE"/>
     </ECEntityClass>
 
     <ECEntityClass typeName="Pipe" modifier="Sealed" displayLabel="Pipe">
@@ -1082,8 +1082,8 @@
 
     <ECEntityClass typeName="CatchmentHortonInfiltrationMethodAspect" modifier="Sealed" displayLabel="CatchmentHortonInfiltrationMethodAspect">
         <BaseClass >CatchmentInfiltrationMethodAspect</BaseClass>
-        <ECProperty propertyName="Hortonfc" typeName="double" displayLabel="fc" category="HydraulicData" description="The equilibrium infiltration rate on the Horton infiltration curve reached once the soil becomes saturated."/>
-        <ECProperty propertyName="Hortonfo" typeName="double" displayLabel="fo" category="HydraulicData" description="The initial or maximum infiltration rate on Horton infiltration curve."/>
+        <ECProperty propertyName="Hortonfc" typeName="double" displayLabel="fc" category="HydraulicData" kindOfQuantity="rru:INTENSITY_INFILTRATION" description="The equilibrium infiltration rate on the Horton infiltration curve reached once the soil becomes saturated."/>
+        <ECProperty propertyName="Hortonfo" typeName="double" displayLabel="fo" category="HydraulicData" kindOfQuantity="rru:INTENSITY_INFILTRATION" description="The initial or maximum infiltration rate on Horton infiltration curve."/>
         <ECProperty propertyName="HortonK" typeName="double" displayLabel="K" category="HydraulicData" description="Decay constant associated with the soil."/>
         <ECProperty propertyName="HortonIA" typeName="double" displayLabel="Initial Abstraction" category="HydraulicData" kindOfQuantity="rru:LENGTH_SHORT" description="The initial abstraction accounts for all losses prior to runoff and consists mainly of interception, infiltration, evaporation, and surface depression storage."/>
         <ECProperty propertyName="HortonMaxVolume" typeName="double" displayLabel="Volume (Maximum)" category="HydraulicData" kindOfQuantity="rru:LENGTH_SHORT" description="Maximum infiltration volume possible (0 if not applicable). Can be estimated as the difference between a soil's porosity and its wilting point times the depth of the infiltration zone."/>
@@ -1161,7 +1161,7 @@
 
     <ECStructClass typeName="IDFPoint" description="Point of IDF Curve" modifier="Sealed">
         <ECProperty propertyName="Duration" typeName="double" description="Duration of storm" kindOfQuantity="AECU:TIME" />
-        <ECProperty propertyName="Intensity" typeName="double" description="Intensity at duration" />
+        <ECProperty propertyName="Intensity" typeName="double" kindOfQuantity="rru:INTENSITY_INFILTRATION" description="Intensity at duration" />
     </ECStructClass>
 
     <ECEntityClass typeName="IDFRainfallEventAspect" modifier="Sealed" displayLabel="IDF Curve">