diff --git a/StructureDefinition/safest-MedicinalProductIngredient.StructureDefinition-profile.xml b/StructureDefinition/safest-MedicinalProductIngredient.StructureDefinition-profile.xml
index 56551bc..e12dd4e 100644
--- a/StructureDefinition/safest-MedicinalProductIngredient.StructureDefinition-profile.xml
+++ b/StructureDefinition/safest-MedicinalProductIngredient.StructureDefinition-profile.xml
@@ -2,14 +2,14 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="00518ad3-d79e-4447-8cc2-baa4af7f359c" />
   <meta>
-    <versionId value="4" />
-    <lastUpdated value="2020-02-20T11:25:39.219+00:00" />
+    <versionId value="7" />
+    <lastUpdated value="2020-03-12T06:40:49.522+00:00" />
   </meta>
   <url value="http://legemiddelverket.no/fhir/StructureDefinition/safest-MedicinalProductIngredient" />
   <name value="safest-medicinalProductIngredient" />
   <status value="draft" />
   <experimental value="true" />
-  <date value="2020-02-20T11:25:37.0303594Z" />
+  <date value="2020-03-12T06:40:47.9356976Z" />
   <fhirVersion value="4.0.0" />
   <mapping>
     <identity value="rim" />
@@ -24,15 +24,14 @@
   <differential>
     <element id="MedicinalProductIngredient.identifier">
       <path value="MedicinalProductIngredient.identifier" />
-      <short value="Identifier for the ingredient " />
       <definition value="The identifier(s) of this Ingredient that are assigned by business processes and/or used to refer to it when a direct URL reference to the resource itself is not appropriate.&#xD;&#xA;&#xD;&#xA;Identifier defined by SAFEST" />
     </element>
     <element id="MedicinalProductIngredient.identifier.system">
       <path value="MedicinalProductIngredient.identifier.system" />
       <fixedUri value="http://legemiddelverket.no/fhir/SAFEST/MedicinalProductIngredient" />
     </element>
-    <element id="MedicinalProductIngredient.specifiedSubstance.extension">
-      <path value="MedicinalProductIngredient.specifiedSubstance.extension" />
+    <element id="MedicinalProductIngredient.specifiedSubstance.code.extension">
+      <path value="MedicinalProductIngredient.specifiedSubstance.code.extension" />
       <slicing>
         <discriminator>
           <type value="value" />
@@ -41,14 +40,36 @@
         <rules value="open" />
       </slicing>
     </element>
-    <element id="MedicinalProductIngredient.specifiedSubstance.extension:substance">
-      <path value="MedicinalProductIngredient.specifiedSubstance.extension" />
-      <sliceName value="substance" />
-      <min value="1" />
+    <element id="MedicinalProductIngredient.specifiedSubstance.code.extension:substanceReference">
+      <path value="MedicinalProductIngredient.specifiedSubstance.code.extension" />
+      <sliceName value="substanceReference" />
+      <short value="Reference to Substance resource" />
+      <min value="0" />
       <max value="1" />
       <type>
         <code value="Extension" />
-        <profile value="http://legemiddelverket.no/fhir/StructureDefinition/safest-substance" />
+        <profile value="http://legemiddelverket.no/fhir/StructureDefinition/safest-substanceReference" />
+      </type>
+    </element>
+    <element id="MedicinalProductIngredient.substance.code.extension">
+      <path value="MedicinalProductIngredient.substance.code.extension" />
+      <slicing>
+        <discriminator>
+          <type value="value" />
+          <path value="url" />
+        </discriminator>
+        <rules value="open" />
+      </slicing>
+    </element>
+    <element id="MedicinalProductIngredient.substance.code.extension:substanceReference">
+      <path value="MedicinalProductIngredient.substance.code.extension" />
+      <sliceName value="substanceReference" />
+      <short value="Reference to Substance resource" />
+      <min value="0" />
+      <max value="1" />
+      <type>
+        <code value="Extension" />
+        <profile value="http://legemiddelverket.no/fhir/StructureDefinition/safest-substanceReference" />
       </type>
     </element>
   </differential>
diff --git a/StructureDefinition/safest-Substance.StructureDefinition-extension.xml b/StructureDefinition/safest-Substance.StructureDefinition-extension.xml
index 054fd7f..f0cf677 100644
--- a/StructureDefinition/safest-Substance.StructureDefinition-extension.xml
+++ b/StructureDefinition/safest-Substance.StructureDefinition-extension.xml
@@ -20,7 +20,7 @@
   <abstract value="false" />
   <context>
     <type value="element" />
