Improved support for completely free fields.

@@ -1190,18 +1190,44 @@ xsd:time rdf:type rdfs:Datatype .
 
 ###  http://data.posccaesar.org/ilap/CompletelyFreeField
 
-:CompletelyFreeField rdf:type owl:Class ;
-                     
-                     rdfs:subClassOf [ rdf:type owl:Restriction ;
-                                       owl:onProperty :hasFieldName ;
-                                       owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-                                       owl:onDataRange xsd:string
-                                     ] ,
-                                     [ rdf:type owl:Restriction ;
-                                       owl:onProperty :hasFieldValue ;
-                                       owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-                                       owl:onDataRange xsd:anyType
-                                     ] .
+:hasFieldReference
+  rdf:type owl:ObjectProperty ;
+  rdfs:label "has field reference"^^xsd:string ;
+.
+
+
+
+:CompletelyFreeField
+  rdf:type owl:Class ;
+  rdfs:comment "A Data Field defined by the user that holds free text values."^^xsd:string ;
+  rdfs:label "Completely Free Field"^^xsd:string ;
+  rdfs:subClassOf owl:Thing ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      :shouldUseRef "true"^^xsd:boolean ;
+      owl:onClass :CompletelyFreeFieldDefinition ;
+      owl:onProperty :hasFieldReference ;
+      owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:onDataRange xsd:anyType ;
+      owl:onProperty :hasFieldValue ;
+      owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+    ] ;
+.
+:CompletelyFreeFieldDefinition
+  rdf:type owl:Class ;
+  :shouldHaveID "true"^^xsd:boolean ;
+  rdfs:label "Completely Free Field Definition"^^xsd:string ;
+  rdfs:subClassOf owl:Thing ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:onDataRange xsd:string ;
+      owl:onProperty :hasFieldName ;
+      owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+    ] ;
+.
 
 
 
@@ -1423,24 +1449,43 @@ xsd:time rdf:type rdfs:Datatype .
 
 ###  http://data.posccaesar.org/ilap/FreeFieldSet
 
-:FreeFieldSet rdf:type owl:Class ;
-              
-              rdfs:subClassOf owl:Thing ,
-                              [ rdf:type owl:Restriction ;
-                                owl:onProperty <http://data.posccaesar.org/ilap-userfield/hasFreeFieldForSpecifiedUserField> ;
-                                owl:onClass :FreeField ;
-                                owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger
-                              ] ,
-                              [ rdf:type owl:Restriction ;
-                                owl:onProperty :hasName ;
-                                owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-                                owl:onDataRange xsd:string
-                              ] ,
-                              [ rdf:type owl:Restriction ;
-                                owl:onProperty :hasFreeField ;
-                                owl:onClass :FreeField ;
-                                owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger
-                              ] .
+:FreeFieldSet
+  rdf:type owl:Class ;
+  :shouldHaveID "true"^^xsd:boolean ;
+  rdfs:comment "A Data Field that is a collection of Free Fields."^^xsd:string ;
+  rdfs:label "Free Field Set"^^xsd:string ;
+  rdfs:subClassOf owl:Thing ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :CompletelyFreeFieldDefinition ;
+      owl:onProperty :hasCompletelyFreeFieldDefinition ;
+    ] ;
+  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 :FreeField ;
+      owl:onProperty :hasFreeField ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :FreeField ;
+      owl:onProperty userfield:hasFreeFieldForSpecifiedUserField ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:onDataRange xsd:string ;
+      owl:onProperty :hasName ;
+      owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+    ] ;
+.