diff --git a/examples/UKCore-Patient-RichardSmith-Example.xml b/examples/UKCore-Patient-RichardSmith-Example.xml
index 7ffb8ec5..d1a9ccfc 100644
--- a/examples/UKCore-Patient-RichardSmith-Example.xml
+++ b/examples/UKCore-Patient-RichardSmith-Example.xml
@@ -1,141 +1,146 @@
 <Patient xmlns="http://hl7.org/fhir">
-	<id value="UKCore-Patient-RichardSmith-Example"/>
-	<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-EthnicCategory">
-		<valueCodeableConcept>
-			<coding>
-				<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-EthnicCategoryEngland"/>
-				<code value="G"/>
-				<display value="Mixed - Any other mixed background"/>
-			</coding>
-		</valueCodeableConcept>
-	</extension>
-	<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactPreference">
-		<extension url="PreferredContactMethod">
-			<valueCodeableConcept>
-				<coding>
-					<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredContactMethod"/>
-					<code value="3"/>
-					<display value="Telephone"/>
-				</coding>
-			</valueCodeableConcept>
-		</extension>
-		<extension url="PreferredContactTimes">
-			<valueTiming>
-				<repeat>
-					<frequency value="1"/>
-					<period value="1"/>
-					<periodUnit value="d"/>
-					<dayOfWeek value="mon"/>
-					<dayOfWeek value="wed"/>
-					<dayOfWeek value="fri"/>
-					<when value="MORN"/>
-				</repeat>
-			</valueTiming>
-		</extension>
-		<extension url="PreferredWrittenCommunicationFormat">
-			<valueCodeableConcept>
-				<coding>
-					<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredWrittenCommunicationFormat"/>
-					<code value="11"/>
-					<display value="Large print"/>
-				</coding>
-			</valueCodeableConcept>
-		</extension>
-	</extension>
-	<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-DeathNotificationStatus">
-		<extension url="deathNotificationStatus">
-			<valueCodeableConcept>
-				<coding>
-					<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DeathNotificationStatus"/>
-					<code value="U"/>
-					<display value="Removed"/>
-				</coding>
-			</valueCodeableConcept>
-		</extension>
-		<extension url="systemEffectiveDate">
-			<valueDateTime value="2019-08-01T00:00:00.000Z"/>
-		</extension>
-	</extension>
-	<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ResidentialStatus">
-		<valueCodeableConcept>
-			<coding>
-				<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-ResidentialStatus"/>
-				<code value="H"/>
-				<display value="UK Resident"/>
-			</coding>
-		</valueCodeableConcept>
-	</extension>
-	<identifier>
-		<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSNumberVerificationStatus">
-			<valueCodeableConcept>
-				<coding>
-					<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-NHSNumberVerificationStatusEngland"/>
-					<code value="01"/>
-					<display value="Number present and verified"/>
-				</coding>
-			</valueCodeableConcept>
-		</extension>
-		<system value="https://fhir.nhs.uk/Id/nhs-number"/>
-		<value value="9912003888"/>
-	</identifier>
-	<name>
-		<use value="official"/>
-		<family value="SMITH"/>
-		<given value="Richard"/>
-	</name>
-	<telecom>
-		<system value="phone"/>
-		<value value="01131231234"/>
-	</telecom>
-	<gender value="male"/>
-	<birthDate value="1970-09-11"/>
-	<address>
-		<line value="4 Sandmoor Drive"/>
-		<city value="LEEDS"/>
-		<postalCode value="LS17 7DF"/>
-	</address>
-	<contact>
-		<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank">
-			<valuePositiveInt value="1"/>
-		</extension>
-		<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator">
-			<valueBoolean value="true"/>
-		</extension>
-		<relationship>
-			<coding>
-				<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalPersonRelationshipRole"/>
-				<code value="Personal"/>
-				<display value="Personal relationship with the patient"/>
-			</coding>
-		</relationship>
-		<name>
-			<use value="official"/>
-			<text value="JACKSON Jane (Miss)"/>
-			<family value="Jackson"/>
-			<given value="Jane"/>
-			<prefix value="Miss"/>
-		</name>
-		<telecom>
-			<system value="phone"/>
-			<value value="07777123123"/>
-			<use value="mobile"/>
-		</telecom>
-		<address>
-			<use value="home"/>
-			<type value="physical"/>
-			<line value="5 Alwoodley Road"/>
-			<city value="LEEDS"/>
-			<postalCode value="LS17 6EH"/>
-		</address>
-		<gender value="female"/>
-	</contact>
-	<communication>
-		<language>
-			<coding>
-				<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-HumanLanguage"/>
-				<code value="en"/>
-				<display value="English"/>
-			</coding>
-		</language>
-	</communication>
+  <id value="UKCore-Patient-RichardSmith-Example" />
+  <extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-EthnicCategory">
+    <valueCodeableConcept>
+      <coding>
+        <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-EthnicCategoryEngland" />
+        <code value="G" />
+        <display value="Mixed - Any other mixed background" />
+      </coding>
+    </valueCodeableConcept>
+  </extension>
+  <extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactPreference">
+    <extension url="PreferredContactMethod">
+      <valueCodeableConcept>
+        <coding>
+          <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredContactMethod" />
+          <code value="3" />
+          <display value="Telephone" />
+        </coding>
+      </valueCodeableConcept>
+    </extension>
+    <extension url="PreferredContactTimes">
+      <valueTiming>
+        <repeat>
+          <frequency value="1" />
+          <period value="1" />
+          <periodUnit value="d" />
+          <dayOfWeek value="mon" />
+          <dayOfWeek value="wed" />
+          <dayOfWeek value="fri" />
+          <when value="MORN" />
+        </repeat>
+      </valueTiming>
+    </extension>
+    <extension url="PreferredWrittenCommunicationFormat">
+      <valueCodeableConcept>
+        <coding>
+          <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredWrittenCommunicationFormat" />
+          <code value="11" />
+          <display value="Large print" />
+        </coding>
+      </valueCodeableConcept>
+    </extension>
+  </extension>
+  <extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-DeathNotificationStatus">
+    <extension url="deathNotificationStatus">
+      <valueCodeableConcept>
+        <coding>
+          <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DeathNotificationStatus" />
+          <code value="U" />
+          <display value="Removed" />
+        </coding>
+      </valueCodeableConcept>
+    </extension>
+    <extension url="systemEffectiveDate">
+      <valueDateTime value="2019-08-01T00:00:00.000Z" />
+    </extension>
+  </extension>
+  <extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ResidentialStatus">
+    <valueCodeableConcept>
+      <coding>
+        <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-ResidentialStatus" />
+        <code value="H" />
+        <display value="UK Resident" />
+      </coding>
+    </valueCodeableConcept>
+  </extension>
+  <identifier>
+    <extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSNumberVerificationStatus">
+      <valueCodeableConcept>
+        <coding>
+          <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-NHSNumberVerificationStatusEngland" />
+          <code value="01" />
+          <display value="Number present and verified" />
+        </coding>
+      </valueCodeableConcept>
+    </extension>
+    <system value="https://fhir.nhs.uk/Id/nhs-number" />
+    <value value="9912003888" />
+  </identifier>
+  <name>
+    <use value="official" />
+    <family value="SMITH" />
+    <given value="Richard" />
+  </name>
+  <telecom>
+    <system value="phone" />
+    <value value="01131231234" />
+  </telecom>
+  <gender value="male" />
+  <birthDate value="1970-09-11" />
+  <address>
+    <line value="4 Sandmoor Drive" />
+    <city value="LEEDS" />
+    <postalCode value="LS17 7DF" />
+  </address>
+  <contact>
+    <extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank">
+      <valuePositiveInt value="1" />
+    </extension>
+    <extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator">
+      <valueBoolean value="true" />
+    </extension>
+    <relationship>
+      <coding>
+        <system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalPersonRelationshipRole" />
+        <code value="Personal" />
+        <display value="Personal relationship with the patient" />
+      </coding>
+    </relationship>
+    <name>
+      <use value="official" />
+      <text value="JACKSON Jane (Miss)" />
+      <family value="Jackson" />
+      <given value="Jane" />
+      <prefix value="Miss" />
+    </name>
+    <telecom>
+      <system value="phone" />
+      <value value="07777123123" />
+      <use value="mobile" />
+    </telecom>
+    <address>
+      <use value="home" />
+      <type value="physical" />
+      <line value="5 Alwoodley Road" />
+      <city value="LEEDS" />
+      <postalCode value="LS17 6EH" />
+    </address>
+    <gender value="female" />
+  </contact>
+  <communication>
+    <language>
+      <coding>
+        <system value="urn:ietf:bcp:47" />
+        <code value="bfi" />
+        <display value="British Sign Language" />
+      </coding>
+    <coding>
+        <system value="http://snomed.info/sct" />
+        <code value="703963007" />
+        <display value="Makaton vocabulary" />
+      </coding>
+    </language>
+  </communication>
 </Patient>
