diff --git a/internal/domain/main-entities/room/base/entity.go b/internal/domain/main-entities/room/base/entity.go
index e45a441d..dd39d921 100644
--- a/internal/domain/main-entities/room/base/entity.go
+++ b/internal/domain/main-entities/room/base/entity.go
@@ -2,20 +2,14 @@ package base
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
-	es "simrs-vx/internal/domain/main-entities/specialist"
-	ess "simrs-vx/internal/domain/main-entities/subspecialist"
-	eu "simrs-vx/internal/domain/main-entities/unit"
 )
 
 type Basic struct {
-	ecore.SmallMain                     // adjust this according to the needs
-	Infra_Id         *uint16            `json:"infra_id"`
-	Unit_Id          *uint16            `json:"unit_id"`
-	Unit             *eu.Unit           `json:"unit,omitempty" gorm:"foreignKey:Unit_Id"`
-	Specialist_Id    *uint16            `json:"specialist_id"`
-	Specialist       *es.Specialist     `json:"specialist,omitempty" gorm:"foreignKey:Specialist_Id"`
-	Subspecialist_Id *uint16            `json:"subspecialist_id"`
-	Subspecialist    *ess.Subspecialist `json:"subspecialist,omitempty" gorm:"foreignKey:Subspecialist_Id"`
+	ecore.SmallMain          // adjust this according to the needs
+	Infra_Id         *uint16 `json:"infra_id"`
+	Unit_Id          *uint16 `json:"unit_id"`
+	Specialist_Id    *uint16 `json:"specialist_id"`
+	Subspecialist_Id *uint16 `json:"subspecialist_id"`
 }
 
 func (Basic) TableName() string {
diff --git a/internal/domain/main-entities/room/entity.go b/internal/domain/main-entities/room/entity.go
index 346c7741..cfa7ec05 100644
--- a/internal/domain/main-entities/room/entity.go
+++ b/internal/domain/main-entities/room/entity.go
@@ -3,9 +3,15 @@ package room
 import (
 	ei "simrs-vx/internal/domain/main-entities/infra"
 	ebase "simrs-vx/internal/domain/main-entities/room/base"
+	es "simrs-vx/internal/domain/main-entities/specialist"
+	ess "simrs-vx/internal/domain/main-entities/subspecialist"
+	eu "simrs-vx/internal/domain/main-entities/unit"
 )
 
 type Room struct {
 	ebase.Basic
-	Infra *ei.Infra `json:"infra,omitempty" gorm:"foreignKey:Infra_Id"`
+	Infra         *ei.Infra          `json:"infra,omitempty" gorm:"foreignKey:Infra_Id"`
+	Unit          *eu.Unit           `json:"unit,omitempty" gorm:"foreignKey:Unit_Id"`
+	Specialist    *es.Specialist     `json:"specialist,omitempty" gorm:"foreignKey:Specialist_Id"`
+	Subspecialist *ess.Subspecialist `json:"subspecialist,omitempty" gorm:"foreignKey:Subspecialist_Id"`
 }