diff --git a/input/examples/auditevent/atc-doc-create-rep-pat.xml b/input/examples/auditevent/atc-doc-create-rep-pat.xml
index b93ef2c..3f911ee 100644
--- a/input/examples/auditevent/atc-doc-create-rep-pat.xml
+++ b/input/examples/auditevent/atc-doc-create-rep-pat.xml
@@ -64,8 +64,8 @@
          </identifier>
       </observer>
    </source>
+   <!-- Patient -->
    <entity>
-      <!-- Patient -->
       <what>
          <identifier>
             <system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
@@ -83,8 +83,26 @@
          <display value="Patient"></display>
       </role>
    </entity>
+   <!-- Trace context -->
+   <entity>
+      <what>
+         <identifier>
+            <value value="00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00"/>
+         </identifier>
+      </what>
+      <type>
+         <system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
+         <code value="4"/>
+         <display value="Other"/>
+      </type>
+      <role>
+         <system value="http://terminology.hl7.org/CodeSystem/object-role"/>
+         <code value="26"/>
+         <display value="Processing Element"/>
+      </role>
+   </entity>
+   <!-- Document -->
    <entity>
-      <!-- Document -->
       <what>
          <identifier>
             <type>
diff --git a/input/examples/auditevent/atc-doc-read-ass-hpc.xml b/input/examples/auditevent/atc-doc-read-ass-hpc.xml
index 188c03e..675710d 100644
--- a/input/examples/auditevent/atc-doc-read-ass-hpc.xml
+++ b/input/examples/auditevent/atc-doc-read-ass-hpc.xml
@@ -80,9 +80,9 @@
          </identifier>
       </observer>
    </source>
+   <!-- Patient -->
    <entity>
       <what>
-         <!-- Patient -->
          <identifier>
             <system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
             <value value="761337610469261945"></value>
@@ -99,9 +99,27 @@
          <display value="Patient"></display>
       </role>
    </entity>
+   <!-- Trace context -->
+   <entity>
+      <what>
+         <identifier>
+            <value value="00-abcdef12345678d90abcdef123456789-deadbeefdeadbeef-00"/>
+         </identifier>
+      </what>
+      <type>
+         <system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
+         <code value="4"/>
+         <display value="Other"/>
+      </type>
+      <role>
+         <system value="http://terminology.hl7.org/CodeSystem/object-role"/>
+         <code value="26"/>
+         <display value="Processing Element"/>
+      </role>
+   </entity>
+   <!-- Document -->
    <entity>
       <what>
-         <!-- Document -->
          <identifier>
             <type>
                <coding>
diff --git a/input/examples/auditevent/atc-doc-search.xml b/input/examples/auditevent/atc-doc-search.xml
index c69011c..976cd97 100644
--- a/input/examples/auditevent/atc-doc-search.xml
+++ b/input/examples/auditevent/atc-doc-search.xml
@@ -63,8 +63,8 @@
             </identifier>
         </observer>
     </source>
+    <!-- Patient -->
     <entity>
-        <!-- Patient -->
         <what>
             <identifier>
                 <system value="urn:oid:2.16.756.5.30.1.127.3.10.3" />
@@ -82,8 +82,26 @@
             <display value="Patient"/>
         </role>
     </entity>
+    <!-- Trace context -->
+    <entity>
+        <what>
+            <identifier>
+                <value value="00-0123456789abcdef0123456789abcdef-abcdef0123456789-00"/>
+            </identifier>
+        </what>
+        <type>
+            <system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
+            <code value="4"/>
+            <display value="Other"/>
+        </type>
+        <role>
+            <system value="http://terminology.hl7.org/CodeSystem/object-role"/>
+            <code value="26"/>
+            <display value="Processing Element"/>
+        </role>
+    </entity>
+    <!-- Query -->
     <entity>
-        <!-- Query -->
         <what>
             <identifier>
                 <system value="urn:ietf:rfc:3986" />
diff --git a/input/examples/auditevent/atc-hpd-group-entry-notify.xml b/input/examples/auditevent/atc-hpd-group-entry-notify.xml
index f74db52..ee91b6f 100644
--- a/input/examples/auditevent/atc-hpd-group-entry-notify.xml
+++ b/input/examples/auditevent/atc-hpd-group-entry-notify.xml
@@ -34,9 +34,8 @@
             </identifier>
         </observer>
     </source>
-
+    <!-- Patient -->
     <entity>
