Updated tags for all XSDs

144b525c · Rushikesh Padsala · cd28ee7a · 144b525c · cd28ee7a · 144b525c
Commit 144b525c authored 4 years ago by Rushikesh Padsala
Hide whitespace changes
Inline Side-by-side

Showing

with 598 additions and 525 deletions
+598 -525
--- a/public/FWEArea/v2.1/UML/EARoot/EA1.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA1.htm
@@ -36,22 +36,22 @@ function nameClassifier(name, separator)
 <img src="EA2.png" usemap="#EA2" border="0" />

 <MAP NAME="EA2">
-<area shape="rect" coords="711,685,1034,930" href="EA5.htm" target="_self">
-<area shape="rect" coords="361,685,683,930" href="EA9.htm" target="_self">
-<area shape="rect" coords="10,685,333,930" href="EA7.htm" target="_self">
-<area shape="rect" coords="394,395,650,585" href="EA4.htm" target="_self">
-<area shape="rect" coords="394,180,650,295" href="EA8.htm" target="_self">
+<area shape="rect" coords="711,676,1034,921" href="EA5.htm" target="_self">
+<area shape="rect" coords="361,676,683,921" href="EA9.htm" target="_self">
+<area shape="rect" coords="10,676,333,921" href="EA7.htm" target="_self">
+<area shape="rect" coords="394,371,650,577" href="EA4.htm" target="_self">
+<area shape="rect" coords="394,178,650,273" href="EA8.htm" target="_self">
 </MAP>

 	<div class="ObjectTitle">FWEArea : Class diagram</div>
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 13:19:57</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 1:19:57 PM</td>
 		</tr>
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Modified:</td>
-			<td width="85%" class="ObjectDetailsValue">06/01/2021 12:42:13</td>
+			<td width="85%" class="ObjectDetailsValue">1/9/2021 5:31:53 PM</td>
 		</tr>
 		<tr style="padding-top: 10px;">
 			<td width="15%" class="ObjectDetailsTopic"><img src="../images/plus03.gif" align="absmiddle" id="proj" onclick="parent.toggleData(this.id)" />Project:</td>

--- a/public/FWEArea/v2.1/UML/EARoot/EA2.png
+++ b/public/FWEArea/v2.1/UML/EARoot/EA2.png
--- a/public/FWEArea/v2.1/UML/EARoot/EA3.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA3.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 13:19:54</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 1:19:54 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">04/01/2021 17:46:04</td>
+			<td class="ObjectDetailsValue">1/4/2021 5:46:04 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>

--- a/public/FWEArea/v2.1/UML/EARoot/EA4.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA4.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 23:36:30</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 11:36:30 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">12/05/2020 23:36:38</td>
+			<td class="ObjectDetailsValue">5/12/2020 11:36:38 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -98,6 +98,7 @@ function nameClassifier(name, separator)
 	<div class="TableGroup" id="TableGroup">
 		<ul class="ItemTitle">
 			<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
+			<li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
 			<li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
 			<li onClick="parent.toggleItem('TaggedVal');" id="TaggedValTitle">Tagged Values</li>
 			<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
@@ -109,7 +110,7 @@ function nameClassifier(name, separator)
 		</tr>
 						<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Integer</i><br /><strong>&nbsp;&nbsp;surveyYear</strong>
+					<i>Public Area</i><br /><strong>&nbsp;&nbsp;buildingFootrpintArea</strong>
 				</td>
 			</tr>
 			<tr>
@@ -157,7 +158,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;surveyYearVersion</strong>
+					<i>Public Area</i><br /><strong>&nbsp;&nbsp;openPlotArea</strong>
 				</td>
 			</tr>
 			<tr>
@@ -183,7 +184,7 @@ function nameClassifier(name, separator)
 						</tr>
 						<tr id="DetailsImageAttributes7_04" style="display: none;">
 							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to *</td>
+							<td>Range:0 to 1</td>
 						</tr>
 						<tr id="DetailsImageAttributes7_05" style="display: none;">
 							<td width="75"><i>Transient: </i></td>
@@ -205,7 +206,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;surveyDescription</strong>
+					<i>Public Integer</i><br /><strong>&nbsp;&nbsp;population</strong>
 				</td>
 			</tr>
 			<tr>
@@ -231,7 +232,7 @@ function nameClassifier(name, separator)
 						</tr>
 						<tr id="DetailsImageAttributes8_04" style="display: none;">
 							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to *</td>
+							<td>Range:0 to 1</td>
 						</tr>
 						<tr id="DetailsImageAttributes8_05" style="display: none;">
 							<td width="75"><i>Transient: </i></td>
@@ -253,7 +254,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Integer</i><br /><strong>&nbsp;&nbsp;population</strong>
+					<i>Public Area</i><br /><strong>&nbsp;&nbsp;settlementArea</strong>
 				</td>
 			</tr>
 			<tr>
@@ -301,7 +302,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Area</i><br /><strong>&nbsp;&nbsp;buildingFootrpintArea</strong>
+					<i>Public Area</i><br /><strong>&nbsp;&nbsp;surfaceArea</strong>
 				</td>
 			</tr>
 			<tr>
@@ -349,7 +350,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Area</i><br /><strong>&nbsp;&nbsp;settlementArea</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;surveyDescription</strong>
 				</td>
 			</tr>
 			<tr>
@@ -375,7 +376,7 @@ function nameClassifier(name, separator)
 						</tr>
 						<tr id="DetailsImageAttributes11_04" style="display: none;">
 							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
+							<td>Range:0 to *</td>
 						</tr>
 						<tr id="DetailsImageAttributes11_05" style="display: none;">
 							<td width="75"><i>Transient: </i></td>
@@ -397,7 +398,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Area</i><br /><strong>&nbsp;&nbsp;openPlotArea</strong>
+					<i>Public Integer</i><br /><strong>&nbsp;&nbsp;surveyYear</strong>
 				</td>
 			</tr>
 			<tr>
@@ -423,7 +424,7 @@ function nameClassifier(name, separator)
 						</tr>
 						<tr id="DetailsImageAttributes12_04" style="display: none;">
 							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
+							<td>Range:0 to *</td>
 						</tr>
 						<tr id="DetailsImageAttributes12_05" style="display: none;">
 							<td width="75"><i>Transient: </i></td>
@@ -445,7 +446,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Area</i><br /><strong>&nbsp;&nbsp;trafficArea</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;surveyYearVersion</strong>
 				</td>
 			</tr>
 			<tr>
@@ -471,7 +472,7 @@ function nameClassifier(name, separator)
 						</tr>
 						<tr id="DetailsImageAttributes13_04" style="display: none;">
 							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
+							<td>Range:0 to *</td>
 						</tr>
 						<tr id="DetailsImageAttributes13_05" style="display: none;">
 							<td width="75"><i>Transient: </i></td>
@@ -493,7 +494,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Area</i><br /><strong>&nbsp;&nbsp;vegetationArea</strong>
+					<i>Public Area</i><br /><strong>&nbsp;&nbsp;trafficArea</strong>
 				</td>
 			</tr>
 			<tr>
@@ -541,7 +542,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Area</i><br /><strong>&nbsp;&nbsp;waterBodyArea</strong>
+					<i>Public Area</i><br /><strong>&nbsp;&nbsp;vegetationArea</strong>
 				</td>
 			</tr>
 			<tr>
@@ -586,11 +587,59 @@ function nameClassifier(name, separator)
 					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
 						&nbsp;
 						
