diff --git a/codesystems/CodeSystem-UKCore-RecordingSetting.xml b/codesystems/CodeSystem-UKCore-RecordingSetting.xml
index 6c8e82b1..c1130ed9 100644
--- a/codesystems/CodeSystem-UKCore-RecordingSetting.xml
+++ b/codesystems/CodeSystem-UKCore-RecordingSetting.xml
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/examples/UKCore-Extension-RecordingSetting-Example.xml b/examples/UKCore-Extension-RecordingSetting-Example.xml
index 2879339e..63273fed 100644
--- a/examples/UKCore-Extension-RecordingSetting-Example.xml
+++ b/examples/UKCore-Extension-RecordingSetting-Example.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Device-BloodPressure.xml b/structuredefinitions/UKCore-Device-BloodPressure.xml
index c94667f8..6b807d69 100644
--- a/structuredefinitions/UKCore-Device-BloodPressure.xml
+++ b/structuredefinitions/UKCore-Device-BloodPressure.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Flag.xml b/structuredefinitions/UKCore-Flag.xml
index b35bac91..228f986b 100644
--- a/structuredefinitions/UKCore-Flag.xml
+++ b/structuredefinitions/UKCore-Flag.xml
@@ -18,7 +18,14 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-ACVPU.xml b/structuredefinitions/UKCore-Observation-ACVPU.xml
index 20820ade..a2db7f49 100644
--- a/structuredefinitions/UKCore-Observation-ACVPU.xml
+++ b/structuredefinitions/UKCore-Observation-ACVPU.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-AlcoholConsumption.xml b/structuredefinitions/UKCore-Observation-AlcoholConsumption.xml
index 3cb2c680..c4f79ae3 100644
--- a/structuredefinitions/UKCore-Observation-AlcoholConsumption.xml
+++ b/structuredefinitions/UKCore-Observation-AlcoholConsumption.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml b/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml
index 698c06c3..db397165 100644
--- a/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml
+++ b/structuredefinitions/UKCore-Observation-AverageBloodPressure.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-BloodGlucose.xml b/structuredefinitions/UKCore-Observation-BloodGlucose.xml
index 54980962..1de4f4ac 100644
--- a/structuredefinitions/UKCore-Observation-BloodGlucose.xml
+++ b/structuredefinitions/UKCore-Observation-BloodGlucose.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml b/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml
index c7fe9dee..55a14c42 100644
--- a/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml
+++ b/structuredefinitions/UKCore-Observation-EarlyWarningTotalScore.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-InspiredOxygen.xml b/structuredefinitions/UKCore-Observation-InspiredOxygen.xml
index 8bc6b432..e1ca2eb9 100644
--- a/structuredefinitions/UKCore-Observation-InspiredOxygen.xml
+++ b/structuredefinitions/UKCore-Observation-InspiredOxygen.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-Lab.xml b/structuredefinitions/UKCore-Observation-Lab.xml
index 7d671afc..65ada130 100644
--- a/structuredefinitions/UKCore-Observation-Lab.xml
+++ b/structuredefinitions/UKCore-Observation-Lab.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-TobaccoConsumption.xml b/structuredefinitions/UKCore-Observation-TobaccoConsumption.xml
index 58c9db71..efdef06d 100644
--- a/structuredefinitions/UKCore-Observation-TobaccoConsumption.xml
+++ b/structuredefinitions/UKCore-Observation-TobaccoConsumption.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml
index 5c831d13..92d4ee09 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BMI.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BloodPressure.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BloodPressure.xml
index 5f7a9975..a00aeabe 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BloodPressure.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BloodPressure.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml
index 180fd171..737c4396 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BodyHeight.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BodyTemperature.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BodyTemperature.xml
index 1da6333d..7319007e 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BodyTemperature.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BodyTemperature.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml b/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml
index f995c552..1d061d92 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-BodyWeight.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml b/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml
index 2c3fad96..74f5dd28 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-HeadCircumference.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-HeartRate.xml b/structuredefinitions/UKCore-Observation-VitalSigns-HeartRate.xml
index e6b075ac..cada9caa 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-HeartRate.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-HeartRate.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-OxygenSaturation.xml b/structuredefinitions/UKCore-Observation-VitalSigns-OxygenSaturation.xml
index cb0a3e8d..0d58e5c2 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-OxygenSaturation.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-OxygenSaturation.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns-RespirationRate.xml b/structuredefinitions/UKCore-Observation-VitalSigns-RespirationRate.xml
index 35d36b3b..8542afc5 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns-RespirationRate.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns-RespirationRate.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/structuredefinitions/UKCore-Observation-VitalSigns.xml b/structuredefinitions/UKCore-Observation-VitalSigns.xml
index bc562ee7..093653e3 100644
--- a/structuredefinitions/UKCore-Observation-VitalSigns.xml
+++ b/structuredefinitions/UKCore-Observation-VitalSigns.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/valuesets/ValueSet-UKCore-RecordingSetting.xml b/valuesets/ValueSet-UKCore-RecordingSetting.xml
index 33c9fc24..9830ab61 100644
--- a/valuesets/ValueSet-UKCore-RecordingSetting.xml
+++ b/valuesets/ValueSet-UKCore-RecordingSetting.xml
@@ -30,8 +30,8 @@
-
-
+
+