-        <!-- Patient -->
         <what>
             <identifier>
                 <system value="urn:oid:2.16.756.5.30.1.127.3.10.3" />
@@ -54,9 +53,26 @@
             <display value="Patient"/>
         </role>
     </entity>
-
+    <!-- Trace context -->
+    <entity>
+        <what>
+            <identifier>
+                <value value="00-9876543210abcdef9876543210abcdef-fedcba9876543210-00"/>
+            </identifier>
+        </what>
+        <type>
+            <system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
+            <code value="4"/>
+            <display value="Other"/>
+        </type>
+        <role>
+            <system value="http://terminology.hl7.org/CodeSystem/object-role"/>
+            <code value="26"/>
+            <display value="Processing Element"/>
+        </role>
+    </entity>
+    <!-- Healthcare professional  -->
     <entity>
-        <!-- Healthcare professional  -->
         <what>
             <identifier>
                 <system value="urn:oid:2.51.1.3"/>
@@ -75,9 +91,8 @@
         </role>
         <name value="Dr. med. Sabine Musterfrau"/>
     </entity>
-
+    <!-- Group -->
     <entity>
-        <!-- Group -->
         <what>
             <identifier>
                 <value value="urn:oid:1.1.1.1.1"/>
diff --git a/input/examples/auditevent/atc-log-read.xml b/input/examples/auditevent/atc-log-read.xml
index bd426c2..2b94f5e 100644
--- a/input/examples/auditevent/atc-log-read.xml
+++ b/input/examples/auditevent/atc-log-read.xml
@@ -40,9 +40,9 @@
          </identifier>
       </observer>
    </source>
+   <!-- Patient -->
    <entity>
       <what>
-         <!-- Patient -->
          <identifier>
             <system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
             <value value="761337610469261945"></value>
@@ -59,4 +59,22 @@
          <display value="Patient"></display>
       </role>
    </entity>
+   <!-- Trace context -->
+   <entity>
+      <what>
+         <identifier>
+            <value value="00-112233445566778899aabbccddeeff00-0011223344556677-00"/>
+         </identifier>
+      </what>
+      <type>
+         <system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
+         <code value="4"/>
+         <display value="Other"/>
+      </type>
+      <role>
+         <system value="http://terminology.hl7.org/CodeSystem/object-role"/>
+         <code value="26"/>
+         <display value="Processing Element"/>
+      </role>
+   </entity>
 </AuditEvent>
\ No newline at end of file
diff --git a/input/examples/auditevent/atc-pol-create-acc-right.xml b/input/examples/auditevent/atc-pol-create-acc-right.xml
index f442637..e325513 100644
--- a/input/examples/auditevent/atc-pol-create-acc-right.xml
+++ b/input/examples/auditevent/atc-pol-create-acc-right.xml
@@ -40,8 +40,8 @@
          </identifier>
       </observer>
    </source>
+    <!-- Patient -->
    <entity>
-      <!-- Patient -->
       <what>
          <identifier>
             <system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
@@ -59,8 +59,26 @@
          <display value="Patient"></display>
       </role>
    </entity>
+   <!-- Trace context -->
+   <entity>
+      <what>
+         <identifier>
+            <value value="00-abcdef0123456789adbcdef012345678-abcdabcdabcdabcd-00"/>
+         </identifier>
+      </what>
+      <type>
+         <system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
+         <code value="4"/>
+         <display value="Other"/>
+      </type>
+      <role>
+         <system value="http://terminology.hl7.org/CodeSystem/object-role"/>
+         <code value="26"/>
+         <display value="Processing Element"/>
+      </role>
+   </entity>
+   <!-- Resource -->
    <entity>
-      <!-- Resource -->
       <what>
          <identifier>
             <system value="urn:oid:2.51.1.3"></system>
diff --git a/input/examples/auditevent/atc-pol-create-rep.xml b/input/examples/auditevent/atc-pol-create-rep.xml
index 026bcb3..2dc1f52 100644
--- a/input/examples/auditevent/atc-pol-create-rep.xml
+++ b/input/examples/auditevent/atc-pol-create-rep.xml
@@ -35,14 +35,14 @@
       <observer>
          <identifier>
             <system value="urn:ietf:rfc:3986"></system>
-           <!-- oid of system generating this audit event -->            
+            <!-- oid of system generating this audit event -->
             <value value="urn:oid:7.8.9.10.12"></value>
          </identifier>
       </observer>
    </source>
+   <!-- Patient -->
    <entity>
       <what>
-        <!-- Patient -->
          <identifier>
             <system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
             <value value="761337610469261945"></value>
@@ -59,8 +59,26 @@
          <display value="Patient"></display>
       </role>
    </entity>
+   <!-- Trace context -->
+   <entity>
+      <what>
+         <identifier>
+            <value value="00-abcdef012345d6789abcdef012345678-abcdabcdabcdabcd-00"/>
+         </identifier>
+      </what>
+      <type>
+         <system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
+         <code value="4"/>
+         <display value="Other"/>
+      </type>
+      <role>
+         <system value="http://terminology.hl7.org/CodeSystem/object-role"/>
+         <code value="26"/>
+         <display value="Processing Element"/>
+      </role>
+   </entity>
+   <!-- Resource -->
    <entity>
-      <!-- Resource -->
       <type>
          <system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"></system>
          <code value="2"></code>
diff --git a/input/pagecontent/changelog.md b/input/pagecontent/changelog.md
index 8118cee..2ec05f1 100644
--- a/input/pagecontent/changelog.md
+++ b/input/pagecontent/changelog.md
@@ -5,6 +5,7 @@ All significant changes to this FHIR implementation guide will be documented on
 
 #### Added
 * Integration of volume 1, 2 and 3 from 'Ergänzung 2.2 zu Anhang 5 EPDV-EDI' in consideration of CP 'EPDBEP-244' [#12](https://github.com/ehealthsuisse/ch-atc/issues/12)
+   * Add tracecontext by using ChEprFhirAuditEvent as parent profile for all AuditEvent profiles in CH ATC [#18](https://github.com/ehealthsuisse/ch-atc/issues/18)
 
 #### Changed / Updated
 * Updated the IG dependencies to the current published versions
diff --git a/input/resources/structuredefinition/AccessAuditTrailEvent.xml b/input/resources/structuredefinition/AccessAuditTrailEvent.xml
index 6c7d740..ff842c0 100644
--- a/input/resources/structuredefinition/AccessAuditTrailEvent.xml
+++ b/input/resources/structuredefinition/AccessAuditTrailEvent.xml
@@ -42,7 +42,7 @@
    <kind value="resource"/>
    <abstract value="false"/>
    <type value="AuditEvent"/>
-   <baseDefinition value="http://hl7.org/fhir/StructureDefinition/AuditEvent"/>
+   <baseDefinition value="http://fhir.ch/ig/ch-epr-fhir/StructureDefinition/ch-epr-fhir-auditevent"/>
    <derivation value="constraint"/>
    <differential>
       <element id="AuditEvent">
@@ -162,54 +162,22 @@
             <rules value="open"/>
          </slicing>
       </element>
-
       <!-- Slice Patient -->
-      <element id="AuditEvent.entity:Patient">
-         <path value="AuditEvent.entity"/>
-         <sliceName value="Patient"/>
-         <short value="Patient"/>
-         <min value="1"/>
-         <max value="1"/>
-         <mapping>
-            <identity value="ch-atc"/>
-            <map value="Patient"/>
-         </mapping>
-      </element>
-      <element id="AuditEvent.entity:Patient.what.identifier">
-         <path value="AuditEvent.entity.what.identifier"/>
-         <short value="Patient Id (EPR-SPID)"/>
-         <min value="1"/>
-         <max value="1"/>
-         <type>
-            <code value="Identifier"/>
-         </type>
-         <mapping>
-            <identity value="ch-atc"/>
-            <map value="EPR-SPID"/>
-         </mapping>
-      </element>
-      <element id="AuditEvent.entity:Patient.what.identifier.system">
-         <path value="AuditEvent.entity.what.identifier.system"/>
-         <min value="1"/>
-         <fixedUri value="urn:oid:2.16.756.5.30.1.127.3.10.3"/>
-      </element>
-      <element id="AuditEvent.entity:Patient.type">
-         <path value="AuditEvent.entity.type"/>
-         <min value="1"/>
-      </element>
-      <element id="AuditEvent.entity:Patient.type.code">
-         <path value="AuditEvent.entity.type.code"/>
-         <min value="1"/>
-         <fixedCode value="1"/>
-      </element>
-      <element id="AuditEvent.entity:Patient.role">
-         <path value="AuditEvent.entity.role"/>
-         <min value="1"/>
-      </element>
-      <element id="AuditEvent.entity:Patient.role.code">
-         <path value="AuditEvent.entity.role.code"/>
-         <min value="1"/>
-         <fixedCode value="1"/>
-      </element>
+		<element id="AuditEvent.entity:Patient">
+			<path value="AuditEvent.entity"/>
+			<sliceName value="Patient"/>
+			<min value="1"/>
+			<mapping>
+				<identity value="ch-atc"/>
+				<map value="Patient"/>
+			</mapping>
+		</element>
+		<element id="AuditEvent.entity:Patient.what.identifier">
+			<path value="AuditEvent.entity.what.identifier"/>
+			<mapping>
+				<identity value="ch-atc"/>
+				<map value="EPR-SPID"/>
+			</mapping>
+		</element>
    </differential>
 </StructureDefinition>
\ No newline at end of file
diff --git a/input/resources/structuredefinition/DocumentAuditEvent.xml b/input/resources/structuredefinition/DocumentAuditEvent.xml
index c06f534..a50cc25 100644
--- a/input/resources/structuredefinition/DocumentAuditEvent.xml
+++ b/input/resources/structuredefinition/DocumentAuditEvent.xml
@@ -45,7 +45,7 @@
 	<kind value="resource" />
 	<abstract value="false" />
 	<type value="AuditEvent" />
-	<baseDefinition value="http://hl7.org/fhir/StructureDefinition/AuditEvent" />
+	<baseDefinition value="http://fhir.ch/ig/ch-epr-fhir/StructureDefinition/ch-epr-fhir-auditevent" />
 	<derivation value="constraint" />
 	<differential>
 		<element id="AuditEvent">
@@ -207,9 +207,7 @@
 		<element id="AuditEvent.entity:Patient">
 			<path value="AuditEvent.entity"/>
 			<sliceName value="Patient"/>
-			<short value="Patient" />
 			<min value="1"/>
-			<max value="1"/>
 			<mapping>
 				<identity value="ch-atc"/>
 				<map value="Patient"/>
@@ -217,40 +215,11 @@
 		</element>
 		<element id="AuditEvent.entity:Patient.what.identifier">
 			<path value="AuditEvent.entity.what.identifier"/>
-			<short value="Patient Id (EPR-SPID)" />
-			<min value="1"/>
-			<max value="1"/>
-			<type>
-				<code value="Identifier"/>
-			</type>
 			<mapping>
 				<identity value="ch-atc"/>
 				<map value="EPR-SPID"/>
 			</mapping>
 		</element>
-		<element id="AuditEvent.entity:Patient.what.identifier.system">
-			<path value="AuditEvent.entity.what.identifier.system"/>
-			<min value="1"/>
-			<fixedUri value="urn:oid:2.16.756.5.30.1.127.3.10.3"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.type">
-			<path value="AuditEvent.entity.type"/>
-			<min value="1"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.type.code">
-			<path value="AuditEvent.entity.type.code"/>
-			<min value="1"/>
-			<fixedCode value="1"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.role">
-			<path value="AuditEvent.entity.role"/>
-			<min value="1"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.role.code">
-			<path value="AuditEvent.entity.role.code"/>
-			<min value="1"/>
-			<fixedCode value="1"/>
-		</element>
 
 		<!-- Slice Document -->
 		<element id="AuditEvent.entity:Document">
diff --git a/input/resources/structuredefinition/HpdAuditEvent.xml b/input/resources/structuredefinition/HpdAuditEvent.xml
index d1d1779..09270ac 100644
--- a/input/resources/structuredefinition/HpdAuditEvent.xml
+++ b/input/resources/structuredefinition/HpdAuditEvent.xml
@@ -45,7 +45,7 @@
 	<kind value="resource" />
 	<abstract value="false" />
 	<type value="AuditEvent" />
-	<baseDefinition value="http://hl7.org/fhir/StructureDefinition/AuditEvent" />
+	<baseDefinition value="http://fhir.ch/ig/ch-epr-fhir/StructureDefinition/ch-epr-fhir-auditevent" />
 	<derivation value="constraint" />
 	<differential>
 		<element id="AuditEvent">
@@ -157,6 +157,10 @@
 		<element id="AuditEvent.entity">
 			<path value="AuditEvent.entity"/>
 			<slicing>
+				<discriminator>
+					<type value="value" />
+					<path value="type.code" />
+				</discriminator>
 				<discriminator>
 					<type value="value" />
 					<path value="role.code" />
@@ -169,9 +173,7 @@
 		<element id="AuditEvent.entity:Patient">
 			<path value="AuditEvent.entity"/>
 			<sliceName value="Patient"/>
-			<short value="Patient" />
 			<min value="1"/>
-			<max value="1"/>
 			<mapping>
 				<identity value="ch-atc"/>
 				<map value="Patient"/>
@@ -179,36 +181,11 @@
 		</element>
 		<element id="AuditEvent.entity:Patient.what.identifier">
 			<path value="AuditEvent.entity.what.identifier"/>
-			<short value="Patient Id (EPR-SPID)" />
-			<min value="1"/>
 			<mapping>
 				<identity value="ch-atc"/>
 				<map value="EPR-SPID"/>
 			</mapping>
 		</element>
-		<element id="AuditEvent.entity:Patient.what.identifier.system">
-			<path value="AuditEvent.entity.what.identifier.system"/>
-			<min value="1"/>
-			<fixedUri value="urn:oid:2.16.756.5.30.1.127.3.10.3"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.type">
-			<path value="AuditEvent.entity.type"/>
-			<min value="1"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.type.code">
-			<path value="AuditEvent.entity.type.code"/>
-			<min value="1"/>
-			<fixedCode value="1"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.role">
-			<path value="AuditEvent.entity.role"/>
-			<min value="1"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.role.code">
-			<path value="AuditEvent.entity.role.code"/>
-			<min value="1"/>
-			<fixedCode value="1"/>
-		</element>
 
 		<!-- Slice Healthcare professional -->
 		<element id="AuditEvent.entity:HealthcareProfessional">
diff --git a/input/resources/structuredefinition/PolicyAuditEvent.xml b/input/resources/structuredefinition/PolicyAuditEvent.xml
index dcb880c..ff2c5fa 100644
--- a/input/resources/structuredefinition/PolicyAuditEvent.xml
+++ b/input/resources/structuredefinition/PolicyAuditEvent.xml
@@ -45,7 +45,7 @@
 	<kind value="resource" />
 	<abstract value="false" />
 	<type value="AuditEvent" />
-	<baseDefinition value="http://hl7.org/fhir/StructureDefinition/AuditEvent" />
+	<baseDefinition value="http://fhir.ch/ig/ch-epr-fhir/StructureDefinition/ch-epr-fhir-auditevent" />
 	<derivation value="constraint" />
 	<differential>
 		<element id="AuditEvent">
@@ -177,6 +177,10 @@
 					<type value="value" />
 					<path value="type.code" />
 				</discriminator>
+				<discriminator>
+					<type value="value" />
+					<path value="role.code" />
+				</discriminator>
 				<rules value="open"/>
 			</slicing>
 		</element>
@@ -185,9 +189,7 @@
 		<element id="AuditEvent.entity:Patient">
 			<path value="AuditEvent.entity"/>
 			<sliceName value="Patient"/>
-			<short value="Patient" />
 			<min value="1"/>
-			<max value="1"/>
 			<mapping>
 				<identity value="ch-atc"/>
 				<map value="Patient"/>
@@ -195,40 +197,11 @@
 		</element>
 		<element id="AuditEvent.entity:Patient.what.identifier">
 			<path value="AuditEvent.entity.what.identifier"/>
-			<short value="Patient Id (EPR-SPID)" />
-			<min value="1"/>
-			<max value="1"/>
-			<type>
-				<code value="Identifier"/>
-			</type>
 			<mapping>
 				<identity value="ch-atc"/>
 				<map value="EPR-SPID"/>
 			</mapping>
 		</element>
-		<element id="AuditEvent.entity:Patient.what.identifier.system">
-			<path value="AuditEvent.entity.what.identifier.system"/>
-			<min value="1"/>
-			<fixedUri value="urn:oid:2.16.756.5.30.1.127.3.10.3"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.type">
-			<path value="AuditEvent.entity.type"/>
-			<min value="1"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.type.code">
-			<path value="AuditEvent.entity.type.code"/>
-			<min value="1"/>
-			<fixedCode value="1"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.role">
-			<path value="AuditEvent.entity.role"/>
-			<min value="1"/>
-		</element>
-		<element id="AuditEvent.entity:Patient.role.code">
-			<path value="AuditEvent.entity.role.code"/>
-			<min value="1"/>
-			<fixedCode value="1"/>
-		</element>
 
 		<!-- Slice  Resource -->
 		<element id="AuditEvent.entity:Resource">