diff --git a/annotation_properties.html b/annotation_properties.html
index 60d82c4..59b4095 100644
--- a/annotation_properties.html
+++ b/annotation_properties.html
@@ -75,70 +75,6 @@ <h2>All Annotation Properties</h2>
 						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
 						<td nowrap="nowrap"><a href="iso.org/iso-1087-1/TemporalRelation.html" target="mainFrame">TemporalRelation</a></td>
 					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/contributor.html" target="mainFrame">contributor</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/coverage.html" target="mainFrame">coverage</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/creator.html" target="mainFrame">creator</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/date.html" target="mainFrame">date</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/description.html" target="mainFrame">description</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/format.html" target="mainFrame">format</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/hasVersion.html" target="mainFrame">hasVersion</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/identifier.html" target="mainFrame">identifier</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/language.html" target="mainFrame">language</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/publisher.html" target="mainFrame">publisher</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/relation.html" target="mainFrame">relation</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/rights.html" target="mainFrame">rights</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/source.html" target="mainFrame">source</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/subject.html" target="mainFrame">subject</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/title.html" target="mainFrame">title</a></td>
-					</tr>
-					<tr>
-						<td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16"></td>
-						<td nowrap="nowrap"><a href="purl.org/dc/elements/1.1/type.html" target="mainFrame">type</a></td>
-					</tr>
 					
             </tbody>
          </table>
diff --git a/bipm.org/jcgm/vim4/Characterizes.html b/bipm.org/jcgm/vim4/Characterizes.html
index a85b44e..9370abc 100644
--- a/bipm.org/jcgm/vim4/Characterizes.html
+++ b/bipm.org/jcgm/vim4/Characterizes.html
@@ -7,7 +7,7 @@
          <h2><font size="-1">http://bipm.org/jcgm/vim4#Characterizes</font><br>Class vim4:Characterizes</h2>
          <img src="http://www.plantuml.com/plantuml/svg/Iyv9B2vMSCv8B4fCBaajognABLQ8ZaRXwsMKvER4nd8b4wyKLP5kQO5kZHsgJW00"/>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -17,7 +17,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              An IndividualProperty characterizes an Object.
             </td>
          </tr>
 
@@ -27,7 +27,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Characterizes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              An IndividualProperty characterizes an Object.
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Characterizes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Describes.html b/bipm.org/jcgm/vim4/Describes.html
index 9c9db58..0e2fccb 100644
--- a/bipm.org/jcgm/vim4/Describes.html
+++ b/bipm.org/jcgm/vim4/Describes.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:AssociativeRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 2.7]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Describes
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.7]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Describes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/GeneralNominalProperty.html b/bipm.org/jcgm/vim4/GeneralNominalProperty.html
index a23d89b..8588da8 100644
--- a/bipm.org/jcgm/vim4/GeneralNominalProperty.html
+++ b/bipm.org/jcgm/vim4/GeneralNominalProperty.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 6.1]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              general nominal property
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 6.1]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              general nominal property
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/GeneralOrdinalQuantity.html b/bipm.org/jcgm/vim4/GeneralOrdinalQuantity.html
index a962ba7..3dc9e56 100644
--- a/bipm.org/jcgm/vim4/GeneralOrdinalQuantity.html
+++ b/bipm.org/jcgm/vim4/GeneralOrdinalQuantity.html
@@ -47,7 +47,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.30]
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              general ordinal quantity
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.30]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -107,7 +107,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -117,7 +117,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              general ordinal quantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/GeneralProperty.html b/bipm.org/jcgm/vim4/GeneralProperty.html
index 5857ee1..1ddb54e 100644
--- a/bipm.org/jcgm/vim4/GeneralProperty.html
+++ b/bipm.org/jcgm/vim4/GeneralProperty.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              general property
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              general property
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -116,7 +116,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/bipm.org/jcgm/vim4/GeneralQuantity.html b/bipm.org/jcgm/vim4/GeneralQuantity.html
index d1fbf56..840a47a 100644
--- a/bipm.org/jcgm/vim4/GeneralQuantity.html
+++ b/bipm.org/jcgm/vim4/GeneralQuantity.html
@@ -47,7 +47,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              General quantity in [VIM4 CD: 1.1] corresponds precisely to kind-of-quantity in [OonP: S.13.3.1].
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              [VIM4 CD: 1.1]
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,15 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              General quantity in [VIM4 CD: 1.1] corresponds precisely to kind-of-quantity in [OonP: S.13.3.1].
+              general quantity
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              kind of quantity
             </td>
          </tr>
 
@@ -107,7 +115,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -117,7 +125,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.1]
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -127,7 +135,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -137,15 +145,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              general quantity
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              kind of quantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -192,7 +192,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/bipm.org/jcgm/vim4/GeneralUnitaryQuantity.html b/bipm.org/jcgm/vim4/GeneralUnitaryQuantity.html
index ca4454f..6f7a98f 100644
--- a/bipm.org/jcgm/vim4/GeneralUnitaryQuantity.html
+++ b/bipm.org/jcgm/vim4/GeneralUnitaryQuantity.html
@@ -47,7 +47,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.1 - 1.30]
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              general unitary quantity
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.1 - 1.30]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -107,7 +107,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -117,7 +117,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              general unitary quantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -173,7 +173,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -183,7 +183,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="specializes.html">vim4:specializes</a> : <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
+              <a href="specializes.html">vim4:specializes</a> → <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Given.html b/bipm.org/jcgm/vim4/Given.html
index 4c73fa8..f75cc3e 100644
--- a/bipm.org/jcgm/vim4/Given.html
+++ b/bipm.org/jcgm/vim4/Given.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:AssociativeRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.13]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Given
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.13]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Given
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/HasCoherence.html b/bipm.org/jcgm/vim4/HasCoherence.html
index da13ba4..969be11 100644
--- a/bipm.org/jcgm/vim4/HasCoherence.html
+++ b/bipm.org/jcgm/vim4/HasCoherence.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Characteristic</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              [VIM4 CD: 1.14]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              HasCoherence
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.14]
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              HasCoherence
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -128,7 +128,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -157,7 +157,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -167,7 +167,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isCoherent.html">vim4:isCoherent</a> : <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
+              <a href="isCoherent.html">vim4:isCoherent</a> → <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/HasInput.html b/bipm.org/jcgm/vim4/HasInput.html
index 41e9676..78ac50a 100644
--- a/bipm.org/jcgm/vim4/HasInput.html
+++ b/bipm.org/jcgm/vim4/HasInput.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:CausalRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 2.14]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              HasInput
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.14]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              HasInput
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/HasMultiple.html b/bipm.org/jcgm/vim4/HasMultiple.html
index 9241b18..71b72e9 100644
--- a/bipm.org/jcgm/vim4/HasMultiple.html
+++ b/bipm.org/jcgm/vim4/HasMultiple.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.17, 1.18]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              HasMultiple
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.17, 1.18]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              HasMultiple
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/HasPowerOfUnitFactor.html b/bipm.org/jcgm/vim4/HasPowerOfUnitFactor.html
index 1dbfa5c..2c79754 100644
--- a/bipm.org/jcgm/vim4/HasPowerOfUnitFactor.html
+++ b/bipm.org/jcgm/vim4/HasPowerOfUnitFactor.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:CausalRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.12]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Has Power Of Unit Factor
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.12]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Has Power Of Unit Factor
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/HasPowerOfUnitaryQuantityFactor.html b/bipm.org/jcgm/vim4/HasPowerOfUnitaryQuantityFactor.html
index f7d7b01..981802f 100644
--- a/bipm.org/jcgm/vim4/HasPowerOfUnitaryQuantityFactor.html
+++ b/bipm.org/jcgm/vim4/HasPowerOfUnitaryQuantityFactor.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:CausalRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.5]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Has Power Of Unitary Quantity Factor
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.5]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Has Power Of Unitary Quantity Factor
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/HasQuantityDimensionFactor.html b/bipm.org/jcgm/vim4/HasQuantityDimensionFactor.html
index 3cff65a..61d65a8 100644
--- a/bipm.org/jcgm/vim4/HasQuantityDimensionFactor.html
+++ b/bipm.org/jcgm/vim4/HasQuantityDimensionFactor.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:AssociativeRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.7]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Has Quantity Dimension Factor
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.7]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Has Quantity Dimension Factor
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/HasUnit.html b/bipm.org/jcgm/vim4/HasUnit.html
index 4a63646..52f3d36 100644
--- a/bipm.org/jcgm/vim4/HasUnit.html
+++ b/bipm.org/jcgm/vim4/HasUnit.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:AssociativeRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.20 for an IndividualUnitaryQuantity]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              HasUnit
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.20 for an IndividualUnitaryQuantity]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              HasUnit
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IdentifiedElement.html b/bipm.org/jcgm/vim4/IdentifiedElement.html
index a094364..d4dc617 100644
--- a/bipm.org/jcgm/vim4/IdentifiedElement.html
+++ b/bipm.org/jcgm/vim4/IdentifiedElement.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Characteristic</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              IdentifiedElement
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              IdentifiedElement
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -217,7 +217,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -227,7 +227,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="id.html">vim4:id</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="id.html">vim4:id</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Includes.html b/bipm.org/jcgm/vim4/Includes.html
index e5f78e7..f24e332 100644
--- a/bipm.org/jcgm/vim4/Includes.html
+++ b/bipm.org/jcgm/vim4/Includes.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.19]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Includes
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.19]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Includes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -129,7 +129,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -139,7 +139,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="ordinalPosition.html">vim4:ordinalPosition</a> : <a href="http://www.w3.org/2001/XMLSchema#positiveInteger">xsd:positiveInteger</a>
+              <a href="ordinalPosition.html">vim4:ordinalPosition</a> → <a href="http://www.w3.org/2001/XMLSchema#positiveInteger">xsd:positiveInteger</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IndividualNominalProperty.html b/bipm.org/jcgm/vim4/IndividualNominalProperty.html
index fde0fa5..c05c924 100644
--- a/bipm.org/jcgm/vim4/IndividualNominalProperty.html
+++ b/bipm.org/jcgm/vim4/IndividualNominalProperty.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 6.2]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              IndividualNominalProperty
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 6.2]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              IndividualNominalProperty
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -162,7 +162,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -172,7 +172,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="instantiates.html">vim4:instantiates</a> all <a href="GeneralNominalProperty.html">vim4:GeneralNominalProperty</a>
+              <a href="instantiates.html">vim4:instantiates</a> → all values from <a href="GeneralNominalProperty.html">vim4:GeneralNominalProperty</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IndividualOrdinalQuantity.html b/bipm.org/jcgm/vim4/IndividualOrdinalQuantity.html
index 19d7a01..54006ed 100644
--- a/bipm.org/jcgm/vim4/IndividualOrdinalQuantity.html
+++ b/bipm.org/jcgm/vim4/IndividualOrdinalQuantity.html
@@ -47,7 +47,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.31]
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              individual ordinal quantity
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.31]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -107,7 +107,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -117,7 +117,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              individual ordinal quantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -188,7 +188,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -218,7 +218,7 @@ <h3>rdfs:superClassOf</h3>
 </dl>
 
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -228,7 +228,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="instantiates.html">vim4:instantiates</a> all <a href="GeneralOrdinalQuantity.html">vim4:GeneralOrdinalQuantity</a>
+              <a href="instantiates.html">vim4:instantiates</a> → all values from <a href="GeneralOrdinalQuantity.html">vim4:GeneralOrdinalQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IndividualProperty.html b/bipm.org/jcgm/vim4/IndividualProperty.html
index c81d94d..9698402 100644
--- a/bipm.org/jcgm/vim4/IndividualProperty.html
+++ b/bipm.org/jcgm/vim4/IndividualProperty.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              The identity of a property is the unique pair of the GeneralProperty it instantiates and of the Object it characterizes.
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              IndividualProperty
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              The identity of a property is the unique pair of the GeneralProperty it instantiates and of the Object it characterizes.
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              IndividualProperty
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -128,7 +128,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -157,7 +157,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -167,7 +167,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="characterizes.html">vim4:characterizes</a> : <a href="Object.html">vim4:Object</a>
+              <a href="characterizes.html">vim4:characterizes</a> → <a href="Object.html">vim4:Object</a>
             </td>
          </tr>
          <tr>
@@ -175,7 +175,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="instantiates.html">vim4:instantiates</a> : <a href="GeneralProperty.html">vim4:GeneralProperty</a>
+              <a href="instantiates.html">vim4:instantiates</a> → <a href="GeneralProperty.html">vim4:GeneralProperty</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IndividualQuantity.html b/bipm.org/jcgm/vim4/IndividualQuantity.html
index af90e72..44df60b 100644
--- a/bipm.org/jcgm/vim4/IndividualQuantity.html
+++ b/bipm.org/jcgm/vim4/IndividualQuantity.html
@@ -47,7 +47,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              [VIM4 CD: 1.2]
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              individual quantity
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.2]
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -107,7 +107,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -117,7 +117,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              individual quantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -164,7 +164,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -202,7 +202,7 @@ <h3>rdfs:superClassOf</h3>
 </dl>
 
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -212,7 +212,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="instantiates.html">vim4:instantiates</a> all <a href="GeneralQuantity.html">vim4:GeneralQuantity</a>
+              <a href="instantiates.html">vim4:instantiates</a> → all values from <a href="GeneralQuantity.html">vim4:GeneralQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IndividualUnitaryQuantity.html b/bipm.org/jcgm/vim4/IndividualUnitaryQuantity.html
index aadbf94..cd17193 100644
--- a/bipm.org/jcgm/vim4/IndividualUnitaryQuantity.html
+++ b/bipm.org/jcgm/vim4/IndividualUnitaryQuantity.html
@@ -47,7 +47,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.2 - 1.31]
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              individual unitary quantity
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.2 - 1.31]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -107,7 +107,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -117,7 +117,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              individual unitary quantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -188,7 +188,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -226,7 +226,7 @@ <h3>rdfs:superClassOf</h3>
 </dl>
 
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -236,7 +236,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="instantiates.html">vim4:instantiates</a> all <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
+              <a href="instantiates.html">vim4:instantiates</a> → all values from <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/InherentOrdinalQuantity.html b/bipm.org/jcgm/vim4/InherentOrdinalQuantity.html
index 6c1a174..9f4efde 100644
--- a/bipm.org/jcgm/vim4/InherentOrdinalQuantity.html
+++ b/bipm.org/jcgm/vim4/InherentOrdinalQuantity.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.31]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              InherentOrdinalQuantity
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.31]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              InherentOrdinalQuantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -198,7 +198,7 @@ <h3>owl:disjointWith</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -208,7 +208,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="characterizes.html">vim4:characterizes</a> exactly 1 <a href="Object.html">vim4:Object</a>
+              <a href="characterizes.html">vim4:characterizes</a> → exact cardinality of 1 <a href="Object.html">vim4:Object</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/InherentUnitaryQuantity.html b/bipm.org/jcgm/vim4/InherentUnitaryQuantity.html
index 7bb8cea..163e09d 100644
--- a/bipm.org/jcgm/vim4/InherentUnitaryQuantity.html
+++ b/bipm.org/jcgm/vim4/InherentUnitaryQuantity.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.2 except for the cases of Note 1]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              InherentUnitaryQuantity
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.2 except for the cases of Note 1]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              InherentUnitaryQuantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -176,7 +176,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -198,7 +198,7 @@ <h3>rdfs:superClassOf</h3>
 </dl>
 
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -208,7 +208,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="characterizes.html">vim4:characterizes</a> exactly 1 <a href="Object.html">vim4:Object</a>
+              <a href="characterizes.html">vim4:characterizes</a> → exact cardinality of 1 <a href="Object.html">vim4:Object</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html b/bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html
index 99611a0..49fbb41 100644
--- a/bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html
+++ b/bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html
@@ -7,7 +7,7 @@
          <h2><font size="-1">http://bipm.org/jcgm/vim4#InherentUnitaryQuantityValue</font><br>Class vim4:InherentUnitaryQuantityValue</h2>
          <img src="http://www.plantuml.com/plantuml/svg/Iyv9B2vMyCpBI2rApIi9pSiiIIog32nDp2l9BAaCIymfJLM8ZiOdhPTHafiJ6ykL33Q80WFmka6tj42tnWwhyLnGgt7efwBjEDG00000"/>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -17,7 +17,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              This combined concept is not explictly discussed in VIM4 CD but it is practically useful.
             </td>
          </tr>
 
@@ -27,7 +27,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              [VIM4 CD: 1.2 except for the cases of Note 1 and 1.20 for an IndividualUnitaryQuantity]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              This combined concept is not explictly discussed in VIM4 CD but it is practically useful.
+              InherentUnitaryQuantityValue
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.2 except for the cases of Note 1 and 1.20 for an IndividualUnitaryQuantity]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              InherentUnitaryQuantityValue
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Instantiates.html b/bipm.org/jcgm/vim4/Instantiates.html
index 17ffeff..148ba1c 100644
--- a/bipm.org/jcgm/vim4/Instantiates.html
+++ b/bipm.org/jcgm/vim4/Instantiates.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:AssociativeRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Instantiates
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Instantiates
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IsAttributedTo.html b/bipm.org/jcgm/vim4/IsAttributedTo.html
index 367773f..282c771 100644
--- a/bipm.org/jcgm/vim4/IsAttributedTo.html
+++ b/bipm.org/jcgm/vim4/IsAttributedTo.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:PartitiveRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.23, 2.1, 2.8, 2.10, 3.1, 6.5, 6.10]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              IsAttributedTo
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.23, 2.1, 2.8, 2.10, 3.1, 6.5, 6.10]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              IsAttributedTo
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IsBasedOn.html b/bipm.org/jcgm/vim4/IsBasedOn.html
index a555316..0095b32 100644
--- a/bipm.org/jcgm/vim4/IsBasedOn.html
+++ b/bipm.org/jcgm/vim4/IsBasedOn.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:AssociativeRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 2.7]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              IsBasedOn
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.7]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              IsBasedOn
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IsInfluencedBy.html b/bipm.org/jcgm/vim4/IsInfluencedBy.html
index 6e26261..da81134 100644
--- a/bipm.org/jcgm/vim4/IsInfluencedBy.html
+++ b/bipm.org/jcgm/vim4/IsInfluencedBy.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:CausalRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 2.16]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              IsInfluencedBy
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.16]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              IsInfluencedBy
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/IsMultipleOf.html b/bipm.org/jcgm/vim4/IsMultipleOf.html
index f0f50db..58673cb 100644
--- a/bipm.org/jcgm/vim4/IsMultipleOf.html
+++ b/bipm.org/jcgm/vim4/IsMultipleOf.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:AssociativeRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.17, 1.18]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              IsMultipleOf
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.17, 1.18]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              IsMultipleOf
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Measurement.html b/bipm.org/jcgm/vim4/Measurement.html
index 7db5b85..38d4793 100644
--- a/bipm.org/jcgm/vim4/Measurement.html
+++ b/bipm.org/jcgm/vim4/Measurement.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 2.1]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Measurement
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.1]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Measurement
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/MeasurementMethod.html b/bipm.org/jcgm/vim4/MeasurementMethod.html
index 3e149f5..da5d655 100644
--- a/bipm.org/jcgm/vim4/MeasurementMethod.html
+++ b/bipm.org/jcgm/vim4/MeasurementMethod.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 2.5]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              MeasurementMethod
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.5]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              MeasurementMethod
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/MeasurementModel.html b/bipm.org/jcgm/vim4/MeasurementModel.html
index 7e5fb4e..bd2e81a 100644
--- a/bipm.org/jcgm/vim4/MeasurementModel.html
+++ b/bipm.org/jcgm/vim4/MeasurementModel.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 2.12]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              MeasurementModel
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.12]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              MeasurementModel
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -137,7 +137,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -147,7 +147,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasInput.html">vim4:hasInput</a> : <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
+              <a href="hasInput.html">vim4:hasInput</a> → <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
             </td>
          </tr>
          <tr>
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isInfluencedBy.html">vim4:isInfluencedBy</a> : <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
+              <a href="isInfluencedBy.html">vim4:isInfluencedBy</a> → <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
             </td>
          </tr>
          <tr>
@@ -163,7 +163,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="measures.html">vim4:measures</a> : <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
+              <a href="measures.html">vim4:measures</a> → <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
             </td>
          </tr>
          <tr>
@@ -171,7 +171,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="usesCorrection.html">vim4:usesCorrection</a> : <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
+              <a href="usesCorrection.html">vim4:usesCorrection</a> → <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
             </td>
          </tr>
          <tr>
@@ -179,7 +179,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="yieldsMeasuredValue.html">vim4:yieldsMeasuredValue</a> : <a href="QuantityValue.html">vim4:QuantityValue</a>
+              <a href="yieldsMeasuredValue.html">vim4:yieldsMeasuredValue</a> → <a href="QuantityValue.html">vim4:QuantityValue</a>
             </td>
          </tr>
          <tr>
@@ -187,7 +187,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="yieldsMeasurementUncertainty.html">vim4:yieldsMeasurementUncertainty</a> : <a href="MeasurementUncertainty.html">vim4:MeasurementUncertainty</a>
+              <a href="yieldsMeasurementUncertainty.html">vim4:yieldsMeasurementUncertainty</a> → <a href="MeasurementUncertainty.html">vim4:MeasurementUncertainty</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/MeasurementPrinciple.html b/bipm.org/jcgm/vim4/MeasurementPrinciple.html
index 82b57d2..b9b06e1 100644
--- a/bipm.org/jcgm/vim4/MeasurementPrinciple.html
+++ b/bipm.org/jcgm/vim4/MeasurementPrinciple.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 2.4]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              MeasurementPrinciple
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.4]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              MeasurementPrinciple
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/MeasurementProcedure.html b/bipm.org/jcgm/vim4/MeasurementProcedure.html
index 3ce53af..f7d5d60 100644
--- a/bipm.org/jcgm/vim4/MeasurementProcedure.html
+++ b/bipm.org/jcgm/vim4/MeasurementProcedure.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 2.7]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              MeasurementProcedure
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.7]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              MeasurementProcedure
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -137,7 +137,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -147,7 +147,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="describes.html">vim4:describes</a> : <a href="Measurement.html">vim4:Measurement</a>
+              <a href="describes.html">vim4:describes</a> → <a href="Measurement.html">vim4:Measurement</a>
             </td>
          </tr>
          <tr>
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isBasedOn.html">vim4:isBasedOn</a> : <a href="MeasurementModel.html">vim4:MeasurementModel</a>
+              <a href="isBasedOn.html">vim4:isBasedOn</a> → <a href="MeasurementModel.html">vim4:MeasurementModel</a>
             </td>
          </tr>
          <tr>
@@ -163,7 +163,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="per.html">vim4:per</a> : <a href="MeasurementPrinciple.html">vim4:MeasurementPrinciple</a>
+              <a href="per.html">vim4:per</a> → <a href="MeasurementPrinciple.html">vim4:MeasurementPrinciple</a>
             </td>
          </tr>
          <tr>
@@ -171,7 +171,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="usesOperationsOf.html">vim4:usesOperationsOf</a> : <a href="MeasurementMethod.html">vim4:MeasurementMethod</a>
+              <a href="usesOperationsOf.html">vim4:usesOperationsOf</a> → <a href="MeasurementMethod.html">vim4:MeasurementMethod</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/MeasurementScale.html b/bipm.org/jcgm/vim4/MeasurementScale.html
index bc0c971..43bd7b9 100644
--- a/bipm.org/jcgm/vim4/MeasurementScale.html
+++ b/bipm.org/jcgm/vim4/MeasurementScale.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.19]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              MeasurementScale
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.19]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              MeasurementScale
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -136,7 +136,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -173,7 +173,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -183,7 +183,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="includes.html">vim4:includes</a> : <a href="IndividualProperty.html">vim4:IndividualProperty</a>
+              <a href="includes.html">vim4:includes</a> → <a href="IndividualProperty.html">vim4:IndividualProperty</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/MeasurementUncertainty.html b/bipm.org/jcgm/vim4/MeasurementUncertainty.html
index 8ae8d15..4af4671 100644
--- a/bipm.org/jcgm/vim4/MeasurementUncertainty.html
+++ b/bipm.org/jcgm/vim4/MeasurementUncertainty.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 3.1]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              MeasurementUncertainty
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 3.1]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              MeasurementUncertainty
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/MeasurementUnit.html b/bipm.org/jcgm/vim4/MeasurementUnit.html
index bfb1575..e7d2029 100644
--- a/bipm.org/jcgm/vim4/MeasurementUnit.html
+++ b/bipm.org/jcgm/vim4/MeasurementUnit.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.9]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              MeasurementUnit
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.9]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              MeasurementUnit
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -184,7 +184,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -213,7 +213,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -223,7 +223,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasMultiple.html">vim4:hasMultiple</a> : <a href="Multiple.html">vim4:Multiple</a>
+              <a href="hasMultiple.html">vim4:hasMultiple</a> → <a href="Multiple.html">vim4:Multiple</a>
             </td>
          </tr>
          <tr>
@@ -231,7 +231,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isMultipleOf.html">vim4:isMultipleOf</a> : <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
+              <a href="isMultipleOf.html">vim4:isMultipleOf</a> → <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
             </td>
          </tr>
 
@@ -242,7 +242,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -252,7 +252,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="characterizes.html">vim4:characterizes</a> exactly 0 <a href="Object.html">vim4:Object</a>
+              <a href="characterizes.html">vim4:characterizes</a> → exact cardinality of 0 <a href="Object.html">vim4:Object</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Measures.html b/bipm.org/jcgm/vim4/Measures.html
index 5e87433..db78d21 100644
--- a/bipm.org/jcgm/vim4/Measures.html
+++ b/bipm.org/jcgm/vim4/Measures.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:CausalRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 2.15]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Measures
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.15]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Measures
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Multiple.html b/bipm.org/jcgm/vim4/Multiple.html
index bb1cdbd..a5dd9f3 100644
--- a/bipm.org/jcgm/vim4/Multiple.html
+++ b/bipm.org/jcgm/vim4/Multiple.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Characteristic</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.17 and 1.18]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Multiple
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.17 and 1.18]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Multiple
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Object.html b/bipm.org/jcgm/vim4/Object.html
index a104c15..6b0cb63 100644
--- a/bipm.org/jcgm/vim4/Object.html
+++ b/bipm.org/jcgm/vim4/Object.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Object
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Object
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/OrdinalQuantityValue.html b/bipm.org/jcgm/vim4/OrdinalQuantityValue.html
index 9ef618a..7b53f8c 100644
--- a/bipm.org/jcgm/vim4/OrdinalQuantityValue.html
+++ b/bipm.org/jcgm/vim4/OrdinalQuantityValue.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.33]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              OrdinalQuantityValue
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.33]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              OrdinalQuantityValue
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -202,7 +202,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -212,7 +212,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isAttributedTo.html">vim4:isAttributedTo</a> all <a href="InherentOrdinalQuantity.html">vim4:InherentOrdinalQuantity</a>
+              <a href="isAttributedTo.html">vim4:isAttributedTo</a> → all values from <a href="InherentOrdinalQuantity.html">vim4:InherentOrdinalQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/OrdinalScale.html b/bipm.org/jcgm/vim4/OrdinalScale.html
index 133203c..88229d7 100644
--- a/bipm.org/jcgm/vim4/OrdinalScale.html
+++ b/bipm.org/jcgm/vim4/OrdinalScale.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.32]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              OrdinalScale
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.32]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              OrdinalScale
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -146,7 +146,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -156,7 +156,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="includes.html">vim4:includes</a> all <a href="OrdinalQuantityValue.html">vim4:OrdinalQuantityValue</a>
+              <a href="includes.html">vim4:includes</a> → all values from <a href="OrdinalQuantityValue.html">vim4:OrdinalQuantityValue</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Per.html b/bipm.org/jcgm/vim4/Per.html
index ad6d000..0493064 100644
--- a/bipm.org/jcgm/vim4/Per.html
+++ b/bipm.org/jcgm/vim4/Per.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:AssociativeRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 2.4, 2.7]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Per
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.4, 2.7]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Per
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/PrefixedMeasurementUnit.html b/bipm.org/jcgm/vim4/PrefixedMeasurementUnit.html
index 2462d55..c6d349e 100644
--- a/bipm.org/jcgm/vim4/PrefixedMeasurementUnit.html
+++ b/bipm.org/jcgm/vim4/PrefixedMeasurementUnit.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.17 or 1.18]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              PrefixedMeasurementUnit
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.17 or 1.18]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              PrefixedMeasurementUnit
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -214,7 +214,7 @@ <h3>owl:disjointWith</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -224,7 +224,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasMultiple.html">vim4:hasMultiple</a> exactly 1 <a href="Multiple.html">vim4:Multiple</a>
+              <a href="hasMultiple.html">vim4:hasMultiple</a> → exact cardinality of 1 <a href="Multiple.html">vim4:Multiple</a>
             </td>
          </tr>
          <tr>
