diff --git a/models.yml b/models.yml
index a4c87ba5..83c2c28b 100644
--- a/models.yml
+++ b/models.yml
@@ -171,12 +171,6 @@ organization:
     type: text
     restriction_mode: D
 
-  vote_decrypt_public_main_key:
-    type: string
-    description: Public key from vote decrypt to validate cryptographic votes.
-    calculated: true
-    restriction_mode: A
-
   committee_ids:
     type: relation-list
     restriction_mode: B
@@ -476,6 +470,14 @@ meeting_user:
     to: meeting_user/vote_delegated_to_id
     equal_fields: meeting_id
     restriction_mode: A
+  crypt_default_secretary_id:
+    type: relation
+    to: meeting/crypt_default_secretary_id
+    restriction_mode: X
+  crypt_default_auditor_id:
+    type: relation
+    to: meeting/crypt_default_auditor_id
+    restriction_mode: X
   chat_message_ids:
     type: relation-list
     to: chat_message/meeting_user_id
@@ -1299,6 +1301,14 @@ meeting:
     type: relation-list
     to: poll_candidate/meeting_id
     restriction_mode: B
+  crypt_default_secretary_id:
+    type: relation
+    to: meeting_user/crypt_default_secretary_id
+    restriction_mode: X
+  crypt_default_pollassistent_auditor_id:
+    type: relation
+    to: meeting_user/crypt_default_pollassistent_auditor_id
+    restriction_mode: X
 
   # Users
   meeting_user_ids:
@@ -3174,6 +3184,7 @@ poll:
     type: string
     enum:
       - created
+      - called
       - started
       - finished
       - published
@@ -3236,26 +3247,21 @@ poll:
     required: true
     restriction_mode: A
     constant: true
-  crypt_key:
+  crypt_key_secretary:
     type: string
-    description: base64 public key to cryptographic votes.
+    description: base64 public key of the secretary.
     read_only: true
     restriction_mode: A
-  crypt_signature:
+  crypt_key_auditor:
     type: string
-    description: base64 signature of cryptographic_key.
+    description: base64 public key of the auditor.
     read_only: true
     restriction_mode: A
-  votes_raw:
+  crypt_documents:
     type: text
     description: original form of decrypted votes.
     read_only: true
     restriction_mode: B
-  votes_signature:
-    type: string
-    description: base64 signature of votes_raw field.
-    read_only: true
-    restriction_mode: B
   content_object_id:
     type: generic-relation
     to: