From c95c7606a088552df9ce1dc534a7512a2f4c03f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20St=C3=A5hl?= <daniel.stahl@ericsson.com>
Date: Tue, 18 Sep 2018 11:42:04 +0200
Subject: [PATCH] Improved security support (#197)

Updated meta.security according to Issue #185. Documentation and schema of all event types has been updated, resulting in a major version step of all event types. Where applicable, examples have been updated, while some examples have been preserved to demonstrate previous behavior in older versions.

Description of information integrity protection has been updated in security.md.
---
 eiffel-syntax-and-usage/security.md           |   10 +-
 .../EiffelActivityCanceledEvent.md            |   50 +-
 .../EiffelActivityFinishedEvent.md            |   50 +-
 .../EiffelActivityStartedEvent.md             |   50 +-
 .../EiffelActivityTriggeredEvent.md           |   50 +-
 .../EiffelAnnouncementPublishedEvent.md       |   50 +-
 .../EiffelArtifactCreatedEvent.md             |   50 +-
 .../EiffelArtifactPublishedEvent.md           |   50 +-
 .../EiffelArtifactReusedEvent.md              |   50 +-
 .../EiffelCompositionDefinedEvent.md          |   50 +-
 .../EiffelConfidenceLevelModifiedEvent.md     |   50 +-
 .../EiffelEnvironmentDefinedEvent.md          |   50 +-
 .../EiffelFlowContextDefinedEvent.md          |   50 +-
 eiffel-vocabulary/EiffelIssueDefinedEvent.md  |   69 +-
 eiffel-vocabulary/EiffelIssueVerifiedEvent.md |   50 +-
 .../EiffelSourceChangeCreatedEvent.md         |   50 +-
 .../EiffelSourceChangeSubmittedEvent.md       |   50 +-
 .../EiffelTestCaseCanceledEvent.md            |   51 +-
 .../EiffelTestCaseFinishedEvent.md            |   50 +-
 .../EiffelTestCaseStartedEvent.md             |   50 +-
 .../EiffelTestCaseTriggeredEvent.md           |   51 +-
 ...stExecutionRecipeCollectionCreatedEvent.md |   50 +-
 .../EiffelTestSuiteFinishedEvent.md           |   50 +-
 .../EiffelTestSuiteStartedEvent.md            |   50 +-
 .../EiffelActivityCanceledEvent/simple.json   |    2 +-
 .../EiffelActivityFinishedEvent/simple.json   |    2 +-
 .../EiffelActivityStartedEvent/simple.json    |    2 +-
 .../simple-customdata.json                    |    2 +-
 .../EiffelActivityTriggeredEvent/simple.json  |    2 +-
 .../simple.json                               |    2 +-
 .../EiffelArtifactCreatedEvent/backend.json   |    2 +-
 .../EiffelArtifactCreatedEvent/dependent.json |    2 +-
 .../EiffelArtifactCreatedEvent/interface.json |    2 +-
 .../EiffelArtifactCreatedEvent/simple.json    |    2 +-
 .../EiffelArtifactPublishedEvent/simple.json  |   22 +-
 .../EiffelArtifactReusedEvent/simple.json     |    2 +-
 .../EiffelCompositionDefinedEvent/simple.json |    2 +-
 .../simple.json                               |    2 +-
 .../EiffelEnvironmentDefinedEvent/host.json   |    2 +-
 .../EiffelEnvironmentDefinedEvent/image.json  |    2 +-
 .../EiffelEnvironmentDefinedEvent/uri.json    |    2 +-
 .../EiffelFlowContextDefinedEvent/simple.json |    2 +-
 .../EiffelIssueDefinedEvent/simple.json       |    2 +-
 .../EiffelIssueVerifiedEvent/simple.json      |    2 +-
 .../simple.json                               |    2 +-
 .../simple.json                               |    2 +-
 .../EiffelTestCaseCanceledEvent/simple.json   |    2 +-
 .../EiffelTestCaseFinishedEvent/simple.json   |    2 +-
 .../EiffelTestCaseStartedEvent/simple.json    |    2 +-
 .../simple-2.0.0.json                         |   46 +
 .../EiffelTestCaseTriggeredEvent/simple.json  |    9 +-
 .../batches.json                              |    2 +-
 .../batchesUri.json                           |    2 +-
 .../EiffelTestSuiteFinishedEvent/simple.json  |    2 +-
 .../EiffelTestSuiteStartedEvent/simple.json   |    2 +-
 examples/flows/build-avoidance/events.json    |   32 +-
 .../confidence-level-joining/events.json      |   46 +-
 examples/flows/delivery-interface/events.json |   44 +-
 .../reference-data-sets/default/dump.json     | 1982 -----------------
 .../EiffelActivityCanceledEvent/3.0.0.json    |  166 ++
 .../EiffelActivityFinishedEvent/3.0.0.json    |  207 ++
 schemas/EiffelActivityStartedEvent/3.0.0.json |  156 ++
 .../EiffelActivityTriggeredEvent/3.0.0.json   |  180 ++
 .../3.0.0.json                                |  181 ++
 schemas/EiffelArtifactCreatedEvent/3.0.0.json |  220 ++
 .../EiffelArtifactPublishedEvent/3.0.0.json   |  191 ++
 schemas/EiffelArtifactReusedEvent/3.0.0.json  |  163 ++
 .../EiffelCompositionDefinedEvent/3.0.0.json  |  172 ++
 .../3.0.0.json                                |  192 ++
 .../EiffelEnvironmentDefinedEvent/3.0.0.json  |  194 ++
 .../EiffelFlowContextDefinedEvent/3.0.0.json  |  178 ++
 schemas/EiffelIssueDefinedEvent/3.0.0.json    |  186 ++
 schemas/EiffelIssueVerifiedEvent/4.0.0.json   |  163 ++
 .../EiffelSourceChangeCreatedEvent/4.0.0.json |  295 +++
 .../3.0.0.json                                |  271 +++
 .../EiffelTestCaseCanceledEvent/3.0.0.json    |  166 ++
 .../EiffelTestCaseFinishedEvent/3.0.0.json    |  234 ++
 schemas/EiffelTestCaseStartedEvent/3.0.0.json |  185 ++
 .../EiffelTestCaseTriggeredEvent/3.0.0.json   |  244 ++
 .../4.0.0.json                                |  277 +++
 .../EiffelTestSuiteFinishedEvent/3.0.0.json   |  209 ++
 .../EiffelTestSuiteStartedEvent/3.0.0.json    |  219 ++
 82 files changed, 5803 insertions(+), 2264 deletions(-)
 create mode 100644 examples/events/EiffelTestCaseTriggeredEvent/simple-2.0.0.json
 delete mode 100644 examples/reference-data-sets/default/dump.json
 create mode 100644 schemas/EiffelActivityCanceledEvent/3.0.0.json
 create mode 100644 schemas/EiffelActivityFinishedEvent/3.0.0.json
 create mode 100644 schemas/EiffelActivityStartedEvent/3.0.0.json
 create mode 100644 schemas/EiffelActivityTriggeredEvent/3.0.0.json
 create mode 100644 schemas/EiffelAnnouncementPublishedEvent/3.0.0.json
 create mode 100644 schemas/EiffelArtifactCreatedEvent/3.0.0.json
 create mode 100644 schemas/EiffelArtifactPublishedEvent/3.0.0.json
 create mode 100644 schemas/EiffelArtifactReusedEvent/3.0.0.json
 create mode 100644 schemas/EiffelCompositionDefinedEvent/3.0.0.json
 create mode 100644 schemas/EiffelConfidenceLevelModifiedEvent/3.0.0.json
 create mode 100644 schemas/EiffelEnvironmentDefinedEvent/3.0.0.json
 create mode 100644 schemas/EiffelFlowContextDefinedEvent/3.0.0.json
 create mode 100644 schemas/EiffelIssueDefinedEvent/3.0.0.json
 create mode 100644 schemas/EiffelIssueVerifiedEvent/4.0.0.json
 create mode 100644 schemas/EiffelSourceChangeCreatedEvent/4.0.0.json
 create mode 100644 schemas/EiffelSourceChangeSubmittedEvent/3.0.0.json
 create mode 100644 schemas/EiffelTestCaseCanceledEvent/3.0.0.json
 create mode 100644 schemas/EiffelTestCaseFinishedEvent/3.0.0.json
 create mode 100644 schemas/EiffelTestCaseStartedEvent/3.0.0.json
 create mode 100644 schemas/EiffelTestCaseTriggeredEvent/3.0.0.json
 create mode 100644 schemas/EiffelTestExecutionRecipeCollectionCreatedEvent/4.0.0.json
 create mode 100644 schemas/EiffelTestSuiteFinishedEvent/3.0.0.json
 create mode 100644 schemas/EiffelTestSuiteStartedEvent/3.0.0.json

diff --git a/eiffel-syntax-and-usage/security.md b/eiffel-syntax-and-usage/security.md
index 37671325..869ab4bd 100644
--- a/eiffel-syntax-and-usage/security.md
+++ b/eiffel-syntax-and-usage/security.md
@@ -1,5 +1,5 @@
 <!---
-   Copyright 2017 Ericsson AB.
+   Copyright 2017-2018 Ericsson AB.
    For a full list of individual contributors, please see the commit history.
 
    Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,13 +22,13 @@ Let us begin by establishing that the Eiffel protocol by itself can be considere
 In the words of ISO27000, confidentiality means that "information is not made available or disclosed to unauthorized individuals, entities, or processes". This can be achieved through multiple (and often complementary) means, such as encryption and access control. The Eiffel protocol itself cannot support confidentiality; instead it is a property of the systems used to transport, process and store the Eiffel events. In other words, if the confidentiality of information communicated as Eiffel events is a concern for you, then you are recommended to take appropriate action to ensure the confidentiality of your data, both at rest and in transit, e.g. through encryption.
 
 ## Integrity
-In information security, integrity refers to the accuracy and completeness of data. In other words, safeguarding integrity requires protection against both malicious and unintentional tampering with or corruption of data in an unauthorized or undetected manner. This cannot be _solved_ by a communication protocol, as it relies on adequate infrastructure and processes for managing the data, but it can be _supported_. Eiffel supports data integrity through digital signing, according to the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html).
+In information security, integrity refers to the accuracy and completeness of data. In other words, safeguarding integrity requires protection against both malicious and unintentional tampering with or corruption of data in an unauthorized or undetected manner. This cannot be _solved_ by a communication protocol, as it relies on adequate infrastructure and processes for managing the data, but it can be _supported_. Eiffel supports data integrity through digital signatures.
 
 A digital signature is a combination of hashing technology and encryption. Hash functions are commonly used to ensure data integrity and are familiar to most software professionals. By using checksums or hash values (particularly hash values, or _digests_, produced by cryptographic hash functions such as the SHA series), any piece of data of arbitrary length is computed into a fixed length digest, with any alteration of the input data resulting in a different digest. Consequently, as long as the digest of the received data matches the digest of the data sent, its integrity can be verified. Unfortunately, the digest must be securely communicated: any malicious attacker able to not only manipulate the data but also the digest can make a corrupted message appear authentic. This is why digital signing also employs encryption.
 
-In the Strong Distribution Model, the author of the data encrypts the digest using a _private key_. A private key is one half of an asymmetric _key pair_, with a matching _public key_ making up the other half. As the names suggest, the private key is kept secret, while the public key is distributed. The two keys in a pair are matches in the sense that one key can decrypt data encrypted by the other, and vice versa. In other words, if the recipient of a message can identify the correct public key and use it to decrypt the digest, and that digest turns out to be correct, both the identity of the author and the integrity of the data can be verified.
+The Eiffel protocol's support is influenced by [JSON Web Signatures (JWS)](https://tools.ietf.org/html/rfc7515), with slight modifications to allow inclusion of the signature within the event message itself, rather than as part of a header. This serves to keep every Eiffel event self-contained, with information integrity protection optional for the producer to include and optional for the consumer to consider. Note that this optionality does not in any way lessen the strength of the security provided: it is always up to the recipient of an unprotected Eiffel event to decide whether to trust it or not. In this sense, Eiffel support of data integrity is very similar to that employed by other document formats, such as the [Portable Document Format](http://www.adobe.com/devnet/pdf/pdf_reference.html).
 