@@ -232,7 +232,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isMultipleOf.html">vim4:isMultipleOf</a> exactly 1 <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
+              <a href="isMultipleOf.html">vim4:isMultipleOf</a> → exact cardinality of 1 <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/QuantityValue.html b/bipm.org/jcgm/vim4/QuantityValue.html
index aadc80d..428d143 100644
--- a/bipm.org/jcgm/vim4/QuantityValue.html
+++ b/bipm.org/jcgm/vim4/QuantityValue.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              [VIM4 CD: 1.20]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              QuantityValue
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.20]
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              QuantityValue
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -168,7 +168,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -197,7 +197,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -207,7 +207,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isAttributedTo.html">vim4:isAttributedTo</a> : <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
+              <a href="isAttributedTo.html">vim4:isAttributedTo</a> → <a href="IndividualQuantity.html">vim4:IndividualQuantity</a>
             </td>
          </tr>
          <tr>
@@ -215,7 +215,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isReferenceValue.html">vim4:isReferenceValue</a> : <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
+              <a href="isReferenceValue.html">vim4:isReferenceValue</a> → <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
             </td>
          </tr>
          <tr>
@@ -223,7 +223,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isTrueValue.html">vim4:isTrueValue</a> : <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
+              <a href="isTrueValue.html">vim4:isTrueValue</a> → <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/RationalExponent.html b/bipm.org/jcgm/vim4/RationalExponent.html
index b8ee05b..c490db4 100644
--- a/bipm.org/jcgm/vim4/RationalExponent.html
+++ b/bipm.org/jcgm/vim4/RationalExponent.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Characteristic</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Rational Exponent
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Rational Exponent
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -145,7 +145,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="exponent.html">vim4:exponent</a> : <a href="http://www.w3.org/2002/07/owl#rational">owl:rational</a>
+              <a href="exponent.html">vim4:exponent</a> → <a href="http://www.w3.org/2002/07/owl#rational">owl:rational</a>
             </td>
          </tr>
 
@@ -166,7 +166,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -176,7 +176,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="exponent.html">vim4:exponent</a> exactly 1 <a href="http://www.w3.org/2002/07/owl#rational">owl:rational</a>
+              <a href="exponent.html">vim4:exponent</a> → exact cardinality of 1 <a href="http://www.w3.org/2002/07/owl#rational">owl:rational</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/ReferenceSet.html b/bipm.org/jcgm/vim4/ReferenceSet.html
index 1cb2a92..0bfba82 100644
--- a/bipm.org/jcgm/vim4/ReferenceSet.html
+++ b/bipm.org/jcgm/vim4/ReferenceSet.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 6.3]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              ReferenceSet
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 6.3]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              ReferenceSet
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -146,7 +146,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -156,7 +156,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="includes.html">vim4:includes</a> all <a href="IndividualNominalProperty.html">vim4:IndividualNominalProperty</a>
+              <a href="includes.html">vim4:includes</a> → all values from <a href="IndividualNominalProperty.html">vim4:IndividualNominalProperty</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/Specializes.html b/bipm.org/jcgm/vim4/Specializes.html
index f19ac94..9f10304 100644
--- a/bipm.org/jcgm/vim4/Specializes.html
+++ b/bipm.org/jcgm/vim4/Specializes.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:GenericRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Specializes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Specializes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/SystemHasBaseUnit.html b/bipm.org/jcgm/vim4/SystemHasBaseUnit.html
index e10190e..c99f657 100644
--- a/bipm.org/jcgm/vim4/SystemHasBaseUnit.html
+++ b/bipm.org/jcgm/vim4/SystemHasBaseUnit.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:PartitiveRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.10, 1.13]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              System Has Base Unit
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.10, 1.13]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              System Has Base Unit
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/SystemHasBaseUnitaryQuantity.html b/bipm.org/jcgm/vim4/SystemHasBaseUnitaryQuantity.html
index 6d4f897..28478be 100644
--- a/bipm.org/jcgm/vim4/SystemHasBaseUnitaryQuantity.html
+++ b/bipm.org/jcgm/vim4/SystemHasBaseUnitaryQuantity.html
@@ -68,7 +68,7 @@ <h3>dc:source</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.4]
             </td>
          </tr>
 
@@ -88,7 +88,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -98,7 +98,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              System Has Base Unitary Quantity
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -118,7 +118,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.4]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -128,7 +128,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -138,7 +138,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              System Has Base Unitary Quantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -198,7 +198,7 @@ <h3>owl:disjointWith</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -208,7 +208,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="dimensionSymbol.html">vim4:dimensionSymbol</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="dimensionSymbol.html">vim4:dimensionSymbol</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/SystemHasDerivedUnit.html b/bipm.org/jcgm/vim4/SystemHasDerivedUnit.html
index a1e6ab7..9d8b83f 100644
--- a/bipm.org/jcgm/vim4/SystemHasDerivedUnit.html
+++ b/bipm.org/jcgm/vim4/SystemHasDerivedUnit.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:PartitiveRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.11, 1.13]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              System Has Derived Unit
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.11, 1.13]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              System Has Derived Unit
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -145,7 +145,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasPowerOfUnitFactor.html">vim4:hasPowerOfUnitFactor</a> : <a href="SystemHasUnit.html">vim4:SystemHasUnit</a>
+              <a href="hasPowerOfUnitFactor.html">vim4:hasPowerOfUnitFactor</a> → <a href="SystemHasUnit.html">vim4:SystemHasUnit</a>
             </td>
          </tr>
          <tr>
@@ -163,7 +163,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isOffSystemUnit.html">vim4:isOffSystemUnit</a> : <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
+              <a href="isOffSystemUnit.html">vim4:isOffSystemUnit</a> → <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/SystemHasDerivedUnitaryQuantity.html b/bipm.org/jcgm/vim4/SystemHasDerivedUnitaryQuantity.html
index f86c135..2450284 100644
--- a/bipm.org/jcgm/vim4/SystemHasDerivedUnitaryQuantity.html
+++ b/bipm.org/jcgm/vim4/SystemHasDerivedUnitaryQuantity.html
@@ -47,7 +47,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.5]
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              System Has Derived Unitary Quantity
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.5]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -107,7 +107,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -117,7 +117,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              System Has Derived Unitary Quantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -157,7 +157,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -167,7 +167,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasPowerOfUnitaryQuantityFactor.html">vim4:hasPowerOfUnitaryQuantityFactor</a> : <a href="SystemHasUnitaryQuantity.html">vim4:SystemHasUnitaryQuantity</a>
+              <a href="hasPowerOfUnitaryQuantityFactor.html">vim4:hasPowerOfUnitaryQuantityFactor</a> → <a href="SystemHasUnitaryQuantity.html">vim4:SystemHasUnitaryQuantity</a>
             </td>
          </tr>
          <tr>
@@ -175,7 +175,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isDimensionless.html">vim4:isDimensionless</a> : <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
+              <a href="isDimensionless.html">vim4:isDimensionless</a> → <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/SystemHasUnit.html b/bipm.org/jcgm/vim4/SystemHasUnit.html
index 17e6b9a..e4f0038 100644
--- a/bipm.org/jcgm/vim4/SystemHasUnit.html
+++ b/bipm.org/jcgm/vim4/SystemHasUnit.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:PartitiveRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.13]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              System Has Unit
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.13]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              System Has Unit
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -128,7 +128,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/bipm.org/jcgm/vim4/SystemHasUnitaryQuantity.html b/bipm.org/jcgm/vim4/SystemHasUnitaryQuantity.html
index d6e128f..3f14ad9 100644
--- a/bipm.org/jcgm/vim4/SystemHasUnitaryQuantity.html
+++ b/bipm.org/jcgm/vim4/SystemHasUnitaryQuantity.html
@@ -47,7 +47,7 @@ <h3>dc:source</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 1.3 Note 1]
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              System Has Unitary Quantity
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.3 Note 1]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -107,7 +107,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -117,7 +117,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              System Has Unitary Quantity
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -148,7 +148,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -177,7 +177,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -187,7 +187,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasQuantityDimensionFactor.html">vim4:hasQuantityDimensionFactor</a> : <a href="SystemHasBaseUnitaryQuantity.html">vim4:SystemHasBaseUnitaryQuantity</a>
+              <a href="hasQuantityDimensionFactor.html">vim4:hasQuantityDimensionFactor</a> → <a href="SystemHasBaseUnitaryQuantity.html">vim4:SystemHasBaseUnitaryQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/SystemOfQuantities.html b/bipm.org/jcgm/vim4/SystemOfQuantities.html
index fea9bbe..fc42497 100644
--- a/bipm.org/jcgm/vim4/SystemOfQuantities.html
+++ b/bipm.org/jcgm/vim4/SystemOfQuantities.html
@@ -47,7 +47,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              system of quantities in [VIM4 CD: 1.3, Note 2] corresponds precisely to system of unitary kinds-ef-quantity in [OonP: S.13.7].
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              [VIM4 CD: 1.3]
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              system of quantities in [VIM4 CD: 1.3, Note 2] corresponds precisely to system of unitary kinds-ef-quantity in [OonP: S.13.7].
+              system of quantities
             </td>
          </tr>
 
@@ -107,7 +107,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -117,7 +117,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.3]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -127,7 +127,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -137,7 +137,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              system of quantities
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -177,7 +177,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -187,7 +187,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="systemHasBaseUnitaryQuantity.html">vim4:systemHasBaseUnitaryQuantity</a> : <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
+              <a href="systemHasBaseUnitaryQuantity.html">vim4:systemHasBaseUnitaryQuantity</a> → <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
             </td>
          </tr>
          <tr>
@@ -195,7 +195,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="systemHasDerivedUnitaryQuantity.html">vim4:systemHasDerivedUnitaryQuantity</a> : <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
+              <a href="systemHasDerivedUnitaryQuantity.html">vim4:systemHasDerivedUnitaryQuantity</a> → <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
             </td>
          </tr>
          <tr>
@@ -203,7 +203,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="systemHasUnitaryQuantity.html">vim4:systemHasUnitaryQuantity</a> : <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
+              <a href="systemHasUnitaryQuantity.html">vim4:systemHasUnitaryQuantity</a> → <a href="GeneralUnitaryQuantity.html">vim4:GeneralUnitaryQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/SystemOfUnits.html b/bipm.org/jcgm/vim4/SystemOfUnits.html
index f2a5b37..74f789a 100644
--- a/bipm.org/jcgm/vim4/SystemOfUnits.html
+++ b/bipm.org/jcgm/vim4/SystemOfUnits.html
@@ -48,7 +48,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.13, 1.14]
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              system of units
             </td>
          </tr>
 
@@ -88,7 +88,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -98,7 +98,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.13, 1.14]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -118,7 +118,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              system of units
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -166,7 +166,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -176,7 +176,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="given.html">vim4:given</a> : <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
+              <a href="given.html">vim4:given</a> → <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
             </td>
          </tr>
          <tr>
@@ -184,7 +184,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="systemHasBaseUnit.html">vim4:systemHasBaseUnit</a> : <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
+              <a href="systemHasBaseUnit.html">vim4:systemHasBaseUnit</a> → <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
             </td>
          </tr>
          <tr>
@@ -192,7 +192,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="systemHasDerivedUnit.html">vim4:systemHasDerivedUnit</a> : <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
+              <a href="systemHasDerivedUnit.html">vim4:systemHasDerivedUnit</a> → <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
             </td>
          </tr>
          <tr>
@@ -200,7 +200,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="systemHasUnit.html">vim4:systemHasUnit</a> : <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
+              <a href="systemHasUnit.html">vim4:systemHasUnit</a> → <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
             </td>
          </tr>
 
@@ -211,7 +211,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -221,7 +221,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="given.html">vim4:given</a> exactly 1 <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
+              <a href="given.html">vim4:given</a> → exact cardinality of 1 <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/UnitaryQuantityValue.html b/bipm.org/jcgm/vim4/UnitaryQuantityValue.html
index b88988e..4bb58d9 100644
--- a/bipm.org/jcgm/vim4/UnitaryQuantityValue.html
+++ b/bipm.org/jcgm/vim4/UnitaryQuantityValue.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.20 for an IndividualUnitaryQuantity]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              UnitaryQuantityValue
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.20 for an IndividualUnitaryQuantity]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              UnitaryQuantityValue
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -200,7 +200,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -221,7 +221,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -231,7 +231,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasDoubleNumber.html">vim4:hasDoubleNumber</a> : <a href="http://www.w3.org/2001/XMLSchema#double">xsd:double</a>
+              <a href="hasDoubleNumber.html">vim4:hasDoubleNumber</a> → <a href="http://www.w3.org/2001/XMLSchema#double">xsd:double</a>
             </td>
          </tr>
          <tr>
@@ -239,7 +239,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="unit.html">vim4:unit</a> : <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
+              <a href="unit.html">vim4:unit</a> → <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
             </td>
          </tr>
 
@@ -250,7 +250,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -260,7 +260,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isAttributedTo.html">vim4:isAttributedTo</a> all <a href="InherentUnitaryQuantity.html">vim4:InherentUnitaryQuantity</a>
+              <a href="isAttributedTo.html">vim4:isAttributedTo</a> → all values from <a href="InherentUnitaryQuantity.html">vim4:InherentUnitaryQuantity</a>
             </td>
          </tr>
          <tr>
@@ -268,7 +268,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="unit.html">vim4:unit</a> exactly 1 <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
+              <a href="unit.html">vim4:unit</a> → exact cardinality of 1 <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/UnitaryScale.html b/bipm.org/jcgm/vim4/UnitaryScale.html
index d5ecf7d..85d4567 100644
--- a/bipm.org/jcgm/vim4/UnitaryScale.html
+++ b/bipm.org/jcgm/vim4/UnitaryScale.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.19]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              UnitaryScale
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.19]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              UnitaryScale
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -146,7 +146,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -156,7 +156,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="includes.html">vim4:includes</a> all <a href="UnitaryQuantityValue.html">vim4:UnitaryQuantityValue</a>
+              <a href="includes.html">vim4:includes</a> → all values from <a href="UnitaryQuantityValue.html">vim4:UnitaryQuantityValue</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/UnprefixedMeasurementUnit.html b/bipm.org/jcgm/vim4/UnprefixedMeasurementUnit.html
index fb90038..149f1ff 100644
--- a/bipm.org/jcgm/vim4/UnprefixedMeasurementUnit.html
+++ b/bipm.org/jcgm/vim4/UnprefixedMeasurementUnit.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:Concept</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [VIM4 CD: 1.9 except for 1.17 and 1.18]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              UnprefixedMeasurementUnit
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.9 except for 1.17 and 1.18]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              UnprefixedMeasurementUnit
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -194,7 +194,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -204,7 +204,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasMultiple.html">vim4:hasMultiple</a> exactly 0 <a href="Multiple.html">vim4:Multiple</a>
+              <a href="hasMultiple.html">vim4:hasMultiple</a> → exact cardinality of 0 <a href="Multiple.html">vim4:Multiple</a>
             </td>
          </tr>
          <tr>
@@ -212,7 +212,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isMultipleOf.html">vim4:isMultipleOf</a> exactly 0 <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
+              <a href="isMultipleOf.html">vim4:isMultipleOf</a> → exact cardinality of 0 <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/UsesCorrection.html b/bipm.org/jcgm/vim4/UsesCorrection.html
index 001309d..f88440d 100644
--- a/bipm.org/jcgm/vim4/UsesCorrection.html
+++ b/bipm.org/jcgm/vim4/UsesCorrection.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:CausalRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 2.17]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              UsesCorrection
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.17]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              UsesCorrection
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/UsesOperationsOf.html b/bipm.org/jcgm/vim4/UsesOperationsOf.html
index 03f91e0..086619e 100644
--- a/bipm.org/jcgm/vim4/UsesOperationsOf.html
+++ b/bipm.org/jcgm/vim4/UsesOperationsOf.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:AssociativeRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 2.5]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              UsesOperationsOf
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.5]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              UsesOperationsOf
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/YieldsMeasuredValue.html b/bipm.org/jcgm/vim4/YieldsMeasuredValue.html
index 9f9c707..d5b9582 100644
--- a/bipm.org/jcgm/vim4/YieldsMeasuredValue.html
+++ b/bipm.org/jcgm/vim4/YieldsMeasuredValue.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:CausalRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 2.11]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              YieldsMeasuredValue
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 2.11]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              YieldsMeasuredValue
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/YieldsMeasurementUncertainty.html b/bipm.org/jcgm/vim4/YieldsMeasurementUncertainty.html
index f9e6db4..f090e0d 100644
--- a/bipm.org/jcgm/vim4/YieldsMeasurementUncertainty.html
+++ b/bipm.org/jcgm/vim4/YieldsMeasurementUncertainty.html
@@ -27,7 +27,7 @@ <h3>iso-1087-1:CausalRelation</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              [VIM4 CD: 3.1]
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              YieldsMeasurementUncertainty
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 3.1]
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              YieldsMeasurementUncertainty
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/characterizes.html b/bipm.org/jcgm/vim4/characterizes.html
index 2602ac1..8d3d6ee 100644
--- a/bipm.org/jcgm/vim4/characterizes.html
+++ b/bipm.org/jcgm/vim4/characterizes.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#characterizes</font><br>Property vim4:characterizes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              characterizes
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IndividualProperty.html">vim4:IndividualProperty</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              characterizes
+              <a href="IndividualProperty.html">vim4:IndividualProperty</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/describes.html b/bipm.org/jcgm/vim4/describes.html
index d0dc1c3..2bedc6d 100644
--- a/bipm.org/jcgm/vim4/describes.html
+++ b/bipm.org/jcgm/vim4/describes.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#describes</font><br>Property vim4:describes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              describes
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementProcedure.html">vim4:MeasurementProcedure</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              describes
+              <a href="MeasurementProcedure.html">vim4:MeasurementProcedure</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/dimensionSymbol.html b/bipm.org/jcgm/vim4/dimensionSymbol.html
index 60ad940..fd5db24 100644
--- a/bipm.org/jcgm/vim4/dimensionSymbol.html
+++ b/bipm.org/jcgm/vim4/dimensionSymbol.html
@@ -26,7 +26,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              [VIM4 CD: 1.7]
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              dimension symbol
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemHasBaseUnitaryQuantity.html">vim4:SystemHasBaseUnitaryQuantity</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -94,7 +86,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +96,15 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.7]
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -114,7 +114,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -124,7 +124,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              dimension symbol
+              <a href="SystemHasBaseUnitaryQuantity.html">vim4:SystemHasBaseUnitaryQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/exponent.html b/bipm.org/jcgm/vim4/exponent.html
index 556f99d..8e6b10b 100644
--- a/bipm.org/jcgm/vim4/exponent.html
+++ b/bipm.org/jcgm/vim4/exponent.html
@@ -26,7 +26,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              exponent
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="RationalExponent.html">vim4:RationalExponent</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -94,7 +94,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +104,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              exponent
+              <a href="RationalExponent.html">vim4:RationalExponent</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/given.html b/bipm.org/jcgm/vim4/given.html
index 7317ea5..81feda1 100644
--- a/bipm.org/jcgm/vim4/given.html
+++ b/bipm.org/jcgm/vim4/given.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#given</font><br>Property vim4:given</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              given
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemOfUnits.html">vim4:SystemOfUnits</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              given
+              <a href="SystemOfUnits.html">vim4:SystemOfUnits</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/hasDoubleNumber.html b/bipm.org/jcgm/vim4/hasDoubleNumber.html
index c28c980..69eea00 100644
--- a/bipm.org/jcgm/vim4/hasDoubleNumber.html
+++ b/bipm.org/jcgm/vim4/hasDoubleNumber.html
@@ -26,7 +26,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              [VIM4 CD: 1.21]
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              hasDoubleNumber
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="UnitaryQuantityValue.html">vim4:UnitaryQuantityValue</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -94,7 +86,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +96,15 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.21]
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -114,7 +114,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -124,7 +124,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              hasDoubleNumber
+              <a href="UnitaryQuantityValue.html">vim4:UnitaryQuantityValue</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/hasInput.html b/bipm.org/jcgm/vim4/hasInput.html
index 3a009d1..e803d05 100644
--- a/bipm.org/jcgm/vim4/hasInput.html
+++ b/bipm.org/jcgm/vim4/hasInput.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#hasInput</font><br>Property vim4:hasInput</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              hasInput
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              hasInput
+              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/hasMultiple.html b/bipm.org/jcgm/vim4/hasMultiple.html
index 091a9bf..aa58aa9 100644
--- a/bipm.org/jcgm/vim4/hasMultiple.html
+++ b/bipm.org/jcgm/vim4/hasMultiple.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#hasMultiple</font><br>Property vim4:hasMultiple</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              hasMultiple
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              hasMultiple
+              <a href="MeasurementUnit.html">vim4:MeasurementUnit</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/hasPowerOfUnitFactor.html b/bipm.org/jcgm/vim4/hasPowerOfUnitFactor.html
index 0da6f46..57b8fa5 100644
--- a/bipm.org/jcgm/vim4/hasPowerOfUnitFactor.html
+++ b/bipm.org/jcgm/vim4/hasPowerOfUnitFactor.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#hasPowerOfUnitFactor</font><br>Property vim4:hasPowerOfUnitFactor</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              has Power Of Unit Factor
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemHasDerivedUnit.html">vim4:SystemHasDerivedUnit</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has Power Of Unit Factor
+              <a href="SystemHasDerivedUnit.html">vim4:SystemHasDerivedUnit</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/hasPowerOfUnitaryQuantityFactor.html b/bipm.org/jcgm/vim4/hasPowerOfUnitaryQuantityFactor.html
index 0f7a16a..a2193f8 100644
--- a/bipm.org/jcgm/vim4/hasPowerOfUnitaryQuantityFactor.html
+++ b/bipm.org/jcgm/vim4/hasPowerOfUnitaryQuantityFactor.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#hasPowerOfUnitaryQuantityFactor</font><br>Property vim4:hasPowerOfUnitaryQuantityFactor</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              has Power Of Unitary Quantity Factor
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemHasDerivedUnitaryQuantity.html">vim4:SystemHasDerivedUnitaryQuantity</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has Power Of Unitary Quantity Factor
+              <a href="SystemHasDerivedUnitaryQuantity.html">vim4:SystemHasDerivedUnitaryQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/hasQuantityDimensionFactor.html b/bipm.org/jcgm/vim4/hasQuantityDimensionFactor.html
index df73844..71d4f25 100644
--- a/bipm.org/jcgm/vim4/hasQuantityDimensionFactor.html
+++ b/bipm.org/jcgm/vim4/hasQuantityDimensionFactor.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#hasQuantityDimensionFactor</font><br>Property vim4:hasQuantityDimensionFactor</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              has quantity dimension factor
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemHasUnitaryQuantity.html">vim4:SystemHasUnitaryQuantity</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has quantity dimension factor
+              <a href="SystemHasUnitaryQuantity.html">vim4:SystemHasUnitaryQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/id.html b/bipm.org/jcgm/vim4/id.html
index 0a136d4..3cb7150 100644
--- a/bipm.org/jcgm/vim4/id.html
+++ b/bipm.org/jcgm/vim4/id.html
@@ -26,7 +26,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              id
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IdentifiedElement.html">vim4:IdentifiedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -94,7 +94,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +104,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              id
+              <a href="IdentifiedElement.html">vim4:IdentifiedElement</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/includes.html b/bipm.org/jcgm/vim4/includes.html
index 1dfe5c9..3b487b3 100644
--- a/bipm.org/jcgm/vim4/includes.html
+++ b/bipm.org/jcgm/vim4/includes.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#includes</font><br>Property vim4:includes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              includes
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementScale.html">vim4:MeasurementScale</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              includes
+              <a href="MeasurementScale.html">vim4:MeasurementScale</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/instantiates.html b/bipm.org/jcgm/vim4/instantiates.html
index a21ccd7..109cff1 100644
--- a/bipm.org/jcgm/vim4/instantiates.html
+++ b/bipm.org/jcgm/vim4/instantiates.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#instantiates</font><br>Property vim4:instantiates</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              instantiates
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IndividualProperty.html">vim4:IndividualProperty</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              instantiates
+              <a href="IndividualProperty.html">vim4:IndividualProperty</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/isAttributedTo.html b/bipm.org/jcgm/vim4/isAttributedTo.html
index cf4f4e6..fef989a 100644
--- a/bipm.org/jcgm/vim4/isAttributedTo.html
+++ b/bipm.org/jcgm/vim4/isAttributedTo.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#isAttributedTo</font><br>Property vim4:isAttributedTo</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              isAttributedTo
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="QuantityValue.html">vim4:QuantityValue</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              isAttributedTo
+              <a href="QuantityValue.html">vim4:QuantityValue</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/isBasedOn.html b/bipm.org/jcgm/vim4/isBasedOn.html
index 7a0fcd5..42ce39d 100644
--- a/bipm.org/jcgm/vim4/isBasedOn.html
+++ b/bipm.org/jcgm/vim4/isBasedOn.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#isBasedOn</font><br>Property vim4:isBasedOn</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              isBasedOn
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementProcedure.html">vim4:MeasurementProcedure</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              isBasedOn
+              <a href="MeasurementProcedure.html">vim4:MeasurementProcedure</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/isCoherent.html b/bipm.org/jcgm/vim4/isCoherent.html
index 84462a5..a804a2c 100644
--- a/bipm.org/jcgm/vim4/isCoherent.html
+++ b/bipm.org/jcgm/vim4/isCoherent.html
@@ -26,7 +26,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              [VIM4 CD: 1.14]
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              isCoherent
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="HasCoherence.html">vim4:HasCoherence</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -94,7 +86,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +96,15 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.14]
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -114,7 +114,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -124,7 +124,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              isCoherent
+              <a href="HasCoherence.html">vim4:HasCoherence</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/isDimensionless.html b/bipm.org/jcgm/vim4/isDimensionless.html
index 1ae96d8..3890743 100644
--- a/bipm.org/jcgm/vim4/isDimensionless.html
+++ b/bipm.org/jcgm/vim4/isDimensionless.html
@@ -26,7 +26,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              [VIM4 CD: 1.8]
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              isDimensionless
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemHasDerivedUnitaryQuantity.html">vim4:SystemHasDerivedUnitaryQuantity</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -94,7 +86,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +96,15 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.8]
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -114,7 +114,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -124,7 +124,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              isDimensionless
+              <a href="SystemHasDerivedUnitaryQuantity.html">vim4:SystemHasDerivedUnitaryQuantity</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/isInfluencedBy.html b/bipm.org/jcgm/vim4/isInfluencedBy.html
index bb1c5b9..32400df 100644
--- a/bipm.org/jcgm/vim4/isInfluencedBy.html
+++ b/bipm.org/jcgm/vim4/isInfluencedBy.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#isInfluencedBy</font><br>Property vim4:isInfluencedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              isInfluencedBy
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              isInfluencedBy
+              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/isMultipleOf.html b/bipm.org/jcgm/vim4/isMultipleOf.html
index 5da22fe..16d8efb 100644
--- a/bipm.org/jcgm/vim4/isMultipleOf.html
+++ b/bipm.org/jcgm/vim4/isMultipleOf.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#isMultipleOf</font><br>Property vim4:isMultipleOf</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              isMultipleOf
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              isMultipleOf
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/bipm.org/jcgm/vim4/isOffSystemUnit.html b/bipm.org/jcgm/vim4/isOffSystemUnit.html
index 21db1e9..db51368 100644
--- a/bipm.org/jcgm/vim4/isOffSystemUnit.html
+++ b/bipm.org/jcgm/vim4/isOffSystemUnit.html
@@ -26,7 +26,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              [VIM4 CD: 1.15]
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              Is Off-System Unit
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemHasDerivedUnit.html">vim4:SystemHasDerivedUnit</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -94,7 +86,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +96,15 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.15]
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -114,7 +114,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -124,7 +124,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Is Off-System Unit
+              <a href="SystemHasDerivedUnit.html">vim4:SystemHasDerivedUnit</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/isReferenceValue.html b/bipm.org/jcgm/vim4/isReferenceValue.html
index 32d55ab..f3ae237 100644
--- a/bipm.org/jcgm/vim4/isReferenceValue.html
+++ b/bipm.org/jcgm/vim4/isReferenceValue.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#isReferenceValue</font><br>Property vim4:isReferenceValue</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              [VIM4 CD: 1.24]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              isReferenceValue
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="QuantityValue.html">vim4:QuantityValue</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,15 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.24]
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -94,7 +94,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +104,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              isReferenceValue
+              <a href="QuantityValue.html">vim4:QuantityValue</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/isTrueValue.html b/bipm.org/jcgm/vim4/isTrueValue.html
index 1f9547b..f23daf9 100644
--- a/bipm.org/jcgm/vim4/isTrueValue.html
+++ b/bipm.org/jcgm/vim4/isTrueValue.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#isTrueValue</font><br>Property vim4:isTrueValue</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              [VIM4 CD: 1.22]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              isTrueValue
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="QuantityValue.html">vim4:QuantityValue</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,15 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.22]
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -94,7 +94,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +104,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              isTrueValue
+              <a href="QuantityValue.html">vim4:QuantityValue</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/measures.html b/bipm.org/jcgm/vim4/measures.html
index 9163c1a..e51f84b 100644
--- a/bipm.org/jcgm/vim4/measures.html
+++ b/bipm.org/jcgm/vim4/measures.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#measures</font><br>Property vim4:measures</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              measures
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              measures
+              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/ordinalPosition.html b/bipm.org/jcgm/vim4/ordinalPosition.html
index c5cd22e..87058c6 100644
--- a/bipm.org/jcgm/vim4/ordinalPosition.html
+++ b/bipm.org/jcgm/vim4/ordinalPosition.html
@@ -26,7 +26,7 @@ <h3>iso-1087-1:Property</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              [VIM4 CD: 1.19]
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              ordinalPosition
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Includes.html">vim4:Includes</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -94,7 +86,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +96,15 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [VIM4 CD: 1.19]
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -114,7 +114,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -124,7 +124,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              ordinalPosition
+              <a href="Includes.html">vim4:Includes</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/per.html b/bipm.org/jcgm/vim4/per.html
index b8428a9..20c89c2 100644
--- a/bipm.org/jcgm/vim4/per.html
+++ b/bipm.org/jcgm/vim4/per.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#per</font><br>Property vim4:per</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              per
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementProcedure.html">vim4:MeasurementProcedure</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              per
+              <a href="MeasurementProcedure.html">vim4:MeasurementProcedure</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/specializes.html b/bipm.org/jcgm/vim4/specializes.html
index ad2255f..ede7fbd 100644
--- a/bipm.org/jcgm/vim4/specializes.html
+++ b/bipm.org/jcgm/vim4/specializes.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#specializes</font><br>Property vim4:specializes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              specializes
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              specializes
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/bipm.org/jcgm/vim4/systemHasBaseUnit.html b/bipm.org/jcgm/vim4/systemHasBaseUnit.html
index 191728f..1e9236d 100644
--- a/bipm.org/jcgm/vim4/systemHasBaseUnit.html
+++ b/bipm.org/jcgm/vim4/systemHasBaseUnit.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#systemHasBaseUnit</font><br>Property vim4:systemHasBaseUnit</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              system has base unit
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemOfUnits.html">vim4:SystemOfUnits</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              system has base unit
+              <a href="SystemOfUnits.html">vim4:SystemOfUnits</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/systemHasBaseUnitaryQuantity.html b/bipm.org/jcgm/vim4/systemHasBaseUnitaryQuantity.html
index c92cff1..d0e831c 100644
--- a/bipm.org/jcgm/vim4/systemHasBaseUnitaryQuantity.html
+++ b/bipm.org/jcgm/vim4/systemHasBaseUnitaryQuantity.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#systemHasBaseUnitaryQuantity</font><br>Property vim4:systemHasBaseUnitaryQuantity</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              system has base unitary quantity
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              system has base unitary quantity
+              <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/systemHasDerivedUnit.html b/bipm.org/jcgm/vim4/systemHasDerivedUnit.html
index a9c8789..e4697eb 100644
--- a/bipm.org/jcgm/vim4/systemHasDerivedUnit.html
+++ b/bipm.org/jcgm/vim4/systemHasDerivedUnit.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#systemHasDerivedUnit</font><br>Property vim4:systemHasDerivedUnit</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              system has derived unit
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemOfUnits.html">vim4:SystemOfUnits</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              system has derived unit
+              <a href="SystemOfUnits.html">vim4:SystemOfUnits</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/systemHasDerivedUnitaryQuantity.html b/bipm.org/jcgm/vim4/systemHasDerivedUnitaryQuantity.html
index 69bb167..e5043d0 100644
--- a/bipm.org/jcgm/vim4/systemHasDerivedUnitaryQuantity.html
+++ b/bipm.org/jcgm/vim4/systemHasDerivedUnitaryQuantity.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#systemHasDerivedUnitaryQuantity</font><br>Property vim4:systemHasDerivedUnitaryQuantity</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              system has derived unitary quantity
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              system has derived unitary quantity
+              <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/systemHasUnit.html b/bipm.org/jcgm/vim4/systemHasUnit.html
index f42d2b2..241884d 100644
--- a/bipm.org/jcgm/vim4/systemHasUnit.html
+++ b/bipm.org/jcgm/vim4/systemHasUnit.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#systemHasUnit</font><br>Property vim4:systemHasUnit</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              system has unit
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemOfUnits.html">vim4:SystemOfUnits</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              system has unit
+              <a href="SystemOfUnits.html">vim4:SystemOfUnits</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/systemHasUnitaryQuantity.html b/bipm.org/jcgm/vim4/systemHasUnitaryQuantity.html
index 5686e63..25ba25d 100644
--- a/bipm.org/jcgm/vim4/systemHasUnitaryQuantity.html
+++ b/bipm.org/jcgm/vim4/systemHasUnitaryQuantity.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#systemHasUnitaryQuantity</font><br>Property vim4:systemHasUnitaryQuantity</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              system has unitary quantity
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              system has unitary quantity
+              <a href="SystemOfQuantities.html">vim4:SystemOfQuantities</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/unit.html b/bipm.org/jcgm/vim4/unit.html
index 10b13db..6934cf6 100644
--- a/bipm.org/jcgm/vim4/unit.html
+++ b/bipm.org/jcgm/vim4/unit.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#unit</font><br>Property vim4:unit</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              hasUnit
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="UnitaryQuantityValue.html">vim4:UnitaryQuantityValue</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              hasUnit
+              <a href="UnitaryQuantityValue.html">vim4:UnitaryQuantityValue</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/usesCorrection.html b/bipm.org/jcgm/vim4/usesCorrection.html
index 53c12a7..d357edc 100644
--- a/bipm.org/jcgm/vim4/usesCorrection.html
+++ b/bipm.org/jcgm/vim4/usesCorrection.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#usesCorrection</font><br>Property vim4:usesCorrection</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              usesCorrection
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              usesCorrection
+              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/usesOperationsOf.html b/bipm.org/jcgm/vim4/usesOperationsOf.html
index e06c12e..a0004db 100644
--- a/bipm.org/jcgm/vim4/usesOperationsOf.html
+++ b/bipm.org/jcgm/vim4/usesOperationsOf.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#usesOperationsOf</font><br>Property vim4:usesOperationsOf</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              usesOperationsOf
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementProcedure.html">vim4:MeasurementProcedure</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              usesOperationsOf
+              <a href="MeasurementProcedure.html">vim4:MeasurementProcedure</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/yieldsMeasuredValue.html b/bipm.org/jcgm/vim4/yieldsMeasuredValue.html
index f154511..4c4c1d4 100644
--- a/bipm.org/jcgm/vim4/yieldsMeasuredValue.html
+++ b/bipm.org/jcgm/vim4/yieldsMeasuredValue.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#yieldsMeasuredValue</font><br>Property vim4:yieldsMeasuredValue</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              yieldsMeasuredValue
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              yieldsMeasuredValue
+              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
             </td>
          </tr>
 
