diff --git a/catalog/catalog.protocol.md b/catalog/catalog.protocol.md
index 14a8a55..fd31ecb 100644
--- a/catalog/catalog.protocol.md
+++ b/catalog/catalog.protocol.md
@@ -184,4 +184,4 @@ When a [Catalog](../model/terminology.md#catalog) contains protected [Datasets](
### 4.4 Catalog Brokers
-A [Dataspace](../model/terminology.md#dataspace) may include Catalog Brokers. A Catalog Broker is a [Consumer](../model/terminology.md#consumer) that has trusted access to 1..N upstream [Catalog Services](../model/terminology.md#catalog-service) and advertises their respective [Catalogs](../model/terminology.md#catalog) as a single [Catalog Service](../model/terminology.md#catalog-service). The broker is expected to honor upstream access control requirements.
\ No newline at end of file
+A [Dataspace](../model/terminology.md#dataspace) may include Catalog Brokers. A Catalog Broker is a [Consumer](../model/terminology.md#consumer) that has trusted access to 1..N upstream [Catalog Services](../model/terminology.md#catalog-service) and advertises their respective [Catalogs](../model/terminology.md#catalog) as a single [Catalog Service](../model/terminology.md#catalog-service). The broker is expected to honor upstream access control requirements.
diff --git a/model/m.dataspace.relationships.png b/model/m.dataspace.relationships.png
index 607785e..c62080b 100644
Binary files a/model/m.dataspace.relationships.png and b/model/m.dataspace.relationships.png differ
diff --git a/model/m.dataspace.relationships.puml b/model/m.dataspace.relationships.puml
index 0ab688a..5bac8fe 100644
--- a/model/m.dataspace.relationships.puml
+++ b/model/m.dataspace.relationships.puml
@@ -9,8 +9,8 @@ agent ParticipantAgent
agent CI as "Credential\nIssuer"
agent IDP as "Identity\nProvider"
agent Dataspace
-agent DataspaceAuthority as "Dataspace\nAuthority"
-agent Registry as "Dataspace\nRegistry"
+agent DataspaceAuthority as "Dataspace\nAuthority" #FAFAFA
+agent Registry as "Dataspace\nRegistry" #FAFAFA
DataspaceAuthority -down-> Dataspace : manages
diff --git a/model/m.participant.entities.drawio b/model/m.participant.entities.drawio
index 430f867..37e0cc2 100644
--- a/model/m.participant.entities.drawio
+++ b/model/m.participant.entities.drawio
@@ -1 +1,137 @@
-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
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/model/m.participant.entities.png b/model/m.participant.entities.png
index ac1601a..22505a0 100644
Binary files a/model/m.participant.entities.png and b/model/m.participant.entities.png differ
diff --git a/model/model.md b/model/model.md
index 504e087..d03766c 100644
--- a/model/model.md
+++ b/model/model.md
@@ -10,9 +10,10 @@ The relationships between the primary [Dataspace](./terminology.md#dataspace) en
-Note that all relationships are multiplicities unless specified.
+Note that all relationships are multiplicities unless specified. `Dataspace Authority` and `Dataspace Registry` are non-normative entities.
- A [Dataspace Authority](./terminology.md#dataspace-authority) manages one or more [Dataspaces](./terminology.md#dataspace). This will include [Participant](./terminology.md#participant) registration and may entail mandating business and/or technical requirements. For example, a [Dataspace Authority](./terminology.md#dataspace-authority) may require [Participants](./terminology.md#participant) to obtain some form of business certification. A [Dataspace Authority](./terminology.md#dataspace-authority) may also impose technical requirements such as support for the technical enforcement of specific usage policies.
+- A [Dataspace Registry](./terminology.md#dataspace-registration-service-dataspace-registry) records dataspace participants.
- A [Participant](./terminology.md#participant) is a member of one or more [Dataspaces](./terminology.md#dataspace). A [Participant](./terminology.md#participant) registers [Participant Agents](./terminology.md#participant-agent) that perform tasks on its behalf.
- A [Participant Agent](./terminology.md#participant-agent) performs tasks such as publishing a [Catalog](./terminology.md#catalog) or engaging in a [Transfer Process](./terminology.md#transfer-process). In order to accomplish these tasks, a [Participant Agent](./terminology.md#participant-agent) may use a _**verifiable presentation**_ generated from a _**credential**_ obtained from a third-party [Credential Issuer](./terminology.md#credential-issuer). A [Participant Agent](./terminology.md#participant-agent) may also use an _**ID token**_ issued by a third-party [Identity Provider](./terminology.md#identity-provider). Note that a [Participant Agent](./terminology.md#participant-agent) is a logical construct and does not necessarily correspond to a single runtime process.
- An [Identity Provider](./terminology.md#identity-provider) is a trust anchor that generates `ID tokens` used to verify the identity of a [Participant Agent](./terminology.md#participant-agent). Multiple identity providers may operate in a [Dataspace](./terminology.md#dataspace). The types and semantics of ID tokens are not part of this specification. An [Identity Provider](./terminology.md#identity-provider) may be a third-party or a [Participant](./terminology.md#participant) itself (for example, in the case of decentralized identifiers).
diff --git a/model/terminology.md b/model/terminology.md
index bd59bb9..64ce63b 100644
--- a/model/terminology.md
+++ b/model/terminology.md
@@ -48,11 +48,11 @@ A set of technical services that facilitate interoperable [Dataset](#dataset) sh
### Dataspace Authority
-An entity that manages a [Dataspace](#dataspace).
+An entity that manages a [Dataspace](#dataspace). The form and capabilities of a Dataspace Authority are not covered in these specifications.
-### Dataspace Registration Service
+### Dataspace Registration Service (Dataspace Registry)
-A technology system that maintains the state of [Participants](#participant) in a [Dataspace](#dataspace).
+A technology system that maintains the state of [Participants](#participant) in a [Dataspace](#dataspace). The form and capabilities of a Dataspace Registration Service are not covered in these specifications.
### Identity Provider