\ No newline at end of file
diff --git a/structuredefinitions/UKCore-HealthcareService.xml b/structuredefinitions/UKCore-HealthcareService.xml
index 5236bdbf..216ed9e3 100644
--- a/structuredefinitions/UKCore-HealthcareService.xml
+++ b/structuredefinitions/UKCore-HealthcareService.xml
@@ -45,10 +45,10 @@
     <element id="HealthcareService.communication">
       <path value="HealthcareService.communication" />
       <binding>
-        <strength value="extensible" />
+        <strength value="required" />
         <description value="A ValueSet that identifies the language used by a person." />
-        <valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-HumanLanguage" />
+        <valueSet value="http://hl7.org/fhir/ValueSet/all-languages" />
       </binding>
     </element>
   </differential>
-</StructureDefinition>
+</StructureDefinition>
\ No newline at end of file
diff --git a/structuredefinitions/UKCore-Patient.xml b/structuredefinitions/UKCore-Patient.xml
index ad61568d..3ebeb2ac 100644
--- a/structuredefinitions/UKCore-Patient.xml
+++ b/structuredefinitions/UKCore-Patient.xml
@@ -81,10 +81,6 @@
         <profile value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-DeathNotificationStatus" />
       </type>
     </element>
-    <element id="Patient.extension:deathNotificationStatus.extension">
-      <path value="Patient.extension.extension" />
-      <min value="1" />
-    </element>
     <element id="Patient.extension:ethnicCategory">
       <path value="Patient.extension" />
       <sliceName value="ethnicCategory" />