diff --git a/bipm.org/jcgm/vim4/yieldsMeasurementUncertainty.html b/bipm.org/jcgm/vim4/yieldsMeasurementUncertainty.html
index f869cb8..50696e3 100644
--- a/bipm.org/jcgm/vim4/yieldsMeasurementUncertainty.html
+++ b/bipm.org/jcgm/vim4/yieldsMeasurementUncertainty.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://bipm.org/jcgm/vim4#yieldsMeasurementUncertainty</font><br>Property vim4:yieldsMeasurementUncertainty</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              yieldsMeasurementUncertainty
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              yieldsMeasurementUncertainty
+              <a href="MeasurementModel.html">vim4:MeasurementModel</a>
             </td>
          </tr>
 
diff --git a/class-hierarchy.html b/class-hierarchy.html
index 2057944..4218cb7 100644
--- a/class-hierarchy.html
+++ b/class-hierarchy.html
@@ -19,30 +19,63 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnitaryQuantityValue.html" target="mainFrame">UnitaryQuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/MeasurementUnit.html" target="mainFrame">MeasurementUnit</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnprefixedMeasurementUnit.html" target="mainFrame">UnprefixedMeasurementUnit</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/PrefixedMeasurementUnit.html" target="mainFrame">PrefixedMeasurementUnit</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantity.html" target="mainFrame">InherentUnitaryQuantity</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/QuantityValue.html" target="mainFrame">QuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/OrdinalQuantityValue.html" target="mainFrame">OrdinalQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnitaryQuantityValue.html" target="mainFrame">UnitaryQuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/IndividualOrdinalQuantity.html" target="mainFrame">IndividualOrdinalQuantity</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/OrdinalQuantityValue.html" target="mainFrame">OrdinalQuantityValue</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentOrdinalQuantity.html" target="mainFrame">InherentOrdinalQuantity</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/IndividualNominalProperty.html" target="mainFrame">IndividualNominalProperty</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/AnalyzedElement.html" target="mainFrame">AnalyzedElement</a></td>
 					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/QuantityValue.html" target="mainFrame">QuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/OrdinalQuantityValue.html" target="mainFrame">OrdinalQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnitaryQuantityValue.html" target="mainFrame">UnitaryQuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/AppliesDuring.html" target="mainFrame">AppliesDuring</a></td>
 					</tr>
@@ -55,6 +88,18 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/AssignedElement.html" target="mainFrame">AssignedElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Process.html" target="mainFrame">Process</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Supplies.html" target="mainFrame">Supplies</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Receives.html" target="mainFrame">Receives</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/ReliesOn.html" target="mainFrame">ReliesOn</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Describes.html" target="mainFrame">Describes</a></td>
 					</tr>
@@ -67,9 +112,24 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemHasUnit.html" target="mainFrame">SystemHasUnit</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemHasDerivedUnit.html" target="mainFrame">SystemHasDerivedUnit</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemHasBaseUnit.html" target="mainFrame">SystemHasBaseUnit</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/PresentingElement.html" target="mainFrame">PresentingElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Interface.html" target="mainFrame">Interface</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Mission.html" target="mainFrame">Mission</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Influences.html" target="mainFrame">Influences</a></td>
 					</tr>
@@ -85,6 +145,9 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Analyzes.html" target="mainFrame">Analyzes</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/HasQuantityValue.html" target="mainFrame">HasQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Asserts.html" target="mainFrame">Asserts</a></td>
 					</tr>
@@ -103,6 +166,12 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Transfers.html" target="mainFrame">Transfers</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/TransfersIn.html" target="mainFrame">TransfersIn</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/TransfersOut.html" target="mainFrame">TransfersOut</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Refines.html" target="mainFrame">Refines</a></td>
 					</tr>
@@ -112,66 +181,222 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemHasUnitaryQuantity.html" target="mainFrame">SystemHasUnitaryQuantity</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemHasDerivedUnitaryQuantity.html" target="mainFrame">SystemHasDerivedUnitaryQuantity</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemHasBaseUnitaryQuantity.html" target="mainFrame">SystemHasBaseUnitaryQuantity</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Produces.html" target="mainFrame">Produces</a></td>
 					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/SuppliedElement.html" target="mainFrame">SuppliedElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Mission.html" target="mainFrame">Mission</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Product.html" target="mainFrame">Product</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Forbids.html" target="mainFrame">Forbids</a></td>
 					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/HasAssignment.html" target="mainFrame">HasAssignment</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Concurs.html" target="mainFrame">Concurs</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Approves.html" target="mainFrame">Approves</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Prepares.html" target="mainFrame">Prepares</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/base/IdentifiedElement.html" target="mainFrame">IdentifiedElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Interchange.html" target="mainFrame">Interchange</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Role.html" target="mainFrame">Role</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Mission.html" target="mainFrame">Mission</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Junction.html" target="mainFrame">Junction</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/InterchangePoint.html" target="mainFrame">InterchangePoint</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Characterization.html" target="mainFrame">Characterization</a></td>
 					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/IndividualOrdinalQuantity.html" target="mainFrame">IndividualOrdinalQuantity</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/OrdinalQuantityValue.html" target="mainFrame">OrdinalQuantityValue</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentOrdinalQuantity.html" target="mainFrame">InherentOrdinalQuantity</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Scenario.html" target="mainFrame">Scenario</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Never.html" target="mainFrame">Never</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Always.html" target="mainFrame">Always</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/GlossaryEntry.html" target="mainFrame">GlossaryEntry</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/IndividualUnitaryQuantity.html" target="mainFrame">IndividualUnitaryQuantity</a></td>
 					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnitaryQuantityValue.html" target="mainFrame">UnitaryQuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/MeasurementUnit.html" target="mainFrame">MeasurementUnit</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnprefixedMeasurementUnit.html" target="mainFrame">UnprefixedMeasurementUnit</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/PrefixedMeasurementUnit.html" target="mainFrame">PrefixedMeasurementUnit</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantity.html" target="mainFrame">InherentUnitaryQuantity</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Assumption.html" target="mainFrame">Assumption</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Fact.html" target="mainFrame">Fact</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Explanation.html" target="mainFrame">Explanation</a></td>
 					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Constraint.html" target="mainFrame">Constraint</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/SatisfiedConstraint.html" target="mainFrame">SatisfiedConstraint</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/QuantityValueConstraint.html" target="mainFrame">QuantityValueConstraint</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/OrdinalQuantityValueConstraint.html" target="mainFrame">OrdinalQuantityValueConstraint</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/UnitaryQuantityValueConstraint.html" target="mainFrame">UnitaryQuantityValueConstraint</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/UnsatisfiedConstraint.html" target="mainFrame">UnsatisfiedConstraint</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/NominalPropertyValueConstraint.html" target="mainFrame">NominalPropertyValueConstraint</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/TradeStudy.html" target="mainFrame">TradeStudy</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/KeyRequirementsExplanation.html" target="mainFrame">KeyRequirementsExplanation</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/DrivingRequirementsExplanation.html" target="mainFrame">DrivingRequirementsExplanation</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/IndividualNominalProperty.html" target="mainFrame">IndividualNominalProperty</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/DevelopmentState.html" target="mainFrame">DevelopmentState</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Item.html" target="mainFrame">Item</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Message.html" target="mainFrame">Message</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/MaterialItem.html" target="mainFrame">MaterialItem</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Flow.html" target="mainFrame">Flow</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Policy.html" target="mainFrame">Policy</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/base/Package.html" target="mainFrame">Package</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/WorkPackage.html" target="mainFrame">WorkPackage</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Organization.html" target="mainFrame">Organization</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Requirement.html" target="mainFrame">Requirement</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Person.html" target="mainFrame">Person</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Product.html" target="mainFrame">Product</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Process.html" target="mainFrame">Process</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Interface.html" target="mainFrame">Interface</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Environment.html" target="mainFrame">Environment</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Function.html" target="mainFrame">Function</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Deliverable.html" target="mainFrame">Deliverable</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/DevelopmentState.html" target="mainFrame">DevelopmentState</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Product.html" target="mainFrame">Product</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Concern.html" target="mainFrame">Concern</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Objective.html" target="mainFrame">Objective</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Stakeholder.html" target="mainFrame">Stakeholder</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Facility.html" target="mainFrame">Facility</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Manifests.html" target="mainFrame">Manifests</a></td>
 					</tr>
@@ -184,27 +409,69 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Authority.html" target="mainFrame">Authority</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Project.html" target="mainFrame">Project</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Program.html" target="mainFrame">Program</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/WorkPackage.html" target="mainFrame">WorkPackage</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/PerformingElement.html" target="mainFrame">PerformingElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Mission.html" target="mainFrame">Mission</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Specifies.html" target="mainFrame">Specifies</a></td>
 					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Joins.html" target="mainFrame">Joins</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Joins1.html" target="mainFrame">Joins1</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Joins2.html" target="mainFrame">Joins2</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/base/ContainedElement.html" target="mainFrame">ContainedElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Junction.html" target="mainFrame">Junction</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Item.html" target="mainFrame">Item</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Message.html" target="mainFrame">Message</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/MaterialItem.html" target="mainFrame">MaterialItem</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Flow.html" target="mainFrame">Flow</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/Per.html" target="mainFrame">Per</a></td>
 					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Involves.html" target="mainFrame">Involves</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Involves1.html" target="mainFrame">Involves1</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Involves2.html" target="mainFrame">Involves2</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UsesOperationsOf.html" target="mainFrame">UsesOperationsOf</a></td>
 					</tr>
@@ -217,12 +484,36 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Item.html" target="mainFrame">Item</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Message.html" target="mainFrame">Message</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/MaterialItem.html" target="mainFrame">MaterialItem</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Flow.html" target="mainFrame">Flow</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/base/Container.html" target="mainFrame">Container</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Junction.html" target="mainFrame">Junction</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Item.html" target="mainFrame">Item</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Message.html" target="mainFrame">Message</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/MaterialItem.html" target="mainFrame">MaterialItem</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Flow.html" target="mainFrame">Flow</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="iso.org/iso-1087-1/ConceptSystem.html" target="mainFrame">ConceptSystem</a></td>
 					</tr>
@@ -244,6 +535,12 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/HasCoherence.html" target="mainFrame">HasCoherence</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemHasDerivedUnit.html" target="mainFrame">SystemHasDerivedUnit</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemOfUnits.html" target="mainFrame">SystemOfUnits</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/base/Aggregates.html" target="mainFrame">Aggregates</a></td>
 					</tr>
@@ -268,33 +565,117 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnitaryQuantityValue.html" target="mainFrame">UnitaryQuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/MeasurementUnit.html" target="mainFrame">MeasurementUnit</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnprefixedMeasurementUnit.html" target="mainFrame">UnprefixedMeasurementUnit</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/PrefixedMeasurementUnit.html" target="mainFrame">PrefixedMeasurementUnit</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantity.html" target="mainFrame">InherentUnitaryQuantity</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/QuantityValue.html" target="mainFrame">QuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/OrdinalQuantityValue.html" target="mainFrame">OrdinalQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnitaryQuantityValue.html" target="mainFrame">UnitaryQuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/IndividualOrdinalQuantity.html" target="mainFrame">IndividualOrdinalQuantity</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/OrdinalQuantityValue.html" target="mainFrame">OrdinalQuantityValue</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentOrdinalQuantity.html" target="mainFrame">InherentOrdinalQuantity</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Requirement.html" target="mainFrame">Requirement</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/DevelopedElement.html" target="mainFrame">DevelopedElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Interface.html" target="mainFrame">Interface</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Junction.html" target="mainFrame">Junction</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Facility.html" target="mainFrame">Facility</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Product.html" target="mainFrame">Product</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/Object.html" target="mainFrame">Object</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/IndividualNominalProperty.html" target="mainFrame">IndividualNominalProperty</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/SpecifiedElement.html" target="mainFrame">SpecifiedElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Presents.html" target="mainFrame">Presents</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Performs.html" target="mainFrame">Performs</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Produces.html" target="mainFrame">Produces</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Mission.html" target="mainFrame">Mission</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/TransfersIn.html" target="mainFrame">TransfersIn</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Characterizes.html" target="mainFrame">Characterizes</a></td>
 					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Explains.html" target="mainFrame">Explains</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Constrains.html" target="mainFrame">Constrains</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Validates.html" target="mainFrame">Validates</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Limits.html" target="mainFrame">Limits</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/Characterizes.html" target="mainFrame">Characterizes</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/base/Contains.html" target="mainFrame">Contains</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/TransfersOut.html" target="mainFrame">TransfersOut</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Invokes.html" target="mainFrame">Invokes</a></td>
 					</tr>
@@ -316,18 +697,57 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/base/AggregatedElement.html" target="mainFrame">AggregatedElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Environment.html" target="mainFrame">Environment</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Explanation.html" target="mainFrame">Explanation</a></td>
 					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/Constraint.html" target="mainFrame">Constraint</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/SatisfiedConstraint.html" target="mainFrame">SatisfiedConstraint</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/QuantityValueConstraint.html" target="mainFrame">QuantityValueConstraint</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/OrdinalQuantityValueConstraint.html" target="mainFrame">OrdinalQuantityValueConstraint</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/UnitaryQuantityValueConstraint.html" target="mainFrame">UnitaryQuantityValueConstraint</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/UnsatisfiedConstraint.html" target="mainFrame">UnsatisfiedConstraint</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/NominalPropertyValueConstraint.html" target="mainFrame">NominalPropertyValueConstraint</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/TradeStudy.html" target="mainFrame">TradeStudy</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/KeyRequirementsExplanation.html" target="mainFrame">KeyRequirementsExplanation</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/analysis/DrivingRequirementsExplanation.html" target="mainFrame">DrivingRequirementsExplanation</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Concern.html" target="mainFrame">Concern</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Objective.html" target="mainFrame">Objective</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Product.html" target="mainFrame">Product</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Product.html" target="mainFrame">Product</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Delivers.html" target="mainFrame">Delivers</a></td>
 					</tr>
@@ -343,24 +763,78 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/IdentifiedElement.html" target="mainFrame">IdentifiedElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemOfQuantities.html" target="mainFrame">SystemOfQuantities</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/SystemOfUnits.html" target="mainFrame">SystemOfUnits</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/MeasurementMethod.html" target="mainFrame">MeasurementMethod</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/Multiple.html" target="mainFrame">Multiple</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/GeneralProperty.html" target="mainFrame">GeneralProperty</a></td>
 					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/GeneralQuantity.html" target="mainFrame">GeneralQuantity</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/GeneralOrdinalQuantity.html" target="mainFrame">GeneralOrdinalQuantity</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/GeneralUnitaryQuantity.html" target="mainFrame">GeneralUnitaryQuantity</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/GeneralNominalProperty.html" target="mainFrame">GeneralNominalProperty</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/Measurement.html" target="mainFrame">Measurement</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/QuantityValue.html" target="mainFrame">QuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/OrdinalQuantityValue.html" target="mainFrame">OrdinalQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnitaryQuantityValue.html" target="mainFrame">UnitaryQuantityValue</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/InherentUnitaryQuantityValue.html" target="mainFrame">InherentUnitaryQuantityValue</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/MeasurementUnit.html" target="mainFrame">MeasurementUnit</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnprefixedMeasurementUnit.html" target="mainFrame">UnprefixedMeasurementUnit</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/PrefixedMeasurementUnit.html" target="mainFrame">PrefixedMeasurementUnit</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/MeasurementProcedure.html" target="mainFrame">MeasurementProcedure</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/MeasurementPrinciple.html" target="mainFrame">MeasurementPrinciple</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/MeasurementModel.html" target="mainFrame">MeasurementModel</a></td>
+					</tr>
 					<tr>
 					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/MeasurementScale.html" target="mainFrame">MeasurementScale</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/OrdinalScale.html" target="mainFrame">OrdinalScale</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/UnitaryScale.html" target="mainFrame">UnitaryScale</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/ReferenceSet.html" target="mainFrame">ReferenceSet</a></td>
+					</tr>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="bipm.org/jcgm/vim4/IsInfluencedBy.html" target="mainFrame">IsInfluencedBy</a></td>
 					</tr>
@@ -379,6 +853,30 @@ <h3>Class Hierarchy</h3>
 					<tr>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/RealizedElement.html" target="mainFrame">RealizedElement</a></td>
 					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Interface.html" target="mainFrame">Interface</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Component.html" target="mainFrame">Component</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Process.html" target="mainFrame">Process</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Junction.html" target="mainFrame">Junction</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Mission.html" target="mainFrame">Mission</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/mission/Function.html" target="mainFrame">Function</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/Project.html" target="mainFrame">Project</a></td>
+					</tr>
+					<tr>
+					   <td>&nbsp;&nbsp;&nbsp;&nbsp;<img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpub_obj.svg" width="16" height="16">&nbsp;<a href="imce.jpl.nasa.gov/foundation/project/WorkPackage.html" target="mainFrame">WorkPackage</a></td>
+					</tr>
 					
             </tbody>
          </table>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Always.html b/imce.jpl.nasa.gov/foundation/analysis/Always.html
index a3fd22a..dc535f5 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Always.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Always.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Always
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Always
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -154,7 +154,7 @@ <h3>owl:disjointWith</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -164,7 +164,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="asserts.html">analysis:asserts</a> all <a href="SatisfiedConstraint.html">analysis:SatisfiedConstraint</a>
+              <a href="asserts.html">analysis:asserts</a> has some values from <a href="SatisfiedConstraint.html">analysis:SatisfiedConstraint</a>
             </td>
          </tr>
          <tr>
@@ -172,7 +172,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="asserts.html">analysis:asserts</a> some <a href="SatisfiedConstraint.html">analysis:SatisfiedConstraint</a>
+              <a href="asserts.html">analysis:asserts</a> → all values from <a href="SatisfiedConstraint.html">analysis:SatisfiedConstraint</a>
             </td>
          </tr>
          <tr>
@@ -180,7 +180,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="denies.html">analysis:denies</a> all <a href="UnsatisfiedConstraint.html">analysis:UnsatisfiedConstraint</a>
+              <a href="denies.html">analysis:denies</a> → all values from <a href="UnsatisfiedConstraint.html">analysis:UnsatisfiedConstraint</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/AnalyzedElement.html b/imce.jpl.nasa.gov/foundation/analysis/AnalyzedElement.html
index 1a8d400..321c985 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/AnalyzedElement.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/AnalyzedElement.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Analyzed Element
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Analyzed Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -129,7 +129,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -139,7 +139,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isAnalyzedBy.html">analysis:isAnalyzedBy</a> : <a href="Explanation.html">analysis:Explanation</a>
+              <a href="isAnalyzedBy.html">analysis:isAnalyzedBy</a> → <a href="Explanation.html">analysis:Explanation</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Analyzes.html b/imce.jpl.nasa.gov/foundation/analysis/Analyzes.html
index c0b2e4f..b96fa79 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Analyzes.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Analyzes.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Analyzes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Analyzes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/AppliesDuring.html b/imce.jpl.nasa.gov/foundation/analysis/AppliesDuring.html
index f8d89a6..cd06596 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/AppliesDuring.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/AppliesDuring.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Applies During
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Applies During
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Asserts.html b/imce.jpl.nasa.gov/foundation/analysis/Asserts.html
index b4c2c5c..083fbb9 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Asserts.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Asserts.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Asserts
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Asserts
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Assumption.html b/imce.jpl.nasa.gov/foundation/analysis/Assumption.html
index edec9c0..e7de4f2 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Assumption.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Assumption.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Assumption
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Assumption
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -124,7 +124,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -145,7 +145,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="limits.html">analysis:limits</a> : <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
+              <a href="limits.html">analysis:limits</a> → <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Characterization.html b/imce.jpl.nasa.gov/foundation/analysis/Characterization.html
index e31b193..c3cc96e 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Characterization.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Characterization.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Characterization
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Characterization
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -116,7 +116,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -193,7 +193,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -203,7 +203,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="characterizes.html">analysis:characterizes</a> : <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
+              <a href="characterizes.html">analysis:characterizes</a> → <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/CharacterizedElement.html b/imce.jpl.nasa.gov/foundation/analysis/CharacterizedElement.html
index 7e1f220..2e4f178 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/CharacterizedElement.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/CharacterizedElement.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Characterized Element
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Characterized Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -161,7 +161,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -171,7 +171,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isCharacterizedBy.html">analysis:isCharacterizedBy</a> : <a href="Characterization.html">analysis:Characterization</a>
+              <a href="isCharacterizedBy.html">analysis:isCharacterizedBy</a> → <a href="Characterization.html">analysis:Characterization</a>
             </td>
          </tr>
          <tr>
@@ -179,7 +179,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isConstrainedBy.html">analysis:isConstrainedBy</a> : <a href="Constraint.html">analysis:Constraint</a>
+              <a href="isConstrainedBy.html">analysis:isConstrainedBy</a> → <a href="Constraint.html">analysis:Constraint</a>
             </td>
          </tr>
          <tr>
@@ -187,7 +187,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isExplainedBy.html">analysis:isExplainedBy</a> : <a href="Explanation.html">analysis:Explanation</a>
+              <a href="isExplainedBy.html">analysis:isExplainedBy</a> → <a href="Explanation.html">analysis:Explanation</a>
             </td>
          </tr>
          <tr>
@@ -195,7 +195,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isLimitedBy.html">analysis:isLimitedBy</a> : <a href="Assumption.html">analysis:Assumption</a>
+              <a href="isLimitedBy.html">analysis:isLimitedBy</a> → <a href="Assumption.html">analysis:Assumption</a>
             </td>
          </tr>
          <tr>