-    <expression value="MedicinalProductIngredient.specifiedSubstance" />
+    <expression value="MedicinalProductIngredient.substance" />
   </context>
   <type value="Extension" />
   <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Extension" />
diff --git a/StructureDefinition/safest-SubstanceSpecification.StructureDefinition-profile.xml b/StructureDefinition/safest-SubstanceSpecification.StructureDefinition-profile.xml
index 11a4774..92b5b5d 100644
--- a/StructureDefinition/safest-SubstanceSpecification.StructureDefinition-profile.xml
+++ b/StructureDefinition/safest-SubstanceSpecification.StructureDefinition-profile.xml
@@ -2,14 +2,14 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="93ba1758-9f4a-49ca-83a6-2342646145fc" />
   <meta>
-    <versionId value="2" />
-    <lastUpdated value="2020-02-20T11:26:24.116+00:00" />
+    <versionId value="3" />
+    <lastUpdated value="2020-03-12T06:41:29.519+00:00" />
   </meta>
   <url value="http://legemiddelverket.no/fhir/StructureDefinition/safest-substanceSpecification" />
   <name value="safest-substanceSpecification" />
   <status value="draft" />
   <experimental value="true" />
-  <date value="2020-02-20T11:26:21.9461908Z" />
+  <date value="2020-03-12T06:41:28.2194558Z" />
   <fhirVersion value="4.0.0" />
   <mapping>
     <identity value="rim" />
@@ -31,14 +31,22 @@
       <max value="0" />
     </element>
     <element id="SubstanceSpecification.relationship.amount[x]:no name">
-      <path value="SubstanceSpecification.relationship.amountRatioLowLimit" />
+      <path value="SubstanceSpecification.relationship.amount[x]" />
       <sliceName value="no name" />
       <max value="0" />
     </element>
     <element id="SubstanceSpecification.relationship.amount[x]:no name">
-      <path value="SubstanceSpecification.relationship.amountType" />
+      <path value="SubstanceSpecification.relationship.amount[x]" />
       <sliceName value="no name" />
       <max value="0" />
     </element>
+    <element id="SubstanceSpecification.relationship.amount[x]:no name">
+      <path value="SubstanceSpecification.relationship.amountRatioLowLimit" />
+      <sliceName value="no name" />
+    </element>
+    <element id="SubstanceSpecification.relationship.amount[x]:no name">
+      <path value="SubstanceSpecification.relationship.amountType" />
+      <sliceName value="no name" />
+    </element>
   </differential>
 </StructureDefinition>
\ No newline at end of file
diff --git a/StructureDefinition/safest-substanceReference.StructureDefinition-extension.xml b/StructureDefinition/safest-substanceReference.StructureDefinition-extension.xml
new file mode 100644
index 0000000..eb40d40
--- /dev/null
+++ b/StructureDefinition/safest-substanceReference.StructureDefinition-extension.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<StructureDefinition xmlns="http://hl7.org/fhir">
+  <id value="26c483ee-11fa-4eec-9487-08169fb07cf4" />
+  <meta>
+    <versionId value="1" />
+    <lastUpdated value="2020-03-12T06:41:47.775+00:00" />
+  </meta>
+  <url value="http://legemiddelverket.no/fhir/StructureDefinition/safest-substanceReference" />
+  <name value="safest-substanceReference" />
+  <status value="draft" />
+  <date value="2020-03-12T06:41:46.4899299Z" />
+  <fhirVersion value="4.0.0" />
+  <mapping>
+    <identity value="rim" />
+    <uri value="http://hl7.org/v3" />
+    <name value="RIM Mapping" />
+  </mapping>
+  <kind value="complex-type" />
+  <abstract value="false" />
+  <context>
+    <type value="element" />
+    <expression value="CodeableConcept" />
+  </context>
+  <type value="Extension" />
+  <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Extension" />
+  <derivation value="constraint" />
+  <differential>
+    <element id="Extension.url">
+      <path value="Extension.url" />
+      <fixedUri value="http://legemiddelverket.no/fhir/StructureDefinition/safest-substanceReference" />
+    </element>
+    <element id="Extension.value[x]">
+      <path value="Extension.value[x]" />
+      <type>
+        <code value="Reference" />
+        <targetProfile value="http://legemiddelverket.no/fhir/StructureDefinition/safest-substanceSpecification" />
+      </type>
+    </element>
+  </differential>
+</StructureDefinition>
\ No newline at end of file