+				</td>
+			</tr>			<tr>
+				<td width="100%" class="TableRow">
+					<i>Public Area</i><br /><strong>&nbsp;&nbsp;waterBodyArea</strong>
+				</td>
+			</tr>
+			<tr>
+				<td class="TableRowBottomDashed"  colspan="1">										
+					<a href="#" onclick="parent.toggleData('DetailsImageAttributes16')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes16" border="0" />Details:</a>
+					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+					
+						<tr id="DetailsImageAttributes16_00" style="display: none;">
+							<td width="75"><i>Alias:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes16_01" style="display: none;">
+							<td width="75"><i>Initial:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes16_02" style="display: none;">
+							<td width="75"><i>Stereotype: </i></td>
+							<td>&lt;&lt;Property&gt;&gt;</td>
+						</tr>
+						<tr id="DetailsImageAttributes16_03" style="display: none;">
+							<td width="75"><i>Ordered: </i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes16_04" style="display: none;">
+							<td width="75"><i>Range: </i></td>
+							<td>Range:0 to 1</td>
+						</tr>
+						<tr id="DetailsImageAttributes16_05" style="display: none;">
+							<td width="75"><i>Transient: </i></td>
+							<td>False</td>
+						</tr>
+						<tr id="DetailsImageAttributes16_06" style="display: none;">
+							<td width="75"><i>Derived: </i></td>
+							<td>False</td>
+						</tr>
+							<tr id="DetailsImageAttributes16_07" style="display: none;">
+							<td width="75"><i>IsID: </i></td>
+						<td>False</td>
+						</tr>
+					</table>
+					
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+						&nbsp;
+						
 				</td>
 			</tr>
 	</table>
 </div>
-		<div class="ItemBody" id="AssociationsFromTable">
+		<div class="ItemBody" id="AssociationsToTable">
 			<table border="0" cellspacing="0" cellpadding="0" class="Table">
 				<tr>
 					<td width="40%" class="TableHeading">Element</td>
@@ -599,11 +648,11 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td width="40%" class="TableRow" valign="top">
-						<a href="EA5.htm">«FeatureType» EnergySurvey</a><br />
+						<a href="EA8.htm">«FeatureType» FWEArea</a><br />
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> energySurveyProperty<br />
+						<strong>Name:</strong> consistsOfFWEsurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -613,31 +662,41 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td class="TableRowBottomDashed"  colspan="3">
-						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink16" onclick="parent.toggleDiv('detailsDIVLink16','DetailsImageLink16')" />Details:
-							<div id="detailsDIVLink16" class="DetailsDiv" >
+						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink17" onclick="parent.toggleDiv('detailsDIVLink17','DetailsImageLink17')" />Details:
+							<div id="detailsDIVLink17" class="DetailsDiv" >
 							&nbsp;
 							</div>
 						</div>
 					</td>
 				</tr>
+
+			</table>
+		</div>
+		<div class="ItemBody" id="AssociationsFromTable">
+			<table border="0" cellspacing="0" cellpadding="0" class="Table">
+				<tr>
+					<td width="40%" class="TableHeading">Element</td>
+					<td width="30%" class="TableHeading">Source Role</td>
+					<td width="30%" class="TableHeading">Target Role</td>
+				</tr>
 				<tr>
 					<td width="40%" class="TableRow" valign="top">
-						<a href="EA8.htm">«FeatureType» FWEArea</a><br />
+						<a href="EA7.htm">«FeatureType» FoodSurvey</a><br />
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> &nbsp;<br />
+						<strong>Name:</strong> foodSurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> areaSurveyProperties<br />
+						<strong>Name:</strong> &nbsp;<br />
 						&nbsp;	
 					</td>
 				</tr>
 				<tr>
 					<td class="TableRowBottomDashed"  colspan="3">
-						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink17" onclick="parent.toggleDiv('detailsDIVLink17','DetailsImageLink17')" />Details:
-							<div id="detailsDIVLink17" class="DetailsDiv" >
+						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink18" onclick="parent.toggleDiv('detailsDIVLink18','DetailsImageLink18')" />Details:
+							<div id="detailsDIVLink18" class="DetailsDiv" >
 							&nbsp;
 							</div>
 						</div>
@@ -649,7 +708,7 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> waterSurveyProperty<br />
+						<strong>Name:</strong> waterSurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -659,8 +718,8 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td class="TableRowBottomDashed"  colspan="3">
-						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink18" onclick="parent.toggleDiv('detailsDIVLink18','DetailsImageLink18')" />Details:
-							<div id="detailsDIVLink18" class="DetailsDiv" >
+						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink19" onclick="parent.toggleDiv('detailsDIVLink19','DetailsImageLink19')" />Details:
+							<div id="detailsDIVLink19" class="DetailsDiv" >
 							&nbsp;
 							</div>
 						</div>
@@ -668,11 +727,11 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td width="40%" class="TableRow" valign="top">
-						<a href="EA7.htm">«FeatureType» FoodSurvey</a><br />
+						<a href="EA5.htm">«FeatureType» EnergySurvey</a><br />
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> foodSurveyProperties<br />
+						<strong>Name:</strong> energySurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -682,8 +741,8 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td class="TableRowBottomDashed"  colspan="3">
-						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink19" onclick="parent.toggleDiv('detailsDIVLink19','DetailsImageLink19')" />Details:
-							<div id="detailsDIVLink19" class="DetailsDiv" >
+						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink20" onclick="parent.toggleDiv('detailsDIVLink20','DetailsImageLink20')" />Details:
+							<div id="detailsDIVLink20" class="DetailsDiv" >
 							&nbsp;
 							</div>
 						</div>
@@ -704,8 +763,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario20" onclick="parent.toggleDiv('detailsDIVScenario20','DetailsImageScenario20')" />Details:
-						<div id="detailsDIVScenario20" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario21" onclick="parent.toggleDiv('detailsDIVScenario21','DetailsImageScenario21')" />Details:
+						<div id="detailsDIVScenario21" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>

 						</div>
@@ -717,8 +776,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario21" onclick="parent.toggleDiv('detailsDIVScenario21','DetailsImageScenario21')" />Details:
-						<div id="detailsDIVScenario21" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario22" onclick="parent.toggleDiv('detailsDIVScenario22','DetailsImageScenario22')" />Details:
+						<div id="detailsDIVScenario22" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>

 						</div>
@@ -730,8 +789,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario22" onclick="parent.toggleDiv('detailsDIVScenario22','DetailsImageScenario22')" />Details:
-						<div id="detailsDIVScenario22" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario23" onclick="parent.toggleDiv('detailsDIVScenario23','DetailsImageScenario23')" />Details:
+						<div id="detailsDIVScenario23" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>

 						</div>
@@ -749,14 +808,14 @@ function nameClassifier(name, separator)
 					<td width="40%" class="TableHeading">Notes</td>
 				</tr>
 				<tr>
-					<td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» EnergySurvey</a></td>
+					<td width="30%" class="TableRow" valign="top"><a href="EA7.htm">«FeatureType» FoodSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
 					<td width="10%" class="TableRow" valign="top">Strong</td>
 					<td width="10%" class="TableRow" valign="top">From</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
-					<td width="30%" class="TableRow" valign="top"><a href="EA7.htm">«FeatureType» FoodSurvey</a></td>
+					<td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
 					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">From</td>
@@ -770,7 +829,14 @@ function nameClassifier(name, separator)
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
-					<td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
+					<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» FWEArea</a></td>
+					<td width="10%" class="TableRow" valign="top">Class</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">To</td>
+					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
+				</tr>
+				<tr>
+					<td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» EnergySurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
 					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">From</td>
@@ -779,14 +845,14 @@ function nameClassifier(name, separator)
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA7.htm">«FeatureType» FoodSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">From</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» EnergySurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Generalization</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
 					<td width="10%" class="TableRow" valign="top">From</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>

--- a/public/FWEArea/v2.1/UML/EARoot/EA5.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA5.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">13/05/2020 12:59:49</td>
+			<td width="85%" class="ObjectDetailsValue">5/13/2020 12:59:49 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">13/05/2020 12:59:56</td>
+			<td class="ObjectDetailsValue">5/13/2020 12:59:56 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -109,55 +109,7 @@ function nameClassifier(name, separator)
 		</tr>
 						<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;spaceHeatingDemand</strong>
