diff --git a/eiffel-syntax-and-usage/the-meta-object.md b/eiffel-syntax-and-usage/the-meta-object.md
index ab4bc515..1093c00a 100644
--- a/eiffel-syntax-and-usage/the-meta-object.md
+++ b/eiffel-syntax-and-usage/the-meta-object.md
@@ -2,12 +2,6 @@
 The __meta__ object contains meta-information describing the event: when it was created, where it came from, its type et cetera. The __meta__ object contains the same members regardless of __meta.type__<sup>[1](#footnote1)</sup>, with the caveat that certain members are optional and the tendency to use them may vary with event type.
 
 ## Meta Members
-### meta.domainId
-__Type:__ String  
-__Format:__ Free text  
-__Required:__ Yes  
-__Description:__ Identifies the domain in which the event was produced. A domain is an infrastructure topological concept, which may or may not correspond to organization or product structures.
-
 ### meta.id
 __Type:__ String  
 __Format:__ [UUID](http://tools.ietf.org/html/rfc4122)  
@@ -41,9 +35,15 @@ __Description:__ Any tags or keywords associated with the events, for searchabil
 ### meta.source
 __Type:__ Object  
 __Format:__  
-__Required:__ No  
+__Required:__ Yes
 __Description:__ A description of the event sender. Primarily for traceability purposes.
 
+#### meta.source.domainId
+__Type:__ String  
+__Format:__ Free text  
+__Required:__ Yes  
+__Description:__ Identifies the domain that produced an event. A domain is an infrastructure topological concept, which may or may not corresponds to an organization or product structures. A good example would be Java packages notation, ex. com.mycompany.product.component or mycompany.site.division. Also, keep in mind that all names are more or less prone to change. Particularly, it is recommended to avoid organizational names or site names, as organizations tend to be volatile and development is easily relocated. Relatively speaking, product and component names tend to be more stable and are therefore encouraged, while code names may be an option. You need to decide what is the most sensible option in your case.
+
 #### meta.source.host
 __Type:__ String  
 __Format:__ Hostname  
diff --git a/examples/events/EiffelActivityCanceledEvent/simple.json b/examples/events/EiffelActivityCanceledEvent/simple.json
index 39c0762d..46b31a47 100644
--- a/examples/events/EiffelActivityCanceledEvent/simple.json
+++ b/examples/events/EiffelActivityCanceledEvent/simple.json
@@ -3,8 +3,10 @@
     "type": "EiffelActivityCanceledEvent",
     "version": "1.0",
     "time": 1234567890,
-    "domainId": "example.domain",
-    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
+    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+    "source": {
+      "domainId": "example.domain"
+    }
   },
   "data": {
     "reason": "Made irrelevant by newly scheduled execution."
diff --git a/examples/events/EiffelActivityFinishedEvent/simple.json b/examples/events/EiffelActivityFinishedEvent/simple.json
index 427000e2..3b7b091a 100644
--- a/examples/events/EiffelActivityFinishedEvent/simple.json
+++ b/examples/events/EiffelActivityFinishedEvent/simple.json
@@ -3,8 +3,10 @@
     "type": "EiffelActivityFinishedEvent",
     "version": "1.0",
     "time": 1234567890,
-    "domainId": "example.domain",
-    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
+    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+    "source": {
+      "domainId": "example.domain"
+    }
   },
   "data": {
     "outcome": {
diff --git a/examples/events/EiffelActivityStartedEvent/simple.json b/examples/events/EiffelActivityStartedEvent/simple.json
index d8b3c87d..cb3329ba 100644
--- a/examples/events/EiffelActivityStartedEvent/simple.json
+++ b/examples/events/EiffelActivityStartedEvent/simple.json
@@ -3,8 +3,10 @@
     "type": "EiffelActivityStartedEvent",
     "version": "1.0",
     "time": 1234567890,
-    "domainId": "example.domain",
-    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
+    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+    "source": {
+      "domainId": "example.domain"
+    }
   },
   "data": {
     "executionUri": "https://my.jenkins.host/myJob/43",
diff --git a/examples/events/EiffelActivityTriggeredEvent/simple-customdata.json b/examples/events/EiffelActivityTriggeredEvent/simple-customdata.json
index b5b68f45..4d9d22f6 100644
--- a/examples/events/EiffelActivityTriggeredEvent/simple-customdata.json
+++ b/examples/events/EiffelActivityTriggeredEvent/simple-customdata.json
@@ -1,10 +1,12 @@
 {
   "meta": {
-    "domainId": "domainId-test",
     "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
     "type": "EiffelActivityTriggeredEvent",
     "version": "1.0",
-    "time": 1234567890
+    "time": 1234567890,
+    "source": {
+      "domainId": "test-domainId"
+    }
   },
   "data": {
     "name": "Component X Build",
diff --git a/examples/events/EiffelActivityTriggeredEvent/simple.json b/examples/events/EiffelActivityTriggeredEvent/simple.json
index b3668809..d95cf507 100644
--- a/examples/events/EiffelActivityTriggeredEvent/simple.json
+++ b/examples/events/EiffelActivityTriggeredEvent/simple.json
@@ -1,10 +1,12 @@
 {
   "meta": {
-    "domainId": "domainId-test",
-    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+    "id": "e1e93f13-7c3c-4f17-9753-ebf0c86ff1c2",
     "type": "EiffelActivityTriggeredEvent",
     "version": "1.0",
-    "time": 1234567890
+    "time": 1234567890,
+    "source": {
+      "domainId": "example.domain"
+    }
   },
   "data": {
     "name": "Component X Build",
diff --git a/examples/events/EiffelArtifactCreatedEvent/simple.json b/examples/events/EiffelArtifactCreatedEvent/simple.json
index e7a3aa4f..36583bfa 100644
--- a/examples/events/EiffelArtifactCreatedEvent/simple.json
+++ b/examples/events/EiffelArtifactCreatedEvent/simple.json
@@ -3,8 +3,10 @@
     "type": "EiffelArtifactCreatedEvent",
     "version": "1.0",
     "time": 1234567890,
-    "domainId": "example.domain",
-    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
+    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+    "source": {
+      "domainId": "example.domain"
+    }
   },
   "data": {
     "gav": {
diff --git a/examples/events/EiffelArtifactPublishedEvent/simple.json b/examples/events/EiffelArtifactPublishedEvent/simple.json
index 54d67079..8e5c3690 100644
--- a/examples/events/EiffelArtifactPublishedEvent/simple.json
+++ b/examples/events/EiffelArtifactPublishedEvent/simple.json
@@ -3,8 +3,10 @@
     "type": "EiffelArtifactPublishedEvent",
     "version": "1.0",
     "time": 1234567890,
-    "domainId": "example.domain",
-    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
+    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+    "source": {
+      "domainId": "example.domain"
+    }
   },
   "data": {
     "locations": [
diff --git a/examples/events/EiffelConfidenceLevelModifiedEvent/simple.json b/examples/events/EiffelConfidenceLevelModifiedEvent/simple.json
index 864b834a..4a42e8d3 100644
--- a/examples/events/EiffelConfidenceLevelModifiedEvent/simple.json
+++ b/examples/events/EiffelConfidenceLevelModifiedEvent/simple.json
@@ -3,8 +3,10 @@
     "type": "EiffelConfidenceLevelModifiedEvent",
     "version": "1.0",
     "time": 1234567890,
-    "domainId": "example.domain",
-    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
+    "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+    "source": {
+      "domainId": "example.domain"
+    }
   },
   "data": {
     "name": "stable",
diff --git a/examples/flows/build-avoidance/events.json b/examples/flows/build-avoidance/events.json
index 2a1afed1..dacc8bd7 100644
--- a/examples/flows/build-avoidance/events.json
+++ b/examples/flows/build-avoidance/events.json
@@ -4,8 +4,10 @@
       "type": "EiffelSourceChangeSubmittedEvent",
       "version": "1.0",
       "time": 1000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -18,8 +20,10 @@
       "type": "EiffelSourceChangeSubmittedEvent",
       "version": "1.0",
       "time": 101000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -36,8 +40,10 @@
       "type": "EiffelCompositionDefinedEvent",
       "version": "1.0",
       "time": 2000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee2"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee2",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -54,8 +60,10 @@
       "type": "EiffelCompositionDefinedEvent",
       "version": "1.0",
       "time": 102000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee3"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee3",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -76,8 +84,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 3000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee4"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee4",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -105,8 +115,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 4000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee5"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee5",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -134,8 +146,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 5000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee6"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee6",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -163,8 +177,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 6000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee7"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee7",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -192,8 +208,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 7000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee8"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee8",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -221,8 +239,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 103000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee9"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee9",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -254,8 +274,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 104000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee10"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee10",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -287,8 +309,10 @@
       "type": "EiffelCompositionDefinedEvent",
       "version": "1.0",
       "time": 8000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee11"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee11",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -321,8 +345,10 @@
       "type": "EiffelCompositionDefinedEvent",
       "version": "1.0",
       "time": 105000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee12"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee12",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
diff --git a/examples/flows/confidence-level-joining/events.json b/examples/flows/confidence-level-joining/events.json
index 11d9d9c3..0c973cd5 100644
--- a/examples/flows/confidence-level-joining/events.json
+++ b/examples/flows/confidence-level-joining/events.json
@@ -4,8 +4,10 @@
       "type": "EiffelEnvironmentDefinedEvent",
       "version": "1.0",
       "time": 1000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -18,8 +20,10 @@
       "type": "EiffelCompositionDefinedEvent",
       "version": "1.0",
       "time": 2000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -32,8 +36,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 3000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee2"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee2",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -69,8 +75,10 @@
       "type": "EiffelArtifactPublishedEvent",
       "version": "1.0",
       "time": 4000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee3"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee3",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "locations": [
@@ -96,8 +104,10 @@
       "type": "EiffelActivityTriggeredEvent",
       "version": "1.0",
       "time": 5000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee4"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee4",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "name": "Act1",
@@ -121,8 +131,10 @@
       "type": "EiffelActivityTriggeredEvent",
       "version": "1.0",
       "time": 6000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee5"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee5",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "name": "Act2",
@@ -146,8 +158,10 @@
       "type": "EiffelActivityStartedEvent",
       "version": "1.0",
       "time": 7000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee6"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee6",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
     },
@@ -163,8 +177,10 @@
       "type": "EiffelActivityStartedEvent",
       "version": "1.0",
       "time": 8000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee7"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee7",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
     },
@@ -180,8 +196,10 @@
       "type": "EiffelTestCaseStartedEvent",
       "version": "1.0",
       "time": 9000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee8"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee8",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -202,8 +220,10 @@
       "type": "EiffelTestCaseStartedEvent",
       "version": "1.0",
       "time": 9000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee9"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee9",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -224,8 +244,10 @@
       "type": "EiffelTestCaseStartedEvent",
       "version": "1.0",
       "time": 9000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee10"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee10",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -246,8 +268,10 @@
       "type": "EiffelTestCaseStartedEvent",
       "version": "1.0",
       "time": 9000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee11"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee11",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -268,8 +292,10 @@
       "type": "EiffelTestCaseFinishedEvent",
       "version": "1.0",
       "time": 19000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee12"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee12",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -286,8 +312,10 @@
       "type": "EiffelTestCaseFinishedEvent",
       "version": "1.0",
       "time": 14000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee13"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee13",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -304,8 +332,10 @@
       "type": "EiffelTestCaseFinishedEvent",
       "version": "1.0",
       "time": 16000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee14"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee14",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -322,8 +352,10 @@
       "type": "EiffelTestCaseFinishedEvent",
       "version": "1.0",
       "time": 15000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee15"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee15",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -340,8 +372,10 @@
       "type": "EiffelActivityFinishedEvent",
       "version": "1.0",
       "time": 20000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee16"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee16",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "outcome": {
@@ -360,8 +394,10 @@
       "type": "EiffelActivityFinishedEvent",
       "version": "1.0",
       "time": 20000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee17"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee17",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "outcome": {
@@ -380,8 +416,10 @@
       "type": "EiffelConfidenceLevelModifiedEvent",
       "version": "1.0",
       "time": 21000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee18"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee18",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "name": "functionalComponentTestsPassed",
diff --git a/examples/flows/delivery-interface/events.json b/examples/flows/delivery-interface/events.json
index 924ae907..bfa178c5 100644
--- a/examples/flows/delivery-interface/events.json
+++ b/examples/flows/delivery-interface/events.json
@@ -4,8 +4,10 @@
       "type": "EiffelSourceChangeSubmittedEvent",
       "version": "1.0",
       "time": 1000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -18,8 +20,10 @@
       "type": "EiffelSourceChangeCreatedEvent",
       "version": "1.0",
       "time": 101000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -36,8 +40,10 @@
       "type": "EiffelSourceChangeCreatedEvent",
       "version": "1.0",
       "time": 102000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee2"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee2",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -58,8 +64,10 @@
       "type": "EiffelSourceChangeSubmittedEvent",
       "version": "1.0",
       "time": 103000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee3"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee3",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -80,8 +88,10 @@
       "type": "EiffelSourceChangeCreatedEvent",
       "version": "1.0",
       "time": 201000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee4"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee4",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -98,8 +108,10 @@
       "type": "EiffelSourceChangeSubmittedEvent",
       "version": "1.0",
       "time": 202000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee5"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee5",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -120,8 +132,10 @@
       "type": "EiffelCompositionDefinedEvent",
       "version": "1.0",
       "time": 2000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee6"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee6",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -138,8 +152,10 @@
       "type": "EiffelCompositionDefinedEvent",
       "version": "1.0",
       "time": 104000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee7"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee7",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -160,8 +176,10 @@
       "type": "EiffelCompositionDefinedEvent",
       "version": "1.0",
       "time": 203000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee8"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee8",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -182,8 +200,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 3000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee9"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee9",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -211,8 +231,10 @@
       "type": "EiffelArtifactCreatedEvent",
       "version": "1.0",
       "time": 204000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee10"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee10",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "gav": {
@@ -240,8 +262,10 @@
       "type": "EiffelTestCaseStartedEvent",
       "version": "1.0",
       "time": 4000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee11"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee11",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -258,8 +282,10 @@
       "type": "EiffelTestCaseStartedEvent",
       "version": "1.0",
       "time": 205000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee12"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee12",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -276,8 +302,10 @@
       "type": "EiffelTestCaseFinishedEvent",
       "version": "1.0",
       "time": 5000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee13"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee13",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -294,8 +322,10 @@
       "type": "EiffelTestCaseFinishedEvent",
       "version": "1.0",
       "time": 206000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee14"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee14",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "placeholder": "The syntax of this event has not yet been defined."
@@ -312,8 +342,10 @@
       "type": "EiffelConfidenceLevelModifiedEvent",
       "version": "1.0",
       "time": 6000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee15"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee15",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "name": "approvedForSystemIntegration",
@@ -331,8 +363,10 @@
       "type": "EiffelConfidenceLevelModifiedEvent",
       "version": "1.0",
       "time": 207000,
-      "domainId": "example.domain",
-      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee16"
+      "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeee16",
+      "source": {
+        "domainId": "example.domain"
+      }
     },
     "data": {
       "name": "approvedForSystemIntegration",
diff --git a/schemas/EiffelActivityTriggeredEvent.json b/schemas/EiffelActivityTriggeredEvent.json
index 56738df5..42efdb83 100644
--- a/schemas/EiffelActivityTriggeredEvent.json
+++ b/schemas/EiffelActivityTriggeredEvent.json
@@ -5,9 +5,6 @@
     "meta": {
       "type": "object",
       "properties": {
-        "domainId": {
-          "type": "string"
-        },
         "id": {
           "type": "string"
         },
@@ -19,14 +16,53 @@
         },
         "time": {
           "type": "integer"
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "uri": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "object",
+              "properties": {
+                "group": {
+                  "type": "string"
+                },
+                "artifactId": {
+                  "type": "string"
+                },
+                "version": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "group",
+                "artifactId",
+                "version"
+              ],
+              "additionalProperties": false
+            }
+          },
+          "required": ["domainId"],
+          "additionalProperties": false
         }
       },
       "required": [
-        "domainId",
         "id",
         "type",
         "version",
-        "time"
+        "time",
+        "source"
       ],
       "additionalProperties": false
     },