@@ -203,7 +203,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isValidatedBy.html">analysis:isValidatedBy</a> : <a href="Explanation.html">analysis:Explanation</a>
+              <a href="isValidatedBy.html">analysis:isValidatedBy</a> → <a href="Explanation.html">analysis:Explanation</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Characterizes.html b/imce.jpl.nasa.gov/foundation/analysis/Characterizes.html
index a9610c5..7234cb5 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Characterizes.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Characterizes.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Characterizes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Characterizes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -116,7 +116,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Constrains.html b/imce.jpl.nasa.gov/foundation/analysis/Constrains.html
index 83a8e89..fd79b24 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Constrains.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Constrains.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Constrains
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Constrains
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Constraint.html b/imce.jpl.nasa.gov/foundation/analysis/Constraint.html
index 429c23f..dd60d0b 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Constraint.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Constraint.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Constraint
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Constraint
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -140,7 +140,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -185,7 +185,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -195,7 +195,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="constrains.html">analysis:constrains</a> : <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
+              <a href="constrains.html">analysis:constrains</a> → <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
             </td>
          </tr>
          <tr>
@@ -203,7 +203,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasTruthValue.html">analysis:hasTruthValue</a> : <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
+              <a href="hasTruthValue.html">analysis:hasTruthValue</a> → <a href="http://www.w3.org/2001/XMLSchema#boolean">xsd:boolean</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Denies.html b/imce.jpl.nasa.gov/foundation/analysis/Denies.html
index f2c8e3d..1a85033 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Denies.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Denies.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Denies
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Denies
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/DrivingRequirementsExplanation.html b/imce.jpl.nasa.gov/foundation/analysis/DrivingRequirementsExplanation.html
index 30fabb1..7b9973d 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/DrivingRequirementsExplanation.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/DrivingRequirementsExplanation.html
@@ -30,7 +30,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -40,7 +40,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Driving Requirements Explanation
             </td>
          </tr>
 
@@ -50,7 +50,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -60,7 +60,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -70,7 +70,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -80,7 +80,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Driving Requirements Explanation
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -145,7 +145,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -155,7 +155,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="explains.html">analysis:explains</a> all <a href="../mission/Requirement.html">mission:Requirement</a>
+              <a href="explains.html">analysis:explains</a> → all values from <a href="../mission/Requirement.html">mission:Requirement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Explains.html b/imce.jpl.nasa.gov/foundation/analysis/Explains.html
index d6ac014..a27f953 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Explains.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Explains.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Explains
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Explains
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -124,7 +124,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Explanation.html b/imce.jpl.nasa.gov/foundation/analysis/Explanation.html
index 29f45ed..ecc0be0 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Explanation.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Explanation.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Explanation
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Explanation
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -133,7 +133,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -178,7 +178,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -188,7 +188,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="analyzes.html">analysis:analyzes</a> : <a href="AnalyzedElement.html">analysis:AnalyzedElement</a>
+              <a href="analyzes.html">analysis:analyzes</a> → <a href="AnalyzedElement.html">analysis:AnalyzedElement</a>
             </td>
          </tr>
          <tr>
@@ -196,7 +196,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="explains.html">analysis:explains</a> : <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
+              <a href="explains.html">analysis:explains</a> → <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
             </td>
          </tr>
          <tr>
@@ -204,7 +204,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="validates.html">analysis:validates</a> : <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
+              <a href="validates.html">analysis:validates</a> → <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Fact.html b/imce.jpl.nasa.gov/foundation/analysis/Fact.html
index c91573f..df74d16 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Fact.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Fact.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Fact
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Fact
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Forbids.html b/imce.jpl.nasa.gov/foundation/analysis/Forbids.html
index d8a0aec..78a3719 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Forbids.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Forbids.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Forbids
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Forbids
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/GlossaryEntry.html b/imce.jpl.nasa.gov/foundation/analysis/GlossaryEntry.html
index b8c10bd..55b8d9e 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/GlossaryEntry.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/GlossaryEntry.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              GlossaryEntry
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              GlossaryEntry
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -125,7 +125,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -135,7 +135,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasGlossaryDefinition.html">analysis:hasGlossaryDefinition</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasGlossaryDefinition.html">analysis:hasGlossaryDefinition</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -143,7 +143,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasGlossaryTerm.html">analysis:hasGlossaryTerm</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasGlossaryTerm.html">analysis:hasGlossaryTerm</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/HasQuantityValue.html b/imce.jpl.nasa.gov/foundation/analysis/HasQuantityValue.html
index 8768f99..fcebd7a 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/HasQuantityValue.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/HasQuantityValue.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Has Quantity Value
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Has Quantity Value
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/KeyRequirementsExplanation.html b/imce.jpl.nasa.gov/foundation/analysis/KeyRequirementsExplanation.html
index e18beb7..7e008de 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/KeyRequirementsExplanation.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/KeyRequirementsExplanation.html
@@ -30,7 +30,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -40,7 +40,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Key Requirements Explanation
             </td>
          </tr>
 
@@ -50,7 +50,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -60,7 +60,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -70,7 +70,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -80,7 +80,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Key Requirements Explanation
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -145,7 +145,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -155,7 +155,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="explains.html">analysis:explains</a> all <a href="../mission/Requirement.html">mission:Requirement</a>
+              <a href="explains.html">analysis:explains</a> → all values from <a href="../mission/Requirement.html">mission:Requirement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Limits.html b/imce.jpl.nasa.gov/foundation/analysis/Limits.html
index 8869452..25f552a 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Limits.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Limits.html
@@ -7,7 +7,7 @@
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#Limits</font><br>Class analysis:Limits</h2>
          <img src="http://www.plantuml.com/plantuml/svg/Iyv9B2vMyCdCpImfLeYEXZ3qCafoSs9ZkPB1aiuPYKM9oIMfHPbLgPXge5frImjqQ-nGrG80"/>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -17,7 +17,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              An [=Assumption=] [=limits=] zero or more [=CharacterizedElement=]s.
             </td>
          </tr>
 
@@ -27,7 +27,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              Limits
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              An [=Assumption=] [=limits=] zero or more [=CharacterizedElement=]s.
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Limits
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Never.html b/imce.jpl.nasa.gov/foundation/analysis/Never.html
index 07d8914..2333725 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Never.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Never.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Never
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Never
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -134,7 +134,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -144,7 +144,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="asserts.html">analysis:asserts</a> all <a href="UnsatisfiedConstraint.html">analysis:UnsatisfiedConstraint</a>
+              <a href="asserts.html">analysis:asserts</a> has some values from <a href="UnsatisfiedConstraint.html">analysis:UnsatisfiedConstraint</a>
             </td>
          </tr>
          <tr>
@@ -152,7 +152,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="asserts.html">analysis:asserts</a> some <a href="UnsatisfiedConstraint.html">analysis:UnsatisfiedConstraint</a>
+              <a href="asserts.html">analysis:asserts</a> → all values from <a href="UnsatisfiedConstraint.html">analysis:UnsatisfiedConstraint</a>
             </td>
          </tr>
          <tr>
@@ -160,7 +160,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="denies.html">analysis:denies</a> all <a href="SatisfiedConstraint.html">analysis:SatisfiedConstraint</a>
+              <a href="denies.html">analysis:denies</a> → all values from <a href="SatisfiedConstraint.html">analysis:SatisfiedConstraint</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/NominalPropertyValueConstraint.html b/imce.jpl.nasa.gov/foundation/analysis/NominalPropertyValueConstraint.html
index 1264f1e..98a556f 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/NominalPropertyValueConstraint.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/NominalPropertyValueConstraint.html
@@ -110,7 +110,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -120,7 +120,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="explains.html">analysis:explains</a> all <a href="../../../bipm.org/jcgm/vim4/IndividualNominalProperty.html">vim4:IndividualNominalProperty</a>
+              <a href="explains.html">analysis:explains</a> → all values from <a href="../../../bipm.org/jcgm/vim4/IndividualNominalProperty.html">vim4:IndividualNominalProperty</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/OrdinalQuantityValueConstraint.html b/imce.jpl.nasa.gov/foundation/analysis/OrdinalQuantityValueConstraint.html
index 1fcf1d4..8ce23f9 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/OrdinalQuantityValueConstraint.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/OrdinalQuantityValueConstraint.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Ordinal Quantity Value Constraint
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Ordinal Quantity Value Constraint
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -178,7 +178,7 @@ <h3>owl:disjointWith</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -188,7 +188,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="analyzes.html">analysis:analyzes</a> all <a href="../../../bipm.org/jcgm/vim4/OrdinalQuantityValue.html">vim4:OrdinalQuantityValue</a>
+              <a href="analyzes.html">analysis:analyzes</a> → all values from <a href="../../../bipm.org/jcgm/vim4/OrdinalQuantityValue.html">vim4:OrdinalQuantityValue</a>
             </td>
          </tr>
          <tr>
@@ -196,7 +196,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="explains.html">analysis:explains</a> all <a href="../../../bipm.org/jcgm/vim4/IndividualOrdinalQuantity.html">vim4:IndividualOrdinalQuantity</a>
+              <a href="explains.html">analysis:explains</a> → all values from <a href="../../../bipm.org/jcgm/vim4/IndividualOrdinalQuantity.html">vim4:IndividualOrdinalQuantity</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/QuantityValueConstraint.html b/imce.jpl.nasa.gov/foundation/analysis/QuantityValueConstraint.html
index d7086e9..faa06dc 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/QuantityValueConstraint.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/QuantityValueConstraint.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Quantity Value Constraint
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Quantity Value Constraint
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -148,7 +148,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -177,7 +177,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -187,7 +187,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasQuantityValue.html">analysis:hasQuantityValue</a> : <a href="../../../bipm.org/jcgm/vim4/QuantityValue.html">vim4:QuantityValue</a>
+              <a href="hasQuantityValue.html">analysis:hasQuantityValue</a> → <a href="../../../bipm.org/jcgm/vim4/QuantityValue.html">vim4:QuantityValue</a>
             </td>
          </tr>
          <tr>
@@ -195,7 +195,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasQuantityValueRelation.html">analysis:hasQuantityValueRelation</a> : <a href="quantityValueRelation.html">analysis:quantityValueRelation</a>
+              <a href="hasQuantityValueRelation.html">analysis:hasQuantityValueRelation</a> → <a href="quantityValueRelation.html">analysis:quantityValueRelation</a>
             </td>
          </tr>
 
@@ -206,7 +206,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -216,7 +216,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="analyzes.html">analysis:analyzes</a> all <a href="../../../bipm.org/jcgm/vim4/QuantityValue.html">vim4:QuantityValue</a>
+              <a href="analyzes.html">analysis:analyzes</a> → all values from <a href="../../../bipm.org/jcgm/vim4/QuantityValue.html">vim4:QuantityValue</a>
             </td>
          </tr>
          <tr>
@@ -224,7 +224,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="explains.html">analysis:explains</a> all <a href="../../../bipm.org/jcgm/vim4/IndividualQuantity.html">vim4:IndividualQuantity</a>
+              <a href="explains.html">analysis:explains</a> → all values from <a href="../../../bipm.org/jcgm/vim4/IndividualQuantity.html">vim4:IndividualQuantity</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Requires.html b/imce.jpl.nasa.gov/foundation/analysis/Requires.html
index 097775c..e80fc8d 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Requires.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Requires.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Requires
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Requires
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/SatisfiedConstraint.html b/imce.jpl.nasa.gov/foundation/analysis/SatisfiedConstraint.html
index 8fc3387..dc4505b 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/SatisfiedConstraint.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/SatisfiedConstraint.html
@@ -110,7 +110,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -120,7 +120,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasTruthValue.html">analysis:hasTruthValue</a> equals true^^http://www.w3.org/2001/XMLSchema#boolean
+              <a href="hasTruthValue.html">analysis:hasTruthValue</a> → value of true^^http://www.w3.org/2001/XMLSchema#boolean
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Scenario.html b/imce.jpl.nasa.gov/foundation/analysis/Scenario.html
index a49ca35..8522b6a 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Scenario.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Scenario.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Scenario
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Scenario
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -124,7 +124,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -153,7 +153,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -163,7 +163,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="asserts.html">analysis:asserts</a> : <a href="Constraint.html">analysis:Constraint</a>
+              <a href="asserts.html">analysis:asserts</a> → <a href="Constraint.html">analysis:Constraint</a>
             </td>
          </tr>
          <tr>
@@ -171,7 +171,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="denies.html">analysis:denies</a> : <a href="Constraint.html">analysis:Constraint</a>
+              <a href="denies.html">analysis:denies</a> → <a href="Constraint.html">analysis:Constraint</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/TradeStudy.html b/imce.jpl.nasa.gov/foundation/analysis/TradeStudy.html
index c663807..405a997 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/TradeStudy.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/TradeStudy.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Trade Study
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Trade Study
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/UnitaryQuantityValueConstraint.html b/imce.jpl.nasa.gov/foundation/analysis/UnitaryQuantityValueConstraint.html
index 7b2f1f6..40cd685 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/UnitaryQuantityValueConstraint.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/UnitaryQuantityValueConstraint.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Unitary Quantity Value Constraint
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Unitary Quantity Value Constraint
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -158,7 +158,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -168,7 +168,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="analyzes.html">analysis:analyzes</a> all <a href="../../../bipm.org/jcgm/vim4/UnitaryQuantityValue.html">vim4:UnitaryQuantityValue</a>
+              <a href="analyzes.html">analysis:analyzes</a> → all values from <a href="../../../bipm.org/jcgm/vim4/UnitaryQuantityValue.html">vim4:UnitaryQuantityValue</a>
             </td>
          </tr>
          <tr>
@@ -176,7 +176,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="explains.html">analysis:explains</a> all <a href="../../../bipm.org/jcgm/vim4/IndividualUnitaryQuantity.html">vim4:IndividualUnitaryQuantity</a>
+              <a href="explains.html">analysis:explains</a> → all values from <a href="../../../bipm.org/jcgm/vim4/IndividualUnitaryQuantity.html">vim4:IndividualUnitaryQuantity</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/UnsatisfiedConstraint.html b/imce.jpl.nasa.gov/foundation/analysis/UnsatisfiedConstraint.html
index 770adfe..b4275d3 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/UnsatisfiedConstraint.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/UnsatisfiedConstraint.html
@@ -110,7 +110,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -120,7 +120,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasTruthValue.html">analysis:hasTruthValue</a> equals false^^http://www.w3.org/2001/XMLSchema#boolean
+              <a href="hasTruthValue.html">analysis:hasTruthValue</a> → value of false^^http://www.w3.org/2001/XMLSchema#boolean
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/Validates.html b/imce.jpl.nasa.gov/foundation/analysis/Validates.html
index 5634885..011745c 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/Validates.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/Validates.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Validates
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Validates
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/analyzes.html b/imce.jpl.nasa.gov/foundation/analysis/analyzes.html
index aaa5734..64495de 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/analyzes.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/analyzes.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#analyzes</font><br>Property analysis:analyzes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              analyzes
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              analyzes
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/appliesDuring.html b/imce.jpl.nasa.gov/foundation/analysis/appliesDuring.html
index 4532977..3929796 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/appliesDuring.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/appliesDuring.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#appliesDuring</font><br>Property analysis:appliesDuring</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              applies during
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../mission/Requirement.html">mission:Requirement</a>
+              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              applies during
+              <a href="../mission/Requirement.html">mission:Requirement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/asserts.html b/imce.jpl.nasa.gov/foundation/analysis/asserts.html
index a4b93ff..fe79a33 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/asserts.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/asserts.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#asserts</font><br>Property analysis:asserts</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              asserts
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Scenario.html">analysis:Scenario</a>
+              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              asserts
+              <a href="Scenario.html">analysis:Scenario</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/characterizes.html b/imce.jpl.nasa.gov/foundation/analysis/characterizes.html
index eccf86c..62064fb 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/characterizes.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/characterizes.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#characterizes</font><br>Property analysis:characterizes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              characterizes
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              characterizes
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/constrains.html b/imce.jpl.nasa.gov/foundation/analysis/constrains.html
index 635db89..6f249e8 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/constrains.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/constrains.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#constrains</font><br>Property analysis:constrains</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              constrains
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Constraint.html">analysis:Constraint</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              constrains
+              <a href="Constraint.html">analysis:Constraint</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/denies.html b/imce.jpl.nasa.gov/foundation/analysis/denies.html
index 790b857..19d14de 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/denies.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/denies.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#denies</font><br>Property analysis:denies</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              denies
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Scenario.html">analysis:Scenario</a>
+              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              denies
+              <a href="Scenario.html">analysis:Scenario</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/explains.html b/imce.jpl.nasa.gov/foundation/analysis/explains.html
index ca0d183..3f61ba0 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/explains.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/explains.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#explains</font><br>Property analysis:explains</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              explains
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              explains
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/forbids.html b/imce.jpl.nasa.gov/foundation/analysis/forbids.html
index 4ba15ba..6e43892 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/forbids.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/forbids.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#forbids</font><br>Property analysis:forbids</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              forbids
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../mission/Requirement.html">mission:Requirement</a>
+              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              forbids
+              <a href="../mission/Requirement.html">mission:Requirement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/hasGlossaryDefinition.html b/imce.jpl.nasa.gov/foundation/analysis/hasGlossaryDefinition.html
index 68d2552..134b265 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/hasGlossaryDefinition.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/hasGlossaryDefinition.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#hasGlossaryDefinition</font><br>Property analysis:hasGlossaryDefinition</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has glossary definition
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="GlossaryEntry.html">analysis:GlossaryEntry</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has glossary definition
+              <a href="GlossaryEntry.html">analysis:GlossaryEntry</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/hasGlossaryTerm.html b/imce.jpl.nasa.gov/foundation/analysis/hasGlossaryTerm.html
index ecd5d61..7eb7ca6 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/hasGlossaryTerm.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/hasGlossaryTerm.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#hasGlossaryTerm</font><br>Property analysis:hasGlossaryTerm</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has glossary term
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="GlossaryEntry.html">analysis:GlossaryEntry</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has glossary term
+              <a href="GlossaryEntry.html">analysis:GlossaryEntry</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/hasQuantityValue.html b/imce.jpl.nasa.gov/foundation/analysis/hasQuantityValue.html
index 12c6dc4..6e8a4d2 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/hasQuantityValue.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/hasQuantityValue.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#hasQuantityValue</font><br>Property analysis:hasQuantityValue</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              has quantity value
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="QuantityValueConstraint.html">analysis:QuantityValueConstraint</a>
+              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has quantity value
+              <a href="QuantityValueConstraint.html">analysis:QuantityValueConstraint</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/hasQuantityValueRelation.html b/imce.jpl.nasa.gov/foundation/analysis/hasQuantityValueRelation.html
index ecaa6c4..8621ccc 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/hasQuantityValueRelation.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/hasQuantityValueRelation.html
@@ -26,7 +26,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has quantity value relation
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="QuantityValueConstraint.html">analysis:QuantityValueConstraint</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -94,7 +94,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +104,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has quantity value relation
+              <a href="QuantityValueConstraint.html">analysis:QuantityValueConstraint</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/isAnalyzedBy.html b/imce.jpl.nasa.gov/foundation/analysis/isAnalyzedBy.html
index 25e85bb..98bddb2 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/isAnalyzedBy.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/isAnalyzedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#isAnalyzedBy</font><br>Property analysis:isAnalyzedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is analyzed by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is analyzed by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/isCharacterizedBy.html b/imce.jpl.nasa.gov/foundation/analysis/isCharacterizedBy.html
index b9477c5..4e7b7f0 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/isCharacterizedBy.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/isCharacterizedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#isCharacterizedBy</font><br>Property analysis:isCharacterizedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is characterized by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is characterized by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/isConstrainedBy.html b/imce.jpl.nasa.gov/foundation/analysis/isConstrainedBy.html
index 585b98e..db9a87c 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/isConstrainedBy.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/isConstrainedBy.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#isConstrainedBy</font><br>Property analysis:isConstrainedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#reverseRelation">http://opencaesar.io/oml#reverseRelation</a>
+              is constrained by
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#reverseRelation">http://opencaesar.io/oml#reverseRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              is constrained by
+              <a href="CharacterizedElement.html">analysis:CharacterizedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/isExplainedBy.html b/imce.jpl.nasa.gov/foundation/analysis/isExplainedBy.html
index e8d8596..68aa1cb 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/isExplainedBy.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/isExplainedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#isExplainedBy</font><br>Property analysis:isExplainedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is explained by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is explained by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/isLimitedBy.html b/imce.jpl.nasa.gov/foundation/analysis/isLimitedBy.html
index 8aa97fb..1928cdb 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/isLimitedBy.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/isLimitedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#isLimitedBy</font><br>Property analysis:isLimitedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is limited by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is limited by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/isValidatedBy.html b/imce.jpl.nasa.gov/foundation/analysis/isValidatedBy.html
index 1dcdf0f..838b3f5 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/isValidatedBy.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/isValidatedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#isValidatedBy</font><br>Property analysis:isValidatedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is validated by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is validated by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/limits.html b/imce.jpl.nasa.gov/foundation/analysis/limits.html
index b99dd08..0e902c0 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/limits.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/limits.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#limits</font><br>Property analysis:limits</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              limits
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              limits
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/analysis/quantityValueRelation.html b/imce.jpl.nasa.gov/foundation/analysis/quantityValueRelation.html
index c94f681..a01f0b5 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/quantityValueRelation.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/quantityValueRelation.html
@@ -26,7 +26,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2000/01/rdf-schema#Datatype">rdfs:Datatype</a>
+              quantity value relation
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              quantity value relation
+              <a href="http://www.w3.org/2000/01/rdf-schema#Datatype">rdfs:Datatype</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/requires.html b/imce.jpl.nasa.gov/foundation/analysis/requires.html
index 39b11a2..4a21475 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/requires.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/requires.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#requires</font><br>Property analysis:requires</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              requires
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../mission/Requirement.html">mission:Requirement</a>
+              <a href="http://www.w3.org/2002/07/owl#AsymmetricProperty">owl:AsymmetricProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              requires
+              <a href="../mission/Requirement.html">mission:Requirement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/analysis/validates.html b/imce.jpl.nasa.gov/foundation/analysis/validates.html
index f78ec0b..c8abb86 100644
--- a/imce.jpl.nasa.gov/foundation/analysis/validates.html
+++ b/imce.jpl.nasa.gov/foundation/analysis/validates.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/analysis#validates</font><br>Property analysis:validates</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              validates
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              validates
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/base/AggregatedElement.html b/imce.jpl.nasa.gov/foundation/base/AggregatedElement.html
index 876eeb8..b3654e4 100644
--- a/imce.jpl.nasa.gov/foundation/base/AggregatedElement.html
+++ b/imce.jpl.nasa.gov/foundation/base/AggregatedElement.html
@@ -30,7 +30,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -40,7 +40,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Aggregated Element
             </td>
          </tr>
 
@@ -50,7 +50,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -60,7 +60,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -70,7 +70,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -80,7 +80,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Aggregated Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -111,7 +111,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -172,7 +172,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -182,7 +182,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="aggregates.html">base:aggregates</a> : <a href="AggregatedElement.html">base:AggregatedElement</a>
+              <a href="aggregates.html">base:aggregates</a> → <a href="AggregatedElement.html">base:AggregatedElement</a>
             </td>
          </tr>
          <tr>
@@ -190,7 +190,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isAggregatedIn.html">base:isAggregatedIn</a> : <a href="AggregatedElement.html">base:AggregatedElement</a>
+              <a href="isAggregatedIn.html">base:isAggregatedIn</a> → <a href="AggregatedElement.html">base:AggregatedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/Aggregates.html b/imce.jpl.nasa.gov/foundation/base/Aggregates.html
index cf6730a..f39dd1e 100644
--- a/imce.jpl.nasa.gov/foundation/base/Aggregates.html
+++ b/imce.jpl.nasa.gov/foundation/base/Aggregates.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Aggregates
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Aggregates
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/ContainedElement.html b/imce.jpl.nasa.gov/foundation/base/ContainedElement.html
index 71e021c..dedb495 100644
--- a/imce.jpl.nasa.gov/foundation/base/ContainedElement.html
+++ b/imce.jpl.nasa.gov/foundation/base/ContainedElement.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Contained Element
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Contained Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -110,7 +110,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -155,7 +155,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -165,7 +165,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasContainmentIndex.html">base:hasContainmentIndex</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasContainmentIndex.html">base:hasContainmentIndex</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -173,7 +173,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isContainedIn.html">base:isContainedIn</a> : <a href="Container.html">base:Container</a>
+              <a href="isContainedIn.html">base:isContainedIn</a> → <a href="Container.html">base:Container</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/Container.html b/imce.jpl.nasa.gov/foundation/base/Container.html
index efbf0de..9521a77 100644
--- a/imce.jpl.nasa.gov/foundation/base/Container.html
+++ b/imce.jpl.nasa.gov/foundation/base/Container.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Container
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Container
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -110,7 +110,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -155,7 +155,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -165,7 +165,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="contains.html">base:contains</a> : <a href="ContainedElement.html">base:ContainedElement</a>
+              <a href="contains.html">base:contains</a> → <a href="ContainedElement.html">base:ContainedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/Contains.html b/imce.jpl.nasa.gov/foundation/base/Contains.html
index c1e31cd..4b666a5 100644
--- a/imce.jpl.nasa.gov/foundation/base/Contains.html
+++ b/imce.jpl.nasa.gov/foundation/base/Contains.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Contains
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Contains
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/IdentifiedElement.html b/imce.jpl.nasa.gov/foundation/base/IdentifiedElement.html
index 5817388..0d717fd 100644
--- a/imce.jpl.nasa.gov/foundation/base/IdentifiedElement.html
+++ b/imce.jpl.nasa.gov/foundation/base/IdentifiedElement.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Identified Element
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Identified Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -109,7 +109,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -314,7 +314,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -324,7 +324,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasAlternateName.html">base:hasAlternateName</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasAlternateName.html">base:hasAlternateName</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -332,7 +332,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasCanonicalName.html">base:hasCanonicalName</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasCanonicalName.html">base:hasCanonicalName</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -340,7 +340,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasDescription.html">base:hasDescription</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasDescription.html">base:hasDescription</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -348,7 +348,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasIdentifier.html">base:hasIdentifier</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasIdentifier.html">base:hasIdentifier</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -356,7 +356,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasIndexEntry.html">base:hasIndexEntry</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasIndexEntry.html">base:hasIndexEntry</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -364,7 +364,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasShortName.html">base:hasShortName</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasShortName.html">base:hasShortName</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -372,7 +372,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasSortKey.html">base:hasSortKey</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasSortKey.html">base:hasSortKey</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -380,7 +380,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasUuid.html">base:hasUuid</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasUuid.html">base:hasUuid</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/Package.html b/imce.jpl.nasa.gov/foundation/base/Package.html
index 760e4f5..defc6af 100644
--- a/imce.jpl.nasa.gov/foundation/base/Package.html
+++ b/imce.jpl.nasa.gov/foundation/base/Package.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Package
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Package
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -116,7 +116,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/imce.jpl.nasa.gov/foundation/base/aggregates.html b/imce.jpl.nasa.gov/foundation/base/aggregates.html
index 20fe350..874d3c9 100644
--- a/imce.jpl.nasa.gov/foundation/base/aggregates.html
+++ b/imce.jpl.nasa.gov/foundation/base/aggregates.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/base#aggregates</font><br>Property base:aggregates</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              aggregates
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              aggregates
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/base/contains.html b/imce.jpl.nasa.gov/foundation/base/contains.html
index f0f90c6..e9b9a5b 100644
--- a/imce.jpl.nasa.gov/foundation/base/contains.html
+++ b/imce.jpl.nasa.gov/foundation/base/contains.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/base#contains</font><br>Property base:contains</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              contains
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              contains
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/base/hasAlternateName.html b/imce.jpl.nasa.gov/foundation/base/hasAlternateName.html
index 7bd3f51..8f4b6e5 100644
--- a/imce.jpl.nasa.gov/foundation/base/hasAlternateName.html
+++ b/imce.jpl.nasa.gov/foundation/base/hasAlternateName.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has alternate name
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has alternate name
+              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/hasCanonicalName.html b/imce.jpl.nasa.gov/foundation/base/hasCanonicalName.html
index 3109fb7..bf28ad6 100644
--- a/imce.jpl.nasa.gov/foundation/base/hasCanonicalName.html
+++ b/imce.jpl.nasa.gov/foundation/base/hasCanonicalName.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has canonical name
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has canonical name
+              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/hasContainmentIndex.html b/imce.jpl.nasa.gov/foundation/base/hasContainmentIndex.html
index 1366f99..bf46279 100644
--- a/imce.jpl.nasa.gov/foundation/base/hasContainmentIndex.html
+++ b/imce.jpl.nasa.gov/foundation/base/hasContainmentIndex.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has containment index
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="ContainedElement.html">base:ContainedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -89,7 +89,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -99,7 +99,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has containment index
+              <a href="ContainedElement.html">base:ContainedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/hasDescription.html b/imce.jpl.nasa.gov/foundation/base/hasDescription.html
index 12d769e..86d8f2f 100644
--- a/imce.jpl.nasa.gov/foundation/base/hasDescription.html
+++ b/imce.jpl.nasa.gov/foundation/base/hasDescription.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has description
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,15 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -75,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -85,7 +77,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -95,7 +95,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -105,7 +105,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has description
+              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/hasIdentifier.html b/imce.jpl.nasa.gov/foundation/base/hasIdentifier.html
index bf4b431..ba13aa1 100644
--- a/imce.jpl.nasa.gov/foundation/base/hasIdentifier.html
+++ b/imce.jpl.nasa.gov/foundation/base/hasIdentifier.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has identifier
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has identifier
+              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/hasIndexEntry.html b/imce.jpl.nasa.gov/foundation/base/hasIndexEntry.html
index 88220dc..25ed5a3 100644
--- a/imce.jpl.nasa.gov/foundation/base/hasIndexEntry.html
+++ b/imce.jpl.nasa.gov/foundation/base/hasIndexEntry.html
@@ -30,7 +30,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -40,7 +40,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has index entry
             </td>
          </tr>
 