-				</td>
-			</tr>
-			<tr>
-				<td class="TableRowBottomDashed"  colspan="1">										
-					<a href="#" onclick="parent.toggleData('DetailsImageAttributes23')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes23" border="0" />Details:</a>
-					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-					
-						<tr id="DetailsImageAttributes23_00" style="display: none;">
-							<td width="75"><i>Alias:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes23_01" style="display: none;">
-							<td width="75"><i>Initial:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes23_02" style="display: none;">
-							<td width="75"><i>Stereotype: </i></td>
-							<td>&lt;&lt;Property&gt;&gt;</td>
-						</tr>
-						<tr id="DetailsImageAttributes23_03" style="display: none;">
-							<td width="75"><i>Ordered: </i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes23_04" style="display: none;">
-							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
-						</tr>
-						<tr id="DetailsImageAttributes23_05" style="display: none;">
-							<td width="75"><i>Transient: </i></td>
-							<td>False</td>
-						</tr>
-						<tr id="DetailsImageAttributes23_06" style="display: none;">
-							<td width="75"><i>Derived: </i></td>
-							<td>False</td>
-						</tr>
-							<tr id="DetailsImageAttributes23_07" style="display: none;">
-							<td width="75"><i>IsID: </i></td>
-						<td>False</td>
-						</tr>
-					</table>
-					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-						&nbsp;
-						
-				</td>
-			</tr>			<tr>
-				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;spaceHeatingDemandUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;biomassElectricityPotential</strong>
 				</td>
 			</tr>
 			<tr>
@@ -205,7 +157,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;spaceCoolingDemand</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;biomassElectricityPotentialUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -253,7 +205,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;spaceCoolingDemandUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;biomassPrimaryEnergyPotential</strong>
 				</td>
 			</tr>
 			<tr>
@@ -301,7 +253,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;residentialElectricityDemand</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;biomassPrimaryEnergyPotentialUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -349,7 +301,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;residentialElectricityDemandUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;biomassThermalPotential</strong>
 				</td>
 			</tr>
 			<tr>
@@ -397,7 +349,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;electricityPotentialFromPVBuildings</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;biomassThermalPotentialUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -445,7 +397,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;electricityPotentialFromPVBuildingsUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;electricityPotentialFromPVBuildings</strong>
 				</td>
 			</tr>
 			<tr>
@@ -493,7 +445,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;biomassPrimaryEnergyPotential</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;electricityPotentialFromPVBuildingsUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -541,7 +493,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;biomassPrimaryEnergyPotentialUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;residentialElectricityDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -589,7 +541,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;biomassElectricityPotential</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;residentialElectricityDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -637,7 +589,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;biomassElectricityPotentialUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;spaceCoolingDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -685,7 +637,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;biomassThermalPotential</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;spaceCoolingDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -733,7 +685,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;biomassThermalPotentialUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;spaceHeatingDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -778,6 +730,54 @@ function nameClassifier(name, separator)
 					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
 						&nbsp;
 						
+				</td>
+			</tr>			<tr>
+				<td width="100%" class="TableRow">
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;spaceHeatingDemandUnit</strong>
+				</td>
+			</tr>
+			<tr>
+				<td class="TableRowBottomDashed"  colspan="1">										
+					<a href="#" onclick="parent.toggleData('DetailsImageAttributes37')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes37" border="0" />Details:</a>
+					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+					
+						<tr id="DetailsImageAttributes37_00" style="display: none;">
+							<td width="75"><i>Alias:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes37_01" style="display: none;">
+							<td width="75"><i>Initial:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes37_02" style="display: none;">
+							<td width="75"><i>Stereotype: </i></td>
+							<td>&lt;&lt;Property&gt;&gt;</td>
+						</tr>
+						<tr id="DetailsImageAttributes37_03" style="display: none;">
+							<td width="75"><i>Ordered: </i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes37_04" style="display: none;">
+							<td width="75"><i>Range: </i></td>
+							<td>Range:0 to 1</td>
+						</tr>
+						<tr id="DetailsImageAttributes37_05" style="display: none;">
+							<td width="75"><i>Transient: </i></td>
+							<td>False</td>
+						</tr>
+						<tr id="DetailsImageAttributes37_06" style="display: none;">
+							<td width="75"><i>Derived: </i></td>
+							<td>False</td>
+						</tr>
+							<tr id="DetailsImageAttributes37_07" style="display: none;">
+							<td width="75"><i>IsID: </i></td>
+						<td>False</td>
+						</tr>
+					</table>
+					
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+						&nbsp;
+						
 				</td>
 			</tr>
 	</table>
@@ -795,7 +795,7 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> energySurveyProperty<br />
+						<strong>Name:</strong> energySurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -805,8 +805,8 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td class="TableRowBottomDashed"  colspan="3">
-						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink37" onclick="parent.toggleDiv('detailsDIVLink37','DetailsImageLink37')" />Details:
-							<div id="detailsDIVLink37" class="DetailsDiv" >
+						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink38" onclick="parent.toggleDiv('detailsDIVLink38','DetailsImageLink38')" />Details:
+							<div id="detailsDIVLink38" class="DetailsDiv" >
 							&nbsp;
 							</div>
 						</div>
@@ -827,8 +827,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario38" onclick="parent.toggleDiv('detailsDIVScenario38','DetailsImageScenario38')" />Details:
-						<div id="detailsDIVScenario38" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario39" onclick="parent.toggleDiv('detailsDIVScenario39','DetailsImageScenario39')" />Details:
+						<div id="detailsDIVScenario39" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>

 						</div>
@@ -840,8 +840,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario39" onclick="parent.toggleDiv('detailsDIVScenario39','DetailsImageScenario39')" />Details:
-						<div id="detailsDIVScenario39" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario40" onclick="parent.toggleDiv('detailsDIVScenario40','DetailsImageScenario40')" />Details:
+						<div id="detailsDIVScenario40" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>

 						</div>
@@ -853,8 +853,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario40" onclick="parent.toggleDiv('detailsDIVScenario40','DetailsImageScenario40')" />Details:
-						<div id="detailsDIVScenario40" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario41" onclick="parent.toggleDiv('detailsDIVScenario41','DetailsImageScenario41')" />Details:
+						<div id="detailsDIVScenario41" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>

 						</div>
@@ -874,14 +874,14 @@ function nameClassifier(name, separator)
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Generalization</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>

--- a/public/FWEArea/v2.1/UML/EARoot/EA6.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA6.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">05/01/2021 21:37:48</td>
+			<td width="85%" class="ObjectDetailsValue">1/5/2021 9:37:48 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">05/01/2021 21:38:00</td>
+			<td class="ObjectDetailsValue">1/5/2021 9:38:00 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -111,8 +111,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario41" onclick="parent.toggleDiv('detailsDIVScenario41','DetailsImageScenario41')" />Details:
-						<div id="detailsDIVScenario41" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario42" onclick="parent.toggleDiv('detailsDIVScenario42','DetailsImageScenario42')" />Details:
+						<div id="detailsDIVScenario42" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true | false<br />Default: true<br />Description: Encode code list as externally managed dictionary.<br /></div>

 						</div>

--- a/public/FWEArea/v2.1/UML/EARoot/EA7.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA7.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">13/05/2020 12:59:26</td>
+			<td width="85%" class="ObjectDetailsValue">5/13/2020 12:59:26 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">13/05/2020 12:59:32</td>
+			<td class="ObjectDetailsValue">5/13/2020 12:59:32 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -112,54 +112,6 @@ function nameClassifier(name, separator)
 					<i>Public <a href="EA6.htm">foodCategoryValues</a></i><br /><strong>&nbsp;&nbsp;foodCategory</strong>
 				</td>
 			</tr>
