diff --git a/bloodPressure.raml b/bloodPressure.raml
index ad6694e..be75fc3 100644
--- a/bloodPressure.raml
+++ b/bloodPressure.raml
@@ -43,5 +43,5 @@ traits:
                 "id":       "unique_example_id",
                 "systolic": 110,
                 "diastolic": 85,
-                "unit": "mmHg"
+                "units": "mmHg"
               }
diff --git a/bloodPressureMonitorAM.raml b/bloodPressureMonitorAM.raml
index 9771896..961228f 100644
--- a/bloodPressureMonitorAM.raml
+++ b/bloodPressureMonitorAM.raml
@@ -12,7 +12,7 @@ documentation:
 schemas:
   - batch-retrieve: !include oic.collection.batch-retrieve-schema.json
   - links: !include oic.collection.linkslist-schema.json
-  - baseline: !include oic.collection-schema.json
+  - baseline: !include oic.r.bloodpressuremonitor-am.json
 
 traits:
   - interface-all:
diff --git a/bodyScaleAM.raml b/bodyScaleAM.raml
index a5cfa33..8068109 100644
--- a/bodyScaleAM.raml
+++ b/bodyScaleAM.raml
@@ -12,7 +12,7 @@ documentation:
 schemas:
   - batch-retrieve: !include oic.collection.batch-retrieve-schema.json
   - links: !include oic.collection.linkslist-schema.json
-  - baseline: !include oic.collection-schema.json
+  - baseline: !include oic.r.bodyscale-am.json
 
 traits:
   - interface-all:
diff --git a/glucoseMedication.raml b/glucoseMedication.raml
index f620246..6488dbf 100644
--- a/glucoseMedication.raml
+++ b/glucoseMedication.raml
@@ -42,6 +42,6 @@ traits:
                 "rt":         ["oic.r.glucose.medication"],
                 "id":         "unique_example_id",
                 "medication": 100,
-                "unit":       "mg",
+                "units":      "mg",
                 "regimen":    "rapidacting"
               }
diff --git a/glucoseMeterAM.raml b/glucoseMeterAM.raml
index fa79de9..472dff9 100644
--- a/glucoseMeterAM.raml
+++ b/glucoseMeterAM.raml
@@ -12,7 +12,7 @@ documentation:
 schemas:
   - batch-retrieve: !include oic.collection.batch-retrieve-schema.json
   - links: !include oic.collection.linkslist-schema.json
-  - baseline: !include oic.collection-schema.json
+  - baseline: !include oic.r.glucosemeter-am.json
 
 traits:
   - interface-all:
diff --git a/oic.r.bloodpressuremonitor-am.json b/oic.r.bloodpressuremonitor-am.json
index d4edf95..bf08a30 100644
--- a/oic.r.bloodpressuremonitor-am.json
+++ b/oic.r.bloodpressuremonitor-am.json
@@ -6,46 +6,45 @@
   "definitions": {
     "oic.r.bloodpressuremonitor-am": {
       "type": "object",
-      "allOf": [
-        {
-          "rt": {
-            "type": "array",
-            "minItems": 2,
-            "maxItems": 2,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.bloodpressuremonitor-am", "oic.wk.col.atomic"]
-            }
+      "properties": {
+        "rt": {
+          "type": "array",
+          "minItems": 2,
+          "maxItems": 2,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.bloodpressuremonitor-am", "oic.wk.col.atomic"]
+          }
+        },
+        "rts": {
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 4,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.bloodpressure", "oic.r.pulserate", "oic.r.userid", "oic.r.time.stamp"]
           },
-          "rts": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 4,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.bloodpressure", "oic.r.pulserate", "oic.r.userid", "oic.r.time.stamp"]
-            },
-            "description": "This contains all possible resource types for this atomic measurement."
+          "description": "This contains all possible resource types for this atomic measurement."
+        },
+        "rts-m": {
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.bloodpressure"]
           },
-          "rts-m": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 1,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.bloodpressure"]
-            },
-            "description": "This contains all mandatory resource types for this atomic measurement."
-          }
+          "description": "This contains all mandatory resource types for this atomic measurement."
         }
-      ]
+      }
     }
   },
   "type": "object",
   "allOf": [
     {"$ref": "oic.core.json#/definitions/oic.core"},
-    {"$ref": "#/definitions/oic.r.bloodpressuremonitor-am"},
-    {"$ref": "oic.collection-schema.json#/definitions/oic.collection"}
+    {"$ref": "oic.collection-schema.json#/definitions/oic.collection.properties"},
+    {"$ref": "oic.collection-schema.json#/definitions/oic.collection.links.arrayoflinks"},
+    {"$ref": "#/definitions/oic.r.bloodpressuremonitor-am"}
   ],
   "required": ["rts-m"]
 }
