diff --git a/source/structure/r2.sindri.json b/source/structure/r2.sindri.json
index 73e2853..eea5b9f 100644
--- a/source/structure/r2.sindri.json
+++ b/source/structure/r2.sindri.json
@@ -1,10 +1,50 @@
 {
 	"domains": [
 		{
-			"name": "member_core",
+			"name": "sessions",
+			"data_fields": [
+				{
+					"name": "key",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "data",
+					"type": "string_long",
+					"nullable": false
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["key"]
+					}
+				}
+			]
 		},
 		{
-			"name": "member_extras",
+			"name": "name_indices",
+			"data_fields": [
+				{
+					"name": "name_image",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "index",
+					"type": "integer",
+					"nullable": false
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["name_image"]
+					}
+				}
+			]
 		},
 		{
 			"name": "members",
@@ -17,60 +57,55 @@
 					"type": "string_short",
 					"nullable": false
 				},
+				{
+					"name": "name_real_value",
+					"type": "string_short",
+					"nullable": false
+				},
+				{
+					"name": "name_real_index",
+					"type": "integer",
+					"nullable": true
+				},
+				{
+					"name": "email_address_private",
+					"type": "string_short",
+					"nullable": true
+				},
+				{
+					"name": "registered",
+					"type": "boolean",
+					"nullable": false
+				},
 				{
 					"name": "enabled",
 					"type": "boolean",
 					"nullable": false
 				},
 				{
-					"name": "name_login",
-					"type": "string_short",
-					"nullable": true
+					"name": "email_use_veiled_address",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_use_nominal_address",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_redirect_to_private_address",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_allow_sending",
+					"type": "boolean",
+					"nullable": false
 				},
 				{
 					"name": "password_image",
 					"type": "string_medium",
 					"nullable": true
-				},
-				{
-					"name": "name_real_value",
-					"type": "string_medium",
-					"nullable": false
-				},
-				{
-					"name": "name_real_extension",
-					"type": "string_short",
-					"nullable": true
-				},
-				{
-					"name": "name_display",
-					"type": "string_medium",
-					"nullable": true
-				},
-				{
-					"name": "salutation",
-					"type": "string_short",
-					"nullable": true
-				},
-				{
-					"name": "email_address_private_value",
-					"type": "string_short",
-					"nullable": true
-				},
-				{
-					"name": "email_address_numberbased_use",
-					"type": "boolean",
-					"nullable": false
-				},
-				{
-					"name": "email_address_namebased_use",
-					"type": "boolean",
-					"nullable": false
-				},
-				{
-					"name": "email_redirect_to_private",
-					"type": "boolean",
-					"nullable": false
 				}
 			],
 			"constraints": [
@@ -83,13 +118,7 @@
 				{
 					"kind": "unique",
 					"parameters": {
-						"fields": ["name_real_value","name_real_extension"]
-					}
-				},
-				{
-					"kind": "unique",
-					"parameters": {
-						"fields": ["name_login"]
+						"fields": ["name_real_value","name_real_index"]
 					}
 				}
 			]