-			<tr>
-				<td class="TableRowBottomDashed"  colspan="1">										
-					<a href="#" onclick="parent.toggleData('DetailsImageAttributes42')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes42" border="0" />Details:</a>
-					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-					
-						<tr id="DetailsImageAttributes42_00" style="display: none;">
-							<td width="75"><i>Alias:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes42_01" style="display: none;">
-							<td width="75"><i>Initial:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes42_02" style="display: none;">
-							<td width="75"><i>Stereotype: </i></td>
-							<td>&lt;&lt;Property&gt;&gt;</td>
-						</tr>
-						<tr id="DetailsImageAttributes42_03" style="display: none;">
-							<td width="75"><i>Ordered: </i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes42_04" style="display: none;">
-							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to *</td>
-						</tr>
-						<tr id="DetailsImageAttributes42_05" style="display: none;">
-							<td width="75"><i>Transient: </i></td>
-							<td>False</td>
-						</tr>
-						<tr id="DetailsImageAttributes42_06" style="display: none;">
-							<td width="75"><i>Derived: </i></td>
-							<td>False</td>
-						</tr>
-							<tr id="DetailsImageAttributes42_07" style="display: none;">
-							<td width="75"><i>IsID: </i></td>
-						<td>False</td>
-						</tr>
-					</table>
-					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-						&nbsp;
-						
-				</td>
-			</tr>			<tr>
-				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodDemand</strong>
-				</td>
-			</tr>
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="1">										
 					<a href="#" onclick="parent.toggleData('DetailsImageAttributes43')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes43" border="0" />Details:</a>
@@ -183,7 +135,7 @@ function nameClassifier(name, separator)
 						</tr>
 						<tr id="DetailsImageAttributes43_04" style="display: none;">
 							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
+							<td>Range:0 to *</td>
 						</tr>
 						<tr id="DetailsImageAttributes43_05" style="display: none;">
 							<td width="75"><i>Transient: </i></td>
@@ -205,7 +157,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodDemandUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodConsumption</strong>
 				</td>
 			</tr>
 			<tr>
@@ -253,7 +205,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProduction</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodConsumptionUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -301,7 +253,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -349,7 +301,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProductionWaterDemand</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -397,7 +349,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionWaterDemandUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProduction</strong>
 				</td>
 			</tr>
 			<tr>
@@ -541,7 +493,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodConsumption</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -589,7 +541,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodConsumptionUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProductionWaterDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -634,6 +586,54 @@ function nameClassifier(name, separator)
 					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
 						&nbsp;
 						
+				</td>
+			</tr>			<tr>
+				<td width="100%" class="TableRow">
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionWaterDemandUnit</strong>
+				</td>
+			</tr>
+			<tr>
+				<td class="TableRowBottomDashed"  colspan="1">										
+					<a href="#" onclick="parent.toggleData('DetailsImageAttributes53')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes53" border="0" />Details:</a>
+					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+					
+						<tr id="DetailsImageAttributes53_00" style="display: none;">
+							<td width="75"><i>Alias:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes53_01" style="display: none;">
+							<td width="75"><i>Initial:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes53_02" style="display: none;">
+							<td width="75"><i>Stereotype: </i></td>
+							<td>&lt;&lt;Property&gt;&gt;</td>
+						</tr>
+						<tr id="DetailsImageAttributes53_03" style="display: none;">
+							<td width="75"><i>Ordered: </i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes53_04" style="display: none;">
+							<td width="75"><i>Range: </i></td>
+							<td>Range:0 to 1</td>
+						</tr>
+						<tr id="DetailsImageAttributes53_05" style="display: none;">
+							<td width="75"><i>Transient: </i></td>
+							<td>False</td>
+						</tr>
+						<tr id="DetailsImageAttributes53_06" style="display: none;">
+							<td width="75"><i>Derived: </i></td>
+							<td>False</td>
+						</tr>
+							<tr id="DetailsImageAttributes53_07" style="display: none;">
+							<td width="75"><i>IsID: </i></td>
+						<td>False</td>
+						</tr>
+					</table>
+					
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+						&nbsp;
+						
 				</td>
 			</tr>
 	</table>
@@ -651,7 +651,7 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> foodSurveyProperties<br />
+						<strong>Name:</strong> foodSurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -661,8 +661,8 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td class="TableRowBottomDashed"  colspan="3">
-						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink53" onclick="parent.toggleDiv('detailsDIVLink53','DetailsImageLink53')" />Details:
-							<div id="detailsDIVLink53" class="DetailsDiv" >
+						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink54" onclick="parent.toggleDiv('detailsDIVLink54','DetailsImageLink54')" />Details:
+							<div id="detailsDIVLink54" class="DetailsDiv" >
 							&nbsp;
 							</div>
 						</div>
@@ -683,8 +683,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario54" onclick="parent.toggleDiv('detailsDIVScenario54','DetailsImageScenario54')" />Details:
-						<div id="detailsDIVScenario54" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario55" onclick="parent.toggleDiv('detailsDIVScenario55','DetailsImageScenario55')" />Details:
+						<div id="detailsDIVScenario55" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>

 						</div>
@@ -696,8 +696,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario55" onclick="parent.toggleDiv('detailsDIVScenario55','DetailsImageScenario55')" />Details:
-						<div id="detailsDIVScenario55" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario56" onclick="parent.toggleDiv('detailsDIVScenario56','DetailsImageScenario56')" />Details:
+						<div id="detailsDIVScenario56" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>

 						</div>
@@ -709,8 +709,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario56" onclick="parent.toggleDiv('detailsDIVScenario56','DetailsImageScenario56')" />Details:
-						<div id="detailsDIVScenario56" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario57" onclick="parent.toggleDiv('detailsDIVScenario57','DetailsImageScenario57')" />Details:
+						<div id="detailsDIVScenario57" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>

 						</div>
@@ -730,14 +730,14 @@ function nameClassifier(name, separator)
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Generalization</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>

--- a/public/FWEArea/v2.1/UML/EARoot/EA8.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA8.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 23:26:40</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 11:26:40 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">12/05/2020 23:26:47</td>
+			<td class="ObjectDetailsValue">5/12/2020 11:26:47 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -99,6 +99,7 @@ function nameClassifier(name, separator)
 		<ul class="ItemTitle">
 			<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
 			<li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
+			<li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
 			<li onClick="parent.toggleItem('TaggedVal');" id="TaggedValTitle">Tagged Values</li>
 			<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
 		</ul>
@@ -108,54 +109,6 @@ function nameClassifier(name, separator)
 			<td width="100%" class="TableHeading">Attribute</td>
 		</tr>
 						<tr>
-				<td width="100%" class="TableRow">
-					<i>Public Area</i><br /><strong>&nbsp;&nbsp;surfaceArea</strong>
-				</td>
-			</tr>
-			<tr>
-				<td class="TableRowBottomDashed"  colspan="1">										
-					<a href="#" onclick="parent.toggleData('DetailsImageAttributes57')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes57" border="0" />Details:</a>
-					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-					
-						<tr id="DetailsImageAttributes57_00" style="display: none;">
-							<td width="75"><i>Alias:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes57_01" style="display: none;">
-							<td width="75"><i>Initial:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes57_02" style="display: none;">
-							<td width="75"><i>Stereotype: </i></td>
-							<td>&lt;&lt;Property&gt;&gt;</td>
-						</tr>
-						<tr id="DetailsImageAttributes57_03" style="display: none;">
-							<td width="75"><i>Ordered: </i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes57_04" style="display: none;">
-							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
-						</tr>
-						<tr id="DetailsImageAttributes57_05" style="display: none;">
-							<td width="75"><i>Transient: </i></td>
-							<td>False</td>
-						</tr>
-						<tr id="DetailsImageAttributes57_06" style="display: none;">
-							<td width="75"><i>Derived: </i></td>
-							<td>False</td>
-						</tr>
-							<tr id="DetailsImageAttributes57_07" style="display: none;">
-							<td width="75"><i>IsID: </i></td>
-						<td>False</td>
-						</tr>
-					</table>
-					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-						&nbsp;
-						
-				</td>
-			</tr>			<tr>
 				<td width="100%" class="TableRow">
 					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;fweAreaName</strong>
 				</td>
@@ -199,7 +152,7 @@ function nameClassifier(name, separator)
 						</tr>
 					</table>
 					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
 						&nbsp;
 						
 				</td>
@@ -247,7 +200,7 @@ function nameClassifier(name, separator)
 						</tr>
 					</table>
 					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
 						&nbsp;
 						
 				</td>
@@ -263,7 +216,7 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td width="40%" class="TableRow" valign="top">
-						<a href="EA4.htm">«FeatureType» AreaSurvey</a><br />
+						«type» GM_MultiSurface<br />
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -271,7 +224,7 @@ function nameClassifier(name, separator)
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> areaSurveyProperties<br />
+						<strong>Name:</strong> lod0MultiSurface<br />
 						&nbsp;	
 					</td>
 				</tr>
@@ -284,17 +237,27 @@ function nameClassifier(name, separator)
 						</div>
 					</td>
 				</tr>
+
+			</table>
+		</div>
+		<div class="ItemBody" id="AssociationsFromTable">
+			<table border="0" cellspacing="0" cellpadding="0" class="Table">
+				<tr>
+					<td width="40%" class="TableHeading">Element</td>
+					<td width="30%" class="TableHeading">Source Role</td>
+					<td width="30%" class="TableHeading">Target Role</td>
+				</tr>
 				<tr>
 					<td width="40%" class="TableRow" valign="top">
-						«type» GM_MultiSurface<br />
+						<a href="EA4.htm">«FeatureType» AreaSurvey</a><br />
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> &nbsp;<br />
+						<strong>Name:</strong> consistsOfFWEsurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> lod0MultiSurface<br />
+						<strong>Name:</strong> &nbsp;<br />
 						&nbsp;	
 					</td>
 				</tr>
@@ -352,6 +315,18 @@ function nameClassifier(name, separator)
 						<div id="detailsDIVScenario64" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>

+						</div>
+					</div>
+				</td>
+			</tr>			<tr>
+				<td width="50%" class="TableRow" valign="top">topLevel</td>
+				<td width="50%" class="TableRow" valign="top">true</td>
+			</tr>	
+			<tr>
+				<td class="TableRowBottomDashed"  colspan="2">
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario65" onclick="parent.toggleDiv('detailsDIVScenario65','DetailsImageScenario65')" />Details:
+						<div id="detailsDIVScenario65" class="DetailsDiv" >
+						&nbsp;
 						</div>
 					</div>
 				</td>
@@ -366,6 +341,13 @@ function nameClassifier(name, separator)
 					<td width="10%" class="TableHeading">Direction</td>
 					<td width="40%" class="TableHeading">Notes</td>
 				</tr>
+				<tr>
+					<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
+					<td width="10%" class="TableRow" valign="top">Class</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">From</td>
+					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
+				</tr>
 				<tr>
 					<td width="30%" class="TableRow" valign="top">_CityObject</td>
 					<td width="10%" class="TableRow" valign="top">Class</td>

--- a/public/FWEArea/v2.1/UML/EARoot/EA9.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA9.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">13/05/2020 12:59:34</td>
+			<td width="85%" class="ObjectDetailsValue">5/13/2020 12:59:34 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">13/05/2020 12:59:42</td>
+			<td class="ObjectDetailsValue">5/13/2020 12:59:42 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -109,55 +109,7 @@ function nameClassifier(name, separator)
 		</tr>
 						<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterDemand</strong>
-				</td>
-			</tr>
-			<tr>
-				<td class="TableRowBottomDashed"  colspan="1">										
-					<a href="#" onclick="parent.toggleData('DetailsImageAttributes65')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes65" border="0" />Details:</a>
-					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-					
-						<tr id="DetailsImageAttributes65_00" style="display: none;">
-							<td width="75"><i>Alias:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes65_01" style="display: none;">
-							<td width="75"><i>Initial:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes65_02" style="display: none;">
-							<td width="75"><i>Stereotype: </i></td>
-							<td>&lt;&lt;Property&gt;&gt;</td>
-						</tr>
-						<tr id="DetailsImageAttributes65_03" style="display: none;">
-							<td width="75"><i>Ordered: </i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes65_04" style="display: none;">
-							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
-						</tr>
-						<tr id="DetailsImageAttributes65_05" style="display: none;">
-							<td width="75"><i>Transient: </i></td>
-							<td>False</td>
-						</tr>
-						<tr id="DetailsImageAttributes65_06" style="display: none;">
-							<td width="75"><i>Derived: </i></td>
-							<td>False</td>
-						</tr>
-							<tr id="DetailsImageAttributes65_07" style="display: none;">
-							<td width="75"><i>IsID: </i></td>
-						<td>False</td>
-						</tr>
-					</table>
-					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-						&nbsp;
-						
-				</td>
-			</tr>			<tr>
-				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterDemandUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -205,7 +157,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemand</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -253,7 +205,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemandUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticSolidWaste</strong>
 				</td>
 			</tr>
 			<tr>
@@ -301,7 +253,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterWaste</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticSolidWasteUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -349,7 +301,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterWasteUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -397,7 +349,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticSolidWaste</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -445,7 +397,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticSolidWasteUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterWaste</strong>
 				</td>
 			</tr>
 			<tr>
@@ -493,7 +445,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;totalDomesticWaste</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterWasteUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -541,7 +493,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;totalDomesticWasteUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;totalDomesticWaste</strong>
 				</td>
 			</tr>
 			<tr>
@@ -682,6 +634,54 @@ function nameClassifier(name, separator)
 					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
 						&nbsp;
 						
+				</td>
+			</tr>			<tr>
+				<td width="100%" class="TableRow">
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;totalDomesticWasteUnit</strong>
+				</td>
+			</tr>
+			<tr>
+				<td class="TableRowBottomDashed"  colspan="1">										
+					<a href="#" onclick="parent.toggleData('DetailsImageAttributes77')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes77" border="0" />Details:</a>
+					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+					
+						<tr id="DetailsImageAttributes77_00" style="display: none;">
+							<td width="75"><i>Alias:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes77_01" style="display: none;">
+							<td width="75"><i>Initial:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes77_02" style="display: none;">
+							<td width="75"><i>Stereotype: </i></td>
+							<td>&lt;&lt;Property&gt;&gt;</td>
+						</tr>
+						<tr id="DetailsImageAttributes77_03" style="display: none;">
+							<td width="75"><i>Ordered: </i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes77_04" style="display: none;">
+							<td width="75"><i>Range: </i></td>
+							<td>Range:0 to 1</td>
+						</tr>
+						<tr id="DetailsImageAttributes77_05" style="display: none;">
+							<td width="75"><i>Transient: </i></td>
+							<td>False</td>
+						</tr>
+						<tr id="DetailsImageAttributes77_06" style="display: none;">
+							<td width="75"><i>Derived: </i></td>
+							<td>False</td>
+						</tr>
+							<tr id="DetailsImageAttributes77_07" style="display: none;">
+							<td width="75"><i>IsID: </i></td>
+						<td>False</td>
+						</tr>
+					</table>
+					
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+						&nbsp;
+						
 				</td>
 			</tr>
 	</table>
@@ -699,7 +699,7 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> waterSurveyProperty<br />
+						<strong>Name:</strong> waterSurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -709,8 +709,8 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td class="TableRowBottomDashed"  colspan="3">
-						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink77" onclick="parent.toggleDiv('detailsDIVLink77','DetailsImageLink77')" />Details:
-							<div id="detailsDIVLink77" class="DetailsDiv" >
+						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink78" onclick="parent.toggleDiv('detailsDIVLink78','DetailsImageLink78')" />Details:
+							<div id="detailsDIVLink78" class="DetailsDiv" >
 							&nbsp;
 							</div>
 						</div>
@@ -731,8 +731,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario78" onclick="parent.toggleDiv('detailsDIVScenario78','DetailsImageScenario78')" />Details:
-						<div id="detailsDIVScenario78" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario79" onclick="parent.toggleDiv('detailsDIVScenario79','DetailsImageScenario79')" />Details:
+						<div id="detailsDIVScenario79" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>

 						</div>
@@ -744,8 +744,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario79" onclick="parent.toggleDiv('detailsDIVScenario79','DetailsImageScenario79')" />Details:
-						<div id="detailsDIVScenario79" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario80" onclick="parent.toggleDiv('detailsDIVScenario80','DetailsImageScenario80')" />Details:
+						<div id="detailsDIVScenario80" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>

 						</div>
@@ -757,8 +757,8 @@ function nameClassifier(name, separator)
 			</tr>	
 			<tr>
 				<td class="TableRowBottomDashed"  colspan="2">
-					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario80" onclick="parent.toggleDiv('detailsDIVScenario80','DetailsImageScenario80')" />Details:
-						<div id="detailsDIVScenario80" class="DetailsDiv" >
+					<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario81" onclick="parent.toggleDiv('detailsDIVScenario81','DetailsImageScenario81')" />Details:
+						<div id="detailsDIVScenario81" class="DetailsDiv" >
 						<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>

 						</div>
@@ -778,14 +778,14 @@ function nameClassifier(name, separator)
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Generalization</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>

--- a/public/FWEBuilding/v2.1/UML/EARoot/EA1.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA1.htm
@@ -36,22 +36,22 @@ function nameClassifier(name, separator)
 <img src="EA2.png" usemap="#EA2" border="0" />

 <MAP NAME="EA2">
-<area shape="rect" coords="380,168,596,309" href="EA4.htm" target="_self">
-<area shape="rect" coords="380,397,596,512" href="EA5.htm" target="_self">
-<area shape="rect" coords="677,602,968,828" href="EA6.htm" target="_self">
-<area shape="rect" coords="331,602,645,828" href="EA9.htm" target="_self">
-<area shape="rect" coords="10,602,301,828" href="EA8.htm" target="_self">
+<area shape="rect" coords="380,175,596,270" href="EA4.htm" target="_self">
+<area shape="rect" coords="380,365,596,506" href="EA5.htm" target="_self">
+<area shape="rect" coords="677,601,968,827" href="EA6.htm" target="_self">
+<area shape="rect" coords="331,601,645,827" href="EA9.htm" target="_self">
+<area shape="rect" coords="10,601,301,827" href="EA8.htm" target="_self">
 </MAP>

 	<div class="ObjectTitle">FWEBuilding : Class diagram</div>
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 00:00:00</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 12:00:00 AM</td>
 		</tr>
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Modified:</td>
-			<td width="85%" class="ObjectDetailsValue">06/01/2021 12:41:00</td>
+			<td width="85%" class="ObjectDetailsValue">1/9/2021 5:31:40 PM</td>
 		</tr>
 		<tr style="padding-top: 10px;">
 			<td width="15%" class="ObjectDetailsTopic"><img src="../images/plus03.gif" align="absmiddle" id="proj" onclick="parent.toggleData(this.id)" />Project:</td>

--- a/public/FWEBuilding/v2.1/UML/EARoot/EA2.png
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA2.png
--- a/public/FWEBuilding/v2.1/UML/EARoot/EA3.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA3.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 13:16:40</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 1:16:40 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">04/01/2021 17:46:43</td>
+			<td class="ObjectDetailsValue">1/4/2021 5:46:43 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>

--- a/public/FWEBuilding/v2.1/UML/EARoot/EA4.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA4.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">04/01/2021 17:55:30</td>
+			<td width="85%" class="ObjectDetailsValue">1/4/2021 5:55:30 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">04/01/2021 17:58:10</td>
+			<td class="ObjectDetailsValue">1/4/2021 5:58:10 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -98,7 +98,7 @@ function nameClassifier(name, separator)
 	<div class="TableGroup" id="TableGroup">
 		<ul class="ItemTitle">
 			<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
-			<li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
+			<li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
 			<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
 		</ul>
 <div class="ItemBody" id="AttributesTable">
@@ -108,7 +108,7 @@ function nameClassifier(name, separator)
 		</tr>
 						<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Area</i><br /><strong>&nbsp;&nbsp;buildingFootprintArea</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;fweAreaName</strong>
 				</td>
 			</tr>
 			<tr>
@@ -150,13 +150,13 @@ function nameClassifier(name, separator)
 						</tr>
 					</table>
 					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
 						&nbsp;
 						
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Area</i><br /><strong>&nbsp;&nbsp;totalFloorArea</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;fweSystemName</strong>
 				</td>
 			</tr>
 			<tr>
@@ -198,110 +198,14 @@ function nameClassifier(name, separator)
 						</tr>
 					</table>
 					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-						&nbsp;
-						
-				</td>
-			</tr>			<tr>
-				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;fweAreaName</strong>
-				</td>
-			</tr>
-			<tr>
-				<td class="TableRowBottomDashed"  colspan="1">										
-					<a href="#" onclick="parent.toggleData('DetailsImageAttributes8')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes8" border="0" />Details:</a>
-					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-					
-						<tr id="DetailsImageAttributes8_00" style="display: none;">
-							<td width="75"><i>Alias:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes8_01" style="display: none;">
-							<td width="75"><i>Initial:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes8_02" style="display: none;">
-							<td width="75"><i>Stereotype: </i></td>
-							<td>&lt;&lt;Property&gt;&gt;</td>
-						</tr>
-						<tr id="DetailsImageAttributes8_03" style="display: none;">
-							<td width="75"><i>Ordered: </i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes8_04" style="display: none;">
-							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
-						</tr>
-						<tr id="DetailsImageAttributes8_05" style="display: none;">
-							<td width="75"><i>Transient: </i></td>
-							<td>False</td>
-						</tr>
-						<tr id="DetailsImageAttributes8_06" style="display: none;">
-							<td width="75"><i>Derived: </i></td>
-							<td>False</td>
-						</tr>
-							<tr id="DetailsImageAttributes8_07" style="display: none;">
-							<td width="75"><i>IsID: </i></td>
-						<td>False</td>
-						</tr>
-					</table>
-					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-						&nbsp;
-						
-				</td>
-			</tr>			<tr>
-				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;fweSystemName</strong>
-				</td>
-			</tr>
-			<tr>
-				<td class="TableRowBottomDashed"  colspan="1">										
-					<a href="#" onclick="parent.toggleData('DetailsImageAttributes9')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes9" border="0" />Details:</a>
-					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-					
-						<tr id="DetailsImageAttributes9_00" style="display: none;">
-							<td width="75"><i>Alias:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes9_01" style="display: none;">
-							<td width="75"><i>Initial:</i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes9_02" style="display: none;">
-							<td width="75"><i>Stereotype: </i></td>
-							<td>&lt;&lt;Property&gt;&gt;</td>
-						</tr>
-						<tr id="DetailsImageAttributes9_03" style="display: none;">
-							<td width="75"><i>Ordered: </i></td>
-							<td></td>
-						</tr>
-						<tr id="DetailsImageAttributes9_04" style="display: none;">
-							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
-						</tr>
-						<tr id="DetailsImageAttributes9_05" style="display: none;">
-							<td width="75"><i>Transient: </i></td>
-							<td>False</td>
-						</tr>
-						<tr id="DetailsImageAttributes9_06" style="display: none;">
-							<td width="75"><i>Derived: </i></td>
-							<td>False</td>
-						</tr>
-							<tr id="DetailsImageAttributes9_07" style="display: none;">
-							<td width="75"><i>IsID: </i></td>
-						<td>False</td>
-						</tr>
-					</table>
-					
-					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
 						&nbsp;
 						
 				</td>
 			</tr>
 	</table>
 </div>
-		<div class="ItemBody" id="AssociationsToTable">
+		<div class="ItemBody" id="AssociationsFromTable">
 			<table border="0" cellspacing="0" cellpadding="0" class="Table">
 				<tr>
 					<td width="40%" class="TableHeading">Element</td>