diff --git a/oic.r.body.location.temperature.json b/oic.r.body.location.temperature.json
index 5f2cd37..ad9871a 100644
--- a/oic.r.body.location.temperature.json
+++ b/oic.r.body.location.temperature.json
@@ -20,7 +20,7 @@
   "allOf": [
     {"$ref": "oic.core.json#/definitions/oic.core"},
     {"$ref": "oic.baseResource.json#/definitions/oic.r.baseresource"},
-    {"$ref": "#/definitions/oic.r.body.location"},
+    {"$ref": "oic.r.body.location.json#/definitions/oic.r.body.location"},
     {"$ref": "#/definitions/oic.r.body.location.temperature"}
   ],
   "required": ["bloc"]
diff --git a/oic.r.bodyscale-am.json b/oic.r.bodyscale-am.json
index 6f5e7f3..385c7e7 100644
--- a/oic.r.bodyscale-am.json
+++ b/oic.r.bodyscale-am.json
@@ -6,46 +6,45 @@
   "definitions": {
     "oic.r.bodyscale-am": {
       "type": "object",
-      "allOf": [
-        {
-          "rt": {
-            "type": "array",
-            "minItems": 2,
-            "maxItems": 2,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.bodyscale-am", "oic.wk.col.atomic"]
-            }
+      "properties": {
+        "rt": {
+          "type": "array",
+          "minItems": 2,
+          "maxItems": 2,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.bodyscale-am", "oic.wk.col.atomic"]
+          }
+        },
+        "rts": {
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 9,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.weight", "oic.r.bmi", "oic.r.height", "oic.r.body.fat", "oic.r.body.water", "oic.r.body.slm", "oic.r.body.ffm", "oic.r.time.stamp", "oic.r.userid"]
           },
-          "rts": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 9,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.weight", "oic.r.bmi", "oic.r.height", "oic.r.body.fat", "oic.r.body.water", "oic.r.body.slm", "oic.r.body.ffm", "oic.r.time.stamp", "oic.r.userid"]
-            },
-            "description": "This contains all possible resource types for this atomic measurement."
+          "description": "This contains all possible resource types for this atomic measurement."
+        },
+        "rts-m": {
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.weight"]
           },
-          "rts-m": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 1,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.weight"]
-            },
-            "description": "This contains all mandatory resource types for this atomic measurement."
-          }
+          "description": "This contains all mandatory resource types for this atomic measurement."
         }
-      ]
+      }
     }
   },
   "type": "object",
   "allOf": [
     {"$ref": "oic.core.json#/definitions/oic.core"},
-    {"$ref": "#/definitions/oic.r.bodyscale-am"},
-    {"$ref": "oic.collection-schema.json#/definitions/oic.collection"}
+    {"$ref": "oic.collection-schema.json#/definitions/oic.collection.properties"},
+    {"$ref": "oic.collection-schema.json#/definitions/oic.collection.links.arrayoflinks"},
+    {"$ref": "#/definitions/oic.r.bodyscale-am"}
   ],
   "required": ["rts-m"]
 }
diff --git a/oic.r.bodythermometer-am.json b/oic.r.bodythermometer-am.json
index 0f458d1..c6c406c 100644
--- a/oic.r.bodythermometer-am.json
+++ b/oic.r.bodythermometer-am.json
@@ -6,46 +6,45 @@
   "definitions": {
     "oic.r.bodythermometer-am": {
       "type": "object",
-      "allOf": [
-        {
-          "rt": {
-            "type": "array",
-            "minItems": 2,
-            "maxItems": 2,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.bodythermometer-am", "oic.wk.col.atomic"]
-            }
+      "properties": {
+        "rt": {
+          "type": "array",
+          "minItems": 2,
+          "maxItems": 2,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.bodythermometer-am", "oic.wk.col.atomic"]
+          }
+        },
+        "rts": {
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 4,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.temperature", "oic.r.body.location.temperature", "oic.r.time.stamp", "oic.r.userid"]
           },
-          "rts": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 4,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.temperature", "oic.r.body.location.temperature", "oic.r.time.stamp", "oic.r.userid"]
-            },
-            "description": "This contains all possible resource types for this atomic measurement."
+          "description": "This contains all possible resource types for this atomic measurement."
+        },
+        "rts-m": {
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.temperature"]
           },
-          "rts-m": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 1,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.temperature"]
-            },
-            "description": "This contains all mandatory resource types for this atomic measurement."
-          }
+          "description": "This contains all mandatory resource types for this atomic measurement."
         }