@@ -50,7 +50,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -60,7 +60,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -70,7 +70,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -80,7 +80,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -90,7 +90,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -100,7 +100,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has index entry
+              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/hasShortName.html b/imce.jpl.nasa.gov/foundation/base/hasShortName.html
index 9abc1a5..2357b3f 100644
--- a/imce.jpl.nasa.gov/foundation/base/hasShortName.html
+++ b/imce.jpl.nasa.gov/foundation/base/hasShortName.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has short name
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has short name
+              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/hasSortKey.html b/imce.jpl.nasa.gov/foundation/base/hasSortKey.html
index 41a2d96..bfe4146 100644
--- a/imce.jpl.nasa.gov/foundation/base/hasSortKey.html
+++ b/imce.jpl.nasa.gov/foundation/base/hasSortKey.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has sort key
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has sort key
+              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/hasUuid.html b/imce.jpl.nasa.gov/foundation/base/hasUuid.html
index e3445d6..658f075 100644
--- a/imce.jpl.nasa.gov/foundation/base/hasUuid.html
+++ b/imce.jpl.nasa.gov/foundation/base/hasUuid.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has uuid
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -87,7 +87,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -97,7 +97,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has uuid
+              <a href="IdentifiedElement.html">base:IdentifiedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/base/isAggregatedIn.html b/imce.jpl.nasa.gov/foundation/base/isAggregatedIn.html
index 21060ca..731145c 100644
--- a/imce.jpl.nasa.gov/foundation/base/isAggregatedIn.html
+++ b/imce.jpl.nasa.gov/foundation/base/isAggregatedIn.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/base#isAggregatedIn</font><br>Property base:isAggregatedIn</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is aggregated in
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is aggregated in
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/base/isContainedIn.html b/imce.jpl.nasa.gov/foundation/base/isContainedIn.html
index f6126a9..33e73e5 100644
--- a/imce.jpl.nasa.gov/foundation/base/isContainedIn.html
+++ b/imce.jpl.nasa.gov/foundation/base/isContainedIn.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/base#isContainedIn</font><br>Property base:isContainedIn</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is contained in
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is contained in
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/Component.html b/imce.jpl.nasa.gov/foundation/mission/Component.html
index f2409e5..94f4d37 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Component.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Component.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Component
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Component
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -199,7 +199,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -209,7 +209,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="induces.html">mission:induces</a> : <a href="Environment.html">mission:Environment</a>
+              <a href="induces.html">mission:induces</a> → <a href="Environment.html">mission:Environment</a>
             </td>
          </tr>
          <tr>
@@ -217,7 +217,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isDeployedBy.html">mission:isDeployedBy</a> : <a href="Mission.html">mission:Mission</a>
+              <a href="isDeployedBy.html">mission:isDeployedBy</a> → <a href="Mission.html">mission:Mission</a>
             </td>
          </tr>
          <tr>
@@ -225,7 +225,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isInfluencedBy.html">mission:isInfluencedBy</a> : <a href="Environment.html">mission:Environment</a>
+              <a href="isInfluencedBy.html">mission:isInfluencedBy</a> → <a href="Environment.html">mission:Environment</a>
             </td>
          </tr>
 
@@ -236,7 +236,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -246,7 +246,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/aggregates.html">base:aggregates</a> all <a href="Component.html">mission:Component</a>
+              <a href="../base/aggregates.html">base:aggregates</a> → all values from <a href="Component.html">mission:Component</a>
             </td>
          </tr>
          <tr>
@@ -254,7 +254,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/contains.html">base:contains</a> all <a href="Component.html">mission:Component</a>
+              <a href="../base/contains.html">base:contains</a> → all values from <a href="Component.html">mission:Component</a>
             </td>
          </tr>
          <tr>
@@ -262,7 +262,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> all <a href="Component.html">mission:Component</a>
+              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> → all values from <a href="Component.html">mission:Component</a>
             </td>
          </tr>
          <tr>
@@ -270,7 +270,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isContainedIn.html">base:isContainedIn</a> all <a href="Component.html">mission:Component</a>
+              <a href="../base/isContainedIn.html">base:isContainedIn</a> → all values from <a href="Component.html">mission:Component</a>
             </td>
          </tr>
          <tr>
@@ -278,7 +278,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> all <a href="Component.html">mission:Component</a>
+              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> → all values from <a href="Component.html">mission:Component</a>
             </td>
          </tr>
          <tr>
@@ -286,7 +286,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/isSuppliedBy.html">project:isSuppliedBy</a> all <a href="../project/WorkPackage.html">project:WorkPackage</a>
+              <a href="../project/isSuppliedBy.html">project:isSuppliedBy</a> → all values from <a href="../project/WorkPackage.html">project:WorkPackage</a>
             </td>
          </tr>
          <tr>
@@ -294,7 +294,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/realizes.html">project:realizes</a> all <a href="Component.html">mission:Component</a>
+              <a href="../project/realizes.html">project:realizes</a> → all values from <a href="Component.html">mission:Component</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Deploys.html b/imce.jpl.nasa.gov/foundation/mission/Deploys.html
index d5709ec..e9decc5 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Deploys.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Deploys.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Deploys
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Deploys
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Environment.html b/imce.jpl.nasa.gov/foundation/mission/Environment.html
index 3bf3c83..039122d 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Environment.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Environment.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Environment
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Environment
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -126,7 +126,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -136,7 +136,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="influences.html">mission:influences</a> : <a href="Component.html">mission:Component</a>
+              <a href="influences.html">mission:influences</a> → <a href="Component.html">mission:Component</a>
             </td>
          </tr>
          <tr>
@@ -144,7 +144,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isInducedBy.html">mission:isInducedBy</a> : <a href="Component.html">mission:Component</a>
+              <a href="isInducedBy.html">mission:isInducedBy</a> → <a href="Component.html">mission:Component</a>
             </td>
          </tr>
 
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -165,7 +165,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/aggregates.html">base:aggregates</a> all <a href="Environment.html">mission:Environment</a>
+              <a href="../base/aggregates.html">base:aggregates</a> → all values from <a href="Environment.html">mission:Environment</a>
             </td>
          </tr>
          <tr>
@@ -173,7 +173,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> all <a href="Environment.html">mission:Environment</a>
+              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> → all values from <a href="Environment.html">mission:Environment</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Flow.html b/imce.jpl.nasa.gov/foundation/mission/Flow.html
index 57ddc1d..767eef5 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Flow.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Flow.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Flow
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Flow
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -143,7 +143,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -153,7 +153,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/contains.html">base:contains</a> all <a href="Flow.html">mission:Flow</a>
+              <a href="../base/contains.html">base:contains</a> → all values from <a href="Flow.html">mission:Flow</a>
             </td>
          </tr>
          <tr>
@@ -161,7 +161,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isContainedIn.html">base:isContainedIn</a> all <a href="Flow.html">mission:Flow</a>
+              <a href="../base/isContainedIn.html">base:isContainedIn</a> → all values from <a href="Flow.html">mission:Flow</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Function.html b/imce.jpl.nasa.gov/foundation/mission/Function.html
index 71c0bc9..ee39dea 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Function.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Function.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Function
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Function
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -125,7 +125,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -135,7 +135,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="invokes.html">mission:invokes</a> : <a href="Function.html">mission:Function</a>
+              <a href="invokes.html">mission:invokes</a> → <a href="Function.html">mission:Function</a>
             </td>
          </tr>
          <tr>
@@ -143,7 +143,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isInvokedBy.html">mission:isInvokedBy</a> : <a href="Function.html">mission:Function</a>
+              <a href="isInvokedBy.html">mission:isInvokedBy</a> → <a href="Function.html">mission:Function</a>
             </td>
          </tr>
          <tr>
@@ -151,7 +151,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isPerformedBy.html">mission:isPerformedBy</a> : <a href="PerformingElement.html">mission:PerformingElement</a>
+              <a href="isPerformedBy.html">mission:isPerformedBy</a> → <a href="PerformingElement.html">mission:PerformingElement</a>
             </td>
          </tr>
 
@@ -162,7 +162,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -172,7 +172,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> all <a href="Function.html">mission:Function</a>
+              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> → all values from <a href="Function.html">mission:Function</a>
             </td>
          </tr>
          <tr>
@@ -180,7 +180,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/realizes.html">project:realizes</a> all <a href="Function.html">mission:Function</a>
+              <a href="../project/realizes.html">project:realizes</a> → all values from <a href="Function.html">mission:Function</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Induces.html b/imce.jpl.nasa.gov/foundation/mission/Induces.html
index 707a067..e0d992e 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Induces.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Induces.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Induces
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Induces
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Influences.html b/imce.jpl.nasa.gov/foundation/mission/Influences.html
index 8c28686..d627421 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Influences.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Influences.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Influences
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Influences
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Interface.html b/imce.jpl.nasa.gov/foundation/mission/Interface.html
index 1837f9b..43083fa 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Interface.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Interface.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Interface
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Interface
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -150,7 +150,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -160,7 +160,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isJoinedIn.html">mission:isJoinedIn</a> : <a href="Junction.html">mission:Junction</a>
+              <a href="isJoinedIn.html">mission:isJoinedIn</a> → <a href="Junction.html">mission:Junction</a>
             </td>
          </tr>
          <tr>
@@ -168,7 +168,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isJoinedIn1.html">mission:isJoinedIn1</a> : <a href="Junction.html">mission:Junction</a>
+              <a href="isJoinedIn1.html">mission:isJoinedIn1</a> → <a href="Junction.html">mission:Junction</a>
             </td>
          </tr>
          <tr>
@@ -176,7 +176,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isJoinedIn2.html">mission:isJoinedIn2</a> : <a href="Junction.html">mission:Junction</a>
+              <a href="isJoinedIn2.html">mission:isJoinedIn2</a> → <a href="Junction.html">mission:Junction</a>
             </td>
          </tr>
          <tr>
@@ -184,7 +184,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isPresentedBy.html">mission:isPresentedBy</a> : <a href="PresentingElement.html">mission:PresentingElement</a>
+              <a href="isPresentedBy.html">mission:isPresentedBy</a> → <a href="PresentingElement.html">mission:PresentingElement</a>
             </td>
          </tr>
          <tr>
@@ -192,7 +192,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="transfers.html">mission:transfers</a> : <a href="TraversingElement.html">mission:TraversingElement</a>
+              <a href="transfers.html">mission:transfers</a> → <a href="TraversingElement.html">mission:TraversingElement</a>
             </td>
          </tr>
          <tr>
@@ -200,7 +200,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="transfersIn.html">mission:transfersIn</a> : <a href="TraversingElement.html">mission:TraversingElement</a>
+              <a href="transfersIn.html">mission:transfersIn</a> → <a href="TraversingElement.html">mission:TraversingElement</a>
             </td>
          </tr>
          <tr>
@@ -208,7 +208,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="transfersOut.html">mission:transfersOut</a> : <a href="TraversingElement.html">mission:TraversingElement</a>
+              <a href="transfersOut.html">mission:transfersOut</a> → <a href="TraversingElement.html">mission:TraversingElement</a>
             </td>
          </tr>
 
@@ -219,7 +219,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -229,7 +229,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> all <a href="Interface.html">mission:Interface</a>
+              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> → all values from <a href="Interface.html">mission:Interface</a>
             </td>
          </tr>
          <tr>
@@ -237,7 +237,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/realizes.html">project:realizes</a> all <a href="Interface.html">mission:Interface</a>
+              <a href="../project/realizes.html">project:realizes</a> → all values from <a href="Interface.html">mission:Interface</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Invokes.html b/imce.jpl.nasa.gov/foundation/mission/Invokes.html
index 3b1f77e..5cb8343 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Invokes.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Invokes.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Invokes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Invokes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Item.html b/imce.jpl.nasa.gov/foundation/mission/Item.html
index 62fbdc9..c666672 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Item.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Item.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Item
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Item
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -140,7 +140,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -170,7 +170,7 @@ <h3>rdfs:superClassOf</h3>
 </dl>
 
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -180,7 +180,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/contains.html">base:contains</a> all <a href="Item.html">mission:Item</a>
+              <a href="../base/contains.html">base:contains</a> → all values from <a href="Item.html">mission:Item</a>
             </td>
          </tr>
          <tr>
@@ -188,7 +188,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isContainedIn.html">base:isContainedIn</a> all <a href="Item.html">mission:Item</a>
+              <a href="../base/isContainedIn.html">base:isContainedIn</a> → all values from <a href="Item.html">mission:Item</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Joins.html b/imce.jpl.nasa.gov/foundation/mission/Joins.html
index fa4b235..d38612d 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Joins.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Joins.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Joins
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Joins
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/imce.jpl.nasa.gov/foundation/mission/Joins1.html b/imce.jpl.nasa.gov/foundation/mission/Joins1.html
index 9f33766..6eef086 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Joins1.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Joins1.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Joins1
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Joins1
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Joins2.html b/imce.jpl.nasa.gov/foundation/mission/Joins2.html
index dd2c179..7c623ae 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Joins2.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Joins2.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Joins2
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Joins2
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Junction.html b/imce.jpl.nasa.gov/foundation/mission/Junction.html
index 7f3efb6..cccced9 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Junction.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Junction.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Junction
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Junction
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -157,7 +157,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -167,7 +167,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isTraversedBy.html">mission:isTraversedBy</a> : <a href="TraversingElement.html">mission:TraversingElement</a>
+              <a href="isTraversedBy.html">mission:isTraversedBy</a> → <a href="TraversingElement.html">mission:TraversingElement</a>
             </td>
          </tr>
          <tr>
@@ -175,7 +175,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="joins.html">mission:joins</a> : <a href="Interface.html">mission:Interface</a>
+              <a href="joins.html">mission:joins</a> → <a href="Interface.html">mission:Interface</a>
             </td>
          </tr>
          <tr>
@@ -183,7 +183,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="joins1.html">mission:joins1</a> : <a href="Interface.html">mission:Interface</a>
+              <a href="joins1.html">mission:joins1</a> → <a href="Interface.html">mission:Interface</a>
             </td>
          </tr>
          <tr>
@@ -191,7 +191,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="joins2.html">mission:joins2</a> : <a href="Interface.html">mission:Interface</a>
+              <a href="joins2.html">mission:joins2</a> → <a href="Interface.html">mission:Interface</a>
             </td>
          </tr>
 
@@ -202,7 +202,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -212,7 +212,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/contains.html">base:contains</a> all <a href="Junction.html">mission:Junction</a>
+              <a href="../base/contains.html">base:contains</a> → all values from <a href="Junction.html">mission:Junction</a>
             </td>
          </tr>
          <tr>
@@ -220,7 +220,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isContainedIn.html">base:isContainedIn</a> all <a href="Junction.html">mission:Junction</a>
+              <a href="../base/isContainedIn.html">base:isContainedIn</a> → all values from <a href="Junction.html">mission:Junction</a>
             </td>
          </tr>
          <tr>
@@ -228,7 +228,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> all <a href="Junction.html">mission:Junction</a>
+              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> → all values from <a href="Junction.html">mission:Junction</a>
             </td>
          </tr>
          <tr>
@@ -236,7 +236,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/realizes.html">project:realizes</a> all <a href="Junction.html">mission:Junction</a>
+              <a href="../project/realizes.html">project:realizes</a> → all values from <a href="Junction.html">mission:Junction</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/MaterialItem.html b/imce.jpl.nasa.gov/foundation/mission/MaterialItem.html
index 08974db..ad202f5 100644
--- a/imce.jpl.nasa.gov/foundation/mission/MaterialItem.html
+++ b/imce.jpl.nasa.gov/foundation/mission/MaterialItem.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Material Item
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Material Item
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -170,7 +170,7 @@ <h3>owl:disjointWith</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -180,7 +180,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/contains.html">base:contains</a> all <a href="MaterialItem.html">mission:MaterialItem</a>
+              <a href="../base/contains.html">base:contains</a> → all values from <a href="MaterialItem.html">mission:MaterialItem</a>
             </td>
          </tr>
          <tr>
@@ -188,7 +188,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isContainedIn.html">base:isContainedIn</a> all <a href="MaterialItem.html">mission:MaterialItem</a>
+              <a href="../base/isContainedIn.html">base:isContainedIn</a> → all values from <a href="MaterialItem.html">mission:MaterialItem</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Message.html b/imce.jpl.nasa.gov/foundation/mission/Message.html
index 29086d5..cbe4b27 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Message.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Message.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Message
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Message
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -150,7 +150,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -160,7 +160,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/contains.html">base:contains</a> all <a href="Message.html">mission:Message</a>
+              <a href="../base/contains.html">base:contains</a> → all values from <a href="Message.html">mission:Message</a>
             </td>
          </tr>
          <tr>
@@ -168,7 +168,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isContainedIn.html">base:isContainedIn</a> all <a href="Message.html">mission:Message</a>
+              <a href="../base/isContainedIn.html">base:isContainedIn</a> → all values from <a href="Message.html">mission:Message</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Mission.html b/imce.jpl.nasa.gov/foundation/mission/Mission.html
index ebafb68..6dba544 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Mission.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Mission.html
@@ -5,7 +5,7 @@
    </head>
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#Mission</font><br>Class mission:Mission</h2>
-         <img src="http://www.plantuml.com/plantuml/svg/Iyv9B2vMyCqiBixCprE8ZeQoz39ASdDYOxcImT91gOavcLMfAQuvgRcfUIMOoc3wTKiBT6liqDLpGOq9BaXDpapB9DuST0qmWmAAKek1tCoyT69Dmj01Cyep1IHCYgCmTC2zLrfGa4EAxr3LmpsNMfIMNvHBYkVGTG00"/>
+         <img src="http://www.plantuml.com/plantuml/svg/Iyv9B2vMyCqiBixCprE8ZeQoz39ASdDYOxcImT91gOavcLMfAQuvgRcfUIMOoc3wTKiBT6liqDLpGOq9I2rAoo_ApSnB9zOW31rmeufIYu5SKen2rm4poZC599oMIRptC7J0Z0ekBIZ88S4WDFLmOmfIaqbo4Be60000"/>
          <hr>
          <h3>dc:description</h3>
 <dl>
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Mission
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Mission
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -157,7 +157,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -167,7 +167,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="deploys.html">mission:deploys</a> : <a href="Component.html">mission:Component</a>
+              <a href="deploys.html">mission:deploys</a> → <a href="Component.html">mission:Component</a>
             </td>
          </tr>
          <tr>
@@ -175,7 +175,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="pursues.html">mission:pursues</a> : <a href="Objective.html">mission:Objective</a>
+              <a href="pursues.html">mission:pursues</a> → <a href="Objective.html">mission:Objective</a>
             </td>
          </tr>
 
@@ -186,7 +186,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -196,7 +196,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> all <a href="Mission.html">mission:Mission</a>
+              <a href="../project/isRealizedBy.html">project:isRealizedBy</a> → all values from <a href="Mission.html">mission:Mission</a>
             </td>
          </tr>
          <tr>
@@ -204,7 +204,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/isSuppliedBy.html">project:isSuppliedBy</a> all <a href="../project/Project.html">project:Project</a>
+              <a href="../project/isSuppliedBy.html">project:isSuppliedBy</a> → all values from <a href="../project/Project.html">project:Project</a>
             </td>
          </tr>
          <tr>
@@ -212,7 +212,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../project/realizes.html">project:realizes</a> all <a href="Mission.html">mission:Mission</a>
+              <a href="../project/realizes.html">project:realizes</a> → all values from <a href="Mission.html">mission:Mission</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Objective.html b/imce.jpl.nasa.gov/foundation/mission/Objective.html
index 5f79ac2..183d490 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Objective.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Objective.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Objective
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Objective
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -133,7 +133,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -143,7 +143,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isPursuedBy.html">mission:isPursuedBy</a> : <a href="Mission.html">mission:Mission</a>
+              <a href="isPursuedBy.html">mission:isPursuedBy</a> → <a href="Mission.html">mission:Mission</a>
             </td>
          </tr>
 
@@ -154,7 +154,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -164,7 +164,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/aggregates.html">base:aggregates</a> all <a href="Objective.html">mission:Objective</a>
+              <a href="../base/aggregates.html">base:aggregates</a> → all values from <a href="Objective.html">mission:Objective</a>
             </td>
          </tr>
          <tr>
@@ -172,7 +172,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> all <a href="Objective.html">mission:Objective</a>
+              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> → all values from <a href="Objective.html">mission:Objective</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/PerformingElement.html b/imce.jpl.nasa.gov/foundation/mission/PerformingElement.html
index fd7793b..526610d 100644
--- a/imce.jpl.nasa.gov/foundation/mission/PerformingElement.html
+++ b/imce.jpl.nasa.gov/foundation/mission/PerformingElement.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Performing Element
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Performing Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -109,7 +109,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -138,7 +138,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -148,7 +148,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="performs.html">mission:performs</a> : <a href="Function.html">mission:Function</a>
+              <a href="performs.html">mission:performs</a> → <a href="Function.html">mission:Function</a>
             </td>
          </tr>
          <tr>
@@ -156,7 +156,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="produces.html">mission:produces</a> : <a href="Product.html">mission:Product</a>
+              <a href="produces.html">mission:produces</a> → <a href="Product.html">mission:Product</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Performs.html b/imce.jpl.nasa.gov/foundation/mission/Performs.html
index e2ddf79..5014eaf 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Performs.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Performs.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Performs
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Performs
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/PresentingElement.html b/imce.jpl.nasa.gov/foundation/mission/PresentingElement.html
index 713756f..66e842a 100644
--- a/imce.jpl.nasa.gov/foundation/mission/PresentingElement.html
+++ b/imce.jpl.nasa.gov/foundation/mission/PresentingElement.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Presenting Element
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Presenting Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -109,7 +109,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -146,7 +146,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -156,7 +156,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="presents.html">mission:presents</a> : <a href="Interface.html">mission:Interface</a>
+              <a href="presents.html">mission:presents</a> → <a href="Interface.html">mission:Interface</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Presents.html b/imce.jpl.nasa.gov/foundation/mission/Presents.html
index 8df8f57..234a9e8 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Presents.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Presents.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Presents
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Presents
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Produces.html b/imce.jpl.nasa.gov/foundation/mission/Produces.html
index 3421b62..788cb2e 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Produces.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Produces.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Produces
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Produces
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Product.html b/imce.jpl.nasa.gov/foundation/mission/Product.html
index 3c5a784..9762b25 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Product.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Product.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Product
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Product
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -125,7 +125,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -135,7 +135,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isProducedBy.html">mission:isProducedBy</a> : <a href="PerformingElement.html">mission:PerformingElement</a>
+              <a href="isProducedBy.html">mission:isProducedBy</a> → <a href="PerformingElement.html">mission:PerformingElement</a>
             </td>
          </tr>
 
@@ -146,7 +146,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -156,7 +156,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/aggregates.html">base:aggregates</a> all <a href="Product.html">mission:Product</a>
+              <a href="../base/aggregates.html">base:aggregates</a> → all values from <a href="Product.html">mission:Product</a>
             </td>
          </tr>
          <tr>
@@ -164,7 +164,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> all <a href="Product.html">mission:Product</a>
+              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> → all values from <a href="Product.html">mission:Product</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Pursues.html b/imce.jpl.nasa.gov/foundation/mission/Pursues.html
index 208bc54..b015e5c 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Pursues.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Pursues.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Pursues
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Pursues
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Refines.html b/imce.jpl.nasa.gov/foundation/mission/Refines.html
index 75ba960..28d0f27 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Refines.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Refines.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Refines
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Refines
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Requirement.html b/imce.jpl.nasa.gov/foundation/mission/Requirement.html
index 5ac5c48..c46085e 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Requirement.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Requirement.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Requirement
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Requirement
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -125,7 +125,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -135,7 +135,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../analysis/appliesDuring.html">analysis:appliesDuring</a> : <a href="../analysis/Scenario.html">analysis:Scenario</a>
+              <a href="../analysis/appliesDuring.html">analysis:appliesDuring</a> → <a href="../analysis/Scenario.html">analysis:Scenario</a>
             </td>
          </tr>
          <tr>
@@ -143,7 +143,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../analysis/forbids.html">analysis:forbids</a> : <a href="../analysis/Constraint.html">analysis:Constraint</a>
+              <a href="../analysis/forbids.html">analysis:forbids</a> → <a href="../analysis/Constraint.html">analysis:Constraint</a>
             </td>
          </tr>
          <tr>
@@ -151,7 +151,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../analysis/requires.html">analysis:requires</a> : <a href="../analysis/Constraint.html">analysis:Constraint</a>
+              <a href="../analysis/requires.html">analysis:requires</a> → <a href="../analysis/Constraint.html">analysis:Constraint</a>
             </td>
          </tr>
          <tr>
@@ -159,7 +159,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasRationale.html">mission:hasRationale</a> : <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
+              <a href="hasRationale.html">mission:hasRationale</a> → <a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a>
             </td>
          </tr>
          <tr>
@@ -167,7 +167,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isRefinedBy.html">mission:isRefinedBy</a> : <a href="Requirement.html">mission:Requirement</a>
+              <a href="isRefinedBy.html">mission:isRefinedBy</a> → <a href="Requirement.html">mission:Requirement</a>
             </td>
          </tr>
          <tr>
@@ -175,7 +175,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="refines.html">mission:refines</a> : <a href="Requirement.html">mission:Requirement</a>
+              <a href="refines.html">mission:refines</a> → <a href="Requirement.html">mission:Requirement</a>
             </td>
          </tr>
          <tr>
@@ -183,7 +183,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="specifies.html">mission:specifies</a> : <a href="SpecifiedElement.html">mission:SpecifiedElement</a>
+              <a href="specifies.html">mission:specifies</a> → <a href="SpecifiedElement.html">mission:SpecifiedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/SpecifiedElement.html b/imce.jpl.nasa.gov/foundation/mission/SpecifiedElement.html
index d01b2dd..51eb836 100644
--- a/imce.jpl.nasa.gov/foundation/mission/SpecifiedElement.html
+++ b/imce.jpl.nasa.gov/foundation/mission/SpecifiedElement.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Specified Element
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Specified Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -110,7 +110,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -195,7 +195,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -205,7 +205,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isSpecifiedBy.html">mission:isSpecifiedBy</a> : <a href="Requirement.html">mission:Requirement</a>
+              <a href="isSpecifiedBy.html">mission:isSpecifiedBy</a> → <a href="Requirement.html">mission:Requirement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Specifies.html b/imce.jpl.nasa.gov/foundation/mission/Specifies.html
index 97a0ac2..570836c 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Specifies.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Specifies.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Specifies
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Specifies
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Transfers.html b/imce.jpl.nasa.gov/foundation/mission/Transfers.html
index c86c911..2d11483 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Transfers.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Transfers.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Transfers
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Transfers
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/imce.jpl.nasa.gov/foundation/mission/TransfersIn.html b/imce.jpl.nasa.gov/foundation/mission/TransfersIn.html
index 73930df..a19e462 100644
--- a/imce.jpl.nasa.gov/foundation/mission/TransfersIn.html
+++ b/imce.jpl.nasa.gov/foundation/mission/TransfersIn.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Transfers In
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Transfers In
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/TransfersOut.html b/imce.jpl.nasa.gov/foundation/mission/TransfersOut.html
index 0a7a10c..303e57f 100644
--- a/imce.jpl.nasa.gov/foundation/mission/TransfersOut.html
+++ b/imce.jpl.nasa.gov/foundation/mission/TransfersOut.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Transfers Out
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Transfers Out
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/Traverses.html b/imce.jpl.nasa.gov/foundation/mission/Traverses.html
index 5ed89f2..a8f04c3 100644
--- a/imce.jpl.nasa.gov/foundation/mission/Traverses.html
+++ b/imce.jpl.nasa.gov/foundation/mission/Traverses.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Traverses
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Traverses
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/TraversingElement.html b/imce.jpl.nasa.gov/foundation/mission/TraversingElement.html
index 3cd928d..fee676a 100644
--- a/imce.jpl.nasa.gov/foundation/mission/TraversingElement.html
+++ b/imce.jpl.nasa.gov/foundation/mission/TraversingElement.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,15 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Presenting Element
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              Traversing Element
             </td>
          </tr>
 