@@ -314,18 +218,18 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> &nbsp;<br />
+						<strong>Name:</strong> consistsOfFWEsurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> buildingSurveyProperties<br />
+						<strong>Name:</strong> &nbsp;<br />
 						&nbsp;	
 					</td>
 				</tr>
 				<tr>
 					<td class="TableRowBottomDashed"  colspan="3">
-						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink10" onclick="parent.toggleDiv('detailsDIVLink10','DetailsImageLink10')" />Details:
-							<div id="detailsDIVLink10" class="DetailsDiv" >
+						<div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink8" onclick="parent.toggleDiv('detailsDIVLink8','DetailsImageLink8')" />Details:
+							<div id="detailsDIVLink8" class="DetailsDiv" >
 							&nbsp;
 							</div>
 						</div>
@@ -350,6 +254,13 @@ function nameClassifier(name, separator)
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
+				<tr>
+					<td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» BuildingSurvey</a></td>
+					<td width="10%" class="TableRow" valign="top">Class</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">From</td>
+					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
+				</tr>

 			</table>
 		</div>

--- a/public/FWEBuilding/v2.1/UML/EARoot/EA5.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA5.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 14:06:12</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 2:06:12 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">12/05/2020 14:06:20</td>
+			<td class="ObjectDetailsValue">1/9/2021 11:52:27 AM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -98,6 +98,7 @@ function nameClassifier(name, separator)
 	<div class="TableGroup" id="TableGroup">
 		<ul class="ItemTitle">
 			<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
+			<li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
 			<li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
 			<li onClick="parent.toggleItem('TaggedVal');" id="TaggedValTitle">Tagged Values</li>
 			<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
@@ -109,7 +110,103 @@ function nameClassifier(name, separator)
 		</tr>
 						<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Integer</i><br /><strong>&nbsp;&nbsp;surveyYear</strong>
+					<i>Public Area</i><br /><strong>&nbsp;&nbsp;buildingFootprintArea</strong>
+				</td>
+			</tr>
+			<tr>
+				<td class="TableRowBottomDashed"  colspan="1">										
+					<a href="#" onclick="parent.toggleData('DetailsImageAttributes9')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes9" border="0" />Details:</a>
+					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+					
+						<tr id="DetailsImageAttributes9_00" style="display: none;">
+							<td width="75"><i>Alias:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes9_01" style="display: none;">
+							<td width="75"><i>Initial:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes9_02" style="display: none;">
+							<td width="75"><i>Stereotype: </i></td>
+							<td>&lt;&lt;Property&gt;&gt;</td>
+						</tr>
+						<tr id="DetailsImageAttributes9_03" style="display: none;">
+							<td width="75"><i>Ordered: </i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes9_04" style="display: none;">
+							<td width="75"><i>Range: </i></td>
+							<td>Range:0 to 1</td>
+						</tr>
+						<tr id="DetailsImageAttributes9_05" style="display: none;">
+							<td width="75"><i>Transient: </i></td>
+							<td>False</td>
+						</tr>
+						<tr id="DetailsImageAttributes9_06" style="display: none;">
+							<td width="75"><i>Derived: </i></td>
+							<td>False</td>
+						</tr>
+							<tr id="DetailsImageAttributes9_07" style="display: none;">
+							<td width="75"><i>IsID: </i></td>
+						<td>False</td>
+						</tr>
+					</table>
+					
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+						&nbsp;
+						
+				</td>
+			</tr>			<tr>
+				<td width="100%" class="TableRow">
+					<i>Public Integer</i><br /><strong>&nbsp;&nbsp;occupants</strong>
+				</td>
+			</tr>
+			<tr>
+				<td class="TableRowBottomDashed"  colspan="1">										
+					<a href="#" onclick="parent.toggleData('DetailsImageAttributes10')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes10" border="0" />Details:</a>
+					<table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+					
+						<tr id="DetailsImageAttributes10_00" style="display: none;">
+							<td width="75"><i>Alias:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes10_01" style="display: none;">
+							<td width="75"><i>Initial:</i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes10_02" style="display: none;">
+							<td width="75"><i>Stereotype: </i></td>
+							<td>&lt;&lt;Property&gt;&gt;</td>
+						</tr>
+						<tr id="DetailsImageAttributes10_03" style="display: none;">
+							<td width="75"><i>Ordered: </i></td>
+							<td></td>
+						</tr>
+						<tr id="DetailsImageAttributes10_04" style="display: none;">
+							<td width="75"><i>Range: </i></td>
+							<td>Range:0 to 1</td>
+						</tr>
+						<tr id="DetailsImageAttributes10_05" style="display: none;">
+							<td width="75"><i>Transient: </i></td>
+							<td>False</td>
+						</tr>
+						<tr id="DetailsImageAttributes10_06" style="display: none;">
+							<td width="75"><i>Derived: </i></td>
+							<td>False</td>
+						</tr>
+							<tr id="DetailsImageAttributes10_07" style="display: none;">
+							<td width="75"><i>IsID: </i></td>
+						<td>False</td>
+						</tr>
+					</table>
+					
+					inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+						&nbsp;
+						
+				</td>
+			</tr>			<tr>
+				<td width="100%" class="TableRow">
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;surveyDescription</strong>
 				</td>
 			</tr>
 			<tr>
@@ -135,7 +232,7 @@ function nameClassifier(name, separator)
 						</tr>
 						<tr id="DetailsImageAttributes11_04" style="display: none;">
 							<td width="75"><i>Range: </i></td>
-							<td>Range:0 to 1</td>
+							<td>Range:0 to *</td>
 						</tr>
 						<tr id="DetailsImageAttributes11_05" style="display: none;">
 							<td width="75"><i>Transient: </i></td>
@@ -157,7 +254,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;surveyYearVersion</strong>
+					<i>Public Integer</i><br /><strong>&nbsp;&nbsp;surveyYear</strong>
 				</td>
 			</tr>
 			<tr>
@@ -205,7 +302,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;surveyDescription</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;surveyYearVersion</strong>
 				</td>
 			</tr>
 			<tr>
@@ -253,7 +350,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Integer</i><br /><strong>&nbsp;&nbsp;population</strong>
+					<i>Public Area</i><br /><strong>&nbsp;&nbsp;totalFloorArea</strong>
 				</td>
 			</tr>
 			<tr>
@@ -302,7 +399,7 @@ function nameClassifier(name, separator)
 			</tr>
 	</table>
 </div>
-		<div class="ItemBody" id="AssociationsFromTable">
+		<div class="ItemBody" id="AssociationsToTable">
 			<table border="0" cellspacing="0" cellpadding="0" class="Table">
 				<tr>
 					<td width="40%" class="TableHeading">Element</td>
@@ -315,11 +412,11 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> &nbsp;<br />
+						<strong>Name:</strong> consistsOfFWEsurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> buildingSurveyProperties<br />
+						<strong>Name:</strong> &nbsp;<br />
 						&nbsp;	
 					</td>
 				</tr>
@@ -332,13 +429,23 @@ function nameClassifier(name, separator)
 						</div>
 					</td>
 				</tr>
+
+			</table>
+		</div>
+		<div class="ItemBody" id="AssociationsFromTable">
+			<table border="0" cellspacing="0" cellpadding="0" class="Table">
+				<tr>
+					<td width="40%" class="TableHeading">Element</td>
+					<td width="30%" class="TableHeading">Source Role</td>
+					<td width="30%" class="TableHeading">Target Role</td>
+				</tr>
 				<tr>
 					<td width="40%" class="TableRow" valign="top">
-						<a href="EA8.htm">«FeatureType» FoodSurvey</a><br />
+						<a href="EA6.htm">«FeatureType» EnergySurvey</a><br />
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> foodSurveyProperties<br />
+						<strong>Name:</strong> energySurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -357,11 +464,11 @@ function nameClassifier(name, separator)
 				</tr>
 				<tr>
 					<td width="40%" class="TableRow" valign="top">
