diff --git a/crates/database-actor/src/schema.rs b/crates/database-actor/src/schema.rs
index 34a35365..a8f775b2 100644
--- a/crates/database-actor/src/schema.rs
+++ b/crates/database-actor/src/schema.rs
@@ -37,19 +37,19 @@ diesel::table! {
     use bitque_data::*;
 
     invitations (id) {
         id -> Int4,
         name -> Text,
         email -> Text,
-        state -> InvitationState,
+        state -> InvitationStateMapping,
         project_id -> Int4,
         invited_by_id -> Int4,
         created_at -> Timestamp,
         updated_at -> Timestamp,
         bind_token -> Uuid,
-        role -> UserRole,
+        role -> UserRoleMapping,
     }
 }
 
 diesel::table! {
     use diesel::sql_types::*;
     use bitque_data::*;
@@ -81,14 +81,14 @@ diesel::table! {
     use diesel::sql_types::*;
     use bitque_data::*;
 
     issues (id) {
         id -> Int4,
         title -> Text,
-        issue_type -> IssueType,
-        priority -> IssuePriority,
+        issue_type -> IssueTypeMapping,
+        priority -> IssuePriorityMapping,
         list_position -> Int4,
         description -> Nullable<Text>,
         description_text -> Nullable<Text>,
         estimate -> Nullable<Int4>,
         time_spent -> Nullable<Int4>,
         time_remaining -> Nullable<Int4>,
@@ -108,13 +108,13 @@ diesel::table! {
     messages (id) {
         id -> Int4,
         receiver_id -> Int4,
         sender_id -> Int4,
         summary -> Text,
         description -> Text,
-        message_type -> MessageType,
+        message_type -> MessageTypeMapping,
         hyper_link -> Text,
         created_at -> Timestamp,
         updated_at -> Timestamp,
     }
 }
 
@@ -124,16 +124,16 @@ diesel::table! {
 
     projects (id) {
         id -> Int4,
         name -> Text,
         url -> Text,
         description -> Text,
-        category -> ProjectCategory,
+        category -> ProjectCategoryMapping,
         created_at -> Timestamp,
         updated_at -> Timestamp,
-        time_tracking -> TimeTracking,
+        time_tracking -> TimeTrackingMapping,
     }
 }
 
 diesel::table! {
     use diesel::sql_types::*;
     use bitque_data::*;
@@ -156,26 +156,26 @@ diesel::table! {
     user_projects (id) {
         id -> Int4,
         user_id -> Int4,
         project_id -> Int4,
         is_default -> Bool,
         is_current -> Bool,
-        role -> UserRole,
+        role -> UserRoleMapping,
         created_at -> Timestamp,
         updated_at -> Timestamp,
     }
 }
 
 diesel::table! {
     use diesel::sql_types::*;
     use bitque_data::*;
 
     user_settings (id) {
         id -> Int4,
         user_id -> Int4,
-        text_editor_mode -> TextEditorMode,
+        text_editor_mode -> TextEditorModeMapping,
     }
 }
 
 diesel::table! {
     use diesel::sql_types::*;
     use bitque_data::*;
@@ -205,20 +205,20 @@ diesel::joinable!(issues -> projects (project_id));
 diesel::joinable!(issues -> users (reporter_id));
 diesel::joinable!(tokens -> users (user_id));
 diesel::joinable!(user_projects -> projects (project_id));
 diesel::joinable!(user_projects -> users (user_id));
 diesel::joinable!(user_settings -> users (user_id));
 
-diesel::allow_tables_to_appear_in_same_query!(
-    comments,
-    epics,
-    invitations,
-    issue_assignees,
-    issue_statuses,
-    issues,
-    messages,
-    projects,
-    tokens,
-    user_projects,
-    user_settings,
-    users,
-);
+// diesel::allow_tables_to_appear_in_same_query!(
+//     comments,
+//     epics,
+//     invitations,
+//     issue_assignees,
+//     issue_statuses,
+//     issues,
+//     messages,
+//     projects,
+//     tokens,
+//     user_projects,
+//     user_settings,
+//     users,
+// );