@@ -48,7 +56,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +66,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -68,7 +76,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,15 +86,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Presenting Element
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              Traversing Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -117,7 +117,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -146,7 +146,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -156,7 +156,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="traverses.html">mission:traverses</a> : <a href="Junction.html">mission:Junction</a>
+              <a href="traverses.html">mission:traverses</a> → <a href="Junction.html">mission:Junction</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/deploys.html b/imce.jpl.nasa.gov/foundation/mission/deploys.html
index 46ebec0..4fe06e0 100644
--- a/imce.jpl.nasa.gov/foundation/mission/deploys.html
+++ b/imce.jpl.nasa.gov/foundation/mission/deploys.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#deploys</font><br>Property mission:deploys</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              deploys
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              deploys
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/hasRationale.html b/imce.jpl.nasa.gov/foundation/mission/hasRationale.html
index 76616b7..6b7e68d 100644
--- a/imce.jpl.nasa.gov/foundation/mission/hasRationale.html
+++ b/imce.jpl.nasa.gov/foundation/mission/hasRationale.html
@@ -26,7 +26,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              has rationale
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,15 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -74,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +76,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Requirement.html">mission:Requirement</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
             </td>
          </tr>
 
@@ -94,7 +94,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -104,7 +104,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has rationale
+              <a href="Requirement.html">mission:Requirement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/induces.html b/imce.jpl.nasa.gov/foundation/mission/induces.html
index dbb6654..8a0e2c1 100644
--- a/imce.jpl.nasa.gov/foundation/mission/induces.html
+++ b/imce.jpl.nasa.gov/foundation/mission/induces.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#induces</font><br>Property mission:induces</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              induces
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              induces
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/influences.html b/imce.jpl.nasa.gov/foundation/mission/influences.html
index dd36d84..00c69fb 100644
--- a/imce.jpl.nasa.gov/foundation/mission/influences.html
+++ b/imce.jpl.nasa.gov/foundation/mission/influences.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#influences</font><br>Property mission:influences</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              influences
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              influences
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/invokes.html b/imce.jpl.nasa.gov/foundation/mission/invokes.html
index f11dec8..9cddeee 100644
--- a/imce.jpl.nasa.gov/foundation/mission/invokes.html
+++ b/imce.jpl.nasa.gov/foundation/mission/invokes.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#invokes</font><br>Property mission:invokes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              invokes
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Function.html">mission:Function</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              invokes
+              <a href="Function.html">mission:Function</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/isDeployedBy.html b/imce.jpl.nasa.gov/foundation/mission/isDeployedBy.html
index 5372c73..9685054 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isDeployedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isDeployedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isDeployedBy</font><br>Property mission:isDeployedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is deployed by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is deployed by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isInducedBy.html b/imce.jpl.nasa.gov/foundation/mission/isInducedBy.html
index 292d940..6c33192 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isInducedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isInducedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isInducedBy</font><br>Property mission:isInducedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is induced by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is induced by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isInfluencedBy.html b/imce.jpl.nasa.gov/foundation/mission/isInfluencedBy.html
index 724726c..091bfad 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isInfluencedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isInfluencedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isInfluencedBy</font><br>Property mission:isInfluencedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is influenced by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is influenced by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isInvokedBy.html b/imce.jpl.nasa.gov/foundation/mission/isInvokedBy.html
index f803901..a4d8b21 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isInvokedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isInvokedBy.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isInvokedBy</font><br>Property mission:isInvokedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#reverseRelation">http://opencaesar.io/oml#reverseRelation</a>
+              is invoked by
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#reverseRelation">http://opencaesar.io/oml#reverseRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Function.html">mission:Function</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              is invoked by
+              <a href="Function.html">mission:Function</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/mission/isJoinedIn.html b/imce.jpl.nasa.gov/foundation/mission/isJoinedIn.html
index 903ae5c..9ed6695 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isJoinedIn.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isJoinedIn.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isJoinedIn</font><br>Property mission:isJoinedIn</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is joined in
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is joined in
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isJoinedIn1.html b/imce.jpl.nasa.gov/foundation/mission/isJoinedIn1.html
index 7564127..d456468 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isJoinedIn1.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isJoinedIn1.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isJoinedIn1</font><br>Property mission:isJoinedIn1</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is joined in1
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is joined in1
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isJoinedIn2.html b/imce.jpl.nasa.gov/foundation/mission/isJoinedIn2.html
index 44349c4..736f4b6 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isJoinedIn2.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isJoinedIn2.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isJoinedIn2</font><br>Property mission:isJoinedIn2</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is joined in2
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is joined in2
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isPerformedBy.html b/imce.jpl.nasa.gov/foundation/mission/isPerformedBy.html
index 8488669..9dfbb79 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isPerformedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isPerformedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isPerformedBy</font><br>Property mission:isPerformedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is performed by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is performed by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isPresentedBy.html b/imce.jpl.nasa.gov/foundation/mission/isPresentedBy.html
index 7b4bd18..da20d51 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isPresentedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isPresentedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isPresentedBy</font><br>Property mission:isPresentedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is presented by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is presented by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isProducedBy.html b/imce.jpl.nasa.gov/foundation/mission/isProducedBy.html
index 1849486..38fd1f2 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isProducedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isProducedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isProducedBy</font><br>Property mission:isProducedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is produced by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is produced by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isPursuedBy.html b/imce.jpl.nasa.gov/foundation/mission/isPursuedBy.html
index 317b960..8b02dff 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isPursuedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isPursuedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isPursuedBy</font><br>Property mission:isPursuedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is pursued by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is pursued by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isRefinedBy.html b/imce.jpl.nasa.gov/foundation/mission/isRefinedBy.html
index 4658797..82f8707 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isRefinedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isRefinedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isRefinedBy</font><br>Property mission:isRefinedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is refined by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is refined by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isSpecifiedBy.html b/imce.jpl.nasa.gov/foundation/mission/isSpecifiedBy.html
index 9fba5c0..636ead1 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isSpecifiedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isSpecifiedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isSpecifiedBy</font><br>Property mission:isSpecifiedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is specified by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is specified by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/isTraversedBy.html b/imce.jpl.nasa.gov/foundation/mission/isTraversedBy.html
index 76a372c..bb35ff6 100644
--- a/imce.jpl.nasa.gov/foundation/mission/isTraversedBy.html
+++ b/imce.jpl.nasa.gov/foundation/mission/isTraversedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#isTraversedBy</font><br>Property mission:isTraversedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is traversed by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is traversed by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/joins.html b/imce.jpl.nasa.gov/foundation/mission/joins.html
index 50b20cb..1be5132 100644
--- a/imce.jpl.nasa.gov/foundation/mission/joins.html
+++ b/imce.jpl.nasa.gov/foundation/mission/joins.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#joins</font><br>Property mission:joins</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              joins
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              joins
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/joins1.html b/imce.jpl.nasa.gov/foundation/mission/joins1.html
index 5165366..f5e82a5 100644
--- a/imce.jpl.nasa.gov/foundation/mission/joins1.html
+++ b/imce.jpl.nasa.gov/foundation/mission/joins1.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#joins1</font><br>Property mission:joins1</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              joins1
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              joins1
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/joins2.html b/imce.jpl.nasa.gov/foundation/mission/joins2.html
index 8261b2d..41c2d54 100644
--- a/imce.jpl.nasa.gov/foundation/mission/joins2.html
+++ b/imce.jpl.nasa.gov/foundation/mission/joins2.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#joins2</font><br>Property mission:joins2</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              joins2
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              joins2
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/performs.html b/imce.jpl.nasa.gov/foundation/mission/performs.html
index ff9f28a..17e5f6b 100644
--- a/imce.jpl.nasa.gov/foundation/mission/performs.html
+++ b/imce.jpl.nasa.gov/foundation/mission/performs.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#performs</font><br>Property mission:performs</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              performs
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              performs
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/presents.html b/imce.jpl.nasa.gov/foundation/mission/presents.html
index 6981ecd..a9bea19 100644
--- a/imce.jpl.nasa.gov/foundation/mission/presents.html
+++ b/imce.jpl.nasa.gov/foundation/mission/presents.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#presents</font><br>Property mission:presents</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              presents
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              presents
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/produces.html b/imce.jpl.nasa.gov/foundation/mission/produces.html
index e26a3ca..0178999 100644
--- a/imce.jpl.nasa.gov/foundation/mission/produces.html
+++ b/imce.jpl.nasa.gov/foundation/mission/produces.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#produces</font><br>Property mission:produces</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              produces
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              produces
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/pursues.html b/imce.jpl.nasa.gov/foundation/mission/pursues.html
index babff1a..102d952 100644
--- a/imce.jpl.nasa.gov/foundation/mission/pursues.html
+++ b/imce.jpl.nasa.gov/foundation/mission/pursues.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#pursues</font><br>Property mission:pursues</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              pursues
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              pursues
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/refines.html b/imce.jpl.nasa.gov/foundation/mission/refines.html
index 6a8d4b6..bf47a5f 100644
--- a/imce.jpl.nasa.gov/foundation/mission/refines.html
+++ b/imce.jpl.nasa.gov/foundation/mission/refines.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#refines</font><br>Property mission:refines</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              refines
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              refines
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/specifies.html b/imce.jpl.nasa.gov/foundation/mission/specifies.html
index 76d816a..4d4aaa2 100644
--- a/imce.jpl.nasa.gov/foundation/mission/specifies.html
+++ b/imce.jpl.nasa.gov/foundation/mission/specifies.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#specifies</font><br>Property mission:specifies</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              specifies
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              specifies
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/transfers.html b/imce.jpl.nasa.gov/foundation/mission/transfers.html
index e2f6802..49e06fb 100644
--- a/imce.jpl.nasa.gov/foundation/mission/transfers.html
+++ b/imce.jpl.nasa.gov/foundation/mission/transfers.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#transfers</font><br>Property mission:transfers</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              transfers
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              transfers
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/transfersIn.html b/imce.jpl.nasa.gov/foundation/mission/transfersIn.html
index eb1f185..7fed288 100644
--- a/imce.jpl.nasa.gov/foundation/mission/transfersIn.html
+++ b/imce.jpl.nasa.gov/foundation/mission/transfersIn.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#transfersIn</font><br>Property mission:transfersIn</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              transfers in
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              transfers in
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/transfersOut.html b/imce.jpl.nasa.gov/foundation/mission/transfersOut.html
index c45e96f..8e63c19 100644
--- a/imce.jpl.nasa.gov/foundation/mission/transfersOut.html
+++ b/imce.jpl.nasa.gov/foundation/mission/transfersOut.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#transfersOut</font><br>Property mission:transfersOut</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              transfers out
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              transfers out
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/mission/traverses.html b/imce.jpl.nasa.gov/foundation/mission/traverses.html
index 1c12590..662862d 100644
--- a/imce.jpl.nasa.gov/foundation/mission/traverses.html
+++ b/imce.jpl.nasa.gov/foundation/mission/traverses.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/mission#traverses</font><br>Property mission:traverses</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              traverses
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              traverses
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/Approves.html b/imce.jpl.nasa.gov/foundation/project/Approves.html
index f01a1ce..7d9b576 100644
--- a/imce.jpl.nasa.gov/foundation/project/Approves.html
+++ b/imce.jpl.nasa.gov/foundation/project/Approves.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Approves
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Approves
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/AssignedElement.html b/imce.jpl.nasa.gov/foundation/project/AssignedElement.html
index 5c3a8c2..49b9c20 100644
--- a/imce.jpl.nasa.gov/foundation/project/AssignedElement.html
+++ b/imce.jpl.nasa.gov/foundation/project/AssignedElement.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Assigned Element
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Assigned Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -153,7 +153,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -163,7 +163,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isAssignedTo.html">project:isAssignedTo</a> : <a href="Role.html">project:Role</a>
+              <a href="isAssignedTo.html">project:isAssignedTo</a> → <a href="Role.html">project:Role</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Authority.html b/imce.jpl.nasa.gov/foundation/project/Authority.html
index 0114c95..3736c78 100644
--- a/imce.jpl.nasa.gov/foundation/project/Authority.html
+++ b/imce.jpl.nasa.gov/foundation/project/Authority.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Authority
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Authority
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -109,7 +109,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -146,7 +146,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -156,7 +156,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="authorizes.html">project:authorizes</a> : <a href="Authority.html">project:Authority</a>
+              <a href="authorizes.html">project:authorizes</a> → <a href="Authority.html">project:Authority</a>
             </td>
          </tr>
          <tr>
@@ -164,7 +164,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="executes.html">project:executes</a> : <a href="Process.html">project:Process</a>
+              <a href="executes.html">project:executes</a> → <a href="Process.html">project:Process</a>
             </td>
          </tr>
          <tr>
@@ -172,7 +172,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isAuthorizedBy.html">project:isAuthorizedBy</a> : <a href="Authority.html">project:Authority</a>
+              <a href="isAuthorizedBy.html">project:isAuthorizedBy</a> → <a href="Authority.html">project:Authority</a>
             </td>
          </tr>
          <tr>
@@ -180,7 +180,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isResponsibilityOf.html">project:isResponsibilityOf</a> : <a href="Organization.html">project:Organization</a>
+              <a href="isResponsibilityOf.html">project:isResponsibilityOf</a> → <a href="Organization.html">project:Organization</a>
             </td>
          </tr>
          <tr>
@@ -188,7 +188,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="produces.html">project:produces</a> : <a href="Product.html">project:Product</a>
+              <a href="produces.html">project:produces</a> → <a href="Product.html">project:Product</a>
             </td>
          </tr>
          <tr>
@@ -196,7 +196,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="reliesOn.html">project:reliesOn</a> : <a href="DevelopedElement.html">project:DevelopedElement</a>
+              <a href="reliesOn.html">project:reliesOn</a> → <a href="DevelopedElement.html">project:DevelopedElement</a>
             </td>
          </tr>
          <tr>
@@ -204,7 +204,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="supplies.html">project:supplies</a> : <a href="SuppliedElement.html">project:SuppliedElement</a>
+              <a href="supplies.html">project:supplies</a> → <a href="SuppliedElement.html">project:SuppliedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Authorizes.html b/imce.jpl.nasa.gov/foundation/project/Authorizes.html
index d27f1a5..8481cb9 100644
--- a/imce.jpl.nasa.gov/foundation/project/Authorizes.html
+++ b/imce.jpl.nasa.gov/foundation/project/Authorizes.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Authorizes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Authorizes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/BelongsTo.html b/imce.jpl.nasa.gov/foundation/project/BelongsTo.html
index dcd009e..593ebfc 100644
--- a/imce.jpl.nasa.gov/foundation/project/BelongsTo.html
+++ b/imce.jpl.nasa.gov/foundation/project/BelongsTo.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Belongs To
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Belongs To
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Binds.html b/imce.jpl.nasa.gov/foundation/project/Binds.html
index 6818603..94d5636 100644
--- a/imce.jpl.nasa.gov/foundation/project/Binds.html
+++ b/imce.jpl.nasa.gov/foundation/project/Binds.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Binds
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Binds
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/BoundElement.html b/imce.jpl.nasa.gov/foundation/project/BoundElement.html
index 82c15a5..fa55c45 100644
--- a/imce.jpl.nasa.gov/foundation/project/BoundElement.html
+++ b/imce.jpl.nasa.gov/foundation/project/BoundElement.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Bound Element
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Bound Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -109,7 +109,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -119,7 +119,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isBoundBy.html">project:isBoundBy</a> : <a href="Policy.html">project:Policy</a>
+              <a href="isBoundBy.html">project:isBoundBy</a> → <a href="Policy.html">project:Policy</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Concern.html b/imce.jpl.nasa.gov/foundation/project/Concern.html
index 10f72f8..b595653 100644
--- a/imce.jpl.nasa.gov/foundation/project/Concern.html
+++ b/imce.jpl.nasa.gov/foundation/project/Concern.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Concern
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Concern
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -124,7 +124,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -145,7 +145,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isRepresentedBy.html">project:isRepresentedBy</a> : <a href="Stakeholder.html">project:Stakeholder</a>
+              <a href="isRepresentedBy.html">project:isRepresentedBy</a> → <a href="Stakeholder.html">project:Stakeholder</a>
             </td>
          </tr>
 
@@ -166,7 +166,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -176,7 +176,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/aggregates.html">base:aggregates</a> all <a href="Concern.html">project:Concern</a>
+              <a href="../base/aggregates.html">base:aggregates</a> → all values from <a href="Concern.html">project:Concern</a>
             </td>
          </tr>
          <tr>
@@ -184,7 +184,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> all <a href="Concern.html">project:Concern</a>
+              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> → all values from <a href="Concern.html">project:Concern</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Concurs.html b/imce.jpl.nasa.gov/foundation/project/Concurs.html
index 3746759..f9a50df 100644
--- a/imce.jpl.nasa.gov/foundation/project/Concurs.html
+++ b/imce.jpl.nasa.gov/foundation/project/Concurs.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Concurs
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Concurs
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/DelegatesTo.html b/imce.jpl.nasa.gov/foundation/project/DelegatesTo.html
index fa0780d..546b1f3 100644
--- a/imce.jpl.nasa.gov/foundation/project/DelegatesTo.html
+++ b/imce.jpl.nasa.gov/foundation/project/DelegatesTo.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Delegates To
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Delegates To
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Deliverable.html b/imce.jpl.nasa.gov/foundation/project/Deliverable.html
index fd6847c..9a5c671 100644
--- a/imce.jpl.nasa.gov/foundation/project/Deliverable.html
+++ b/imce.jpl.nasa.gov/foundation/project/Deliverable.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Deliverable
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Deliverable
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -116,7 +116,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -137,7 +137,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -147,7 +147,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isDeliveredBy.html">project:isDeliveredBy</a> : <a href="InterchangePoint.html">project:InterchangePoint</a>
+              <a href="isDeliveredBy.html">project:isDeliveredBy</a> → <a href="InterchangePoint.html">project:InterchangePoint</a>
             </td>
          </tr>
          <tr>
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isReceivedBy.html">project:isReceivedBy</a> : <a href="InterchangePoint.html">project:InterchangePoint</a>
+              <a href="isReceivedBy.html">project:isReceivedBy</a> → <a href="InterchangePoint.html">project:InterchangePoint</a>
             </td>
          </tr>
          <tr>
@@ -163,7 +163,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isRequiredNotLaterThan.html">project:isRequiredNotLaterThan</a> : <a href="http://www.w3.org/2001/XMLSchema#dateTime">xsd:dateTime</a>
+              <a href="isRequiredNotLaterThan.html">project:isRequiredNotLaterThan</a> → <a href="http://www.w3.org/2001/XMLSchema#dateTime">xsd:dateTime</a>
             </td>
          </tr>
          <tr>
@@ -171,7 +171,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="participatesIn.html">project:participatesIn</a> : <a href="Interchange.html">project:Interchange</a>
+              <a href="participatesIn.html">project:participatesIn</a> → <a href="Interchange.html">project:Interchange</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Delivers.html b/imce.jpl.nasa.gov/foundation/project/Delivers.html
index e1d303c..5296801 100644
--- a/imce.jpl.nasa.gov/foundation/project/Delivers.html
+++ b/imce.jpl.nasa.gov/foundation/project/Delivers.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Delivers
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Delivers
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Describes.html b/imce.jpl.nasa.gov/foundation/project/Describes.html
index 839d9a2..b28b16a 100644
--- a/imce.jpl.nasa.gov/foundation/project/Describes.html
+++ b/imce.jpl.nasa.gov/foundation/project/Describes.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Describes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Describes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/DevelopedElement.html b/imce.jpl.nasa.gov/foundation/project/DevelopedElement.html
index a77a816..beca2e5 100644
--- a/imce.jpl.nasa.gov/foundation/project/DevelopedElement.html
+++ b/imce.jpl.nasa.gov/foundation/project/DevelopedElement.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Developed Element
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Developed Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -116,7 +116,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -169,7 +169,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -179,7 +179,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isDescribedBy.html">project:isDescribedBy</a> : <a href="Product.html">project:Product</a>
+              <a href="isDescribedBy.html">project:isDescribedBy</a> → <a href="Product.html">project:Product</a>
             </td>
          </tr>
          <tr>
@@ -187,7 +187,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isReliedOnBy.html">project:isReliedOnBy</a> : <a href="Authority.html">project:Authority</a>
+              <a href="isReliedOnBy.html">project:isReliedOnBy</a> → <a href="Authority.html">project:Authority</a>
             </td>
          </tr>
          <tr>
@@ -195,7 +195,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="manifests.html">project:manifests</a> : <a href="DevelopmentState.html">project:DevelopmentState</a>
+              <a href="manifests.html">project:manifests</a> → <a href="DevelopmentState.html">project:DevelopmentState</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/DevelopmentState.html b/imce.jpl.nasa.gov/foundation/project/DevelopmentState.html
index 75396b8..29cf10c 100644
--- a/imce.jpl.nasa.gov/foundation/project/DevelopmentState.html
+++ b/imce.jpl.nasa.gov/foundation/project/DevelopmentState.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Development State
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Development State
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -134,7 +134,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -144,7 +144,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isManfestedBy.html">project:isManfestedBy</a> : <a href="DevelopedElement.html">project:DevelopedElement</a>
+              <a href="isManfestedBy.html">project:isManfestedBy</a> → <a href="DevelopedElement.html">project:DevelopedElement</a>
             </td>
          </tr>
 
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -165,7 +165,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../analysis/characterizes.html">analysis:characterizes</a> all <a href="DevelopedElement.html">project:DevelopedElement</a>
+              <a href="../analysis/characterizes.html">analysis:characterizes</a> → all values from <a href="DevelopedElement.html">project:DevelopedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Executes.html b/imce.jpl.nasa.gov/foundation/project/Executes.html
index 86e22a7..b494e02 100644
--- a/imce.jpl.nasa.gov/foundation/project/Executes.html
+++ b/imce.jpl.nasa.gov/foundation/project/Executes.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Executes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Executes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Facility.html b/imce.jpl.nasa.gov/foundation/project/Facility.html
index 205c7d7..ac34e8b 100644
--- a/imce.jpl.nasa.gov/foundation/project/Facility.html
+++ b/imce.jpl.nasa.gov/foundation/project/Facility.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Facility
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Facility
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/HasAssignment.html b/imce.jpl.nasa.gov/foundation/project/HasAssignment.html
index b57b7c1..d63890c 100644
--- a/imce.jpl.nasa.gov/foundation/project/HasAssignment.html
+++ b/imce.jpl.nasa.gov/foundation/project/HasAssignment.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Has Assignment
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Has Assignment
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/imce.jpl.nasa.gov/foundation/project/HasParticipant.html b/imce.jpl.nasa.gov/foundation/project/HasParticipant.html
index ff149f3..dca1c17 100644
--- a/imce.jpl.nasa.gov/foundation/project/HasParticipant.html
+++ b/imce.jpl.nasa.gov/foundation/project/HasParticipant.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Has Participant
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Has Participant
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/HasResponsibilityFor.html b/imce.jpl.nasa.gov/foundation/project/HasResponsibilityFor.html
index 309c6f7..19b18df 100644
--- a/imce.jpl.nasa.gov/foundation/project/HasResponsibilityFor.html
+++ b/imce.jpl.nasa.gov/foundation/project/HasResponsibilityFor.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Has Responsibility For
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Has Responsibility For
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/HasRole.html b/imce.jpl.nasa.gov/foundation/project/HasRole.html
index 5f3f628..6e31b44 100644
--- a/imce.jpl.nasa.gov/foundation/project/HasRole.html
+++ b/imce.jpl.nasa.gov/foundation/project/HasRole.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Has Role
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Has Role
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Interchange.html b/imce.jpl.nasa.gov/foundation/project/Interchange.html
index 52bfe81..3a05795 100644
--- a/imce.jpl.nasa.gov/foundation/project/Interchange.html
+++ b/imce.jpl.nasa.gov/foundation/project/Interchange.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Interchange
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Interchange
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -118,7 +118,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -128,7 +128,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasParticipant.html">project:hasParticipant</a> : <a href="Deliverable.html">project:Deliverable</a>
+              <a href="hasParticipant.html">project:hasParticipant</a> → <a href="Deliverable.html">project:Deliverable</a>
             </td>
          </tr>
          <tr>
@@ -136,7 +136,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="involves.html">project:involves</a> : <a href="Process.html">project:Process</a>
+              <a href="involves.html">project:involves</a> → <a href="Process.html">project:Process</a>
             </td>
          </tr>
          <tr>
@@ -144,7 +144,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="involves1.html">project:involves1</a> : <a href="Process.html">project:Process</a>
+              <a href="involves1.html">project:involves1</a> → <a href="Process.html">project:Process</a>
             </td>
          </tr>
          <tr>
@@ -152,7 +152,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="involves2.html">project:involves2</a> : <a href="Process.html">project:Process</a>
+              <a href="involves2.html">project:involves2</a> → <a href="Process.html">project:Process</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/InterchangePoint.html b/imce.jpl.nasa.gov/foundation/project/InterchangePoint.html
index 5c32c7a..054c4be 100644
--- a/imce.jpl.nasa.gov/foundation/project/InterchangePoint.html
+++ b/imce.jpl.nasa.gov/foundation/project/InterchangePoint.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Interchange Point
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Interchange Point
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -118,7 +118,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -128,7 +128,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="delivers.html">project:delivers</a> : <a href="Deliverable.html">project:Deliverable</a>
+              <a href="delivers.html">project:delivers</a> → <a href="Deliverable.html">project:Deliverable</a>
             </td>
          </tr>
          <tr>
@@ -136,7 +136,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isInterchangePointFor.html">project:isInterchangePointFor</a> : <a href="Process.html">project:Process</a>
+              <a href="isInterchangePointFor.html">project:isInterchangePointFor</a> → <a href="Process.html">project:Process</a>
             </td>
          </tr>
          <tr>
@@ -144,7 +144,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="receives.html">project:receives</a> : <a href="Deliverable.html">project:Deliverable</a>
+              <a href="receives.html">project:receives</a> → <a href="Deliverable.html">project:Deliverable</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/InterchangesThrough.html b/imce.jpl.nasa.gov/foundation/project/InterchangesThrough.html
index b722a6e..be56631 100644
--- a/imce.jpl.nasa.gov/foundation/project/InterchangesThrough.html
+++ b/imce.jpl.nasa.gov/foundation/project/InterchangesThrough.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Interchanges Through
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Interchanges Through
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Invokes.html b/imce.jpl.nasa.gov/foundation/project/Invokes.html
index afeb0f1..c0b9062 100644
--- a/imce.jpl.nasa.gov/foundation/project/Invokes.html
+++ b/imce.jpl.nasa.gov/foundation/project/Invokes.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Invokes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Invokes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Involves.html b/imce.jpl.nasa.gov/foundation/project/Involves.html
index 5b4637d..ea8774c 100644
--- a/imce.jpl.nasa.gov/foundation/project/Involves.html
+++ b/imce.jpl.nasa.gov/foundation/project/Involves.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Involves
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Involves
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
diff --git a/imce.jpl.nasa.gov/foundation/project/Involves1.html b/imce.jpl.nasa.gov/foundation/project/Involves1.html
index bb6d84e..50834b1 100644
--- a/imce.jpl.nasa.gov/foundation/project/Involves1.html
+++ b/imce.jpl.nasa.gov/foundation/project/Involves1.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Involves1
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Involves1
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Involves2.html b/imce.jpl.nasa.gov/foundation/project/Involves2.html
index 6f6cda3..e055831 100644
--- a/imce.jpl.nasa.gov/foundation/project/Involves2.html
+++ b/imce.jpl.nasa.gov/foundation/project/Involves2.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Involves2
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Involves2
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Manifests.html b/imce.jpl.nasa.gov/foundation/project/Manifests.html
index 679b403..c7da424 100644
--- a/imce.jpl.nasa.gov/foundation/project/Manifests.html
+++ b/imce.jpl.nasa.gov/foundation/project/Manifests.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Manifests
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Manifests
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Organization.html b/imce.jpl.nasa.gov/foundation/project/Organization.html
index 70bd36a..0d0f293 100644
--- a/imce.jpl.nasa.gov/foundation/project/Organization.html
+++ b/imce.jpl.nasa.gov/foundation/project/Organization.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Organization
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Organization
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -117,7 +117,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -127,7 +127,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasResponsibilityFor.html">project:hasResponsibilityFor</a> : <a href="Authority.html">project:Authority</a>
+              <a href="hasResponsibilityFor.html">project:hasResponsibilityFor</a> → <a href="Authority.html">project:Authority</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Person.html b/imce.jpl.nasa.gov/foundation/project/Person.html
index 7406a3c..e6193b4 100644
--- a/imce.jpl.nasa.gov/foundation/project/Person.html
+++ b/imce.jpl.nasa.gov/foundation/project/Person.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Person
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Person
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -117,7 +117,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -127,7 +127,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="belongsTo.html">project:belongsTo</a> : <a href="Organization.html">project:Organization</a>
+              <a href="belongsTo.html">project:belongsTo</a> → <a href="Organization.html">project:Organization</a>
             </td>
          </tr>
          <tr>
@@ -135,7 +135,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasRole.html">project:hasRole</a> : <a href="Role.html">project:Role</a>
+              <a href="hasRole.html">project:hasRole</a> → <a href="Role.html">project:Role</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Policy.html b/imce.jpl.nasa.gov/foundation/project/Policy.html
index 2e2a83a..06115e0 100644
--- a/imce.jpl.nasa.gov/foundation/project/Policy.html
+++ b/imce.jpl.nasa.gov/foundation/project/Policy.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Policy
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Policy
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -117,7 +117,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -127,7 +127,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="binds.html">project:binds</a> : <a href="BoundElement.html">project:BoundElement</a>
+              <a href="binds.html">project:binds</a> → <a href="BoundElement.html">project:BoundElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Prepares.html b/imce.jpl.nasa.gov/foundation/project/Prepares.html
index 59cbcda..9a1ef00 100644
--- a/imce.jpl.nasa.gov/foundation/project/Prepares.html
+++ b/imce.jpl.nasa.gov/foundation/project/Prepares.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Prepares
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Prepares
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Process.html b/imce.jpl.nasa.gov/foundation/project/Process.html
index 0e1e099..bb3a1f0 100644
--- a/imce.jpl.nasa.gov/foundation/project/Process.html
+++ b/imce.jpl.nasa.gov/foundation/project/Process.html
@@ -33,7 +33,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -43,7 +43,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Process
             </td>
          </tr>
 
@@ -53,7 +53,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -63,7 +63,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -73,7 +73,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -83,7 +83,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Process
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -139,7 +139,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -149,7 +149,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="interchangesThrough.html">project:interchangesThrough</a> : <a href="InterchangePoint.html">project:InterchangePoint</a>
+              <a href="interchangesThrough.html">project:interchangesThrough</a> → <a href="InterchangePoint.html">project:InterchangePoint</a>
             </td>
          </tr>
          <tr>
@@ -157,7 +157,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="invokes.html">project:invokes</a> : <a href="Process.html">project:Process</a>
+              <a href="invokes.html">project:invokes</a> → <a href="Process.html">project:Process</a>
             </td>
          </tr>
          <tr>
@@ -165,7 +165,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isExecutedBy.html">project:isExecutedBy</a> : <a href="Authority.html">project:Authority</a>
+              <a href="isExecutedBy.html">project:isExecutedBy</a> → <a href="Authority.html">project:Authority</a>
             </td>
          </tr>
          <tr>
@@ -173,7 +173,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isInvokedBy.html">project:isInvokedBy</a> : <a href="Process.html">project:Process</a>
+              <a href="isInvokedBy.html">project:isInvokedBy</a> → <a href="Process.html">project:Process</a>
             </td>
          </tr>
          <tr>
@@ -181,7 +181,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isInvolvedIn.html">project:isInvolvedIn</a> : <a href="Interchange.html">project:Interchange</a>
+              <a href="isInvolvedIn.html">project:isInvolvedIn</a> → <a href="Interchange.html">project:Interchange</a>
             </td>
          </tr>
          <tr>
@@ -189,7 +189,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isInvolvedIn1.html">project:isInvolvedIn1</a> : <a href="Interchange.html">project:Interchange</a>
+              <a href="isInvolvedIn1.html">project:isInvolvedIn1</a> → <a href="Interchange.html">project:Interchange</a>
             </td>
          </tr>
          <tr>
@@ -197,7 +197,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isInvolvedIn2.html">project:isInvolvedIn2</a> : <a href="Interchange.html">project:Interchange</a>
+              <a href="isInvolvedIn2.html">project:isInvolvedIn2</a> → <a href="Interchange.html">project:Interchange</a>
             </td>
          </tr>
 
@@ -208,7 +208,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -218,7 +218,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isRealizedBy.html">project:isRealizedBy</a> all <a href="Process.html">project:Process</a>
+              <a href="isRealizedBy.html">project:isRealizedBy</a> → all values from <a href="Process.html">project:Process</a>
             </td>
          </tr>
          <tr>
@@ -226,7 +226,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="realizes.html">project:realizes</a> all <a href="Process.html">project:Process</a>
+              <a href="realizes.html">project:realizes</a> → all values from <a href="Process.html">project:Process</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Produces.html b/imce.jpl.nasa.gov/foundation/project/Produces.html
index 1523286..f77ccb1 100644
--- a/imce.jpl.nasa.gov/foundation/project/Produces.html
+++ b/imce.jpl.nasa.gov/foundation/project/Produces.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Produces
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Produces
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Product.html b/imce.jpl.nasa.gov/foundation/project/Product.html
index 766535d..97be856 100644
--- a/imce.jpl.nasa.gov/foundation/project/Product.html
+++ b/imce.jpl.nasa.gov/foundation/project/Product.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Product
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Product
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -149,7 +149,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -159,7 +159,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="describes.html">project:describes</a> : <a href="DevelopedElement.html">project:DevelopedElement</a>
+              <a href="describes.html">project:describes</a> → <a href="DevelopedElement.html">project:DevelopedElement</a>
             </td>
          </tr>
          <tr>
@@ -167,7 +167,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isApprovedBy.html">project:isApprovedBy</a> : <a href="Role.html">project:Role</a>
+              <a href="isApprovedBy.html">project:isApprovedBy</a> → <a href="Role.html">project:Role</a>
             </td>
          </tr>
          <tr>
@@ -175,7 +175,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isConcurredBy.html">project:isConcurredBy</a> : <a href="Role.html">project:Role</a>
+              <a href="isConcurredBy.html">project:isConcurredBy</a> → <a href="Role.html">project:Role</a>
             </td>
          </tr>
          <tr>
@@ -183,7 +183,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isPreparedBy.html">project:isPreparedBy</a> : <a href="Role.html">project:Role</a>
+              <a href="isPreparedBy.html">project:isPreparedBy</a> → <a href="Role.html">project:Role</a>
             </td>
          </tr>
          <tr>
@@ -191,7 +191,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isProducedBy.html">project:isProducedBy</a> : <a href="Authority.html">project:Authority</a>
+              <a href="isProducedBy.html">project:isProducedBy</a> → <a href="Authority.html">project:Authority</a>
             </td>
          </tr>
 
@@ -202,7 +202,7 @@ <h3>owl:domainOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -212,7 +212,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/aggregates.html">base:aggregates</a> all <a href="Product.html">project:Product</a>
+              <a href="../base/aggregates.html">base:aggregates</a> → all values from <a href="Product.html">project:Product</a>
             </td>
          </tr>
          <tr>
@@ -220,7 +220,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> all <a href="Product.html">project:Product</a>
+              <a href="../base/isAggregatedIn.html">base:isAggregatedIn</a> → all values from <a href="Product.html">project:Product</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Program.html b/imce.jpl.nasa.gov/foundation/project/Program.html
index 885efe4..019ee69 100644
--- a/imce.jpl.nasa.gov/foundation/project/Program.html
+++ b/imce.jpl.nasa.gov/foundation/project/Program.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Program
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Program
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -138,7 +138,7 @@ <h3>owl:disjointWith</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -148,7 +148,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="authorizes.html">project:authorizes</a> all <a href="Project.html">project:Project</a>
+              <a href="authorizes.html">project:authorizes</a> → all values from <a href="Project.html">project:Project</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Project.html b/imce.jpl.nasa.gov/foundation/project/Project.html
index 69a72da..ca2e328 100644
--- a/imce.jpl.nasa.gov/foundation/project/Project.html
+++ b/imce.jpl.nasa.gov/foundation/project/Project.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Project
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Project
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -126,7 +126,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -136,7 +136,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="authorizes.html">project:authorizes</a> all <a href="WorkPackage.html">project:WorkPackage</a>
+              <a href="authorizes.html">project:authorizes</a> → all values from <a href="WorkPackage.html">project:WorkPackage</a>
             </td>
          </tr>
          <tr>
@@ -144,7 +144,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isAuthorizedBy.html">project:isAuthorizedBy</a> all <a href="Program.html">project:Program</a>
+              <a href="isAuthorizedBy.html">project:isAuthorizedBy</a> → all values from <a href="Program.html">project:Program</a>
             </td>
          </tr>
          <tr>
@@ -152,7 +152,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isRealizedBy.html">project:isRealizedBy</a> all <a href="Project.html">project:Project</a>
+              <a href="isRealizedBy.html">project:isRealizedBy</a> → all values from <a href="Project.html">project:Project</a>
             </td>
          </tr>
          <tr>
@@ -160,7 +160,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="realizes.html">project:realizes</a> all <a href="Project.html">project:Project</a>
+              <a href="realizes.html">project:realizes</a> → all values from <a href="Project.html">project:Project</a>
             </td>
          </tr>
          <tr>
@@ -168,7 +168,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="supplies.html">project:supplies</a> all <a href="../mission/Mission.html">mission:Mission</a>
+              <a href="supplies.html">project:supplies</a> → all values from <a href="../mission/Mission.html">mission:Mission</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/RealizedElement.html b/imce.jpl.nasa.gov/foundation/project/RealizedElement.html
index d3b5fea..6c16c23 100644
--- a/imce.jpl.nasa.gov/foundation/project/RealizedElement.html
+++ b/imce.jpl.nasa.gov/foundation/project/RealizedElement.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Realized Element
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Realized Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -185,7 +185,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -195,7 +195,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isRealizedBy.html">project:isRealizedBy</a> : <a href="RealizedElement.html">project:RealizedElement</a>
+              <a href="isRealizedBy.html">project:isRealizedBy</a> → <a href="RealizedElement.html">project:RealizedElement</a>
             </td>
          </tr>
          <tr>
@@ -203,7 +203,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="realizes.html">project:realizes</a> : <a href="RealizedElement.html">project:RealizedElement</a>
+              <a href="realizes.html">project:realizes</a> → <a href="RealizedElement.html">project:RealizedElement</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Realizes.html b/imce.jpl.nasa.gov/foundation/project/Realizes.html
index 2a8b6bb..a34e466 100644
--- a/imce.jpl.nasa.gov/foundation/project/Realizes.html
+++ b/imce.jpl.nasa.gov/foundation/project/Realizes.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Realizes
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Realizes
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Receives.html b/imce.jpl.nasa.gov/foundation/project/Receives.html
index b125dae..b40e9c3 100644
--- a/imce.jpl.nasa.gov/foundation/project/Receives.html
+++ b/imce.jpl.nasa.gov/foundation/project/Receives.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Receives
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Receives
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/ReliesOn.html b/imce.jpl.nasa.gov/foundation/project/ReliesOn.html
index ca2a245..cf0d533 100644
--- a/imce.jpl.nasa.gov/foundation/project/ReliesOn.html
+++ b/imce.jpl.nasa.gov/foundation/project/ReliesOn.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Relies On
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Relies On
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Represents.html b/imce.jpl.nasa.gov/foundation/project/Represents.html
index c17c7f1..3f3b8c3 100644
--- a/imce.jpl.nasa.gov/foundation/project/Represents.html
+++ b/imce.jpl.nasa.gov/foundation/project/Represents.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Represents
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Represents
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Role.html b/imce.jpl.nasa.gov/foundation/project/Role.html
index 09f1bdb..910cc2d 100644
--- a/imce.jpl.nasa.gov/foundation/project/Role.html
+++ b/imce.jpl.nasa.gov/foundation/project/Role.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Role
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Role
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -117,7 +117,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -127,7 +127,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="approves.html">project:approves</a> : <a href="Product.html">project:Product</a>
+              <a href="approves.html">project:approves</a> → <a href="Product.html">project:Product</a>
             </td>
          </tr>
          <tr>
@@ -135,7 +135,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="concurs.html">project:concurs</a> : <a href="Product.html">project:Product</a>
+              <a href="concurs.html">project:concurs</a> → <a href="Product.html">project:Product</a>
             </td>
          </tr>
          <tr>
@@ -143,7 +143,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="delegatesTo.html">project:delegatesTo</a> : <a href="Role.html">project:Role</a>
+              <a href="delegatesTo.html">project:delegatesTo</a> → <a href="Role.html">project:Role</a>
             </td>
          </tr>
          <tr>
@@ -151,7 +151,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="hasAssignment.html">project:hasAssignment</a> : <a href="AssignedElement.html">project:AssignedElement</a>
+              <a href="hasAssignment.html">project:hasAssignment</a> → <a href="AssignedElement.html">project:AssignedElement</a>
             </td>
          </tr>
          <tr>
@@ -159,7 +159,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isDelegateOf.html">project:isDelegateOf</a> : <a href="Role.html">project:Role</a>
+              <a href="isDelegateOf.html">project:isDelegateOf</a> → <a href="Role.html">project:Role</a>
             </td>
          </tr>
          <tr>
@@ -167,7 +167,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isRoleOf.html">project:isRoleOf</a> : <a href="Person.html">project:Person</a>
+              <a href="isRoleOf.html">project:isRoleOf</a> → <a href="Person.html">project:Person</a>
             </td>
          </tr>
          <tr>
@@ -175,7 +175,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="prepares.html">project:prepares</a> : <a href="Product.html">project:Product</a>
+              <a href="prepares.html">project:prepares</a> → <a href="Product.html">project:Product</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Stakeholder.html b/imce.jpl.nasa.gov/foundation/project/Stakeholder.html
index 1882579..27a2cdb 100644
--- a/imce.jpl.nasa.gov/foundation/project/Stakeholder.html
+++ b/imce.jpl.nasa.gov/foundation/project/Stakeholder.html
@@ -28,7 +28,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -38,7 +38,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Stakeholder
             </td>
          </tr>
 
@@ -48,7 +48,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -58,7 +58,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -68,7 +68,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -78,7 +78,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Stakeholder
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -118,7 +118,7 @@ <h3>rdfs:subClassOf</h3>
 </dl>
 
          
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -128,7 +128,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="represents.html">project:represents</a> : <a href="Concern.html">project:Concern</a>
+              <a href="represents.html">project:represents</a> → <a href="Concern.html">project:Concern</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/SuppliedElement.html b/imce.jpl.nasa.gov/foundation/project/SuppliedElement.html
index 860433c..7f1792d 100644
--- a/imce.jpl.nasa.gov/foundation/project/SuppliedElement.html
+++ b/imce.jpl.nasa.gov/foundation/project/SuppliedElement.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
+              Supplied Element
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Aspect">http://opencaesar.io/oml#Aspect</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Supplied Element
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -108,7 +108,7 @@ <h3>rdfs:subClassOf</h3>
    </dd>
 </dl>
 
-         <h3>rdfs:superClassOf</h3>
+         <h3>directSuperClassOf</h3>
 <dl>
    <dd>
         <table>
@@ -145,7 +145,7 @@ <h3>rdfs:superClassOf</h3>
    </dd>
 </dl>
 
-         <h3>owl:domainOf</h3>
+         <h3>directDomainOf</h3>
 <dl>
    <dd>
         <table>
@@ -155,7 +155,7 @@ <h3>owl:domainOf</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isSuppliedBy.html">project:isSuppliedBy</a> : <a href="Authority.html">project:Authority</a>
+              <a href="isSuppliedBy.html">project:isSuppliedBy</a> → <a href="Authority.html">project:Authority</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/Supplies.html b/imce.jpl.nasa.gov/foundation/project/Supplies.html
index 137af2d..a2889df 100644
--- a/imce.jpl.nasa.gov/foundation/project/Supplies.html
+++ b/imce.jpl.nasa.gov/foundation/project/Supplies.html
@@ -27,7 +27,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
+              Supplies
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#RelationEntity">http://opencaesar.io/oml#RelationEntity</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Supplies
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/WorkPackage.html b/imce.jpl.nasa.gov/foundation/project/WorkPackage.html
index 8b55367..1b1e87b 100644
--- a/imce.jpl.nasa.gov/foundation/project/WorkPackage.html
+++ b/imce.jpl.nasa.gov/foundation/project/WorkPackage.html
@@ -29,7 +29,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -39,7 +39,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              Work Package
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -69,7 +69,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -79,7 +79,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Work Package
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
@@ -144,7 +144,7 @@ <h3>rdfs:subClassOf</h3>
 
          
          
-         <h3>owl:restrictionOn</h3>
+         <h3>directHasRestrictionOn</h3>
 <dl>
    <dd>
         <table>
@@ -154,7 +154,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="authorizes.html">project:authorizes</a> all <a href="WorkPackage.html">project:WorkPackage</a>
+              <a href="authorizes.html">project:authorizes</a> → all values from <a href="WorkPackage.html">project:WorkPackage</a>
             </td>
          </tr>
          <tr>
@@ -162,7 +162,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="isRealizedBy.html">project:isRealizedBy</a> all <a href="WorkPackage.html">project:WorkPackage</a>
+              <a href="isRealizedBy.html">project:isRealizedBy</a> → all values from <a href="WorkPackage.html">project:WorkPackage</a>
             </td>
          </tr>
          <tr>
@@ -170,7 +170,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="realizes.html">project:realizes</a> all <a href="WorkPackage.html">project:WorkPackage</a>
+              <a href="realizes.html">project:realizes</a> → all values from <a href="WorkPackage.html">project:WorkPackage</a>
             </td>
          </tr>
          <tr>
@@ -178,7 +178,7 @@ <h3>owl:restrictionOn</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="supplies.html">project:supplies</a> all <a href="../mission/Component.html">mission:Component</a>
+              <a href="supplies.html">project:supplies</a> → all values from <a href="../mission/Component.html">mission:Component</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/approves.html b/imce.jpl.nasa.gov/foundation/project/approves.html
index cdb8c78..9199564 100644
--- a/imce.jpl.nasa.gov/foundation/project/approves.html
+++ b/imce.jpl.nasa.gov/foundation/project/approves.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#approves</font><br>Property project:approves</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              approves
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              approves
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/authorizes.html b/imce.jpl.nasa.gov/foundation/project/authorizes.html
index 07827d2..0e43c4c 100644
--- a/imce.jpl.nasa.gov/foundation/project/authorizes.html
+++ b/imce.jpl.nasa.gov/foundation/project/authorizes.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#authorizes</font><br>Property project:authorizes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              authorizes
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              authorizes
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/belongsTo.html b/imce.jpl.nasa.gov/foundation/project/belongsTo.html
index 4ffff53..c84aff7 100644
--- a/imce.jpl.nasa.gov/foundation/project/belongsTo.html
+++ b/imce.jpl.nasa.gov/foundation/project/belongsTo.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#belongsTo</font><br>Property project:belongsTo</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              belongs to
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Person.html">project:Person</a>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              belongs to
+              <a href="Person.html">project:Person</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/binds.html b/imce.jpl.nasa.gov/foundation/project/binds.html
index d54b438..a006055 100644
--- a/imce.jpl.nasa.gov/foundation/project/binds.html
+++ b/imce.jpl.nasa.gov/foundation/project/binds.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#binds</font><br>Property project:binds</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              binds
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              binds
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/concurs.html b/imce.jpl.nasa.gov/foundation/project/concurs.html
index 54a1989..b2befc9 100644
--- a/imce.jpl.nasa.gov/foundation/project/concurs.html
+++ b/imce.jpl.nasa.gov/foundation/project/concurs.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#concurs</font><br>Property project:concurs</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              concurs
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              concurs
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/delegatesTo.html b/imce.jpl.nasa.gov/foundation/project/delegatesTo.html
index 91c0328..21f4d2b 100644
--- a/imce.jpl.nasa.gov/foundation/project/delegatesTo.html
+++ b/imce.jpl.nasa.gov/foundation/project/delegatesTo.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#delegatesTo</font><br>Property project:delegatesTo</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              delegates to
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              delegates to
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/delivers.html b/imce.jpl.nasa.gov/foundation/project/delivers.html
index e7604df..26e9d9c 100644
--- a/imce.jpl.nasa.gov/foundation/project/delivers.html
+++ b/imce.jpl.nasa.gov/foundation/project/delivers.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#delivers</font><br>Property project:delivers</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              delivers
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              delivers
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/describes.html b/imce.jpl.nasa.gov/foundation/project/describes.html
index 332ac3b..457c0b4 100644
--- a/imce.jpl.nasa.gov/foundation/project/describes.html
+++ b/imce.jpl.nasa.gov/foundation/project/describes.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#describes</font><br>Property project:describes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              describes
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              describes
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/executes.html b/imce.jpl.nasa.gov/foundation/project/executes.html
index c6eb87e..4a4a897 100644
--- a/imce.jpl.nasa.gov/foundation/project/executes.html
+++ b/imce.jpl.nasa.gov/foundation/project/executes.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#executes</font><br>Property project:executes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              executes
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              executes
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/hasAssignment.html b/imce.jpl.nasa.gov/foundation/project/hasAssignment.html
index 8a4472b..8df9c0e 100644
--- a/imce.jpl.nasa.gov/foundation/project/hasAssignment.html
+++ b/imce.jpl.nasa.gov/foundation/project/hasAssignment.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#hasAssignment</font><br>Property project:hasAssignment</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              has assignment
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              has assignment
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/hasParticipant.html b/imce.jpl.nasa.gov/foundation/project/hasParticipant.html
index e415e9b..3e6b695 100644
--- a/imce.jpl.nasa.gov/foundation/project/hasParticipant.html
+++ b/imce.jpl.nasa.gov/foundation/project/hasParticipant.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#hasParticipant</font><br>Property project:hasParticipant</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              has participant
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              has participant
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/hasResponsibilityFor.html b/imce.jpl.nasa.gov/foundation/project/hasResponsibilityFor.html
index ed5dc9b..c207183 100644
--- a/imce.jpl.nasa.gov/foundation/project/hasResponsibilityFor.html
+++ b/imce.jpl.nasa.gov/foundation/project/hasResponsibilityFor.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#hasResponsibilityFor</font><br>Property project:hasResponsibilityFor</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              has responsibility for
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#InverseFunctionalProperty">owl:InverseFunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Organization.html">project:Organization</a>
+              <a href="http://www.w3.org/2002/07/owl#InverseFunctionalProperty">owl:InverseFunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              has responsibility for
+              <a href="Organization.html">project:Organization</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/hasRole.html b/imce.jpl.nasa.gov/foundation/project/hasRole.html
index eee0442..0e20355 100644
--- a/imce.jpl.nasa.gov/foundation/project/hasRole.html
+++ b/imce.jpl.nasa.gov/foundation/project/hasRole.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#hasRole</font><br>Property project:hasRole</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              has role
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              has role
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/interchangesThrough.html b/imce.jpl.nasa.gov/foundation/project/interchangesThrough.html
index 9317a87..ce2399b 100644
--- a/imce.jpl.nasa.gov/foundation/project/interchangesThrough.html
+++ b/imce.jpl.nasa.gov/foundation/project/interchangesThrough.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#interchangesThrough</font><br>Property project:interchangesThrough</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              interchanges through
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              interchanges through
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/invokes.html b/imce.jpl.nasa.gov/foundation/project/invokes.html
index 03120ad..6aaa51f 100644
--- a/imce.jpl.nasa.gov/foundation/project/invokes.html
+++ b/imce.jpl.nasa.gov/foundation/project/invokes.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#invokes</font><br>Property project:invokes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
+              invokes
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#IrreflexiveProperty">owl:IrreflexiveProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#forwardRelation">http://opencaesar.io/oml#forwardRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Process.html">project:Process</a>
+              <a href="http://www.w3.org/2002/07/owl#IrreflexiveProperty">owl:IrreflexiveProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              invokes
+              <a href="Process.html">project:Process</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/involves.html b/imce.jpl.nasa.gov/foundation/project/involves.html
index cef425d..d04c7b1 100644
--- a/imce.jpl.nasa.gov/foundation/project/involves.html
+++ b/imce.jpl.nasa.gov/foundation/project/involves.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#involves</font><br>Property project:involves</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              involves
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              involves
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/involves1.html b/imce.jpl.nasa.gov/foundation/project/involves1.html
index 4b8a038..19ba2f7 100644
--- a/imce.jpl.nasa.gov/foundation/project/involves1.html
+++ b/imce.jpl.nasa.gov/foundation/project/involves1.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#involves1</font><br>Property project:involves1</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              involves1
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              involves1
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/involves2.html b/imce.jpl.nasa.gov/foundation/project/involves2.html
index fce1091..acb87ce 100644
--- a/imce.jpl.nasa.gov/foundation/project/involves2.html
+++ b/imce.jpl.nasa.gov/foundation/project/involves2.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#involves2</font><br>Property project:involves2</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              involves2
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              involves2
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isApprovedBy.html b/imce.jpl.nasa.gov/foundation/project/isApprovedBy.html
index eafb97e..5c75edb 100644
--- a/imce.jpl.nasa.gov/foundation/project/isApprovedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isApprovedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isApprovedBy</font><br>Property project:isApprovedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is approved by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is approved by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isAssignedTo.html b/imce.jpl.nasa.gov/foundation/project/isAssignedTo.html
index 0480c06..87d72be 100644
--- a/imce.jpl.nasa.gov/foundation/project/isAssignedTo.html
+++ b/imce.jpl.nasa.gov/foundation/project/isAssignedTo.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isAssignedTo</font><br>Property project:isAssignedTo</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is assigned to
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is assigned to
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isAuthorizedBy.html b/imce.jpl.nasa.gov/foundation/project/isAuthorizedBy.html
index 4116e50..1da7662 100644
--- a/imce.jpl.nasa.gov/foundation/project/isAuthorizedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isAuthorizedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isAuthorizedBy</font><br>Property project:isAuthorizedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is authorized by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is authorized by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isBoundBy.html b/imce.jpl.nasa.gov/foundation/project/isBoundBy.html
index b3a7e53..1ba3fd9 100644
--- a/imce.jpl.nasa.gov/foundation/project/isBoundBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isBoundBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isBoundBy</font><br>Property project:isBoundBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is bound by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is bound by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isConcurredBy.html b/imce.jpl.nasa.gov/foundation/project/isConcurredBy.html
index ede1c14..de7b65c 100644
--- a/imce.jpl.nasa.gov/foundation/project/isConcurredBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isConcurredBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isConcurredBy</font><br>Property project:isConcurredBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is concurred by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is concurred by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isDelegateOf.html b/imce.jpl.nasa.gov/foundation/project/isDelegateOf.html
index 82db39f..a3fbf12 100644
--- a/imce.jpl.nasa.gov/foundation/project/isDelegateOf.html
+++ b/imce.jpl.nasa.gov/foundation/project/isDelegateOf.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isDelegateOf</font><br>Property project:isDelegateOf</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is delegate of
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is delegate of
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isDeliveredBy.html b/imce.jpl.nasa.gov/foundation/project/isDeliveredBy.html
index 8b33e66..047716c 100644
--- a/imce.jpl.nasa.gov/foundation/project/isDeliveredBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isDeliveredBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isDeliveredBy</font><br>Property project:isDeliveredBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is delivered by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is delivered by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isDescribedBy.html b/imce.jpl.nasa.gov/foundation/project/isDescribedBy.html
index 9923c1f..896d6d2 100644
--- a/imce.jpl.nasa.gov/foundation/project/isDescribedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isDescribedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isDescribedBy</font><br>Property project:isDescribedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is described by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is described by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isExecutedBy.html b/imce.jpl.nasa.gov/foundation/project/isExecutedBy.html
index 3f070fe..89ad0c6 100644
--- a/imce.jpl.nasa.gov/foundation/project/isExecutedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isExecutedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isExecutedBy</font><br>Property project:isExecutedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is executed by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is executed by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isInterchangePointFor.html b/imce.jpl.nasa.gov/foundation/project/isInterchangePointFor.html
index bbca166..7ac7d7c 100644
--- a/imce.jpl.nasa.gov/foundation/project/isInterchangePointFor.html
+++ b/imce.jpl.nasa.gov/foundation/project/isInterchangePointFor.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isInterchangePointFor</font><br>Property project:isInterchangePointFor</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is interchange point for
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is interchange point for
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isInvokedBy.html b/imce.jpl.nasa.gov/foundation/project/isInvokedBy.html
index 3c8026a..a9ee039 100644
--- a/imce.jpl.nasa.gov/foundation/project/isInvokedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isInvokedBy.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isInvokedBy</font><br>Property project:isInvokedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#reverseRelation">http://opencaesar.io/oml#reverseRelation</a>
+              is invoked by
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#IrreflexiveProperty">owl:IrreflexiveProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#reverseRelation">http://opencaesar.io/oml#reverseRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Process.html">project:Process</a>
+              <a href="http://www.w3.org/2002/07/owl#IrreflexiveProperty">owl:IrreflexiveProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              is invoked by
+              <a href="Process.html">project:Process</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/isInvolvedIn.html b/imce.jpl.nasa.gov/foundation/project/isInvolvedIn.html
index 9aa4632..bad1035 100644
--- a/imce.jpl.nasa.gov/foundation/project/isInvolvedIn.html
+++ b/imce.jpl.nasa.gov/foundation/project/isInvolvedIn.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isInvolvedIn</font><br>Property project:isInvolvedIn</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is involved in
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is involved in
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isInvolvedIn1.html b/imce.jpl.nasa.gov/foundation/project/isInvolvedIn1.html
index d36d112..26769c2 100644
--- a/imce.jpl.nasa.gov/foundation/project/isInvolvedIn1.html
+++ b/imce.jpl.nasa.gov/foundation/project/isInvolvedIn1.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isInvolvedIn1</font><br>Property project:isInvolvedIn1</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is involved in 1
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is involved in 1
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isInvolvedIn2.html b/imce.jpl.nasa.gov/foundation/project/isInvolvedIn2.html
index e1ea693..5612ac8 100644
--- a/imce.jpl.nasa.gov/foundation/project/isInvolvedIn2.html
+++ b/imce.jpl.nasa.gov/foundation/project/isInvolvedIn2.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isInvolvedIn2</font><br>Property project:isInvolvedIn2</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is involved in 2
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is involved in 2
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isManfestedBy.html b/imce.jpl.nasa.gov/foundation/project/isManfestedBy.html
index fae4918..616ae4d 100644
--- a/imce.jpl.nasa.gov/foundation/project/isManfestedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isManfestedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isManfestedBy</font><br>Property project:isManfestedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is manifested by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is manifested by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isPreparedBy.html b/imce.jpl.nasa.gov/foundation/project/isPreparedBy.html
index 2545e06..545dd26 100644
--- a/imce.jpl.nasa.gov/foundation/project/isPreparedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isPreparedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isPreparedBy</font><br>Property project:isPreparedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is prepared by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is prepared by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isProducedBy.html b/imce.jpl.nasa.gov/foundation/project/isProducedBy.html
index ca4cec5..1d1c905 100644
--- a/imce.jpl.nasa.gov/foundation/project/isProducedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isProducedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isProducedBy</font><br>Property project:isProducedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is produced by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is produced by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isRealizedBy.html b/imce.jpl.nasa.gov/foundation/project/isRealizedBy.html
index df1f931..5d104f1 100644
--- a/imce.jpl.nasa.gov/foundation/project/isRealizedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isRealizedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isRealizedBy</font><br>Property project:isRealizedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is realized by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is realized by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isReceivedBy.html b/imce.jpl.nasa.gov/foundation/project/isReceivedBy.html
index 3981b88..7ac4f94 100644
--- a/imce.jpl.nasa.gov/foundation/project/isReceivedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isReceivedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isReceivedBy</font><br>Property project:isReceivedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is received by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is received by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isReliedOnBy.html b/imce.jpl.nasa.gov/foundation/project/isReliedOnBy.html
index 8d98887..111ae20 100644
--- a/imce.jpl.nasa.gov/foundation/project/isReliedOnBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isReliedOnBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isReliedOnBy</font><br>Property project:isReliedOnBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is relied on by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is relied on by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isRepresentedBy.html b/imce.jpl.nasa.gov/foundation/project/isRepresentedBy.html
index 2fb3961..8e7f133 100644
--- a/imce.jpl.nasa.gov/foundation/project/isRepresentedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isRepresentedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isRepresentedBy</font><br>Property project:isRepresentedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is represented by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is represented by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isRequiredNotLaterThan.html b/imce.jpl.nasa.gov/foundation/project/isRequiredNotLaterThan.html
index 83fb797..b7e51ac 100644
--- a/imce.jpl.nasa.gov/foundation/project/isRequiredNotLaterThan.html
+++ b/imce.jpl.nasa.gov/foundation/project/isRequiredNotLaterThan.html
@@ -26,7 +26,7 @@ <h3>dc:description</h3>
 
    </dd>
 </dl>