-      ]
+      }
     }
   },
   "type": "object",
   "allOf": [
     {"$ref": "oic.core.json#/definitions/oic.core"},
-    {"$ref": "#/definitions/oic.r.bodythermometer-am"},
-    {"$ref": "oic.collection-schema.json#/definitions/oic.collection"}
+    {"$ref": "oic.collection-schema.json#/definitions/oic.collection.properties"},
+    {"$ref": "oic.collection-schema.json#/definitions/oic.collection.links.arrayoflinks"},
+    {"$ref": "#/definitions/oic.r.bodythermometer-am"}
   ],
   "required": ["rts-m"]
 }
diff --git a/oic.r.glucose.medication.json b/oic.r.glucose.medication.json
index 5f43bd1..c9ae40b 100644
--- a/oic.r.glucose.medication.json
+++ b/oic.r.glucose.medication.json
@@ -12,7 +12,7 @@
           "readOnly": true,
           "description": "The level of medication undertaken"
         },
-        "unit": {
+        "units": {
           "type": "string",
           "readOnly": true,
           "enum": ["mg", "mL"],
diff --git a/oic.r.glucosemeter-am.json b/oic.r.glucosemeter-am.json
index c702da8..ecb2fd0 100644
--- a/oic.r.glucosemeter-am.json
+++ b/oic.r.glucosemeter-am.json
@@ -6,46 +6,45 @@
   "definitions": {
     "oic.r.glucosemeter-am": {
       "type": "object",
-      "allOf": [
-        {
-          "rt": {
-            "type": "array",
-            "minItems": 2,
-            "maxItems": 2,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.glucosemeter-am", "oic.wk.col.atomic"]
-            }
+      "properties": {
+        "rt": {
+          "type": "array",
+          "minItems": 2,
+          "maxItems": 2,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.glucosemeter-am", "oic.wk.col.atomic"]
+          }
+        },
+        "rts": {
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 11,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.glucose", "oic.r.glucose.carb", "oic.r.glucose.exercise", "oic.r.glucose.health", "oic.r.glucose.hba1c", "oic.r.glucose.meal", "oic.r.glucose.medication", "oic.r.glucose.samplelocation", "oic.r.glucose.tester", "oic.r.time.observed", "oic.r.userid"]
           },
-          "rts": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 11,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.glucose", "oic.r.glucose.carb", "oic.r.glucose.exercise", "oic.r.glucose.health", "oic.r.glucose.hba1c", "oic.r.glucose.meal", "oic.r.glucose.medication", "oic.r.glucose.samplelocation", "oic.r.glucose.tester", "oic.r.time.observed", "oic.r.userid"]
-            },
-            "description": "This contains all possible resource types for this atomic measurement."
+          "description": "This contains all possible resource types for this atomic measurement."
+        },
+        "rts-m": {
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "enum": ["oic.r.glucose"]
           },
-          "rts-m": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 1,
-            "uniqueItems": true,
-            "items": {
-              "enum": ["oic.r.glucose"]
-            },
-            "description": "This contains all mandatory resource types for this atomic measurement."
-          }
+          "description": "This contains all mandatory resource types for this atomic measurement."
         }
-      ]
+      }
     }
   },
   "type": "object",
   "allOf": [
     {"$ref": "oic.core.json#/definitions/oic.core"},
-    {"$ref": "#/definitions/oic.r.glucosemeter-am"},
-    {"$ref": "oic.collection-schema.json#/definitions/oic.collection"}
+    {"$ref": "oic.collection-schema.json#/definitions/oic.collection.properties"},
+    {"$ref": "oic.collection-schema.json#/definitions/oic.collection.links.arrayoflinks"},
+    {"$ref": "#/definitions/oic.r.glucosemeter-am"}
   ],
   "required": ["rts-m"]
 }
diff --git a/rbodyThermometerAM.raml b/rbodyThermometerAM.raml
index fc7d2de..8d3b8d6 100644
--- a/rbodyThermometerAM.raml
+++ b/rbodyThermometerAM.raml
@@ -12,7 +12,7 @@ documentation:
 schemas:
   - batch-retrieve: !include oic.collection.batch-retrieve-schema.json
   - links: !include oic.collection.linkslist-schema.json
-  - baseline: !include oic.collection-schema.json
+  - baseline: !include oic.r.bodythermometer-am.json
 
 traits:
   - interface-all: