Many updates from DDR Mapping work complete.

-# Saved by TopBraid on Sat Aug 20 18:57:39 BST 2011
+# Saved by TopBraid on Thu Sep 15 15:42:36 BST 2011
 # baseURI: http://www.reportinghub.no/ep/schema/1.0/facility
 # imports: http://www.reportinghub.no/ep/schema/1.0/core
 
+@prefix ep-core:  <http://www.reportinghub.no/ep/schema/core#> .
 @prefix ep-fac:  <http://www.reportinghub.no/ep/schema/facility#> .
 @prefix owl:     <http://www.w3.org/2002/07/owl#> .
 @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -16,15 +17,10 @@
       owl:imports <http://www.reportinghub.no/ep/schema/1.0/core> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 
-ep-fac:AllOrPartOfTheLifeOfARig
-      rdf:type owl:Class ;
-      rdfs:label "all or part of the life of a rig"^^xsd:string ;
-      rdfs:subClassOf ep-fac:Facility .
-
 ep-fac:Facility
       rdf:type owl:Class ;
       rdfs:label "facility"^^xsd:string ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalObject> .
+      rdfs:subClassOf ep-core:PhysicalObject .
 
 ep-fac:FixedFacility
       rdf:type owl:DeprecatedClass ;
@@ -36,23 +32,28 @@ ep-fac:FixedOrMoveableRigType
       rdfs:subClassOf owl:Class .
 
 ep-fac:FixedRig
-      rdf:type owl:Class , ep-fac:FixedOrMoveableRigType ;
+      rdf:type ep-fac:FixedOrMoveableRigType , owl:Class ;
       rdfs:label "fixed rig"^^xsd:string ;
-      rdfs:subClassOf ep-fac:Rig , ep-fac:FixedFacility .
+      rdfs:subClassOf ep-fac:Rig-WholeLife , ep-fac:FixedFacility .
 
 ep-fac:MoveableFacility
       rdf:type owl:Class ;
       rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:MoveableRig
-      rdf:type owl:Class , ep-fac:FixedOrMoveableRigType ;
+      rdf:type ep-fac:FixedOrMoveableRigType , owl:Class ;
       rdfs:label "moveable rig"^^xsd:string ;
-      rdfs:subClassOf ep-fac:Rig , ep-fac:MoveableFacility .
+      rdfs:subClassOf ep-fac:Rig-WholeLife , ep-fac:MoveableFacility .
 
 ep-fac:Rig
       rdf:type owl:Class ;
+      rdfs:label "all or part of the life of a rig"^^xsd:string ;
+      rdfs:subClassOf ep-fac:Facility .
+
+ep-fac:Rig-WholeLife
+      rdf:type owl:Class ;
       rdfs:label "rig"^^xsd:string ;
-      rdfs:subClassOf ep-fac:AllOrPartOfTheLifeOfARig .
+      rdfs:subClassOf ep-fac:Rig .
 
 ep-fac:SubSurfaceFixedFacility
       rdf:type owl:Class ;
@@ -62,7 +63,13 @@ ep-fac:SurfaceFixedFacility
       rdf:type owl:Class ;
       rdfs:subClassOf ep-fac:FixedFacility .
 
-ep-fac:TemporalPartOfARig
+ep-fac:SurroundingWater
       rdf:type owl:Class ;
-      rdfs:label "temporal part of a rig"^^xsd:string ;
-      rdfs:subClassOf ep-fac:AllOrPartOfTheLifeOfARig .
+      rdfs:label "surrounding water"^^xsd:string ;
+      rdfs:subClassOf ep-core:PhysicalObject .
+
+ep-fac:depthOfSurroundingWater
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdfs:domain ep-fac:SurroundingWater ;
+      rdfs:label "depth of surrounding water"^^xsd:string ;
+      rdfs:range ep-core:Length .

-# Saved by TopBraid on Sat Aug 20 18:58:12 BST 2011
+# Saved by TopBraid on Sun Sep 11 08:18:34 BST 2011
 # baseURI: http://www.reportinghub.no/ep/schema/1.0/organization
 # imports: http://www.reportinghub.no/ep/schema/1.0/core
 
@@ -16,9 +16,14 @@
 ep-org:Company
       rdf:type owl:Class ;
       rdfs:label "Company"^^xsd:string ;
-      rdfs:subClassOf ep-org:Organization .
+      rdfs:subClassOf ep-org:Organization-WholeLife .
 
 ep-org:Organization
       rdf:type owl:Class ;
       rdfs:label "organization"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalObject> .
+
+ep-org:Organization-WholeLife
+      rdf:type owl:Class ;
+      rdfs:label "organization - whole life"^^xsd:string ;
+      rdfs:subClassOf ep-org:Organization .

-# Saved by TopBraid on Thu Aug 11 18:17:22 BST 2011
+# Saved by TopBraid on Thu Sep 15 15:49:34 BST 2011
 # baseURI: http://www.reportinghub.no/ep/schema/1.0/report
 # imports: http://www.reportinghub.no/ep/schema/1.0/well
 # imports: http://www.reportinghub.no/ep/schema/1.0/core
 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment
 # imports: http://www.reportinghub.no/ep/schema/1.0/activity
 
+@prefix ep-core:  <http://www.reportinghub.no/ep/schema/core#> .
 @prefix ep-report:  <http://www.reportinghub.no/ep/schema/report#> .
 @prefix owl:     <http://www.w3.org/2002/07/owl#> .
 @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -39,3 +40,23 @@ ep-report:PreliminaryDailyDrillingReport
 ep-report:Report
       rdf:type owl:Class ;
       rdfs:subClassOf owl:Thing .
+
+ep-report:createdAt
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:domain ep-report:Report ;
+      rdfs:label "created at"^^xsd:string .
+
+ep-report:dailyDrillingReportNumber
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:domain ep-report:DailyDrillingReport ;
+      rdfs:label "daily drilling report number"^^xsd:string .
+
+ep-report:hasContent
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:domain ep-report:Report ;
+      rdfs:label "has content"^^xsd:string .
+
+ep-report:reportOn
+      rdf:type owl:ObjectProperty ;
+      rdfs:domain ep-report:Report ;
+      rdfs:label "report on"^^xsd:string .