diff --git a/models.yml b/models.yml
index bc7c71a6..c0159caa 100644
--- a/models.yml
+++ b/models.yml
@@ -112,13 +112,9 @@ organization:
   reset_password_verbose_errors:
     type: boolean
     restriction_mode: B
-  genders:
-    type: string[]
-    default:
-      - male
-      - female
-      - diverse
-      - non-binary
+  gender_ids:
+    type: relation-list
+    to: gender/organization_id
     restriction_mode: A
 
   # Configuration (only for the server owner)
@@ -301,9 +297,6 @@ user:
     type: boolean
     default: true
     restriction_mode: D
-  gender:
-    type: string
-    restriction_mode: A
   email:
     type: string
     restriction_mode: B
@@ -322,6 +315,10 @@ user:
     type: timestamp
     restriction_mode: A
     read_only: true
+  gender_id:
+    type: relation
+    to: gender/user_ids
+    restriction_mode: A
 
   # Organization, meeting and committee
   organization_management_level:
@@ -497,6 +494,26 @@ meeting_user:
     restriction_mode: A
     to: structure_level/meeting_user_ids
 
+gender:
+  id:
+    type: number
+    restriction_mode: A
+    constant: true
+  name:
+    type: string
+    required: True
+    restriction_mode: A
+    description: unique
+  organization_id:
+    type: relation
+    required: True
+    to: organization/gender_ids
+    restriction_mode: A
+  user_ids:
+    type: relation-list
+    to: user/gender_id
+    restriction_mode: A
+
 organization_tag:
   id:
     type: number
@@ -1154,6 +1171,10 @@ meeting:
     type: boolean
     default: True
     restriction_mode: B
+  motions_hide_metadata_background:
+    type: boolean
+    default: False
+    restriction_mode: B
   motions_show_referring_motions:
     type: boolean
     default: True
diff --git a/search.yml b/search.yml
index 47f8a322..aab29ff7 100644
--- a/search.yml
+++ b/search.yml
@@ -132,7 +132,12 @@ motion:
                 last_name: null
                 pronoun: null
                 username: null
-                gender: null
+                gender_id:
+                  type: relation
+                  collection: gender
+                  fields: 
+                    id: null
+                    name: null
 motion_change_recommendation:
   contains:
     - motion
@@ -251,7 +256,6 @@ user:
     - title
     - first_name
     - last_name
-    - gender
     - email
     - organization_management_level
     - meeting_ids
@@ -278,3 +282,9 @@ user:
           fields:
             id: null
             name: null
+    gender_id:
+      type: relation
+      collection: gender
+      fields: 
+        id: null
+        name: null
\ No newline at end of file