Updated userfields

@@ -4385,12 +4385,6 @@ SCCS:SAB_S
 userfield:SpecifiedUserField
   rdfs:comment "A class that holds the Free Text Fields for a Plan (i.e., associated with the Project or Activities in the Plan)."^^xsd:string ;
   rdfs:label "ILAP Specified User Field"^^xsd:string ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-      owl:onClass :FreeFieldValue ;
-      owl:onProperty userfield:hasWellType ;
-    ] ;
 .
 userfield:hasFreeFieldForSpecifiedUserField
   rdf:type owl:ObjectProperty ;

@@ -812,6 +812,13 @@ ilap:shouldUseAnyUri
       ilap:shouldUseRef "true"^^xsd:boolean ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
       owl:onClass ilap:FreeFieldValue ;
+      owl:onProperty :hasWellType ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      ilap:shouldUseRef "true"^^xsd:boolean ;
+      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+      owl:onClass ilap:FreeFieldValue ;
       owl:onProperty :hasWorkCenter ;
     ] ;
   rdfs:subClassOf [
@@ -878,18 +885,6 @@ ilap:shouldUseAnyUri
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-      owl:onClass ilap:FreeFieldValue ;
-      owl:onProperty :hasPlannedManHours ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-      owl:onClass ilap:FreeFieldValue ;
-      owl:onProperty :hasPlannedManHoursUOM ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
       owl:onDataRange xsd:dateTime ;
       owl:onProperty :hasNotificationDate ;
     ] ;
@@ -939,6 +934,12 @@ ilap:shouldUseAnyUri
       rdf:type owl:Restriction ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
       owl:onDataRange xsd:integer ;
+      owl:onProperty :hasPlannedManHours ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+      owl:onDataRange xsd:integer ;
       owl:onProperty :hasSAPActualManHours ;
     ] ;
 .
@@ -1313,15 +1314,10 @@ ilap:shouldUseAnyUri
   rdfs:label "has Planned Finish Date"^^xsd:string ;
 .
 :hasPlannedManHours
-  rdf:type owl:ObjectProperty ;
+  rdf:type owl:DatatypeProperty ;
   rdfs:comment "A relationship between an instance of Specified User Field required for exchange of SAP data, and the instance of newRelationshipName that holds the (user defined) name and value this application-specific variable."^^xsd:string ;
   rdfs:label "has Planned Man Hours"^^xsd:string ;
 .
-:hasPlannedManHoursUOM
-  rdf:type owl:ObjectProperty ;
-  rdfs:comment "A relationship between an instance of Specified User Field and the instance of Free Field that holds the user defined name and value this application-specific job card status variable, through instances of the hasFieldName property and hasValue relationship."^^xsd:string ;
-  rdfs:label "has Planned Man Hours UOM"^^xsd:string ;
-.
 :hasPlannedStartDate
   rdf:type owl:DatatypeProperty ;
   rdfs:comment "A relationship between an instance of Specified User Field required for exchange of SAP data, and the instance of newRelationshipName that holds the (user defined) name and value this application-specific variable."^^xsd:string ;