Index: /main/eko-disco-specs/trunk/actors.rst
===================================================================
--- /main/eko-disco-specs/trunk/actors.rst	(revision 10745)
+++ /main/eko-disco-specs/trunk/actors.rst	(revision 10746)
@@ -4,18 +4,21 @@
 ======
 
+* System
+
 * Maintainer of old data
 
 * Customer
 
-* New System Admin
+* Officer
 
-* Staff
+  - Accountant
 
-  - Meter-Reader
+  .. _label-manager:
 
   - Manager
 
-  - Accountant
+  - Meter Reader
 
-  - Admins
+  .. _label-system-admin:
 
+  - System Admin
Index: /main/eko-disco-specs/trunk/data.rst
===================================================================
--- /main/eko-disco-specs/trunk/data.rst	(revision 10745)
+++ /main/eko-disco-specs/trunk/data.rst	(revision 10746)
@@ -158,5 +158,5 @@
 --------
 
-Beneficiary of one or more :ref:`label-contract`\ s.
+Beneficiary of :ref:`label-contract`\ s.
 
 Customers are added to the system by initial import (migration phase),
@@ -190,5 +190,6 @@
 
 Connected to: :ref:`label-contract` (1:p),
-:ref:`label-contact-data` (1:1), :ref:`label-login-credentials` (1:1)
+:ref:`label-contact-data` (1:1), :ref:`label-login-credentials` (1:1),
+:ref:`label-user` (b:1)
 
 
@@ -272,4 +273,20 @@
 
 
+.. _label-officer:
+
+Officer
+-------
+
+Officers are staff members with certain permissions to manage portal data.
+
+Actors are called :ref:`Manager <label-manager>` if they are officers with with local managing permission. :ref:`System Admins <label-system-admin>` are officers which are allowed to change the
+portal's configuration.
+
+Connected to: :ref:`label-login-credentials` (1:1),
+:ref:`label-user` (b:1),
+:ref:`label-user-role` (1:p)
+
+
+
 .. _label-report:
 
@@ -365,4 +382,5 @@
 
 Connected to: :ref:`label-login-credentials` (1:1),
+:ref:`label-customer` (1:b),
 :ref:`label-user-role` (p:q)
 
@@ -373,5 +391,5 @@
 ---------
 
-A role assigned to a group of :ref:`label-user`\ s.
+A set of permissions assigned to a group of :ref:`label-user`\ s.
 
 Connected to: :ref:`label-user` (p:q)
