diff --git a/crates/oxidetalis_entities/src/blacklist.rs b/crates/oxidetalis_entities/src/blacklist.rs
index 30b5ad2..848432d 100644
--- a/crates/oxidetalis_entities/src/blacklist.rs
+++ b/crates/oxidetalis_entities/src/blacklist.rs
@@ -22,8 +22,7 @@
 use chrono::Utc;
 use sea_orm::entity::prelude::*;
 
-use super::users::Entity as UserEntity;
-use crate::prelude::UserId;
+use crate::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "blacklist")]
diff --git a/crates/oxidetalis_entities/src/incoming_chat_requests.rs b/crates/oxidetalis_entities/src/incoming_chat_requests.rs
index d3e16e4..2d363cd 100644
--- a/crates/oxidetalis_entities/src/incoming_chat_requests.rs
+++ b/crates/oxidetalis_entities/src/incoming_chat_requests.rs
@@ -22,8 +22,7 @@
 use chrono::Utc;
 use sea_orm::entity::prelude::*;
 
-use super::users::Entity as UserEntity;
-use crate::prelude::UserId;
+use crate::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "in_chat_requests")]
diff --git a/crates/oxidetalis_entities/src/outgoing_chat_requests.rs b/crates/oxidetalis_entities/src/outgoing_chat_requests.rs
index 6df5ed0..d083e3e 100644
--- a/crates/oxidetalis_entities/src/outgoing_chat_requests.rs
+++ b/crates/oxidetalis_entities/src/outgoing_chat_requests.rs
@@ -22,8 +22,7 @@
 use chrono::Utc;
 use sea_orm::entity::prelude::*;
 
-use super::users::Entity as UserEntity;
-use crate::prelude::UserId;
+use crate::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "out_chat_requests")]
diff --git a/crates/oxidetalis_entities/src/users.rs b/crates/oxidetalis_entities/src/users.rs
index f33a285..cd6b172 100644
--- a/crates/oxidetalis_entities/src/users.rs
+++ b/crates/oxidetalis_entities/src/users.rs
@@ -21,11 +21,7 @@
 
 use sea_orm::entity::prelude::*;
 
-use super::blacklist::Entity as BlacklistEntity;
-use super::incoming_chat_requests::Entity as InChatRequestsEntity;
-use super::outgoing_chat_requests::Entity as OutChatRequestsEntity;
-use super::whitelist::Entity as WhitelistEntity;
-use crate::prelude::UserId;
+use crate::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "users")]
diff --git a/crates/oxidetalis_entities/src/whitelist.rs b/crates/oxidetalis_entities/src/whitelist.rs
index 1f4d944..b1bee22 100644
--- a/crates/oxidetalis_entities/src/whitelist.rs
+++ b/crates/oxidetalis_entities/src/whitelist.rs
@@ -22,8 +22,7 @@
 use chrono::Utc;
 use sea_orm::entity::prelude::*;
 
-use super::users::Entity as UserEntity;
-use crate::prelude::UserId;
+use crate::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "whitelist")]