diff --git a/structuredefinitions/UKCore-Device-BloodPressure.xml b/structuredefinitions/UKCore-Device-BloodPressure.xml
index 6b807d69..cf231fdf 100644
--- a/structuredefinitions/UKCore-Device-BloodPressure.xml
+++ b/structuredefinitions/UKCore-Device-BloodPressure.xml
@@ -5,7 +5,7 @@
-
+
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-ACVPU.xml b/structuredefinitions/UKCore-Observation-ACVPU.xml
index a2db7f49..f9d05129 100644
--- a/structuredefinitions/UKCore-Observation-ACVPU.xml
+++ b/structuredefinitions/UKCore-Observation-ACVPU.xml
@@ -5,7 +5,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-AlcoholConsumption.xml b/structuredefinitions/UKCore-Observation-AlcoholConsumption.xml
index c4f79ae3..3f367a5f 100644
--- a/structuredefinitions/UKCore-Observation-AlcoholConsumption.xml
+++ b/structuredefinitions/UKCore-Observation-AlcoholConsumption.xml
@@ -2,10 +2,10 @@
-
+
-
+
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml b/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml
index 83cf0a7d..c96f9b20 100644
--- a/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml
+++ b/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml
@@ -5,7 +5,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-BloodGlucose.xml b/structuredefinitions/UKCore-Observation-BloodGlucose.xml
index 1de4f4ac..d1a260d2 100644
--- a/structuredefinitions/UKCore-Observation-BloodGlucose.xml
+++ b/structuredefinitions/UKCore-Observation-BloodGlucose.xml
@@ -5,7 +5,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml b/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml
index 55a14c42..93aec961 100644
--- a/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml
+++ b/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml
@@ -5,7 +5,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-TobaccoConsumption.xml b/structuredefinitions/UKCore-Observation-TobaccoConsumption.xml
index efdef06d..718eb81f 100644
--- a/structuredefinitions/UKCore-Observation-TobaccoConsumption.xml
+++ b/structuredefinitions/UKCore-Observation-TobaccoConsumption.xml
@@ -2,10 +2,10 @@
-
+
-
+
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml
index 92d4ee09..07a95e36 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml
@@ -2,10 +2,10 @@
-
+
-
+
@@ -17,7 +17,7 @@
-
+
@@ -38,7 +38,6 @@
-
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BloodPressure.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BloodPressure.xml
index f921c2ed..fc0c6e71 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BloodPressure.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BloodPressure.xml
@@ -5,7 +5,7 @@
-
+
@@ -30,8 +30,6 @@
-
-
@@ -40,7 +38,6 @@
-
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml
index a029e765..e0292b3e 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml
@@ -5,7 +5,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BodyTemperature.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BodyTemperature.xml
index 7319007e..64c6d074 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BodyTemperature.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BodyTemperature.xml
@@ -2,10 +2,10 @@
-
+
-
+
@@ -17,7 +17,7 @@
-
+
@@ -38,7 +38,6 @@
-
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml
index bc4947cc..33e1c60e 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml
@@ -5,7 +5,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml b/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml
index 79c55724..1ff0fc61 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml
@@ -5,7 +5,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-HeartRate.xml b/structuredefinitions/UKCore-Observation-VitalSigns-HeartRate.xml
index cada9caa..26226925 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-HeartRate.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-HeartRate.xml
@@ -2,10 +2,10 @@
-
+
-
+
@@ -17,7 +17,7 @@
-
+
@@ -38,7 +38,6 @@
-
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-OxygenSaturation.xml b/structuredefinitions/UKCore-Observation-VitalSigns-OxygenSaturation.xml
index 0d58e5c2..3133fb85 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-OxygenSaturation.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-OxygenSaturation.xml
@@ -2,10 +2,10 @@
-
+
-
+
@@ -17,7 +17,7 @@
-
+
@@ -38,7 +38,6 @@
-
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-RespirationRate.xml b/structuredefinitions/UKCore-Observation-VitalSigns-RespirationRate.xml
index ce91e466..692b5caf 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-RespirationRate.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-RespirationRate.xml
@@ -2,10 +2,10 @@
-
+
-
+
@@ -17,7 +17,7 @@
-
+
@@ -38,8 +38,6 @@
-
-