diff --git a/apps/note/fixtures/initial.json b/apps/note/fixtures/initial.json
index 3654fa2f..119e1c28 100644
--- a/apps/note/fixtures/initial.json
+++ b/apps/note/fixtures/initial.json
@@ -3,7 +3,7 @@
         "model": "note.note",
         "pk": 1,
         "fields": {
-            "polymorphic_ctype": 40,
+            "polymorphic_ctype": 23,
             "balance": 0,
             "is_active": true,
             "display_image": "",
@@ -14,7 +14,7 @@
         "model": "note.note",
         "pk": 2,
         "fields": {
-            "polymorphic_ctype": 40,
+            "polymorphic_ctype": 23,
             "balance": 0,
             "is_active": true,
             "display_image": "",
@@ -25,7 +25,7 @@
         "model": "note.note",
         "pk": 3,
         "fields": {
-            "polymorphic_ctype": 40,
+            "polymorphic_ctype": 23,
             "balance": 0,
             "is_active": true,
             "display_image": "",
@@ -36,7 +36,7 @@
         "model": "note.note",
         "pk": 4,
         "fields": {
-            "polymorphic_ctype": 40,
+            "polymorphic_ctype": 23,
             "balance": 0,
             "is_active": true,
             "display_image": "",
@@ -47,7 +47,7 @@
         "model": "note.note",
         "pk": 5,
         "fields": {
-            "polymorphic_ctype": 39,
+            "polymorphic_ctype": 22,
             "balance": 0,
             "is_active": true,
             "display_image": "",
@@ -58,7 +58,7 @@
         "model": "note.note",
         "pk": 6,
         "fields": {
-            "polymorphic_ctype": 39,
+            "polymorphic_ctype": 22,
             "balance": 0,
             "is_active": true,
             "display_image": "",
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 69900372..da1fa486 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -83,7 +83,7 @@
     "model": "permission.permission",
     "pk": 1,
     "fields": {
-      "model": 21,
+      "model": 4,
       "query": "{\"pk\": [\"user\", \"pk\"]}",
       "type": "view",
       "mask": 1,
@@ -95,7 +95,7 @@
     "model": "permission.permission",
     "pk": 2,
     "fields": {
-      "model": 31,
+      "model": 14,
       "query": "{\"user\": [\"user\"]}",
       "type": "view",
       "mask": 1,
@@ -107,7 +107,7 @@
     "model": "permission.permission",
     "pk": 3,
     "fields": {
-      "model": 34,
+      "model": 24,
       "query": "{\"pk\": [\"user\", \"note\", \"pk\"]}",
       "type": "view",
       "mask": 1,
@@ -119,7 +119,7 @@
     "model": "permission.permission",
     "pk": 4,
     "fields": {
-      "model": 25,
+      "model": 8,
       "query": "{\"user\": [\"user\"]}",
       "type": "view",
       "mask": 1,
@@ -131,7 +131,7 @@
     "model": "permission.permission",
     "pk": 5,
     "fields": {
-      "model": 36,
+      "model": 19,
       "query": "[\"OR\", {\"source\": [\"user\", \"note\"]}, {\"destination\": [\"user\", \"note\"]}]",
       "type": "view",
       "mask": 1,
@@ -143,7 +143,7 @@
     "model": "permission.permission",
     "pk": 6,
     "fields": {
-      "model": 33,
+      "model": 16,
       "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}]",
       "type": "view",
       "mask": 1,
@@ -155,7 +155,7 @@
     "model": "permission.permission",
     "pk": 7,
     "fields": {
-      "model": 21,
+      "model": 4,
       "query": "{\"pk\": [\"user\", \"pk\"]}",
       "type": "change",
       "mask": 1,
@@ -167,7 +167,7 @@
     "model": "permission.permission",
     "pk": 8,
     "fields": {
-      "model": 21,
+      "model": 4,
       "query": "{\"pk\": [\"user\", \"pk\"]}",
       "type": "change",
       "mask": 1,
@@ -179,7 +179,7 @@
     "model": "permission.permission",
     "pk": 9,
     "fields": {
-      "model": 21,
+      "model": 4,
       "query": "{\"pk\": [\"user\", \"pk\"]}",
       "type": "change",
       "mask": 1,
@@ -191,7 +191,7 @@
     "model": "permission.permission",
     "pk": 10,
     "fields": {
-      "model": 21,
+      "model": 4,
       "query": "{\"pk\": [\"user\", \"pk\"]}",
       "type": "change",
       "mask": 1,
@@ -203,7 +203,7 @@
     "model": "permission.permission",
     "pk": 11,
     "fields": {
-      "model": 21,
+      "model": 4,
       "query": "{\"pk\": [\"user\", \"pk\"]}",
       "type": "change",
       "mask": 1,
@@ -215,7 +215,7 @@
     "model": "permission.permission",
     "pk": 12,
     "fields": {
-      "model": 25,
+      "model": 8,
       "query": "{\"user\": [\"user\"]}",
       "type": "delete",
       "mask": 1,
@@ -227,7 +227,7 @@
     "model": "permission.permission",
     "pk": 13,
     "fields": {
-      "model": 25,
+      "model": 8,
       "query": "{\"user\": [\"user\"]}",
       "type": "add",
       "mask": 1,
@@ -239,7 +239,7 @@
     "model": "permission.permission",
     "pk": 14,
     "fields": {
-      "model": 33,
+      "model": 16,
       "query": "{\"note\": [\"user\", \"note\"]}",
       "type": "delete",
       "mask": 1,
@@ -251,7 +251,7 @@
     "model": "permission.permission",
     "pk": 15,
     "fields": {
-      "model": 33,
+      "model": 16,
       "query": "{\"note\": [\"user\", \"note\"]}",
       "type": "add",
       "mask": 1,
@@ -263,7 +263,7 @@
     "model": "permission.permission",
     "pk": 16,
     "fields": {
-      "model": 34,
+      "model": 24,
       "query": "{\"pk\": [\"user\", \"note\", \"pk\"]}",
       "type": "change",
       "mask": 1,
@@ -275,7 +275,7 @@
     "model": "permission.permission",
     "pk": 17,
     "fields": {
-      "model": 36,
+      "model": 19,
       "query": "[\"AND\", {\"source\": [\"user\", \"note\"]}, {\"amount__lte\": [\"user\", \"note\", \"balance\"]}]",
       "type": "add",
       "mask": 1,
@@ -287,7 +287,7 @@
     "model": "permission.permission",
     "pk": 18,
     "fields": {
-      "model": 34,
+      "model": 17,
       "query": "{}",
       "type": "change",
       "mask": 1,
@@ -299,7 +299,7 @@
     "model": "permission.permission",
     "pk": 19,
     "fields": {
-      "model": 34,
+      "model": 17,
       "query": "[\"OR\", {\"pk\": [\"club\", \"note\", \"pk\"]}, {\"pk__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club\": [\"club\"]}], [\"all\"]]}]",
       "type": "view",
       "mask": 2,
@@ -311,7 +311,7 @@
     "model": "permission.permission",
     "pk": 20,
     "fields": {
-      "model": 36,
+      "model": 19,
       "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}]",
       "type": "add",
       "mask": 2,
@@ -323,7 +323,7 @@
     "model": "permission.permission",
     "pk": 21,
     "fields": {
-      "model": 42,
+      "model": 25,
       "query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}]",
       "type": "add",
       "mask": 2,
@@ -335,7 +335,7 @@
     "model": "permission.permission",
     "pk": 22,
     "fields": {
-      "model": 29,
+      "model": 12,
       "query": "{\"pk\": [\"club\", \"pk\"]}",
       "type": "view",
       "mask": 1,
@@ -347,7 +347,7 @@
     "model": "permission.permission",
     "pk": 23,
     "fields": {
-      "model": 36,
+      "model": 19,
       "query": "{}",
       "type": "change",
       "mask": 1,
@@ -359,7 +359,7 @@
     "model": "permission.permission",
     "pk": 24,
     "fields": {
-      "model": 36,
+      "model": 19,
       "query": "{}",
       "type": "view",
       "mask": 2,
@@ -371,7 +371,7 @@
     "model": "permission.permission",
     "pk": 25,
     "fields": {
-      "model": 40,
+      "model": 23,
       "query": "{}",
       "type": "view",
       "mask": 2,
@@ -383,7 +383,7 @@
     "model": "permission.permission",
     "pk": 26,
     "fields": {
-      "model": 43,
+      "model": 26,
       "query": "{}",
       "type": "add",
       "mask": 2,
@@ -395,7 +395,7 @@
     "model": "permission.permission",
     "pk": 27,
     "fields": {
-      "model": 35,
+      "model": 18,
       "query": "{}",
       "type": "view",
       "mask": 2,
@@ -407,7 +407,7 @@
     "model": "permission.permission",
     "pk": 28,
     "fields": {
-      "model": 35,
+      "model": 18,
       "query": "{}",
       "type": "change",
       "mask": 3,
@@ -419,7 +419,7 @@
     "model": "permission.permission",
     "pk": 29,
     "fields": {
-      "model": 35,
+      "model": 18,
       "query": "{}",
       "type": "add",
       "mask": 3,
@@ -431,7 +431,7 @@
     "model": "permission.permission",
     "pk": 30,
     "fields": {
-      "model": 37,
+      "model": 20,
       "query": "{}",
       "type": "view",
       "mask": 2,
@@ -443,7 +443,7 @@
     "model": "permission.permission",
     "pk": 31,
     "fields": {
-      "model": 37,
+      "model": 20,
       "query": "{}",
       "type": "add",
       "mask": 3,
@@ -455,7 +455,7 @@
     "model": "permission.permission",
     "pk": 32,
     "fields": {
-      "model": 37,
+      "model": 20,
       "query": "{}",
       "type": "change",
       "mask": 3,
@@ -467,7 +467,7 @@
     "model": "permission.permission",
     "pk": 33,
     "fields": {
-      "model": 36,
+      "model": 19,
       "query": "{}",
       "type": "add",
       "mask": 2,