Corrected Milestone and made userfield:MilestoneType into FreeFieldValue

@@ -318,12 +318,6 @@
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ScheduleForActivityInPlan ;
-      owl:onProperty :hasSchedule ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :ShutdownPhase ;
       owl:onProperty :hasShutdownPhase ;
     ] ;
@@ -1483,16 +1477,124 @@
   rdfs:subClassOf :PrioritizedActivity ;
 .
 :MilestoneInPlan
+  rdf:type :ClassOfClassOfActivity ;
   rdf:type owl:Class ;
-  rdfs:comment "A MilestoneInPlan that is part of an Activity Plan, with a 0-duration, and in many cases a fixed date. A milestone is normally a specified event within Project, often linked to contractual items."^^xsd:string ;
-  rdfs:label "Milestone in plan"^^xsd:string ;
+  rdfs:comment "An Activity that has its role within a larger PlanForActivity as a criterion for membership. An ActivityInPlan is part of a PlanForActivity, with defined Constraints, Duration, Schedule Dates, Resources and Results."^^xsd:string ;
+  rdfs:label "Milestone in Plan"^^xsd:string ;
   rdfs:subClassOf :PlanForEvent ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
+      :shouldUseAnyUri "true"^^xsd:boolean ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass [
+          rdf:type owl:Class ;
+          owl:unionOf (
+              :RegionInSpace
+              :PointInSpace
+              :PhysicalObject
+            ) ;
+        ] ;
+      owl:onProperty :hasLocation ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      :shouldUseRef "true"^^xsd:boolean ;
+      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+      owl:onClass :Calendar ;
+      owl:onProperty :hasCalendar ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      :shouldUseRef "true"^^xsd:boolean ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :FreeFieldValue ;
+      owl:onProperty :hasFreeField ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+      owl:onClass userfield:SpecifiedUserField ;
+      owl:onProperty :hasSpecifiedUserField ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :ActivityConstraint ;
-      owl:onProperty :hasSuccessor ;
+      owl:onProperty :hasConstraint ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ActivityCriticality ;
+      owl:onProperty :hasCriticality ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ActivityCriticality ;
+      owl:onProperty :hasPlanCriticality ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ActivityPriority ;
+      owl:onProperty :hasPriority ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :CompletelyFreeField ;
+      owl:onProperty :hasCompletelyFreeField ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ExternalReference ;
+      owl:onProperty :hasExternalReference ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :MaterialOrderStatus ;
+      owl:onProperty :hasMaterialOrderStatus ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ScheduleForActivityInPlan ;
+      owl:onProperty :hasBaselineSchedule ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ScheduleForActivityInPlan ;
+      owl:onProperty :hasCurrentSchedule ;
     ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ScheduleForActivityInPlan ;
+      owl:onProperty :hasLiveSchedule ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ScheduleForActivityInPlan ;
+      owl:onProperty :hasRevisedSchedule ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :Status ;
+      owl:onProperty :hasStatus ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onDataRange xsd:string ;
+      owl:onProperty :hasDescription ;
+    ] ;
+  owl:disjointWith :PlanForILAP ;
 .
 :MiniShutdown
   rdf:type :ShutdownType ;
@@ -3211,7 +3313,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has commissioning milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasCompletelyFreeField
@@ -3233,14 +3334,12 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has construction milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasContractMilestone
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has contract milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasCoordinate
@@ -3275,7 +3374,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has decision milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasDefaultRate
@@ -3298,7 +3396,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has design milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasDiscipline
@@ -3310,7 +3407,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has drilling milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasDuration
@@ -3332,14 +3428,12 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has end milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasEngineeringMilestone
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has engineering milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasExpendedCost
@@ -3504,7 +3598,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdfs:comment "A Relationship between a planning object and a Milestone."^^xsd:string ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
 .
 :hasMsoDate
   rdf:type owl:DatatypeProperty ;
@@ -3672,14 +3765,12 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has procurement milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasProductionMilestone
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has production milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasProfile
@@ -3713,7 +3804,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has project milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasProjectPhase
@@ -3866,7 +3956,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has start milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasStartTime
@@ -3903,7 +3992,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type owl:ObjectProperty ;
   rdfs:domain :PlanForActivity ;
   rdfs:label "has task milestone"^^xsd:string ;
-  rdfs:range :MilestoneInPlan ;
   rdfs:subPropertyOf :hasMilestone ;
 .
 :hasTimeBasedResource

@@ -118,15 +118,15 @@ ilap:shouldUseAnyUri
       rdf:type owl:Restriction ;
       ilap:shouldUseAnyUri "true"^^xsd:boolean ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-      owl:onClass ilap:LicenseBlock ;
-      owl:onProperty :hasLicense ;
+      owl:onClass ilap:FreeFieldValue ;
+      owl:onProperty :hasMilestoneType ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       ilap:shouldUseAnyUri "true"^^xsd:boolean ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-      owl:onClass ilap:MilestoneInPlan ;
-      owl:onProperty :hasMilestoneType ;
+      owl:onClass ilap:LicenseBlock ;
+      owl:onProperty :hasLicense ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;