-In support of this model, Eiffel events optionally include properties for communicating author identity and the encrypted digest as part of the __meta.security__ object. In combination, these two properties enable enforcement of the Strong Distribution Model. They are kept optional, however, as the Eiffel protocol itself leaves the decision to the user whether to make use of this security feature. Note that this optionality does not in any way lessen the strength of the security model: it is always up to the recipient of an unprotected Eiffel event to decide whether to trust it or not. In this sense, Eiffel support of data integrity is very similar to that employed by other document formats, such as the [Portable Document Format](http://www.adobe.com/devnet/pdf/pdf_reference.html).
+Apart from digital signing, the Eiffel protocol also supports author identification using [Distinguished Names](https://tools.ietf.org/html/rfc2253) and event sequence integrity protection. Please see the documentation of each event type for further information and detailed instructions on correct usage.
 
 ## Availability
-Availability of information communicated over the Eiffel protocol is a property of the communication channels and storage solutions used. In other words, similarly to confidentiality, it is an infrastructural concern and external to the protocol itself.
\ No newline at end of file
+Availability of information communicated over the Eiffel protocol is a property of the communication channels and storage solutions used. In other words, similarly to confidentiality, it is an infrastructural concern and external to the protocol itself.
diff --git a/eiffel-vocabulary/EiffelActivityCanceledEvent.md b/eiffel-vocabulary/EiffelActivityCanceledEvent.md
index 0956bcb7..7f97637a 100644
--- a/eiffel-vocabulary/EiffelActivityCanceledEvent.md
+++ b/eiffel-vocabulary/EiffelActivityCanceledEvent.md
@@ -123,28 +123,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelActivityCanceledEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelActivityFinishedEvent.md b/eiffel-vocabulary/EiffelActivityFinishedEvent.md
index 5da5df6e..baac30f6 100644
--- a/eiffel-vocabulary/EiffelActivityFinishedEvent.md
+++ b/eiffel-vocabulary/EiffelActivityFinishedEvent.md
@@ -155,28 +155,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelActivityFinishedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelActivityStartedEvent.md b/eiffel-vocabulary/EiffelActivityStartedEvent.md
index 3b124ae5..cd19ddb8 100644
--- a/eiffel-vocabulary/EiffelActivityStartedEvent.md
+++ b/eiffel-vocabulary/EiffelActivityStartedEvent.md
@@ -144,28 +144,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelActivityStartedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelActivityTriggeredEvent.md b/eiffel-vocabulary/EiffelActivityTriggeredEvent.md
index 11c7f7e5..0af4e0e6 100644
--- a/eiffel-vocabulary/EiffelActivityTriggeredEvent.md
+++ b/eiffel-vocabulary/EiffelActivityTriggeredEvent.md
@@ -151,28 +151,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelActivityTriggeredEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelAnnouncementPublishedEvent.md b/eiffel-vocabulary/EiffelAnnouncementPublishedEvent.md
index 52cef7d5..f39516f7 100644
--- a/eiffel-vocabulary/EiffelAnnouncementPublishedEvent.md
+++ b/eiffel-vocabulary/EiffelAnnouncementPublishedEvent.md
@@ -139,28 +139,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelAnnouncementPublishedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelArtifactCreatedEvent.md b/eiffel-vocabulary/EiffelArtifactCreatedEvent.md
index 57ff84be..41cb8858 100644
--- a/eiffel-vocabulary/EiffelArtifactCreatedEvent.md
+++ b/eiffel-vocabulary/EiffelArtifactCreatedEvent.md
@@ -183,28 +183,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelArtifactCreatedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelArtifactPublishedEvent.md b/eiffel-vocabulary/EiffelArtifactPublishedEvent.md
index f250bd2e..fb2bb278 100644
--- a/eiffel-vocabulary/EiffelArtifactPublishedEvent.md
+++ b/eiffel-vocabulary/EiffelArtifactPublishedEvent.md
@@ -138,28 +138,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelArtifactPublishedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelArtifactReusedEvent.md b/eiffel-vocabulary/EiffelArtifactReusedEvent.md
index 528f63be..4d90fa91 100644
--- a/eiffel-vocabulary/EiffelArtifactReusedEvent.md
+++ b/eiffel-vocabulary/EiffelArtifactReusedEvent.md
@@ -127,28 +127,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelArtifactReusedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelCompositionDefinedEvent.md b/eiffel-vocabulary/EiffelCompositionDefinedEvent.md
index dbc19f2c..c50ded4d 100644
--- a/eiffel-vocabulary/EiffelCompositionDefinedEvent.md
+++ b/eiffel-vocabulary/EiffelCompositionDefinedEvent.md
@@ -136,28 +136,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelCompositionDefinedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelConfidenceLevelModifiedEvent.md b/eiffel-vocabulary/EiffelConfidenceLevelModifiedEvent.md
index f3e1d0b7..16be2645 100644
--- a/eiffel-vocabulary/EiffelConfidenceLevelModifiedEvent.md
+++ b/eiffel-vocabulary/EiffelConfidenceLevelModifiedEvent.md
@@ -169,28 +169,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelConfidenceLevelModifiedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelEnvironmentDefinedEvent.md b/eiffel-vocabulary/EiffelEnvironmentDefinedEvent.md
index 1f95bf46..ef5d7e34 100644
--- a/eiffel-vocabulary/EiffelEnvironmentDefinedEvent.md
+++ b/eiffel-vocabulary/EiffelEnvironmentDefinedEvent.md
@@ -155,28 +155,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelEnvironmentDefinedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelFlowContextDefinedEvent.md b/eiffel-vocabulary/EiffelFlowContextDefinedEvent.md
index a7883f79..08c2cdb1 100644
--- a/eiffel-vocabulary/EiffelFlowContextDefinedEvent.md
+++ b/eiffel-vocabulary/EiffelFlowContextDefinedEvent.md
@@ -139,28 +139,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelFlowContextDefinedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelIssueDefinedEvent.md b/eiffel-vocabulary/EiffelIssueDefinedEvent.md
index 8d9086fc..5dd6b7ec 100644
--- a/eiffel-vocabulary/EiffelIssueDefinedEvent.md
+++ b/eiffel-vocabulary/EiffelIssueDefinedEvent.md
@@ -181,47 +181,66 @@ __Description:__ The URI of, related to or describing the event sender.
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for enclosing security related
-information, particularly supporting data integrity. See
-[Security](../eiffel-syntax-and-usage/security.md) for further information.
+__Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong
-Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html).
-Note that this only addressed the _integrity_ of the Eiffel event, not its
-_confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is
-intended to enable the recipient to look up the appropriate public key for
-decrypting the digest and thereby verifying author identity and data
-integrity. The format of the author identity varies depending on the key
-infrastructure solution used. Note that this requires the presence of a
-Trusted Authority (TA) which the recipient can query for the correct public
-key. The identity and location of the TA must never be included in the event
-itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and
-the decryption algorithm to use, similarly to the Trusted Authority (TA),
-must be known to the recipient. Note that the digest of the entire event is
-affected by the value of this property. For this reason the input to the hash
-function SHALL be the entire event unaltered in all parts except for this
-property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelIssueDefinedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.0.0     | [0706840](../../../blob/070684053ceb1da5fb42d9f0ef21df816961d6bc/eiffel-vocabulary/EiffelIssueDefinedEvent.md) | Initial version                         |
 
 ## Examples
diff --git a/eiffel-vocabulary/EiffelIssueVerifiedEvent.md b/eiffel-vocabulary/EiffelIssueVerifiedEvent.md
index 0dac17c8..b2f6eecb 100644
--- a/eiffel-vocabulary/EiffelIssueVerifiedEvent.md
+++ b/eiffel-vocabulary/EiffelIssueVerifiedEvent.md
@@ -153,28 +153,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 3.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 4.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 3.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelIssueVerifiedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 2.0.0     | [0706840](../../../blob/070684053ceb1da5fb42d9f0ef21df816961d6bc/eiffel-vocabulary/EiffelIssueVerifiedEvent.md) | Replaced data.issues with links         |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
diff --git a/eiffel-vocabulary/EiffelSourceChangeCreatedEvent.md b/eiffel-vocabulary/EiffelSourceChangeCreatedEvent.md
index b443c06e..44ec727b 100644
--- a/eiffel-vocabulary/EiffelSourceChangeCreatedEvent.md
+++ b/eiffel-vocabulary/EiffelSourceChangeCreatedEvent.md
@@ -299,28 +299,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 3.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 4.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 3.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelSourceChangeCreatedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 2.0.0     | [0706840](../../../blob/070684053ceb1da5fb42d9f0ef21df816961d6bc/eiffel-vocabulary/EiffelSourceChangeCreatedEvent.md) | Replaced data.issues with links         |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
diff --git a/eiffel-vocabulary/EiffelSourceChangeSubmittedEvent.md b/eiffel-vocabulary/EiffelSourceChangeSubmittedEvent.md
index 90304e5d..283cbe48 100644
--- a/eiffel-vocabulary/EiffelSourceChangeSubmittedEvent.md
+++ b/eiffel-vocabulary/EiffelSourceChangeSubmittedEvent.md
@@ -248,28 +248,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelSourceChangeCreatedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelTestCaseCanceledEvent.md b/eiffel-vocabulary/EiffelTestCaseCanceledEvent.md
index ba12d497..7c74166a 100644
--- a/eiffel-vocabulary/EiffelTestCaseCanceledEvent.md
+++ b/eiffel-vocabulary/EiffelTestCaseCanceledEvent.md
@@ -123,28 +123,65 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
+
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelTestCaseCanceledEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelTestCaseFinishedEvent.md b/eiffel-vocabulary/EiffelTestCaseFinishedEvent.md
index 8ee6abb8..3df39fcc 100644
--- a/eiffel-vocabulary/EiffelTestCaseFinishedEvent.md
+++ b/eiffel-vocabulary/EiffelTestCaseFinishedEvent.md
@@ -182,28 +182,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelTestCaseFinishedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.1     | [0a2f9ef](../../../blob/0a2f9ef139fe6ead2493e5deddf1337ffb3dd4af/eiffel-vocabulary/EiffelTestCaseFinishedEvent.md) | data.outcome.metrics.value and data.outcome.metrics.name made mandatory. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version. |
diff --git a/eiffel-vocabulary/EiffelTestCaseStartedEvent.md b/eiffel-vocabulary/EiffelTestCaseStartedEvent.md
index b2b88415..619cedb1 100644
--- a/eiffel-vocabulary/EiffelTestCaseStartedEvent.md
+++ b/eiffel-vocabulary/EiffelTestCaseStartedEvent.md
@@ -145,28 +145,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelTestCaseStartedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelTestCaseTriggeredEvent.md b/eiffel-vocabulary/EiffelTestCaseTriggeredEvent.md
index 6e7e2ac1..93470fa6 100644
--- a/eiffel-vocabulary/EiffelTestCaseTriggeredEvent.md
+++ b/eiffel-vocabulary/EiffelTestCaseTriggeredEvent.md
@@ -193,30 +193,67 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelTestCaseTriggeredEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
 ## Examples
 * [Simple example](../examples/events/EiffelTestCaseTriggeredEvent/simple.json)
+* [Simple example using pre-3.0.0 meta.security object](../examples/events/EiffelTestCaseTriggeredEvent/simple-2.0.0.json)
diff --git a/eiffel-vocabulary/EiffelTestExecutionRecipeCollectionCreatedEvent.md b/eiffel-vocabulary/EiffelTestExecutionRecipeCollectionCreatedEvent.md
index d7d0df7a..ed265360 100644
--- a/eiffel-vocabulary/EiffelTestExecutionRecipeCollectionCreatedEvent.md
+++ b/eiffel-vocabulary/EiffelTestExecutionRecipeCollectionCreatedEvent.md
@@ -220,28 +220,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
+
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.integrityProtection.publicKey
 __Type:__ String  
 __Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
+
+##### meta.security.sequenceProtection.sequenceName
+__Type:__ String  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 3.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 4.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 3.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelTestExecutionRecipeCollectionCreatedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 2.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 2.0.0     | [f92e001](../../../blob/f92e001c88d1139a62f8ace976958e0a30d8f9c5/eiffel-vocabulary/EiffelTestExecutionRecipeCollectionCreatedEvent.md) | Changed syntax of data.batches.recipes.constraints from an uncontrolled object to a list of key-value pairs to comply with design guidelines. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
diff --git a/eiffel-vocabulary/EiffelTestSuiteFinishedEvent.md b/eiffel-vocabulary/EiffelTestSuiteFinishedEvent.md
index c8649eff..5768657b 100644
--- a/eiffel-vocabulary/EiffelTestSuiteFinishedEvent.md
+++ b/eiffel-vocabulary/EiffelTestSuiteFinishedEvent.md
@@ -165,28 +165,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelTestSuiteFinishedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/eiffel-vocabulary/EiffelTestSuiteStartedEvent.md b/eiffel-vocabulary/EiffelTestSuiteStartedEvent.md
index 6141ae3c..39e1aec4 100644
--- a/eiffel-vocabulary/EiffelTestSuiteStartedEvent.md
+++ b/eiffel-vocabulary/EiffelTestSuiteStartedEvent.md
@@ -151,28 +151,64 @@ __Format:__
 __Required:__ No  
 __Description:__ An optional object for enclosing security related information, particularly supporting data integrity. See [Security](../eiffel-syntax-and-usage/security.md) for further information.
 
-#### meta.security.sdm
+#### meta.security.authorIdentity
+__Type:__ String  
+__Format:__ [Distinguished Name](https://tools.ietf.org/html/rfc2253)  
+__Required:__ Yes  
+__Description:__ The identity of the author of the event. This property is intended to enable the recipient to identify the author of the event contents and/or look up the appropriate public key for decrypting the __meta.security.integrityProtection.signature__ value and thereby verifying author identity and data integrity.
+
+#### meta.security.integrityProtection
 __Type:__ Object  
 __Format:__  
 __Required:__ No  
-__Description:__ An optional object for properties supporting the [Strong Distribution Model](http://www.cryptnet.net/fdp/crypto/strong_distro.html). Note that this only addressed the _integrity_ of the Eiffel event, not its _confidentiality_ or _availability_.
+__Description:__ An optional object for enabling information integrity protection via cryptographic signing. To generate a correct __meta.security.integrityProtection__ object:
+1. Generate the entire event, but with the __meta.security.integrityProtection.signature__ value set to an empty string.
+1. Serialize the event on [Canonical JSON Form](https://tools.ietf.org/html/draft-staykov-hu-json-canonical-form-00).
+1. Generate the signature using the __meta.security.integrityProtection.alg__ algorithm.
+1. Set the __meta.security.integrityProtection.signature__ value to the resulting signature while maintaining Canonical JSON Form.
+To verify the integrity of the event, the consumer then resets __meta.security.integrityProtection.signature__ to an empty string and ensures Canonical JSON Form before verifying the signature.
 
-##### meta.security.sdm.authorIdentity
+##### meta.security.integrityProtection.alg
+__Type:__ String  
+__Format:__ [A valid JWA RFC 7518 alg parameter value](https://tools.ietf.org/html/rfc7518#section-3.1), excluding "none"  
+__Required:__ Yes  
+__Description:__ The cryptographic algorithm used to digitally sign the event. If no signing is performed, the __meta.security.integrityProtection__ SHALL be omitted rather than setting __meta.security.integrityProtection.alg__ to "none".
+
+##### meta.security.integrityProtection.signature
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The identity of the author of the event. This property is intended to enable the recipient to look up the appropriate public key for decrypting the digest and thereby verifying author identity and data integrity. The format of the author identity varies depending on the key infrastructure solution used. Note that this requires the presence of a Trusted Authority (TA) which the recipient can query for the correct public key. The identity and location of the TA must never be included in the event itself, as this would compromise the security of the solution.
+__Description:__ The signature produced by the signing algorithm.
+
+##### meta.security.integrityProtection.publicKey
+__Type:__ String  
+__Format:__  
+__Required:__ No  
+__Description:__ The producer of the event may include the relevant public key for convenience, rather than relying a separate key distribution mechanism. Note that this property, along with the rest of the event, is encompassed by the integrity protection offered via __meta.security.integrityProtection__.
+
+#### meta.security.sequenceProtection
+__Type:__ Object[]  
+__Format:__  
+__Required:__ No  
+__Description:__ An optional object for enabling verification of intact event sequences in a distributed environment, thereby protecting against data loss, race conditions and replay attacks. It allows event publishers to state the order in which they produce a certain set of events. In other words, it cannot provide any global guarantees as to event sequencing, but rather per-publisher guarantees. Every object in the array represents a named sequence of which this event forms a part. For every event including a given named sequence, the publisher SHALL increment __meta.security.sequenceProtection.position__ by 1. The first event produced in a given named sequence SHALL numbered 1.
 
-##### meta.security.sdm.encryptedDigest
+##### meta.security.sequenceProtection.sequenceName
 __Type:__ String  
 __Format:__  
 __Required:__ Yes  
-__Description:__ The encrypted digest. The cryptographic hash function and the decryption algorithm to use, similarly to the Trusted Authority (TA), must be known to the recipient. Note that the digest of the entire event is affected by the value of this property. For this reason the input to the hash function SHALL be the entire event unaltered in all parts except for this property, which SHALL be replaced by an empty string.
+__Description:__ The name of the sequence. There MUST not be two identical __meta.security.sequenceProtection.sequenceName__ values in the same event.
+
+##### meta.security.sequenceProtection.position
+__Type:__ Integer  
+__Format:__  
+__Required:__ Yes  
+__Description:__ The number of the event within the named sequence.
 
 ## Version History
 | Version   | Introduced in                                          | Changes                                 |
 | --------- | ------------------------------------------------------ | --------------------------------------- |
-| 2.0.0     | Current version                                        | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
+| 3.0.0     | Current version                                        | Improved information integrity protection | (see [Issue 185](https://github.com/eiffel-community/eiffel/issues/185)) |
+| 2.0.0     | [dc5ec6f](../../../blob/dc5ec6fb87e293eeffe88fdafe698eec0f5a2c89/eiffel-vocabulary/EiffelTestSuiteStartedEvent.md) | Introduced purl identifiers instead of GAVs (see [Issue 182](https://github.com/eiffel-community/eiffel/issues/182)) |
 | 1.1.0     | [edition-toulouse](../../../tree/edition-toulouse)     | Multiple links of type FLOW_CONTEXT allowed. |
 | 1.0.0     | [edition-bordeaux](../../../tree/edition-bordeaux)     | Initial version.                        |
 
diff --git a/examples/events/EiffelActivityCanceledEvent/simple.json b/examples/events/EiffelActivityCanceledEvent/simple.json
index 8a4c2754..313dc61b 100644
--- a/examples/events/EiffelActivityCanceledEvent/simple.json
+++ b/examples/events/EiffelActivityCanceledEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelActivityCanceledEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelActivityFinishedEvent/simple.json b/examples/events/EiffelActivityFinishedEvent/simple.json
index f1bd5540..80caad16 100644
--- a/examples/events/EiffelActivityFinishedEvent/simple.json
+++ b/examples/events/EiffelActivityFinishedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelActivityFinishedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelActivityStartedEvent/simple.json b/examples/events/EiffelActivityStartedEvent/simple.json
index 67b80b4a..8d26cf8a 100644
--- a/examples/events/EiffelActivityStartedEvent/simple.json
+++ b/examples/events/EiffelActivityStartedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelActivityStartedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelActivityTriggeredEvent/simple-customdata.json b/examples/events/EiffelActivityTriggeredEvent/simple-customdata.json
index 8119f614..1e414f83 100644
--- a/examples/events/EiffelActivityTriggeredEvent/simple-customdata.json
+++ b/examples/events/EiffelActivityTriggeredEvent/simple-customdata.json
@@ -2,7 +2,7 @@
   "meta": {
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
     "type": "EiffelActivityTriggeredEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "source": {
       "domainId": "test-domainId"
diff --git a/examples/events/EiffelActivityTriggeredEvent/simple.json b/examples/events/EiffelActivityTriggeredEvent/simple.json
index ae978c55..292d4170 100644
--- a/examples/events/EiffelActivityTriggeredEvent/simple.json
+++ b/examples/events/EiffelActivityTriggeredEvent/simple.json
@@ -2,7 +2,7 @@
   "meta": {
     "id": "e1e93f13-7c3c-4f17-9753-ebf0c86ff1c2",
     "type": "EiffelActivityTriggeredEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890
   },
   "data": {
diff --git a/examples/events/EiffelAnnouncementPublishedEvent/simple.json b/examples/events/EiffelAnnouncementPublishedEvent/simple.json
index 17439fbc..e778b4e6 100644
--- a/examples/events/EiffelAnnouncementPublishedEvent/simple.json
+++ b/examples/events/EiffelAnnouncementPublishedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelAnnouncementPublishedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelArtifactCreatedEvent/backend.json b/examples/events/EiffelArtifactCreatedEvent/backend.json
index c3978263..f9b3c4fe 100644
--- a/examples/events/EiffelArtifactCreatedEvent/backend.json
+++ b/examples/events/EiffelArtifactCreatedEvent/backend.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelArtifactCreatedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "source": {
     },
diff --git a/examples/events/EiffelArtifactCreatedEvent/dependent.json b/examples/events/EiffelArtifactCreatedEvent/dependent.json
index 5adc368e..3ecad5b7 100644
--- a/examples/events/EiffelArtifactCreatedEvent/dependent.json
+++ b/examples/events/EiffelArtifactCreatedEvent/dependent.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelArtifactCreatedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "source": {
       "uri": "https://ci.internal.myorg.org/ArtifactBuilder/info"
diff --git a/examples/events/EiffelArtifactCreatedEvent/interface.json b/examples/events/EiffelArtifactCreatedEvent/interface.json
index 976e2394..67f0c4a3 100644
--- a/examples/events/EiffelArtifactCreatedEvent/interface.json
+++ b/examples/events/EiffelArtifactCreatedEvent/interface.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelArtifactCreatedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "source": {
       "serializer": "pkg:maven/com.mycompany.pipeline-tools/eiffel-serializer@57"
diff --git a/examples/events/EiffelArtifactCreatedEvent/simple.json b/examples/events/EiffelArtifactCreatedEvent/simple.json
index 34bcec7e..10b153b7 100644
--- a/examples/events/EiffelArtifactCreatedEvent/simple.json
+++ b/examples/events/EiffelArtifactCreatedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelArtifactCreatedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
     "source": {
diff --git a/examples/events/EiffelArtifactPublishedEvent/simple.json b/examples/events/EiffelArtifactPublishedEvent/simple.json
index 7295f413..c5e46d35 100644
--- a/examples/events/EiffelArtifactPublishedEvent/simple.json
+++ b/examples/events/EiffelArtifactPublishedEvent/simple.json
@@ -1,14 +1,26 @@
 {
   "meta": {
     "type": "EiffelArtifactPublishedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
     "security": {
-      "sdm": {
-        "authorIdentity": "MyCompany/JohnDoe",
-        "encryptedDigest": "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a"
-      }
+      "authorIdentity": "CN=John Doe,O=Awesome Company,C=Awesomeistan",
+      "integrityProtection": {
+        "signature": "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a",
+        "alg": "HS256",
+        "publicKey": "really-long-string-containing-the-public-key-matching-the-private-key-used-to-generate-the-encrypted-digest"
+      },
+      "sequenceProtection": [
+        {
+          "sequenceName": "allEvents",
+          "position": 8734
+        },
+        {
+          "sequenceName": "deploymentEvents",
+          "position": 18
+        }
+      ]
     }
   },
   "data": {
diff --git a/examples/events/EiffelArtifactReusedEvent/simple.json b/examples/events/EiffelArtifactReusedEvent/simple.json
index d0df20f1..fa326c8a 100644
--- a/examples/events/EiffelArtifactReusedEvent/simple.json
+++ b/examples/events/EiffelArtifactReusedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelArtifactReusedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
     "source": {
diff --git a/examples/events/EiffelCompositionDefinedEvent/simple.json b/examples/events/EiffelCompositionDefinedEvent/simple.json
index 5e551f07..d1086a93 100644
--- a/examples/events/EiffelCompositionDefinedEvent/simple.json
+++ b/examples/events/EiffelCompositionDefinedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelCompositionDefinedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelConfidenceLevelModifiedEvent/simple.json b/examples/events/EiffelConfidenceLevelModifiedEvent/simple.json
index 66018b83..cef1da84 100644
--- a/examples/events/EiffelConfidenceLevelModifiedEvent/simple.json
+++ b/examples/events/EiffelConfidenceLevelModifiedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelConfidenceLevelModifiedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelEnvironmentDefinedEvent/host.json b/examples/events/EiffelEnvironmentDefinedEvent/host.json
index 1b493994..92eb17d4 100644
--- a/examples/events/EiffelEnvironmentDefinedEvent/host.json
+++ b/examples/events/EiffelEnvironmentDefinedEvent/host.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelEnvironmentDefinedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
     "source": {
diff --git a/examples/events/EiffelEnvironmentDefinedEvent/image.json b/examples/events/EiffelEnvironmentDefinedEvent/image.json
index 166c59e8..4f1cd403 100644
--- a/examples/events/EiffelEnvironmentDefinedEvent/image.json
+++ b/examples/events/EiffelEnvironmentDefinedEvent/image.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelEnvironmentDefinedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelEnvironmentDefinedEvent/uri.json b/examples/events/EiffelEnvironmentDefinedEvent/uri.json
index 15c8453c..8f4b8665 100644
--- a/examples/events/EiffelEnvironmentDefinedEvent/uri.json
+++ b/examples/events/EiffelEnvironmentDefinedEvent/uri.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelEnvironmentDefinedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
     "source": {
diff --git a/examples/events/EiffelFlowContextDefinedEvent/simple.json b/examples/events/EiffelFlowContextDefinedEvent/simple.json
index c0596591..b70a4291 100644
--- a/examples/events/EiffelFlowContextDefinedEvent/simple.json
+++ b/examples/events/EiffelFlowContextDefinedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelFlowContextDefinedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelIssueDefinedEvent/simple.json b/examples/events/EiffelIssueDefinedEvent/simple.json
index 254770e5..000b18b7 100644
--- a/examples/events/EiffelIssueDefinedEvent/simple.json
+++ b/examples/events/EiffelIssueDefinedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelIssueDefinedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelIssueVerifiedEvent/simple.json b/examples/events/EiffelIssueVerifiedEvent/simple.json
index cce74dd4..91e54393 100644
--- a/examples/events/EiffelIssueVerifiedEvent/simple.json
+++ b/examples/events/EiffelIssueVerifiedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelIssueVerifiedEvent",
-    "version": "3.0.0",
+    "version": "4.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelSourceChangeCreatedEvent/simple.json b/examples/events/EiffelSourceChangeCreatedEvent/simple.json
index dc887255..31cce00b 100644
--- a/examples/events/EiffelSourceChangeCreatedEvent/simple.json
+++ b/examples/events/EiffelSourceChangeCreatedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelSourceChangeCreatedEvent",
-    "version": "3.0.0",
+    "version": "4.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelSourceChangeSubmittedEvent/simple.json b/examples/events/EiffelSourceChangeSubmittedEvent/simple.json
index 33c95b4f..4f9f9c63 100644
--- a/examples/events/EiffelSourceChangeSubmittedEvent/simple.json
+++ b/examples/events/EiffelSourceChangeSubmittedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelSourceChangeSubmittedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelTestCaseCanceledEvent/simple.json b/examples/events/EiffelTestCaseCanceledEvent/simple.json
index 4c0e0840..f2688e3a 100644
--- a/examples/events/EiffelTestCaseCanceledEvent/simple.json
+++ b/examples/events/EiffelTestCaseCanceledEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelTestCaseCanceledEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelTestCaseFinishedEvent/simple.json b/examples/events/EiffelTestCaseFinishedEvent/simple.json
index b4867bb9..6692f2ca 100644
--- a/examples/events/EiffelTestCaseFinishedEvent/simple.json
+++ b/examples/events/EiffelTestCaseFinishedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelTestCaseFinishedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelTestCaseStartedEvent/simple.json b/examples/events/EiffelTestCaseStartedEvent/simple.json
index 73dc1246..811169f8 100644
--- a/examples/events/EiffelTestCaseStartedEvent/simple.json
+++ b/examples/events/EiffelTestCaseStartedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelTestCaseStartedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelTestCaseTriggeredEvent/simple-2.0.0.json b/examples/events/EiffelTestCaseTriggeredEvent/simple-2.0.0.json
new file mode 100644
index 00000000..4d1607a3
--- /dev/null
+++ b/examples/events/EiffelTestCaseTriggeredEvent/simple-2.0.0.json
@@ -0,0 +1,46 @@
+{
+  "meta": {
+    "type": "EiffelTestCaseTriggeredEvent",
+    "version": "2.0.0",
+    "time": 1234567890,
+    "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
+    "security": {
+      "sdm": {
+        "authorIdentity": "My Test Management System",
+        "encryptedDigest": "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a"
+      }
+    }
+  },
+  "data": {
+    "testCase": {
+      "tracker": "My Test Management System",
+      "id": "TC-1234",
+      "version": "42",
+      "uri": "http://tm.company.com/browse/TC-1234/42"
+    },
+    "recipeId": "aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee0",
+    "parameters": [
+      {
+        "name": "login",
+        "value": "admin"
+      }
+    ],
+    "executionType": "AUTOMATED",
+    "triggers": [
+      {
+        "type": "TIMER",
+        "description": "Nightly test timer."
+      }
+    ]
+  },
+  "links": [
+    {
+      "type": "CONTEXT",
+      "target": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee1"
+    },
+    {
+      "type": "IUT",
+      "target": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee2"
+    }
+  ]
+}
diff --git a/examples/events/EiffelTestCaseTriggeredEvent/simple.json b/examples/events/EiffelTestCaseTriggeredEvent/simple.json
index 4d1607a3..472f6ffe 100644
--- a/examples/events/EiffelTestCaseTriggeredEvent/simple.json
+++ b/examples/events/EiffelTestCaseTriggeredEvent/simple.json
@@ -1,13 +1,14 @@
 {
   "meta": {
     "type": "EiffelTestCaseTriggeredEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
     "security": {
-      "sdm": {
-        "authorIdentity": "My Test Management System",
-        "encryptedDigest": "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a"
+      "authorIdentity": "CN=Jane Doe,O=Test Management Group,C=United Kingdom",
+      "integrityProtection": {
+        "signature": "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a",
+        "alg": "HS256"
       }
     }
   },
diff --git a/examples/events/EiffelTestExecutionRecipeCollectionCreatedEvent/batches.json b/examples/events/EiffelTestExecutionRecipeCollectionCreatedEvent/batches.json
index ffe3ed7e..040c96cb 100644
--- a/examples/events/EiffelTestExecutionRecipeCollectionCreatedEvent/batches.json
+++ b/examples/events/EiffelTestExecutionRecipeCollectionCreatedEvent/batches.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelTestExecutionRecipeCollectionCreatedEvent",
-    "version": "3.0.0",
+    "version": "4.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelTestExecutionRecipeCollectionCreatedEvent/batchesUri.json b/examples/events/EiffelTestExecutionRecipeCollectionCreatedEvent/batchesUri.json
index a719ec9d..899c2f83 100644
--- a/examples/events/EiffelTestExecutionRecipeCollectionCreatedEvent/batchesUri.json
+++ b/examples/events/EiffelTestExecutionRecipeCollectionCreatedEvent/batchesUri.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelTestExecutionRecipeCollectionCreatedEvent",
-    "version": "3.0.0",
+    "version": "4.0.0",
     "time": 1234567890,
     "source": {
       "domainId": "example.domain"
diff --git a/examples/events/EiffelTestSuiteFinishedEvent/simple.json b/examples/events/EiffelTestSuiteFinishedEvent/simple.json
index 292df4a6..7706c24c 100644
--- a/examples/events/EiffelTestSuiteFinishedEvent/simple.json
+++ b/examples/events/EiffelTestSuiteFinishedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelTestSuiteFinishedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/events/EiffelTestSuiteStartedEvent/simple.json b/examples/events/EiffelTestSuiteStartedEvent/simple.json
index 9dda556d..9338ac28 100644
--- a/examples/events/EiffelTestSuiteStartedEvent/simple.json
+++ b/examples/events/EiffelTestSuiteStartedEvent/simple.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "type": "EiffelTestSuiteStartedEvent",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "time": 1234567890,
     "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0"
   },
diff --git a/examples/flows/build-avoidance/events.json b/examples/flows/build-avoidance/events.json
index 6113aacc..80c3c8f9 100644
--- a/examples/flows/build-avoidance/events.json
+++ b/examples/flows/build-avoidance/events.json
@@ -2,7 +2,7 @@
   {
     "meta": {
       "type": "EiffelSourceChangeSubmittedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 1000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
       "source": {
@@ -23,7 +23,7 @@
   {
     "meta": {
       "type": "EiffelSourceChangeSubmittedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 101000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee1",
       "source": {
@@ -48,7 +48,7 @@
   {
     "meta": {
       "type": "EiffelCompositionDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 2000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee2",
       "source": {
@@ -69,7 +69,7 @@
   {
     "meta": {
       "type": "EiffelCompositionDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 102000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee3",
       "source": {
@@ -94,7 +94,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 3000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee4",
       "source": {
@@ -120,7 +120,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 4000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee5",
       "source": {
@@ -146,7 +146,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 5000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee6",
       "source": {
@@ -172,7 +172,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 6000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee7",
       "source": {
@@ -198,7 +198,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 7000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee8",
       "source": {
@@ -224,7 +224,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 103000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee9",
       "source": {
@@ -254,7 +254,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 104000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee10",
       "source": {
@@ -284,7 +284,7 @@
   {
     "meta": {
       "type": "EiffelCompositionDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 8000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee11",
       "source": {
@@ -321,7 +321,7 @@
   {
     "meta": {
       "type": "EiffelCompositionDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 105000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee12",
       "source": {
@@ -362,7 +362,7 @@
   {
     "meta": {
       "type": "EiffelArtifactReusedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 102100,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee13",
       "source": {
@@ -385,7 +385,7 @@
   {
     "meta": {
       "type": "EiffelArtifactReusedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 102200,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee14",
       "source": {
@@ -408,7 +408,7 @@
   {
     "meta": {
       "type": "EiffelArtifactReusedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 102300,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee15",
       "source": {
diff --git a/examples/flows/confidence-level-joining/events.json b/examples/flows/confidence-level-joining/events.json
index 17ff624c..96ab87f1 100644
--- a/examples/flows/confidence-level-joining/events.json
+++ b/examples/flows/confidence-level-joining/events.json
@@ -2,7 +2,7 @@
   {
     "meta": {
       "type": "EiffelEnvironmentDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 1000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
       "source": {
@@ -20,7 +20,7 @@
   {
     "meta": {
       "type": "EiffelCompositionDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 2000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee1",
       "source": {
@@ -36,7 +36,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 3000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee2",
       "source": {
@@ -65,7 +65,7 @@
   {
     "meta": {
       "type": "EiffelArtifactPublishedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 4000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee3",
       "source": {
@@ -94,7 +94,7 @@
   {
     "meta": {
       "type": "EiffelActivityTriggeredEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 5000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee4",
       "source": {
@@ -121,7 +121,7 @@
   {
     "meta": {
       "type": "EiffelActivityTriggeredEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 6000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee5",
       "source": {
@@ -148,7 +148,7 @@
   {
     "meta": {
       "type": "EiffelActivityStartedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 7000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee6",
       "source": {
@@ -167,7 +167,7 @@
   {
     "meta": {
       "type": "EiffelActivityStartedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 8000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee7",
       "source": {
@@ -186,7 +186,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseTriggeredEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 9000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeea8",
       "source": {
@@ -215,7 +215,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseStartedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 9001,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee8",
       "source": {
@@ -235,7 +235,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseTriggeredEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 9000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeea9",
       "source": {
@@ -264,7 +264,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseStartedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 9001,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee9",
       "source": {
@@ -284,7 +284,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseTriggeredEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 9000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeea10",
       "source": {
@@ -313,7 +313,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseStartedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 9001,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee10",
       "source": {
@@ -333,7 +333,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseTriggeredEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 9000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeea11",
       "source": {
@@ -362,7 +362,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseStartedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 9001,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee11",
       "source": {
@@ -382,7 +382,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseFinishedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 19000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee12",
       "source": {
@@ -416,7 +416,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseFinishedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 14000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee13",
       "source": {
@@ -442,7 +442,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseFinishedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 16000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee14",
       "source": {
@@ -465,7 +465,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseFinishedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 15000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee15",
       "source": {
@@ -488,7 +488,7 @@
   {
     "meta": {
       "type": "EiffelActivityFinishedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 20000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee16",
       "source": {
@@ -510,7 +510,7 @@
   {
     "meta": {
       "type": "EiffelActivityFinishedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 20000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee17",
       "source": {
@@ -532,7 +532,7 @@
   {
     "meta": {
       "type": "EiffelConfidenceLevelModifiedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 21000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee18",
       "source": {
diff --git a/examples/flows/delivery-interface/events.json b/examples/flows/delivery-interface/events.json
index fc5a4b89..baa0b5ef 100644
--- a/examples/flows/delivery-interface/events.json
+++ b/examples/flows/delivery-interface/events.json
@@ -2,7 +2,7 @@
   {
     "meta": {
       "type": "EiffelSourceChangeSubmittedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 1000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee0",
       "source": {
@@ -25,7 +25,7 @@
   {
     "meta": {
       "type": "EiffelSourceChangeCreatedEvent",
-      "version": "3.0.0",
+      "version": "4.0.0",
       "time": 101000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee1",
       "source": {
@@ -58,7 +58,7 @@
   {
     "meta": {
       "type": "EiffelSourceChangeCreatedEvent",
-      "version": "3.0.0",
+      "version": "4.0.0",
       "time": 102000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee2",
       "source": {
@@ -101,7 +101,7 @@
   {
     "meta": {
       "type": "EiffelSourceChangeSubmittedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 103000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee3",
       "source": {
@@ -132,7 +132,7 @@
   {
     "meta": {
       "type": "EiffelSourceChangeCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 201000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee4",
       "source": {
@@ -163,7 +163,7 @@
   {
     "meta": {
       "type": "EiffelSourceChangeSubmittedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 202000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee5",
       "source": {
@@ -194,7 +194,7 @@
   {
     "meta": {
       "type": "EiffelCompositionDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 2000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee6",
       "source": {
@@ -214,7 +214,7 @@
   {
     "meta": {
       "type": "EiffelCompositionDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 104000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee7",
       "source": {
@@ -239,7 +239,7 @@
   {
     "meta": {
       "type": "EiffelCompositionDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 203000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee8",
       "source": {
@@ -264,7 +264,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 3000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee9",
       "source": {
@@ -285,7 +285,7 @@
   {
     "meta": {
       "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 204000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee10",
       "source": {
@@ -306,7 +306,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseTriggeredEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 4000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeea11",
       "source": {
@@ -331,7 +331,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseStartedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 4001,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee11",
       "source": {
@@ -351,7 +351,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseTriggeredEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 205000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeea12",
       "source": {
@@ -376,7 +376,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseStartedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 205001,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee12",
       "source": {
@@ -396,7 +396,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseFinishedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 5000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee13",
       "source": {
@@ -430,7 +430,7 @@
   {
     "meta": {
       "type": "EiffelTestCaseFinishedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 206000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee14",
       "source": {
@@ -460,7 +460,7 @@
   {
     "meta": {
       "type": "EiffelConfidenceLevelModifiedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 6000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee15",
       "source": {
@@ -481,7 +481,7 @@
   {
     "meta": {
       "type": "EiffelConfidenceLevelModifiedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 207000,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee16",
       "source": {
@@ -502,7 +502,7 @@
   {
     "meta": {
       "type": "EiffelIssueDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 900,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee17",
       "source": {
@@ -521,7 +521,7 @@
   {
     "meta": {
       "type": "EiffelIssueDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 901,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee18",
       "source": {
@@ -540,7 +540,7 @@
   {
     "meta": {
       "type": "EiffelIssueDefinedEvent",
-      "version": "2.0.0",
+      "version": "3.0.0",
       "time": 902,
       "id": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeee19",
       "source": {
diff --git a/examples/reference-data-sets/default/dump.json b/examples/reference-data-sets/default/dump.json
deleted file mode 100644
index 5a657273..00000000
--- a/examples/reference-data-sets/default/dump.json
+++ /dev/null
@@ -1,1982 +0,0 @@
-[
-  {
-    "links": [],
-    "meta": {
-      "time": 1533632845799,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "2d9b365e-9c1a-4075-87f2-a8c630e86f87",
-      "type": "EiffelSourceChangeSubmittedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "gitIdentifier": {
-        "repoName": "myRepo",
-        "branch": "master",
-        "repoUri": "https://repo.com",
-        "commitId": "fd090b60a4aedc5161da9c035a49b14a319829b4"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "SCS1"
-        },
-        {
-          "key": "iteration",
-          "value": 0
-        }
-      ],
-      "submitter": {
-        "email": "john.doe@company.com",
-        "id": "johnxxx",
-        "group": "Team Gophers",
-        "name": "John Doe"
-      }
-    }
-  },
-  {
-    "links": [],
-    "meta": {
-      "time": 1533632845800,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "38c7d1d5-3f62-4932-94a7-f7be7b5200e6",
-      "type": "EiffelEnvironmentDefinedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "EDef1"
-        },
-        {
-          "key": "iteration",
-          "value": 0
-        }
-      ],
-      "name": "Environment 1",
-      "version": "0"
-    }
-  },
-  {
-    "links": [],
-    "meta": {
-      "time": 1533632845801,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "e0b5e701-6f6a-4a11-bdb2-b7f487497a27",
-      "type": "EiffelEnvironmentDefinedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "EDef2"
-        },
-        {
-          "key": "iteration",
-          "value": 0
-        }
-      ],
-      "name": "Environment 2",
-      "version": "0"
-    }
-  },
-  {
-    "links": [],
-    "meta": {
-      "time": 1533632845802,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "a3a48338-35c7-426b-9cc3-42ffbf19881c",
-      "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtC3"
-        },
-        {
-          "key": "iteration",
-          "value": 0
-        }
-      ],
-      "identity": "pkg:maven/com.othercompany.library/third-party-library@3.2.4"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "2d9b365e-9c1a-4075-87f2-a8c630e86f87",
-        "type": "ELEMENT"
-      }
-    ],
-    "meta": {
-      "time": 1533632845803,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "d57b9a7a-3fae-4c3e-b065-b9bf1ad5ba0d",
-      "type": "EiffelCompositionDefinedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "CDef3"
-        },
-        {
-          "key": "iteration",
-          "value": 0
-        }
-      ],
-      "name": "Composition 3",
-      "version": "0"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "d57b9a7a-3fae-4c3e-b065-b9bf1ad5ba0d",
-        "type": "COMPOSITION"
-      },
-      {
-        "target": "d57b9a7a-3fae-4c3e-b065-b9bf1ad5ba0d",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533632845804,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "8fb3721f-18ad-447e-9527-4c82a8853beb",
-      "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtCC1"
-        },
-        {
-          "key": "iteration",
-          "value": 0
-        }
-      ],
-      "identity": "pkg:maven/com.mycompany.myproduct/component-1@1.0.0"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "d57b9a7a-3fae-4c3e-b065-b9bf1ad5ba0d",
-        "type": "COMPOSITION"
-      },
-      {
-        "target": "d57b9a7a-3fae-4c3e-b065-b9bf1ad5ba0d",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533632845805,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "9893af82-d7e1-4942-9d1d-5f6a741ac13d",
-      "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtCC2"
-        },
-        {
-          "key": "iteration",
-          "value": 0
-        }
-      ],
-      "identity": "pkg:maven/com.mycompany.myproduct/component-2@1.0.0"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "d57b9a7a-3fae-4c3e-b065-b9bf1ad5ba0d",
-        "type": "COMPOSITION"
-      },
-      {
-        "target": "d57b9a7a-3fae-4c3e-b065-b9bf1ad5ba0d",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533632845806,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "7e36245b-4ed5-4770-84f7-2213f91f748a",
-      "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtCC3"
-        },
-        {
-          "key": "iteration",
-          "value": 0
-        }
-      ],
-      "identity": "pkg:maven/com.mycompany.myproduct/component-3@1.0.0"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "2d9b365e-9c1a-4075-87f2-a8c630e86f87",
-        "type": "BASE"
-      }
-    ],
-    "meta": {
-      "time": 1533632855807,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "743f74f7-9d36-4463-9210-289d56b44d2e",
-      "type": "EiffelSourceChangeCreatedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "author": {
-        "email": "john.doe@company.com",
-        "id": "johnxxx",
-        "group": "Team Gophers",
-        "name": "John Doe"
-      },
-      "gitIdentifier": {
-        "repoName": "myRepo",
-        "branch": "topic-branch-1",
-        "repoUri": "https://repo.com",
-        "commitId": "fd090b60a4aedc5161da9c035a49b14a319829c5"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "SCC1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "change": {
-        "files": "https://filelist.com/1",
-        "deletions": 130,
-        "insertions": 48
-      }
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "2d9b365e-9c1a-4075-87f2-a8c630e86f87",
-        "type": "PREVIOUS_VERSION"
-      },
-      {
-        "target": "743f74f7-9d36-4463-9210-289d56b44d2e",
-        "type": "CHANGE"
-      }
-    ],
-    "meta": {
-      "time": 1533632855808,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "40fe0f7e-7ee2-454a-8d1a-1b7a5e12bff7",
-      "type": "EiffelSourceChangeSubmittedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "gitIdentifier": {
-        "repoName": "myRepo",
-        "branch": "master",
-        "repoUri": "https://repo.com",
-        "commitId": "fd090b60a4aedc5161da9c035a49b14a319829b4"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "SCS1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "submitter": {
-        "email": "john.doe@company.com",
-        "id": "johnxxx",
-        "group": "Team Gophers",
-        "name": "John Doe"
-      }
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "d57b9a7a-3fae-4c3e-b065-b9bf1ad5ba0d",
-        "type": "PREVIOUS_VERSION"
-      },
-      {
-        "target": "40fe0f7e-7ee2-454a-8d1a-1b7a5e12bff7",
-        "type": "ELEMENT"
-      }
-    ],
-    "meta": {
-      "time": 1533632855908,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "c9465287-b31d-4907-8129-6cead44bb2df",
-      "type": "EiffelCompositionDefinedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "CDef3"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "name": "Composition 3",
-      "version": "1"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "c9465287-b31d-4907-8129-6cead44bb2df",
-        "type": "COMPOSITION"
-      },
-      {
-        "target": "c9465287-b31d-4907-8129-6cead44bb2df",
-        "type": "CAUSE"
-      },
-      {
-        "target": "8fb3721f-18ad-447e-9527-4c82a8853beb",
-        "type": "PREVIOUS_VERSION"
-      }
-    ],
-    "meta": {
-      "time": 1533633055908,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "bbfeee0a-68a9-450e-909c-3552cb490886",
-      "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtCC1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "identity": "pkg:maven/com.mycompany.myproduct/component-1@1.1.0"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "c9465287-b31d-4907-8129-6cead44bb2df",
-        "type": "COMPOSITION"
-      },
-      {
-        "target": "c9465287-b31d-4907-8129-6cead44bb2df",
-        "type": "CAUSE"
-      },
-      {
-        "target": "9893af82-d7e1-4942-9d1d-5f6a741ac13d",
-        "type": "PREVIOUS_VERSION"
-      }
-    ],
-    "meta": {
-      "time": 1533633090908,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "33168379-f560-448f-92d1-2cab2c985e87",
-      "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtCC2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "identity": "pkg:maven/com.mycompany.myproduct/component-2@1.1.0"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "c9465287-b31d-4907-8129-6cead44bb2df",
-        "type": "COMPOSITION"
-      },
-      {
-        "target": "c9465287-b31d-4907-8129-6cead44bb2df",
-        "type": "CAUSE"
-      },
-      {
-        "target": "7e36245b-4ed5-4770-84f7-2213f91f748a",
-        "type": "PREVIOUS_VERSION"
-      }
-    ],
-    "meta": {
-      "time": 1533633091908,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "5577c3e8-b207-49c1-b597-cbafe814633e",
-      "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtCC3"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "identity": "pkg:maven/com.mycompany.myproduct/component-3@1.1.0"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "bbfeee0a-68a9-450e-909c-3552cb490886",
-        "type": "CAUSE"
-      },
-      {
-        "target": "33168379-f560-448f-92d1-2cab2c985e87",
-        "type": "CAUSE"
-      },
-      {
-        "target": "5577c3e8-b207-49c1-b597-cbafe814633e",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533633092008,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "89a935c3-f0ea-4909-991f-3b85121d45a4",
-      "type": "EiffelActivityTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "triggers": [
-        {
-          "type": "EIFFEL_EVENT"
-        }
-      ],
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActT4"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "categories": [
-        "Sub-system Build Activity"
-      ],
-      "executionType": "AUTOMATED",
-      "name": "Act4"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "89a935c3-f0ea-4909-991f-3b85121d45a4",
-        "type": "ACTIVITY_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633092009,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "72f35d6d-fb18-4268-b48b-eba6d4d9d982",
-      "type": "EiffelActivityStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActS4"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "89a935c3-f0ea-4909-991f-3b85121d45a4",
-        "type": "CONTEXT"
-      },
-      {
-        "target": "bbfeee0a-68a9-450e-909c-3552cb490886",
-        "type": "ELEMENT"
-      },
-      {
-        "target": "33168379-f560-448f-92d1-2cab2c985e87",
-        "type": "ELEMENT"
-      },
-      {
-        "target": "5577c3e8-b207-49c1-b597-cbafe814633e",
-        "type": "ELEMENT"
-      }
-    ],
-    "meta": {
-      "time": 1533633092109,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "745e698f-f177-4e05-acdd-bb38f49198a1",
-      "type": "EiffelCompositionDefinedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "CDef2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "name": "Composition 2",
-      "version": "1"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "745e698f-f177-4e05-acdd-bb38f49198a1",
-        "type": "COMPOSITION"
-      },
-      {
-        "target": "e0b5e701-6f6a-4a11-bdb2-b7f487497a27",
-        "type": "ENVIRONMENT"
-      },
-      {
-        "target": "89a935c3-f0ea-4909-991f-3b85121d45a4",
-        "type": "CONTEXT"
-      }
-    ],
-    "meta": {
-      "time": 1533633092209,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "208cfc27-23f7-469d-a741-b15ac150bf8c",
-      "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtC2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "identity": "pkg:maven/com.mycompany.myproduct/sub-system@1.1.0"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "208cfc27-23f7-469d-a741-b15ac150bf8c",
-        "type": "ARTIFACT"
-      },
-      {
-        "target": "89a935c3-f0ea-4909-991f-3b85121d45a4",
-        "type": "CONTEXT"
-      }
-    ],
-    "meta": {
-      "time": 1533633122209,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "3593b445-773a-469e-977f-0456e4224d1c",
-      "type": "EiffelArtifactPublishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "locations": [
-        {
-          "uri": "https://myrepository.com/mySubSystemArtifact",
-          "type": "PLAIN"
-        }
-      ],
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtP2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "89a935c3-f0ea-4909-991f-3b85121d45a4",
-        "type": "ACTIVITY_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633122259,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "93fb8227-9b0e-4084-839b-07845df0b38c",
-      "type": "EiffelActivityFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActF4"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "3593b445-773a-469e-977f-0456e4224d1c",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533633124259,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "9aa39ad1-d4a0-4caf-a675-502d82fc295e",
-      "type": "EiffelActivityTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "triggers": [
-        {
-          "type": "EIFFEL_EVENT"
-        }
-      ],
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActT3"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "categories": [
-        "Sub-system Test Activity"
-      ],
-      "executionType": "AUTOMATED",
-      "name": "Act3"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "9aa39ad1-d4a0-4caf-a675-502d82fc295e",
-        "type": "ACTIVITY_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633124262,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "bc7d7b52-866f-4c0d-9e62-f635607ac248",
-      "type": "EiffelActivityStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActS3"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "9aa39ad1-d4a0-4caf-a675-502d82fc295e",
-        "type": "CONTEXT"
-      }
-    ],
-    "meta": {
-      "time": 1533633126262,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "20a470bc-70ae-4ce8-b6a2-1480f43d2f7f",
-      "type": "EiffelTestSuiteStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TSS1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "categories": [
-        "Pre system integration tests"
-      ],
-      "name": "My functional test suite",
-      "types": [
-        "FUNCTIONAL"
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "20a470bc-70ae-4ce8-b6a2-1480f43d2f7f",
-        "type": "CONTEXT"
-      },
-      {
-        "target": "208cfc27-23f7-469d-a741-b15ac150bf8c",
-        "type": "IUT"
-      }
-    ],
-    "meta": {
-      "time": 1533633126362,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "16d9350f-482e-4b51-aceb-f9f3ad662bd7",
-      "type": "EiffelTestCaseTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCT5"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "testCase": {
-        "id": "TC5",
-        "uri": "https://other-tm.company.com/testCase/TC5",
-        "tracker": "My Other Test Management System"
-      }
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "20a470bc-70ae-4ce8-b6a2-1480f43d2f7f",
-        "type": "CONTEXT"
-      },
-      {
-        "target": "208cfc27-23f7-469d-a741-b15ac150bf8c",
-        "type": "IUT"
-      }
-    ],
-    "meta": {
-      "time": 1533633126363,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "fb634111-7d1d-4143-a9c6-1b4a26f8503b",
-      "type": "EiffelTestCaseTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCT6"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "testCase": {
-        "id": "TC6",
-        "uri": "https://other-tm.company.com/testCase/TC6",
-        "tracker": "My Other Test Management System"
-      }
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "20a470bc-70ae-4ce8-b6a2-1480f43d2f7f",
-        "type": "CONTEXT"
-      },
-      {
-        "target": "208cfc27-23f7-469d-a741-b15ac150bf8c",
-        "type": "IUT"
-      }
-    ],
-    "meta": {
-      "time": 1533633126364,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "88f11a6c-7e64-4a1a-ae85-019e8092107e",
-      "type": "EiffelTestCaseTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCT7"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "testCase": {
-        "id": "TC6",
-        "uri": "https://other-tm.company.com/testCase/TC6",
-        "tracker": "My Other Test Management System"
-      }
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "16d9350f-482e-4b51-aceb-f9f3ad662bd7",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633126365,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "324eecf6-0865-4adc-9cac-7f53f9c8cfbd",
-      "type": "EiffelTestCaseStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCS5"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "fb634111-7d1d-4143-a9c6-1b4a26f8503b",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633126367,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "345eaded-44bb-4020-ab68-d176a04f31f0",
-      "type": "EiffelTestCaseStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCS6"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "88f11a6c-7e64-4a1a-ae85-019e8092107e",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633126368,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "88042f00-d7b9-4215-a1c7-82ae14477170",
-      "type": "EiffelTestCaseStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCS7"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "16d9350f-482e-4b51-aceb-f9f3ad662bd7",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633136368,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "029925ca-bae7-49ea-8721-0a71837b0c80",
-      "type": "EiffelTestCaseFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL",
-        "verdict": "PASSED"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCF5"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "fb634111-7d1d-4143-a9c6-1b4a26f8503b",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633139368,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "7677fd1e-040a-4fa4-9f57-92146a490427",
-      "type": "EiffelTestCaseFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL",
-        "verdict": "PASSED"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCF6"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "88f11a6c-7e64-4a1a-ae85-019e8092107e",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633144368,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "c4f3a6ee-3e86-45d0-99a2-bfe985765958",
-      "type": "EiffelTestCaseFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL",
-        "verdict": "PASSED"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCF7"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "20a470bc-70ae-4ce8-b6a2-1480f43d2f7f",
-        "type": "TEST_SUITE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633144418,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "31ad7612-aa5c-4736-a98d-6500f0d4ce1a",
-      "type": "EiffelTestSuiteFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "verdict": "PASSED"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "TSF1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "9aa39ad1-d4a0-4caf-a675-502d82fc295e",
-        "type": "ACTIVITY_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633144421,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "42132f28-5987-45a7-9fbb-0863250758ef",
-      "type": "EiffelActivityFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActF3"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "31ad7612-aa5c-4736-a98d-6500f0d4ce1a",
-        "type": "CAUSE"
-      },
-      {
-        "target": "208cfc27-23f7-469d-a741-b15ac150bf8c",
-        "type": "SUBJECT"
-      }
-    ],
-    "meta": {
-      "time": 1533633144721,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "68159775-c3e5-4613-b6ac-f471aac96083",
-      "type": "EiffelConfidenceLevelModifiedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "CLM2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "value": "SUCCESS",
-      "name": "readyForSystemIntegration"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "68159775-c3e5-4613-b6ac-f471aac96083",
-        "type": "CAUSE"
-      },
-      {
-        "target": "208cfc27-23f7-469d-a741-b15ac150bf8c",
-        "type": "ELEMENT"
-      },
-      {
-        "target": "a3a48338-35c7-426b-9cc3-42ffbf19881c",
-        "type": "ELEMENT"
-      }
-    ],
-    "meta": {
-      "time": 1533633145021,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "d6683047-7d42-4d2b-b601-a5473e51479d",
-      "type": "EiffelCompositionDefinedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "CDef1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "name": "Composition 1",
-      "version": "1"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "d6683047-7d42-4d2b-b601-a5473e51479d",
-        "type": "COMPOSITION"
-      },
-      {
-        "target": "38c7d1d5-3f62-4932-94a7-f7be7b5200e6",
-        "type": "ENVIRONMENT"
-      },
-      {
-        "target": "d6683047-7d42-4d2b-b601-a5473e51479d",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533633146021,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "2026ebe0-6ce6-4ce2-a687-557832aad1d9",
-      "type": "EiffelArtifactCreatedEvent",
-      "version": "2.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtC1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "identity": "pkg:maven/com.mycompany.myproduct/complete-system@1.1.0"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "2026ebe0-6ce6-4ce2-a687-557832aad1d9",
-        "type": "ARTIFACT"
-      },
-      {
-        "target": "2026ebe0-6ce6-4ce2-a687-557832aad1d9",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533633147021,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "0c952030-1741-4723-89f5-6bc0f1b4b155",
-      "type": "EiffelArtifactPublishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "locations": [
-        {
-          "uri": "https://myrepository.com/myCompleteSystemArtifact",
-          "type": "PLAIN"
-        }
-      ],
-      "customData": [
-        {
-          "key": "name",
-          "value": "ArtP1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "0c952030-1741-4723-89f5-6bc0f1b4b155",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533633148021,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "82e31f53-3641-4fee-96d1-4262b91d838a",
-      "type": "EiffelActivityTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "triggers": [
-        {
-          "type": "EIFFEL_EVENT"
-        }
-      ],
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActT1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "categories": [
-        "Test Activity"
-      ],
-      "executionType": "AUTOMATED",
-      "name": "Act1"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "82e31f53-3641-4fee-96d1-4262b91d838a",
-        "type": "ACTIVITY_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633148023,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "f0c26197-48ef-400c-a4c7-101aa74fd171",
-      "type": "EiffelActivityStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActS1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "0c952030-1741-4723-89f5-6bc0f1b4b155",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533633148073,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "f27398b9-dfa6-49c5-994f-439b12473702",
-      "type": "EiffelActivityTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "triggers": [
-        {
-          "type": "EIFFEL_EVENT"
-        }
-      ],
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActT2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "categories": [
-        "Test Activity"
-      ],
-      "executionType": "AUTOMATED",
-      "name": "Act2"
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "82e31f53-3641-4fee-96d1-4262b91d838a",
-        "type": "CONTEXT"
-      },
-      {
-        "target": "2026ebe0-6ce6-4ce2-a687-557832aad1d9",
-        "type": "IUT"
-      }
-    ],
-    "meta": {
-      "time": 1533633148074,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "a02f748b-e4e2-4504-903d-f1ab6e07c0b0",
-      "type": "EiffelTestCaseTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCT1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "testCase": {
-        "id": "TC1",
-        "uri": "http://tm.company.com/browse/TC1",
-        "tracker": "My First Test Management System"
-      }
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "82e31f53-3641-4fee-96d1-4262b91d838a",
-        "type": "CONTEXT"
-      },
-      {
-        "target": "2026ebe0-6ce6-4ce2-a687-557832aad1d9",
-        "type": "IUT"
-      }
-    ],
-    "meta": {
-      "time": 1533633148075,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "4cdc56c9-28df-4c6a-8c10-022af9128802",
-      "type": "EiffelTestCaseTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCT2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "testCase": {
-        "id": "TC2",
-        "uri": "http://tm.company.com/browse/TC2",
-        "tracker": "My First Test Management System"
-      }
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "a02f748b-e4e2-4504-903d-f1ab6e07c0b0",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633149075,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "9f249fc0-b7c7-4e18-9d55-801fd9156952",
-      "type": "EiffelTestCaseStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCS1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "4cdc56c9-28df-4c6a-8c10-022af9128802",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633149175,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "26fd9ebd-9a14-4e60-a39f-81edf8820fd1",
-      "type": "EiffelTestCaseStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCS2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "4cdc56c9-28df-4c6a-8c10-022af9128802",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633199175,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "e9e2aa26-783a-4f44-91f4-8721e8f67587",
-      "type": "EiffelTestCaseFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL",
-        "verdict": "PASSED"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCF2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "a02f748b-e4e2-4504-903d-f1ab6e07c0b0",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633202175,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "28172f76-9b8f-4ace-b37d-809ddd62e375",
-      "type": "EiffelTestCaseFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL",
-        "verdict": "PASSED"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCF1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "82e31f53-3641-4fee-96d1-4262b91d838a",
-        "type": "ACTIVITY_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633202275,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "d3c274e0-1c42-4871-83c3-a585e0f5fe9c",
-      "type": "EiffelActivityFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActF1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "f27398b9-dfa6-49c5-994f-439b12473702",
-        "type": "ACTIVITY_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633302275,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "220f9fa3-3d9f-46af-bd5f-2c61b41f2712",
-      "type": "EiffelActivityStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActS2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "f27398b9-dfa6-49c5-994f-439b12473702",
-        "type": "CONTEXT"
-      },
-      {
-        "target": "2026ebe0-6ce6-4ce2-a687-557832aad1d9",
-        "type": "IUT"
-      }
-    ],
-    "meta": {
-      "time": 1533633302276,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "2177c1a2-4086-438d-bf76-a9026d121461",
-      "type": "EiffelTestCaseTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCT3"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "testCase": {
-        "id": "TC3",
-        "uri": "http://tm.company.com/browse/TC3",
-        "tracker": "My First Test Management System"
-      }
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "2177c1a2-4086-438d-bf76-a9026d121461",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633302476,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "1c70eaf4-d035-496d-a509-ee7b52c7044d",
-      "type": "EiffelTestCaseStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCS3"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "2177c1a2-4086-438d-bf76-a9026d121461",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633312476,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "8e0a20cf-19ca-4521-83e5-b65b4bbc92e6",
-      "type": "EiffelTestCaseFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL",
-        "verdict": "PASSED"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCF3"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "f27398b9-dfa6-49c5-994f-439b12473702",
-        "type": "CONTEXT"
-      },
-      {
-        "target": "2026ebe0-6ce6-4ce2-a687-557832aad1d9",
-        "type": "IUT"
-      }
-    ],
-    "meta": {
-      "time": 1533633312477,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "55b29ff8-bf00-4477-aa3e-6619264198d4",
-      "type": "EiffelTestCaseTriggeredEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCT4"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "testCase": {
-        "id": "TC4",
-        "uri": "http://tm.company.com/browse/TC4",
-        "tracker": "My First Test Management System"
-      }
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "55b29ff8-bf00-4477-aa3e-6619264198d4",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633312577,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "e4a41dec-bd52-4284-945c-440c5ba83c32",
-      "type": "EiffelTestCaseStartedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCS4"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "55b29ff8-bf00-4477-aa3e-6619264198d4",
-        "type": "TEST_CASE_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633432577,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "bcc8940c-237c-416e-a9b5-07cfb26d045a",
-      "type": "EiffelTestCaseFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL",
-        "verdict": "PASSED"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "TCF4"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "f27398b9-dfa6-49c5-994f-439b12473702",
-        "type": "ACTIVITY_EXECUTION"
-      }
-    ],
-    "meta": {
-      "time": 1533633432597,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "52c90dc5-6729-47e5-874e-4aa0464ec857",
-      "type": "EiffelActivityFinishedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "outcome": {
-        "conclusion": "SUCCESSFUL"
-      },
-      "customData": [
-        {
-          "key": "name",
-          "value": "ActF2"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ]
-    }
-  },
-  {
-    "links": [
-      {
-        "target": "2026ebe0-6ce6-4ce2-a687-557832aad1d9",
-        "type": "SUBJECT"
-      },
-      {
-        "target": "28172f76-9b8f-4ace-b37d-809ddd62e375",
-        "type": "CAUSE"
-      },
-      {
-        "target": "e9e2aa26-783a-4f44-91f4-8721e8f67587",
-        "type": "CAUSE"
-      },
-      {
-        "target": "8e0a20cf-19ca-4521-83e5-b65b4bbc92e6",
-        "type": "CAUSE"
-      },
-      {
-        "target": "bcc8940c-237c-416e-a9b5-07cfb26d045a",
-        "type": "CAUSE"
-      }
-    ],
-    "meta": {
-      "time": 1533633435097,
-      "source": {
-        "domainId": "example.domain"
-      },
-      "id": "748b3e16-8f02-4316-9b35-f0d83d11e218",
-      "type": "EiffelConfidenceLevelModifiedEvent",
-      "version": "1.0.0"
-    },
-    "data": {
-      "customData": [
-        {
-          "key": "name",
-          "value": "CLM1"
-        },
-        {
-          "key": "iteration",
-          "value": 1
-        }
-      ],
-      "value": "SUCCESS",
-      "name": "readyForRelease"
-    }
-  }
-]
diff --git a/schemas/EiffelActivityCanceledEvent/3.0.0.json b/schemas/EiffelActivityCanceledEvent/3.0.0.json
new file mode 100644
index 00000000..3c59987c
--- /dev/null
+++ b/schemas/EiffelActivityCanceledEvent/3.0.0.json
@@ -0,0 +1,166 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": ["EiffelActivityCanceledEvent"]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "reason": {
+          "type": "string"
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additonalProperties": false
+}
diff --git a/schemas/EiffelActivityFinishedEvent/3.0.0.json b/schemas/EiffelActivityFinishedEvent/3.0.0.json
new file mode 100644
index 00000000..de018bae
--- /dev/null
+++ b/schemas/EiffelActivityFinishedEvent/3.0.0.json
@@ -0,0 +1,207 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": ["EiffelActivityFinishedEvent"]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "outcome": {
+          "type": "object",
+          "properties": {
+            "conclusion": {
+              "type": "string",
+              "enum": [
+                "SUCCESSFUL",
+                "UNSUCCESSFUL",
+                "FAILED",
+                "ABORTED",
+                "TIMED_OUT",
+                "INCONCLUSIVE"
+              ]
+            },
+            "description": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "conclusion"
+          ]
+        },
+        "persistentLogs": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "uri": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "name",
+              "uri"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "outcome"
+      ]
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelActivityStartedEvent/3.0.0.json b/schemas/EiffelActivityStartedEvent/3.0.0.json
new file mode 100644
index 00000000..2df8f278
--- /dev/null
+++ b/schemas/EiffelActivityStartedEvent/3.0.0.json
@@ -0,0 +1,156 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": ["EiffelActivityStartedEvent"]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "sdm": {
+              "type": "object",
+              "properties": {
+                "authorIdentity": {
+                  "type": "string"
+                },
+                "encryptedDigest": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "authorIdentity",
+                "encryptedDigest"
+              ],
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "executionUri": {
+          "type": "string"
+        },
+        "liveLogs": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "uri": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "name",
+              "uri"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelActivityTriggeredEvent/3.0.0.json b/schemas/EiffelActivityTriggeredEvent/3.0.0.json
new file mode 100644
index 00000000..2ae4c38e
--- /dev/null
+++ b/schemas/EiffelActivityTriggeredEvent/3.0.0.json
@@ -0,0 +1,180 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": ["EiffelActivityTriggeredEvent"]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "sdm": {
+              "type": "object",
+              "properties": {
+                "authorIdentity": {
+                  "type": "string"
+                },
+                "encryptedDigest": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "authorIdentity",
+                "encryptedDigest"
+              ],
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "categories": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "triggers": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "MANUAL",
+                  "EIFFEL_EVENT",
+                  "SOURCE_CHANGE",
+                  "TIMER",
+                  "OTHER"
+                ]
+              },
+              "description": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "executionType": {
+          "type": "string",
+          "enum": [
+            "MANUAL",
+            "SEMI_AUTOMATED",
+            "AUTOMATED",
+            "OTHER"
+          ]
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelAnnouncementPublishedEvent/3.0.0.json b/schemas/EiffelAnnouncementPublishedEvent/3.0.0.json
new file mode 100644
index 00000000..630750d8
--- /dev/null
+++ b/schemas/EiffelAnnouncementPublishedEvent/3.0.0.json
@@ -0,0 +1,181 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelAnnouncementPublishedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "heading": {
+          "type": "string"
+        },
+        "body": {
+          "type": "string"
+        },
+        "uri": {
+          "type": "string"
+        },
+        "severity": {
+          "type": "string",
+          "enum": ["MINOR", "MAJOR", "CRITICAL", "BLOCKER", "CLOSED", "CANCELED"]
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "heading",
+        "body",
+        "severity"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelArtifactCreatedEvent/3.0.0.json b/schemas/EiffelArtifactCreatedEvent/3.0.0.json
new file mode 100644
index 00000000..f5aa3799
--- /dev/null
+++ b/schemas/EiffelArtifactCreatedEvent/3.0.0.json
@@ -0,0 +1,220 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": ["EiffelArtifactCreatedEvent"]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "identity": {
+          "type": "string",
+          "pattern": "^pkg:"
+        },
+        "fileInformation": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "tags": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "name"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "buildCommand": {
+          "type": "string"
+        },
+        "requiresImplementation": {
+          "type": "string",
+          "enum": [
+            "NONE",
+            "ANY",
+            "EXACTLY_ONE",
+            "AT_LEAST_ONE"
+          ]
+        },
+        "dependsOn": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "pattern": "^pkg:"
+          }
+        },
+        "implements": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "pattern": "^pkg:"
+          }
+        },
+        "name": {
+          "type": "string"
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "identity"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelArtifactPublishedEvent/3.0.0.json b/schemas/EiffelArtifactPublishedEvent/3.0.0.json
new file mode 100644
index 00000000..826aa6c5
--- /dev/null
+++ b/schemas/EiffelArtifactPublishedEvent/3.0.0.json
@@ -0,0 +1,191 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": ["EiffelArtifactPublishedEvent"]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "locations": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "ARTIFACTORY",
+                  "NEXUS",
+                  "PLAIN",
+                  "OTHER"
+                ]
+              },
+              "uri": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "uri"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "locations"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelArtifactReusedEvent/3.0.0.json b/schemas/EiffelArtifactReusedEvent/3.0.0.json
new file mode 100644
index 00000000..750cedcc
--- /dev/null
+++ b/schemas/EiffelArtifactReusedEvent/3.0.0.json
@@ -0,0 +1,163 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelArtifactReusedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelCompositionDefinedEvent/3.0.0.json b/schemas/EiffelCompositionDefinedEvent/3.0.0.json
new file mode 100644
index 00000000..f40d9e4c
--- /dev/null
+++ b/schemas/EiffelCompositionDefinedEvent/3.0.0.json
@@ -0,0 +1,172 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelCompositionDefinedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelConfidenceLevelModifiedEvent/3.0.0.json b/schemas/EiffelConfidenceLevelModifiedEvent/3.0.0.json
new file mode 100644
index 00000000..4901ce8e
--- /dev/null
+++ b/schemas/EiffelConfidenceLevelModifiedEvent/3.0.0.json
@@ -0,0 +1,192 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": ["EiffelConfidenceLevelModifiedEvent"]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "value": {
+          "type": "string",
+          "enum": ["SUCCESS", "FAILURE", "INCONCLUSIVE"]
+        },
+        "issuer": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "email": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "group": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "name",
+        "value"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelEnvironmentDefinedEvent/3.0.0.json b/schemas/EiffelEnvironmentDefinedEvent/3.0.0.json
new file mode 100644
index 00000000..b3e2257a
--- /dev/null
+++ b/schemas/EiffelEnvironmentDefinedEvent/3.0.0.json
@@ -0,0 +1,194 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelEnvironmentDefinedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        },
+        "image": {
+          "type": "string"
+        },
+        "host": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "user": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "name",
+            "user"
+          ],
+          "additionalProperties": false
+        },
+        "uri": {
+          "type": "string"
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelFlowContextDefinedEvent/3.0.0.json b/schemas/EiffelFlowContextDefinedEvent/3.0.0.json
new file mode 100644
index 00000000..96d1198d
--- /dev/null
+++ b/schemas/EiffelFlowContextDefinedEvent/3.0.0.json
@@ -0,0 +1,178 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelFlowContextDefinedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "product": {
+          "type": "string"
+        },
+        "project": {
+          "type": "string"
+        },
+        "program": {
+          "type": "string"
+        },
+        "track": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelIssueDefinedEvent/3.0.0.json b/schemas/EiffelIssueDefinedEvent/3.0.0.json
new file mode 100644
index 00000000..d06914dc
--- /dev/null
+++ b/schemas/EiffelIssueDefinedEvent/3.0.0.json
@@ -0,0 +1,186 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelIssueDefinedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "BUG",
+            "IMPROVEMENT",
+            "FEATURE",
+            "WORK_ITEM",
+            "REQUIREMENT",
+            "OTHER"
+          ]
+        },
+        "tracker": {
+          "type": "string"
+        },
+        "id": {
+          "type": "string"
+        },
+        "uri": {
+          "type": "string"
+        },
+        "title": {
+          "type": "string"
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "type",
+        "tracker",
+        "id",
+        "uri"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  }
+}
diff --git a/schemas/EiffelIssueVerifiedEvent/4.0.0.json b/schemas/EiffelIssueVerifiedEvent/4.0.0.json
new file mode 100644
index 00000000..ac790b37
--- /dev/null
+++ b/schemas/EiffelIssueVerifiedEvent/4.0.0.json
@@ -0,0 +1,163 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelIssueVerifiedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "4.0.0" ],
+          "default": "4.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelSourceChangeCreatedEvent/4.0.0.json b/schemas/EiffelSourceChangeCreatedEvent/4.0.0.json
new file mode 100644
index 00000000..722c335c
--- /dev/null
+++ b/schemas/EiffelSourceChangeCreatedEvent/4.0.0.json
@@ -0,0 +1,295 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelSourceChangeCreatedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "4.0.0" ],
+          "default": "4.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "author": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "email": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "group": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "change": {
+          "type": "object",
+          "properties": {
+            "insertions": {
+              "type": "integer"
+            },
+            "deletions": {
+              "type": "integer"
+            },
+            "files": {
+              "type": "string"
+            },
+            "details": {
+              "type": "string"
+            },
+            "tracker": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "gitIdentifier": {
+          "type": "object",
+          "properties": {
+            "commitId": {
+              "type": "string"
+            },
+            "branch": {
+              "type": "string"
+            },
+            "repoName": {
+              "type": "string"
+            },
+            "repoUri": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "commitId",
+            "repoUri"
+          ],
+          "additionalProperties": false
+        },
+        "svnIdentifier": {
+          "type": "object",
+          "properties": {
+            "revision": {
+              "type": "integer"
+            },
+            "directory": {
+              "type": "string"
+            },
+            "repoName": {
+              "type": "string"
+            },
+            "repoUri": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "revision",
+            "directory",
+            "repoUri"
+          ],
+          "additionalProperties": false
+        },
+        "ccCompositeIdentifier": {
+          "type": "object",
+          "properties": {
+            "vobs": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "branch": {
+              "type": "string"
+            },
+            "configSpec": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "vobs",
+            "branch",
+            "configSpec"
+          ],
+          "additionalProperties": false
+        },
+        "hgIdentifier": {
+          "type": "object",
+          "properties": {
+            "commitId": {
+              "type": "string"
+            },
+            "branch": {
+              "type": "string"
+            },
+            "repoName": {
+              "type": "string"
+            },
+            "repoUri": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "commitId",
+            "repoUri"
+          ],
+          "additionalProperties": false
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelSourceChangeSubmittedEvent/3.0.0.json b/schemas/EiffelSourceChangeSubmittedEvent/3.0.0.json
new file mode 100644
index 00000000..f5d2d9aa
--- /dev/null
+++ b/schemas/EiffelSourceChangeSubmittedEvent/3.0.0.json
@@ -0,0 +1,271 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelSourceChangeSubmittedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "submitter": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "email": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "group": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "gitIdentifier": {
+          "type": "object",
+          "properties": {
+            "commitId": {
+              "type": "string"
+            },
+            "branch": {
+              "type": "string"
+            },
+            "repoName": {
+              "type": "string"
+            },
+            "repoUri": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "commitId",
+            "repoUri"
+          ],
+          "additionalProperties": false
+        },
+        "svnIdentifier": {
+          "type": "object",
+          "properties": {
+            "revision": {
+              "type": "integer"
+            },
+            "directory": {
+              "type": "string"
+            },
+            "repoName": {
+              "type": "string"
+            },
+            "repoUri": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "revision",
+            "directory",
+            "repoUri"
+          ],
+          "additionalProperties": false
+        },
+        "ccCompositeIdentifier": {
+          "type": "object",
+          "properties": {
+            "vobs": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "branch": {
+              "type": "string"
+            },
+            "configSpec": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "vobs",
+            "branch",
+            "configSpec"
+          ],
+          "additionalProperties": false
+        },
+        "hgIdentifier": {
+          "type": "object",
+          "properties": {
+            "commitId": {
+              "type": "string"
+            },
+            "branch": {
+              "type": "string"
+            },
+            "repoName": {
+              "type": "string"
+            },
+            "repoUri": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "commitId",
+            "repoUri"
+          ],
+          "additionalProperties": false
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelTestCaseCanceledEvent/3.0.0.json b/schemas/EiffelTestCaseCanceledEvent/3.0.0.json
new file mode 100644
index 00000000..4cc1f307
--- /dev/null
+++ b/schemas/EiffelTestCaseCanceledEvent/3.0.0.json
@@ -0,0 +1,166 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelTestCaseCanceledEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "reason": {
+          "type": "string"
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelTestCaseFinishedEvent/3.0.0.json b/schemas/EiffelTestCaseFinishedEvent/3.0.0.json
new file mode 100644
index 00000000..54ff32c1
--- /dev/null
+++ b/schemas/EiffelTestCaseFinishedEvent/3.0.0.json
@@ -0,0 +1,234 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelTestCaseFinishedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "outcome": {
+          "type": "object",
+          "properties": {
+            "verdict": {
+              "type": "string",
+              "enum": [
+                "PASSED",
+                "FAILED",
+                "INCONCLUSIVE"
+              ]
+            },
+            "conclusion": {
+              "type": "string",
+              "enum": [
+                "SUCCESSFUL",
+                "FAILED",
+                "ABORTED",
+                "TIMED_OUT",
+                "INCONCLUSIVE"
+              ]
+            },
+            "description": {
+              "type": "string"
+            },
+            "metrics": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string"
+                  },
+                  "value": {
+                  }
+                },
+                "required": [
+                  "name",
+                  "value"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": [
+            "verdict",
+            "conclusion"
+          ],
+          "additionalProperties": false
+        },
+        "persistentLogs": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "uri": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "name",
+              "uri"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "outcome"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelTestCaseStartedEvent/3.0.0.json b/schemas/EiffelTestCaseStartedEvent/3.0.0.json
new file mode 100644
index 00000000..53c90a37
--- /dev/null
+++ b/schemas/EiffelTestCaseStartedEvent/3.0.0.json
@@ -0,0 +1,185 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelTestCaseStartedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "executor": {
+          "type": "string"
+        },
+        "liveLogs": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "uri": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "name",
+              "uri"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelTestCaseTriggeredEvent/3.0.0.json b/schemas/EiffelTestCaseTriggeredEvent/3.0.0.json
new file mode 100644
index 00000000..ffdcb65b
--- /dev/null
+++ b/schemas/EiffelTestCaseTriggeredEvent/3.0.0.json
@@ -0,0 +1,244 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelTestCaseTriggeredEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "testCase": {
+          "type": "object",
+          "properties": {
+            "tracker": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "version": {
+              "type": "string"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "id"
+          ],
+          "additionalProperties": false
+        },
+        "recipeId": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "triggers": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "MANUAL",
+                  "EIFFEL_EVENT",
+                  "SOURCE_CHANGE",
+                  "TIMER",
+                  "OTHER"
+                ]
+              },
+              "description": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "executionType": {
+          "type": "string",
+          "enum": [
+            "MANUAL",
+            "SEMI_AUTOMATED",
+            "AUTOMATED",
+            "OTHER"
+          ]
+        },
+        "parameters": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "value": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "name",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "testCase"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelTestExecutionRecipeCollectionCreatedEvent/4.0.0.json b/schemas/EiffelTestExecutionRecipeCollectionCreatedEvent/4.0.0.json
new file mode 100644
index 00000000..fa18cd89
--- /dev/null
+++ b/schemas/EiffelTestExecutionRecipeCollectionCreatedEvent/4.0.0.json
@@ -0,0 +1,277 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelTestExecutionRecipeCollectionCreatedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "4.0.0" ],
+          "default": "4.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "selectionStrategy": {
+          "type": "object",
+          "properties": {
+            "tracker": {
+              "type": "string"
+            },
+            "id": {
+              "type": "string"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "id"
+          ],
+          "additionalProperties": false
+        },
+        "batchesUri": {
+          "type": "string"
+        },
+        "batches": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "priority": {
+                "type": "integer"
+              },
+              "recipes": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+                    },
+                    "testCase": {
+                      "type": "object",
+                      "properties": {
+                        "tracker": {
+                          "type": "string"
+                        },
+                        "id": {
+                          "type": "string"
+                        },
+                        "uri": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "id"
+                      ],
+                      "additionalProperties": false
+                    },
+                    "constraints": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "key": {
+                            "type": "string"
+                          },
+                          "value": {
+                          }
+                        },
+                        "required": [
+                          "key",
+                          "value"
+                        ],
+                        "additionalProperties": false
+                      }
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "testCase"
+                  ],
+                  "additionalProperties": false
+                }
+              },
+              "dependencies": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "dependent": {
+                      "type": "string"
+                    },
+                    "dependency": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "dependent",
+                    "dependency"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            },
+            "required": [
+              "priority",
+              "recipes"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "selectionStrategy"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelTestSuiteFinishedEvent/3.0.0.json b/schemas/EiffelTestSuiteFinishedEvent/3.0.0.json
new file mode 100644
index 00000000..38180b76
--- /dev/null
+++ b/schemas/EiffelTestSuiteFinishedEvent/3.0.0.json
@@ -0,0 +1,209 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelTestSuiteFinishedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "outcome": {
+          "type": "object",
+          "properties": {
+            "verdict": {
+              "type": "string",
+              "enum": [
+                "PASSED",
+                "FAILED",
+                "INCONCLUSIVE"
+              ]
+            },
+            "conclusion": {
+              "type": "string",
+              "enum": [
+                "SUCCESSFUL",
+                "FAILED",
+                "ABORTED",
+                "TIMED_OUT",
+                "INCONCLUSIVE"
+              ]
+            },
+            "description": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "persistentLogs": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "uri": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "name",
+              "uri"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}
diff --git a/schemas/EiffelTestSuiteStartedEvent/3.0.0.json b/schemas/EiffelTestSuiteStartedEvent/3.0.0.json
new file mode 100644
index 00000000..424ed1ff
--- /dev/null
+++ b/schemas/EiffelTestSuiteStartedEvent/3.0.0.json
@@ -0,0 +1,219 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "meta": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "EiffelTestSuiteStartedEvent" ]
+        },
+        "version": {
+          "type": "string",
+          "enum": [ "3.0.0" ],
+          "default": "3.0.0"
+        },
+        "time": {
+          "type": "integer"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "object",
+          "properties": {
+            "domainId": {
+              "type": "string"
+            },
+            "host": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "serializer": {
+              "type": "string",
+              "pattern": "^pkg:"
+            },
+            "uri": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "security": {
+          "type": "object",
+          "properties": {
+            "authorIdentity": {
+              "type": "string"
+            },
+            "integrityProtection": {
+              "type": "object",
+              "properties": {
+                "signature": {
+                  "type": "string"
+                },
+                "alg": {
+                  "type": "string",
+                  "enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
+                },
+                "publicKey": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "signature",
+                "alg"
+              ],
+              "additionalProperties": false
+            },
+            "sequenceProtection": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "sequenceName": {
+                    "type": "string"
+                  },
+                  "position": {
+                    "type": "integer"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "sequenceName",
+                  "position"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "authorIdentity"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "version",
+        "time"
+      ],
+      "additionalProperties": false
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "categories": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "types": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "ACCESSIBILITY",
+              "BACKUP_RECOVERY",
+              "COMPATIBILITY",
+              "CONVERSION",
+              "DISASTER_RECOVERY",
+              "FUNCTIONAL",
+              "INSTALLABILITY",
+              "INTEROPERABILITY",
+              "LOCALIZATION",
+              "MAINTAINABILITY",
+              "PERFORMANCE",
+              "PORTABILITY",
+              "PROCEDURE",
+              "RELIABILITY",
+              "SECURITY",
+              "STABILITY",
+              "USABILITY"
+            ]
+          }
+        },
+        "liveLogs": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "uri": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "name",
+              "uri"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "customData": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": {
+                "type": "string"
+              },
+              "value": {
+              }
+            },
+            "required": [
+              "key",
+              "value"
+            ],
+            "additionalProperties": false
+          }
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false
+    },
+    "links": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "target": {
+            "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
+          }
+        },
+        "required": [
+          "type",
+          "target"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "meta",
+    "data",
+    "links"
+  ],
+  "additionalProperties": false
+}