@@ -242,10 +238,6 @@
       </type>
       <mustSupport value="false" />
     </element>
-    <element id="Patient.address.extension:addressKey.extension">
-      <path value="Patient.address.extension.extension" />
-      <min value="2" />
-    </element>
     <element id="Patient.address.line">
       <path value="Patient.address.line" />
       <mustSupport value="true" />
@@ -329,9 +321,9 @@
       <short value="A ValueSet that identifies the language used by a person." />
       <definition value="A ValueSet that identifies the language used by a person." />
       <binding>
-        <strength value="extensible" />
+        <strength value="required" />
         <description value="A ValueSet that identifies the language used by a person." />
-        <valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-HumanLanguage" />
+        <valueSet value="http://hl7.org/fhir/ValueSet/all-languages" />
       </binding>
     </element>
   </differential>
diff --git a/structuredefinitions/UKCore-Practitioner.xml b/structuredefinitions/UKCore-Practitioner.xml
index 5170682a..e0339291 100644
--- a/structuredefinitions/UKCore-Practitioner.xml
+++ b/structuredefinitions/UKCore-Practitioner.xml
@@ -66,9 +66,9 @@
     <element id="Practitioner.communication">
       <path value="Practitioner.communication" />
       <binding>
-        <strength value="extensible" />
+        <strength value="required" />
         <description value="A ValueSet that identifies the language used by a person." />
-        <valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-HumanLanguage" />
+        <valueSet value="http://hl7.org/fhir/ValueSet/all-languages" />
       </binding>
     </element>
   </differential>