-<h3>dc:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
+              is required not later than
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
+              <a href="http://opencaesar.io/oml#scalarProperty">http://opencaesar.io/oml#scalarProperty</a>
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Deliverable.html">project:Deliverable</a>
+              <a href="http://www.w3.org/2002/07/owl#DatatypeProperty">owl:DatatypeProperty</a>
             </td>
          </tr>
 
@@ -86,7 +86,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -96,7 +96,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              is required not later than
+              <a href="Deliverable.html">project:Deliverable</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/isResponsibilityOf.html b/imce.jpl.nasa.gov/foundation/project/isResponsibilityOf.html
index f60c89c..08b75de 100644
--- a/imce.jpl.nasa.gov/foundation/project/isResponsibilityOf.html
+++ b/imce.jpl.nasa.gov/foundation/project/isResponsibilityOf.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isResponsibilityOf</font><br>Property project:isResponsibilityOf</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#reverseRelation">http://opencaesar.io/oml#reverseRelation</a>
+              is responsibility of
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -36,15 +36,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
+              <a href="http://opencaesar.io/oml#reverseRelation">http://opencaesar.io/oml#reverseRelation</a>
             </td>
          </tr>
 
@@ -54,7 +46,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:domain</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -64,7 +56,15 @@ <h3>rdfs:domain</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="Authority.html">project:Authority</a>
+              <a href="http://www.w3.org/2002/07/owl#FunctionalProperty">owl:FunctionalProperty</a>
+            </td>
+         </tr>
+         <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              <a href="http://www.w3.org/2002/07/owl#ObjectProperty">owl:ObjectProperty</a>
             </td>
          </tr>
 
@@ -74,7 +74,7 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdfs:domain</h3>
 <dl>
    <dd>
         <table>
@@ -84,7 +84,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              is responsibility of
+              <a href="Authority.html">project:Authority</a>
             </td>
          </tr>
 
diff --git a/imce.jpl.nasa.gov/foundation/project/isRoleOf.html b/imce.jpl.nasa.gov/foundation/project/isRoleOf.html
index 3059ccf..f6f2894 100644
--- a/imce.jpl.nasa.gov/foundation/project/isRoleOf.html
+++ b/imce.jpl.nasa.gov/foundation/project/isRoleOf.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isRoleOf</font><br>Property project:isRoleOf</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is role of
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is role of
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/isSuppliedBy.html b/imce.jpl.nasa.gov/foundation/project/isSuppliedBy.html
index b998208..3c47417 100644
--- a/imce.jpl.nasa.gov/foundation/project/isSuppliedBy.html
+++ b/imce.jpl.nasa.gov/foundation/project/isSuppliedBy.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#isSuppliedBy</font><br>Property project:isSuppliedBy</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              is supplied by
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              is supplied by
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/manifests.html b/imce.jpl.nasa.gov/foundation/project/manifests.html
index 6387b6d..d2b924a 100644
--- a/imce.jpl.nasa.gov/foundation/project/manifests.html
+++ b/imce.jpl.nasa.gov/foundation/project/manifests.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#manifests</font><br>Property project:manifests</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              manifests
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              manifests
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/participatesIn.html b/imce.jpl.nasa.gov/foundation/project/participatesIn.html
index 4259e13..2675f28 100644
--- a/imce.jpl.nasa.gov/foundation/project/participatesIn.html
+++ b/imce.jpl.nasa.gov/foundation/project/participatesIn.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#participatesIn</font><br>Property project:participatesIn</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              participates in
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              participates in
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/prepares.html b/imce.jpl.nasa.gov/foundation/project/prepares.html
index fe53434..cb73545 100644
--- a/imce.jpl.nasa.gov/foundation/project/prepares.html
+++ b/imce.jpl.nasa.gov/foundation/project/prepares.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#prepares</font><br>Property project:prepares</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              prepares
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              prepares
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/produces.html b/imce.jpl.nasa.gov/foundation/project/produces.html
index 2e67120..4435e9f 100644
--- a/imce.jpl.nasa.gov/foundation/project/produces.html
+++ b/imce.jpl.nasa.gov/foundation/project/produces.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#produces</font><br>Property project:produces</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              produces
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              produces
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/realizes.html b/imce.jpl.nasa.gov/foundation/project/realizes.html
index 8c2f5fb..82ffde9 100644
--- a/imce.jpl.nasa.gov/foundation/project/realizes.html
+++ b/imce.jpl.nasa.gov/foundation/project/realizes.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#realizes</font><br>Property project:realizes</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              realizes
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              realizes
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/receives.html b/imce.jpl.nasa.gov/foundation/project/receives.html
index 454156b..87a6d56 100644
--- a/imce.jpl.nasa.gov/foundation/project/receives.html
+++ b/imce.jpl.nasa.gov/foundation/project/receives.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#receives</font><br>Property project:receives</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              receives
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              receives
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/reliesOn.html b/imce.jpl.nasa.gov/foundation/project/reliesOn.html
index ff05688..a7c18d2 100644
--- a/imce.jpl.nasa.gov/foundation/project/reliesOn.html
+++ b/imce.jpl.nasa.gov/foundation/project/reliesOn.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#reliesOn</font><br>Property project:reliesOn</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              relies on
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              relies on
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/represents.html b/imce.jpl.nasa.gov/foundation/project/represents.html
index 3dee9c9..3f09e7c 100644
--- a/imce.jpl.nasa.gov/foundation/project/represents.html
+++ b/imce.jpl.nasa.gov/foundation/project/represents.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#represents</font><br>Property project:represents</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              represents
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -82,26 +102,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              represents
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/imce.jpl.nasa.gov/foundation/project/supplies.html b/imce.jpl.nasa.gov/foundation/project/supplies.html
index 5bf9423..49b9245 100644
--- a/imce.jpl.nasa.gov/foundation/project/supplies.html
+++ b/imce.jpl.nasa.gov/foundation/project/supplies.html
@@ -6,7 +6,27 @@
    <body>
          <h2><font size="-1">http://imce.jpl.nasa.gov/foundation/project#supplies</font><br>Property project:supplies</h2>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:label</h3>
+<dl>
+   <dd>
+        <table>
+   <tbody>
+                    <tr>
+            <td valign="TOP">
+               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
+            </td>
+            <td>
+              supplies
+            </td>
+         </tr>
+
+      </tbody>
+</table>
+<p/>
+
+   </dd>
+</dl>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -90,26 +110,6 @@ <h3>rdfs:domain</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              supplies
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
 <h3>rdfs:range</h3>
 <dl>
    <dd>
diff --git a/iso.org/iso-1087-1/AssociativeRelation.html b/iso.org/iso-1087-1/AssociativeRelation.html
index c7ae7c3..c60aef1 100644
--- a/iso.org/iso-1087-1/AssociativeRelation.html
+++ b/iso.org/iso-1087-1/AssociativeRelation.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#AssociativeRelation</font><br>Property iso-1087-1:AssociativeRelation</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.23]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.23]
+              associative relation
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              associative relation
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/CausalRelation.html b/iso.org/iso-1087-1/CausalRelation.html
index d589855..4e8ce39 100644
--- a/iso.org/iso-1087-1/CausalRelation.html
+++ b/iso.org/iso-1087-1/CausalRelation.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#CausalRelation</font><br>Property iso-1087-1:CausalRelation</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.26]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.26]
+              causal relation
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              causal relation
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/Characteristic.html b/iso.org/iso-1087-1/Characteristic.html
index cf23870..6b0965f 100644
--- a/iso.org/iso-1087-1/Characteristic.html
+++ b/iso.org/iso-1087-1/Characteristic.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#Characteristic</font><br>Property iso-1087-1:Characteristic</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.4]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.4]
+              characteristic
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              characteristic
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/Concept.html b/iso.org/iso-1087-1/Concept.html
index 95dcd7b..c5bef28 100644
--- a/iso.org/iso-1087-1/Concept.html
+++ b/iso.org/iso-1087-1/Concept.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#Concept</font><br>Property iso-1087-1:Concept</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.1]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.1]
+              concept
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              concept
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/ConceptDiagram.html b/iso.org/iso-1087-1/ConceptDiagram.html
index 2de2573..c4f31cc 100644
--- a/iso.org/iso-1087-1/ConceptDiagram.html
+++ b/iso.org/iso-1087-1/ConceptDiagram.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#ConceptDiagram</font><br>Property iso-1087-1:ConceptDiagram</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              Annotation subject is an ontology
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Annotation subject is an ontology
+              [ISO 1087-1:3.2.12]
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.12]
+              concept diagram
             </td>
          </tr>
 
@@ -66,7 +66,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -76,7 +76,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              concept diagram
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/ConceptSystem.html b/iso.org/iso-1087-1/ConceptSystem.html
index 98a2492..1880ff4 100644
--- a/iso.org/iso-1087-1/ConceptSystem.html
+++ b/iso.org/iso-1087-1/ConceptSystem.html
@@ -7,7 +7,7 @@
          <h2><font size="-1">http://iso.org/iso-1087-1#ConceptSystem</font><br>Class iso-1087-1:ConceptSystem</h2>
          <img src="http://www.plantuml.com/plantuml/svg/Iyv9B2vMSCxFIqujA0ckB2v9pLM8ZaRXwsMKvER4nW80"/>
          <hr>
-         <h3>dc:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -17,7 +17,7 @@ <h3>dc:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
+              [ISO 1087-1:3.2.11]
             </td>
          </tr>
 
@@ -27,7 +27,7 @@ <h3>dc:type</h3>
 
    </dd>
 </dl>
-<h3>rdf:type</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -37,7 +37,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
+              concept system
             </td>
          </tr>
 
@@ -47,7 +47,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>dc:type</h3>
 <dl>
    <dd>
         <table>
@@ -57,7 +57,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.11]
+              <a href="http://opencaesar.io/oml#Concept">http://opencaesar.io/oml#Concept</a>
             </td>
          </tr>
 
@@ -67,7 +67,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -77,7 +77,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              concept system
+              <a href="http://www.w3.org/2002/07/owl#Class">owl:Class</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/DelimitingCharacteristic.html b/iso.org/iso-1087-1/DelimitingCharacteristic.html
index 1b9f47e..3a57823 100644
--- a/iso.org/iso-1087-1/DelimitingCharacteristic.html
+++ b/iso.org/iso-1087-1/DelimitingCharacteristic.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#DelimitingCharacteristic</font><br>Property iso-1087-1:DelimitingCharacteristic</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.7]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.7]
+              delimiting characteristic
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              delimiting characteristic
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/EssentialCharacteristic.html b/iso.org/iso-1087-1/EssentialCharacteristic.html
index 4a75081..1b879e1 100644
--- a/iso.org/iso-1087-1/EssentialCharacteristic.html
+++ b/iso.org/iso-1087-1/EssentialCharacteristic.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#EssentialCharacteristic</font><br>Property iso-1087-1:EssentialCharacteristic</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.6]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.6]
+              essential characteristic
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              essential characteristic
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/GenericRelation.html b/iso.org/iso-1087-1/GenericRelation.html
index 11e107d..e536196 100644
--- a/iso.org/iso-1087-1/GenericRelation.html
+++ b/iso.org/iso-1087-1/GenericRelation.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#GenericRelation</font><br>Property iso-1087-1:GenericRelation</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.21]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.21]
+              generic relation
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              generic relation
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/HierarchicalRelation.html b/iso.org/iso-1087-1/HierarchicalRelation.html
index d798b74..cb67da7 100644
--- a/iso.org/iso-1087-1/HierarchicalRelation.html
+++ b/iso.org/iso-1087-1/HierarchicalRelation.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#HierarchicalRelation</font><br>Property iso-1087-1:HierarchicalRelation</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.20]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.20]
+              hierarchical relation
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              hierarchical relation
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/Includes.html b/iso.org/iso-1087-1/Includes.html
index 08f4c1d..f618d94 100644
--- a/iso.org/iso-1087-1/Includes.html
+++ b/iso.org/iso-1087-1/Includes.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#Includes</font><br>Property iso-1087-1:Includes</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,11 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              
+This annotation specifies that the annotation subject is included in the scope of a concept system (the annotation object).
+The annotation subject should be an instance or a specialization of ConceptSystem.
+The annotation target should have an annotation as Object, Property, Concept or one of the Characteristics or *Relations.
+
             </td>
          </tr>
 
@@ -26,7 +30,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,11 +40,7 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              
-This annotation specifies that the annotation subject is included in the scope of a concept system (the annotation object).
-The annotation subject should be an instance or a specialization of ConceptSystem.
-The annotation target should have an annotation as Object, Property, Concept or one of the Characteristics or *Relations.
-
+              includes
             </td>
          </tr>
 
@@ -50,7 +50,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -60,7 +60,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              includes
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/IsIncludedIn.html b/iso.org/iso-1087-1/IsIncludedIn.html
index 1b63cb2..1002727 100644
--- a/iso.org/iso-1087-1/IsIncludedIn.html
+++ b/iso.org/iso-1087-1/IsIncludedIn.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#IsIncludedIn</font><br>Property iso-1087-1:IsIncludedIn</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,10 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              
+This annotation specifies that the annotation subject is included in the scope of a concept system (the annotation object).
+The annotation subject should have an annotation as Object, Property, Concept or one of the Characteristics or *Relations.
+The annotation object should be an instance or a specialization of ConceptSystem.
             </td>
          </tr>
 
@@ -26,7 +29,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,10 +39,7 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              
-This annotation specifies that the annotation subject is included in the scope of a concept system (the annotation object).
-The annotation subject should have an annotation as Object, Property, Concept or one of the Characteristics or *Relations.
-The annotation object should be an instance or a specialization of ConceptSystem.
+              is included in
             </td>
          </tr>
 
@@ -49,7 +49,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -59,7 +59,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              is included in
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/Object.html b/iso.org/iso-1087-1/Object.html
index ab41335..0253b29 100644
--- a/iso.org/iso-1087-1/Object.html
+++ b/iso.org/iso-1087-1/Object.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#Object</font><br>Property iso-1087-1:Object</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.1.1]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.1.1]
+              object
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              object
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/PartitiveRelation.html b/iso.org/iso-1087-1/PartitiveRelation.html
index 3f9a2a5..b330612 100644
--- a/iso.org/iso-1087-1/PartitiveRelation.html
+++ b/iso.org/iso-1087-1/PartitiveRelation.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#PartitiveRelation</font><br>Property iso-1087-1:PartitiveRelation</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.22]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.22]
+              partitive relation
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              partitive relation
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/Property.html b/iso.org/iso-1087-1/Property.html
index 05c174a..8138782 100644
--- a/iso.org/iso-1087-1/Property.html
+++ b/iso.org/iso-1087-1/Property.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#Property</font><br>Property iso-1087-1:Property</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.4]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.4]
+              property
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              property
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/SequentialRelation.html b/iso.org/iso-1087-1/SequentialRelation.html
index 80c7eb1..45cef0b 100644
--- a/iso.org/iso-1087-1/SequentialRelation.html
+++ b/iso.org/iso-1087-1/SequentialRelation.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#SequentialRelation</font><br>Property iso-1087-1:SequentialRelation</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.24]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.24]
+              sequential relation
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              sequential relation
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/Shows.html b/iso.org/iso-1087-1/Shows.html
index 921df6e..2fab3d3 100644
--- a/iso.org/iso-1087-1/Shows.html
+++ b/iso.org/iso-1087-1/Shows.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#Shows</font><br>Property iso-1087-1:Shows</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:comment</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              Annotation subject is shown in the diagram of the annotated ontology.
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:comment</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:comment</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              Annotation subject is shown in the diagram of the annotated ontology.
+              shows
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:comment</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              shows
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/iso.org/iso-1087-1/TemporalRelation.html b/iso.org/iso-1087-1/TemporalRelation.html
index b2e94af..84e3047 100644
--- a/iso.org/iso-1087-1/TemporalRelation.html
+++ b/iso.org/iso-1087-1/TemporalRelation.html
@@ -6,7 +6,7 @@
    <body>
          <h2><font size="-1">http://iso.org/iso-1087-1#TemporalRelation</font><br>Property iso-1087-1:TemporalRelation</h2>
          <hr>
-         <h3>rdf:type</h3>
+         <h3>rdfs:isDefinedBy</h3>
 <dl>
    <dd>
         <table>
@@ -16,7 +16,7 @@ <h3>rdf:type</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
+              [ISO 1087-1:3.2.25]
             </td>
          </tr>
 
@@ -26,7 +26,7 @@ <h3>rdf:type</h3>
 
    </dd>
 </dl>
-<h3>rdfs:isDefinedBy</h3>
+<h3>rdfs:label</h3>
 <dl>
    <dd>
         <table>
@@ -36,7 +36,7 @@ <h3>rdfs:isDefinedBy</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              [ISO 1087-1:3.2.25]
+              temporal relation
             </td>
          </tr>
 
@@ -46,7 +46,7 @@ <h3>rdfs:isDefinedBy</h3>
 
    </dd>
 </dl>
-<h3>rdfs:label</h3>
+<h3>rdf:type</h3>
 <dl>
    <dd>
         <table>
@@ -56,7 +56,7 @@ <h3>rdfs:label</h3>
                <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
             </td>
             <td>
-              temporal relation
+              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
             </td>
          </tr>
 
diff --git a/navigation.html b/navigation.html
index 2585c13..f08a2cb 100644
--- a/navigation.html
+++ b/navigation.html
@@ -39,10 +39,6 @@ <h3>Ontologies</h3>
 					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/package_obj.svg" width="16" height="16"></td>
 					   <td nowrap="nowrap"><a href="iso.org/iso-1087-1_2.html" target="navigationFrame">http://iso.org/iso-1087-1</a></td>
 					</tr>
-					<tr>
-					   <td><img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/package_obj.svg" width="16" height="16"></td>
-					   <td nowrap="nowrap"><a href="purl.org/dc/elements/1.1_2.html" target="navigationFrame">http://purl.org/dc/elements/1.1</a></td>
-					</tr>
 					
             </tbody>
          </table>
diff --git a/purl.org/dc/elements/1.1.html b/purl.org/dc/elements/1.1.html
deleted file mode 100644
index cb80262..0000000
--- a/purl.org/dc/elements/1.1.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<html>
-   <head>
-      <title>http://purl.org/dc/elements/1.1</title>
-	  <link rel="stylesheet" href="../../../main.css">
-   </head>
-   <body>
-	  <h3>Ontology http://purl.org/dc/elements/1.1</h3>
-      <hr>
-      <h3>dc:creator</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              DCMI Usage Board
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-<h3>dc:description</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              The DC vocabulary is a subset of the vocabulary maintained by the Dublin Core Metadata Initiative.
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-<h3>dc:rights</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              Copyright 1995-2019 DCMI.
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-<h3>dc:title</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              DC
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-<h3>dc:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://opencaesar.io/oml#Vocabulary">http://opencaesar.io/oml#Vocabulary</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-<h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#Ontology">owl:Ontology</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/contributor.html b/purl.org/dc/elements/1.1/contributor.html
deleted file mode 100644
index a33e99e..0000000
--- a/purl.org/dc/elements/1.1/contributor.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:contributor</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/contributor</font><br>Property dc:contributor</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/coverage.html b/purl.org/dc/elements/1.1/coverage.html
deleted file mode 100644
index fd583c7..0000000
--- a/purl.org/dc/elements/1.1/coverage.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:coverage</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/coverage</font><br>Property dc:coverage</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/creator.html b/purl.org/dc/elements/1.1/creator.html
deleted file mode 100644
index 31a8b50..0000000
--- a/purl.org/dc/elements/1.1/creator.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:creator</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/creator</font><br>Property dc:creator</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/date.html b/purl.org/dc/elements/1.1/date.html
deleted file mode 100644
index fd84a1d..0000000
--- a/purl.org/dc/elements/1.1/date.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:date</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/date</font><br>Property dc:date</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/description.html b/purl.org/dc/elements/1.1/description.html
deleted file mode 100644
index 208e46c..0000000
--- a/purl.org/dc/elements/1.1/description.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:description</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/description</font><br>Property dc:description</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/format.html b/purl.org/dc/elements/1.1/format.html
deleted file mode 100644
index 1c3c0f7..0000000
--- a/purl.org/dc/elements/1.1/format.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:format</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/format</font><br>Property dc:format</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/hasVersion.html b/purl.org/dc/elements/1.1/hasVersion.html
deleted file mode 100644
index c4e2396..0000000
--- a/purl.org/dc/elements/1.1/hasVersion.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:hasVersion</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/hasVersion</font><br>Property dc:hasVersion</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/identifier.html b/purl.org/dc/elements/1.1/identifier.html
deleted file mode 100644
index 424a999..0000000
--- a/purl.org/dc/elements/1.1/identifier.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:identifier</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/identifier</font><br>Property dc:identifier</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/language.html b/purl.org/dc/elements/1.1/language.html
deleted file mode 100644
index 098451c..0000000
--- a/purl.org/dc/elements/1.1/language.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:language</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/language</font><br>Property dc:language</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/publisher.html b/purl.org/dc/elements/1.1/publisher.html
deleted file mode 100644
index 30cee9c..0000000
--- a/purl.org/dc/elements/1.1/publisher.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:publisher</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/publisher</font><br>Property dc:publisher</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/relation.html b/purl.org/dc/elements/1.1/relation.html
deleted file mode 100644
index 394e0c6..0000000
--- a/purl.org/dc/elements/1.1/relation.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:relation</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/relation</font><br>Property dc:relation</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/rights.html b/purl.org/dc/elements/1.1/rights.html
deleted file mode 100644
index 74d5aba..0000000
--- a/purl.org/dc/elements/1.1/rights.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:rights</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/rights</font><br>Property dc:rights</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/source.html b/purl.org/dc/elements/1.1/source.html
deleted file mode 100644
index 23d8b91..0000000
--- a/purl.org/dc/elements/1.1/source.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:source</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/source</font><br>Property dc:source</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/subject.html b/purl.org/dc/elements/1.1/subject.html
deleted file mode 100644
index 3ba5492..0000000
--- a/purl.org/dc/elements/1.1/subject.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:subject</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/subject</font><br>Property dc:subject</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/title.html b/purl.org/dc/elements/1.1/title.html
deleted file mode 100644
index dac4c06..0000000
--- a/purl.org/dc/elements/1.1/title.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:title</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/title</font><br>Property dc:title</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1/type.html b/purl.org/dc/elements/1.1/type.html
deleted file mode 100644
index 7ce2d9c..0000000
--- a/purl.org/dc/elements/1.1/type.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-   <head>
-      <title>dc:type</title>
-      <link rel="stylesheet" href="../../../../main.css">
-   </head>
-   <body>
-         <h2><font size="-1">http://purl.org/dc/elements/1.1/type</font><br>Property dc:type</h2>
-         <hr>
-         <h3>rdf:type</h3>
-<dl>
-   <dd>
-        <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methdef_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="http://www.w3.org/2002/07/owl#AnnotationProperty">owl:AnnotationProperty</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-   </dd>
-</dl>
-
-   </body>
-</html>
diff --git a/purl.org/dc/elements/1.1_2.html b/purl.org/dc/elements/1.1_2.html
deleted file mode 100644
index 8fc857b..0000000
--- a/purl.org/dc/elements/1.1_2.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<html>
-   <head>
-      <title>http://purl.org/dc/elements/1.1</title>
-	  <link rel="stylesheet" href="../../../main.css">
-   </head>
-   <body>
-      <p><a href="1.1.html" target="mainFrame">http://purl.org/dc/elements/1.1</a></p>
-	  
-	  
-	  <h3>Annotation Properties</h3>
-   <table>
-   <tbody>
-                    <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/contributor.html" target="mainFrame">contributor</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/coverage.html" target="mainFrame">coverage</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/creator.html" target="mainFrame">creator</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/date.html" target="mainFrame">date</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/description.html" target="mainFrame">description</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/format.html" target="mainFrame">format</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/hasVersion.html" target="mainFrame">hasVersion</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/identifier.html" target="mainFrame">identifier</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/language.html" target="mainFrame">language</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/publisher.html" target="mainFrame">publisher</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/relation.html" target="mainFrame">relation</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/rights.html" target="mainFrame">rights</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/source.html" target="mainFrame">source</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/subject.html" target="mainFrame">subject</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/title.html" target="mainFrame">title</a>
-            </td>
-         </tr>
-         <tr>
-            <td valign="TOP">
-               <img border="0" src="https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/methpro_obj.svg" width="16" height="16">
-            </td>
-            <td>
-              <a href="1.1/type.html" target="mainFrame">type</a>
-            </td>
-         </tr>
-
-      </tbody>
-</table>
-<p/>
-
-
-	  
-	  
-	  
-   </body>
-</html>
diff --git a/summary.html b/summary.html
index 43cc1ab..50a0ee0 100644
--- a/summary.html
+++ b/summary.html
@@ -5,7 +5,8 @@
    </head>
    <body>
          <h1>IMCE Vocabularies v5.0.0</h1>
-         <p class="date">Updated on: 2023/08/16 05:52:33</p>
+         <p class="date">Updated on: 2023/10/12 15:47:04</p>
          <hr>
+      <img src="http://www.plantuml.com/plantuml/svg/fP712i8m44Jl-OhWlOa5GV7WlspZ6bERRCZ6WeZ_RkcX86g9zRINURExCunPCaP8a2d9G05517C1Yt9rpZdkjMvSz8gIrQsnNlVERrRo_X1lEkSDgZPsAW23ijJh4rt34RAZe250TsF72z0661TWtZ4FSm4P4xLeyXUIQGnZc5MztcshUjJDXLMfmnmkn8y9llYLHF3NXWyV5VfD3HGVF5PTw3wrLEm-_VS4"/>
    </body>
 </html>