-						<a href="EA6.htm">«FeatureType» EnergySurvey</a><br />
+						<a href="EA8.htm">«FeatureType» FoodSurvey</a><br />
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> energySurveyProperty<br />
+						<strong>Name:</strong> foodSurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -384,7 +491,7 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> waterSurveyProperty<br />
+						<strong>Name:</strong> waterSurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -470,31 +577,38 @@ function nameClassifier(name, separator)
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» FoodSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">From</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
-					<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» FoodSurvey</a></td>
+					<td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
 					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">From</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
-					<td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
+					<td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» EnergySurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Generalization</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
 					<td width="10%" class="TableRow" valign="top">From</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
-					<td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» EnergySurvey</a></td>
+					<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» FoodSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
 					<td width="10%" class="TableRow" valign="top">Strong</td>
 					<td width="10%" class="TableRow" valign="top">From</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
+				<tr>
+					<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«ADEElement» _AbstractBuilding</a></td>
+					<td width="10%" class="TableRow" valign="top">Class</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">To</td>
+					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
+				</tr>
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>

--- a/public/FWEBuilding/v2.1/UML/EARoot/EA6.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA6.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 13:38:49</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 1:38:49 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">15/05/2020 19:00:43</td>
+			<td class="ObjectDetailsValue">5/15/2020 7:00:43 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -109,7 +109,7 @@ function nameClassifier(name, separator)
 		</tr>
 						<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;spaceHeatingDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;electricityPotentialFromPV</strong>
 				</td>
 			</tr>
 			<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;spaceHeatingDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;electricityPotentialfromPVUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;spaceCoolingDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;residentialElectricityDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;spaceCoolingDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;residentialElectricityDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;residentialElectricityDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;spaceCoolingDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;residentialElectricityDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;spaceCoolingDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;electricityPotentialFromPV</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;spaceHeatingDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;electricityPotentialfromPVUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;spaceHeatingDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -507,7 +507,7 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> energySurveyProperty<br />
+						<strong>Name:</strong> energySurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">

--- a/public/FWEBuilding/v2.1/UML/EARoot/EA7.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA7.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">04/01/2021 20:30:54</td>
+			<td width="85%" class="ObjectDetailsValue">1/4/2021 8:30:54 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">04/01/2021 20:31:45</td>
+			<td class="ObjectDetailsValue">1/4/2021 8:31:45 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>

--- a/public/FWEBuilding/v2.1/UML/EARoot/EA8.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA8.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 13:38:24</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 1:38:24 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">12/05/2020 13:38:30</td>
+			<td class="ObjectDetailsValue">5/12/2020 1:38:30 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodConsumption</strong>
 				</td>
 			</tr>
 			<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodConsumptionUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProduction</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProductionWaterDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProduction</strong>
 				</td>
 			</tr>
 			<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionWaterDemandUnit</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProductionEnergyDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProductionEnergyDemand</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionEnergyDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionEnergyDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodConsumption</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;foodProductionWaterDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -589,7 +589,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodConsumptionUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;foodProductionWaterDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -651,7 +651,7 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> foodSurveyProperties<br />
+						<strong>Name:</strong> foodSurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -730,14 +730,14 @@ function nameClassifier(name, separator)
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» BuildingSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» BuildingSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Generalization</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>

--- a/public/FWEBuilding/v2.1/UML/EARoot/EA9.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA9.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 13:38:33</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 1:38:33 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">12/05/2020 13:38:41</td>
+			<td class="ObjectDetailsValue">5/12/2020 1:38:41 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -109,7 +109,7 @@ function nameClassifier(name, separator)
 		</tr>
 						<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterEnergyDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterEnergyDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterEnergyDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticSolidWaste</strong>
 				</td>
 			</tr>
 			<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterEnergyDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticSolidWasteUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterWaste</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterWasteUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticSolidWaste</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterWaste</strong>
 				</td>
 			</tr>
 			<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticSolidWasteUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterWasteUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -699,7 +699,7 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> waterSurveyProperty<br />
+						<strong>Name:</strong> waterSurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">

--- a/public/FWELanduse/v2.1/UML/EARoot/EA1.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA1.htm
@@ -39,19 +39,19 @@ function nameClassifier(name, separator)
 <area shape="rect" coords="690,599,1020,1014" href="EA4.htm" target="_self">
 <area shape="rect" coords="341,599,655,831" href="EA10.htm" target="_self">
 <area shape="rect" coords="10,599,306,831" href="EA6.htm" target="_self">
-<area shape="rect" coords="371,370,627,511" href="EA8.htm" target="_self">
-<area shape="rect" coords="371,168,627,282" href="EA7.htm" target="_self">
+<area shape="rect" coords="370,363,626,504" href="EA8.htm" target="_self">
+<area shape="rect" coords="370,174,626,269" href="EA7.htm" target="_self">
 </MAP>

 	<div class="ObjectTitle">FWELanduse : Class diagram</div>
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 13:19:39</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 1:19:39 PM</td>
 		</tr>
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Modified:</td>
-			<td width="85%" class="ObjectDetailsValue">06/01/2021 12:41:01</td>
+			<td width="85%" class="ObjectDetailsValue">1/9/2021 5:31:19 PM</td>
 		</tr>
 		<tr style="padding-top: 10px;">
 			<td width="15%" class="ObjectDetailsTopic"><img src="../images/plus03.gif" align="absmiddle" id="proj" onclick="parent.toggleData(this.id)" />Project:</td>

--- a/public/FWELanduse/v2.1/UML/EARoot/EA10.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA10.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
 	<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
 		<tr>
 			<td width="15%" class="ObjectDetailsTopic">Created:</td>
-			<td width="85%" class="ObjectDetailsValue">12/05/2020 18:53:23</td>
+			<td width="85%" class="ObjectDetailsValue">5/12/2020 6:53:23 PM</td>
 		</tr>
 		<tr>
 			<td class="ObjectDetailsTopic">Modified:</td>
-			<td class="ObjectDetailsValue">12/05/2020 18:53:33</td>
+			<td class="ObjectDetailsValue">5/12/2020 6:53:33 PM</td>
 		</tr>
 		<tr style="height: 10px"><td colspan="2"></td></tr>
 		<tr>
@@ -109,7 +109,7 @@ function nameClassifier(name, separator)
 		</tr>
 						<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterEnergyDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterEnergyDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticHotWaterEnergyDemand</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticSolidWaste</strong>
 				</td>
 			</tr>
 			<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticHotWaterEnergyDemandUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticSolidWasteUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterWaste</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterDemand</strong>
 				</td>
 			</tr>
 			<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterWasteUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterDemandUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticSolidWaste</strong>
+					<i>Public Decimal</i><br /><strong>&nbsp;&nbsp;domesticWaterWaste</strong>
 				</td>
 			</tr>
 			<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
 				</td>
 			</tr>			<tr>
 				<td width="100%" class="TableRow">
-					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticSolidWasteUnit</strong>
+					<i>Public CharacterString</i><br /><strong>&nbsp;&nbsp;domesticWaterWasteUnit</strong>
 				</td>
 			</tr>
 			<tr>
@@ -699,7 +699,7 @@ function nameClassifier(name, separator)
 						Class &nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
-						<strong>Name:</strong> waterSurveyProperty<br />
+						<strong>Name:</strong> waterSurvey<br />
 						&nbsp;
 					</td>
 					<td width="30%" class="TableRow" valign="top">
@@ -778,14 +778,14 @@ function nameClassifier(name, separator)
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» LandUseSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Strong</td>
+					<td width="10%" class="TableRow" valign="top">Generalization</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>
 				<tr>
 					<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» LandUseSurvey</a></td>
 					<td width="10%" class="TableRow" valign="top">Class</td>
-					<td width="10%" class="TableRow" valign="top">Generalization</td>
+					<td width="10%" class="TableRow" valign="top">Strong</td>
 					<td width="10%" class="TableRow" valign="top">To</td>
 					<td width="40%" class="TableRow" valign="top">&nbsp;</td>
 				</tr>