diff --git a/source/glossary.rst b/source/glossary.rst
index 8061e97fb33776548d78711164f889d2e9b2b977_c291cmNlL2dsb3NzYXJ5LnJzdA==..d74b7ba0f2fc3201296167eaf4fb2652faabbddd_c291cmNlL2dsb3NzYXJ5LnJzdA== 100644
--- a/source/glossary.rst
+++ b/source/glossary.rst
@@ -8,6 +8,14 @@
 .. glossary::
 
     Actor
-        Any application connected to the bus is seen as one of several actors.
-        Each can be an :term:`Emitter`, a :term:`Consumer` or a :term:`Worker`.
+        Actors are what exchanges :term:`messages <Message>` through the bus.
+        Thay can be an :term:`Emitter`, a :term:`Consumer` or a :term:`Worker`.
+
+        An actor is always associated to a :term:`Actor Account`, to ensure
+        security.
+
+        It must have one and only one :term:`Role`.
+
+    Emitter
+        A kind of :term:`Actor` that sends envelopes to the bus.
 
@@ -13,6 +21,14 @@
 
-        An actor is always associated to a :term:`Actor Account`, so the
-        application is properly identified by the bus.
+    Consumer
+        A kind of :term:`Actor` that receives envelopes from the bus.
+
+    Worker
+        A kind of :term:`Actor` that receives envelopes and sends envelopes in
+        reaction.
+
+    Role
+        An :term:`Actor` property. Pipelines can select actors by roles instead
+        of name/id.
 
     Account
         An account is what allows a person or an application to connect to the
@@ -32,4 +48,7 @@
         An account with very specific privileges needed by a gateway program
         like :ref:`xbus-http <program-xbus-http>`.
 
+    Connector
+        A set of actors that connects an application to the bus.
+
     Pipeline
@@ -35,5 +54,8 @@
     Pipeline
-        A pipeline defines a path between an emitter, workers and consumers.
+        A pipeline defines a path between an emitter, workers and consumers, in
+        the form of a `directed acyclic graph
+        <https://en.wikipedia.org/wiki/Directed_acyclic_graph>`_.
+
         It 'matches' incoming envelopes based on the message types they contain.
 
 
@@ -54,6 +76,9 @@
 
         It is identified by a GUID.
 
+    Event
+        Deprecated term for :term:`Message`
+
 
 
 Process