diff --git a/cmd/migration/migrations/20250829081406.sql b/cmd/migration/migrations/20250829081952.sql
similarity index 100%
rename from cmd/migration/migrations/20250829081406.sql
rename to cmd/migration/migrations/20250829081952.sql
diff --git a/cmd/migration/migrations/atlas.sum b/cmd/migration/migrations/atlas.sum
index c58a11d6..e818fb5f 100644
--- a/cmd/migration/migrations/atlas.sum
+++ b/cmd/migration/migrations/atlas.sum
@@ -1,2 +1,2 @@
-h1:GkE3HIJ9M82/ti7zJNqapdIZW4D9hFb21ii0uzbb5Es=
-20250829081406.sql h1:ZLNXBAoMVVK0zib9NcgF49Ctv/f/pNrf3ciGgae8JVQ=
+h1:UO+I1wZYLfwSyDcWbSN/dgiNfkPYW567Smq1CT+Xeng=
+20250829081952.sql h1:WgG/R3VjMqxFwOaqOACdoDVM9UKQDcaKAq77LxfIDWo=
diff --git a/internal/domain/main-entities/infra/dto.go b/internal/domain/main-entities/infra/dto.go
index abc3c014..08314637 100644
--- a/internal/domain/main-entities/infra/dto.go
+++ b/internal/domain/main-entities/infra/dto.go
@@ -8,19 +8,19 @@ import (
 )
 
 type CreateDto struct {
-	Code            string              `json:"code"`
-	Name            string              `json:"name"`
-	InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code"`
-	Parent_Id       *int16              `json:"parent_id"`
-	Item_Id         *uint               `json:"item_id"`
+	Code            string             `json:"code"`
+	Name            string             `json:"name"`
+	InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`
+	Parent_Id       *int16             `json:"parent_id"`
+	Item_Id         *uint              `json:"item_id"`
 }
 
 type ReadListDto struct {
-	Code            string              `json:"code"`
-	Name            string              `json:"name"`
-	InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code"`
-	Parent_Id       *int16              `json:"parent_id"`
-	Item_Id         *uint               `json:"item_id"`
+	Code            string             `json:"code"`
+	Name            string             `json:"name"`
+	InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`
+	Parent_Id       *int16             `json:"parent_id"`
+	Item_Id         *uint              `json:"item_id"`
 
 	Page         int `json:"page"`
 	PageSize     int `json:"page_size"`
@@ -28,12 +28,12 @@ type ReadListDto struct {
 }
 
 type ReadDetailDto struct {
-	Id              uint16              `json:"id"`
-	Code            string              `json:"code"`
-	Name            string              `json:"name"`
-	InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code"`
-	Parent_Id       *int16              `json:"parent_id"`
-	Item_Id         *uint               `json:"item_id"`
+	Id              uint16             `json:"id"`
+	Code            string             `json:"code"`
+	Name            string             `json:"name"`
+	InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`
+	Parent_Id       *int16             `json:"parent_id"`
+	Item_Id         *uint              `json:"item_id"`
 }
 
 type UpdateDto struct {
@@ -53,12 +53,12 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.SmallMain
-	Code            string              `json:"code"`
-	Name            string              `json:"name"`
-	InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code"`
-	Parent_Id       *int16              `json:"parent_id"`
-	Item_Id         *uint               `json:"item_id"`
-	Item            *ei.Item            `json:"item,omitempty"`
+	Code            string             `json:"code"`
+	Name            string             `json:"name"`
+	InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`
+	Parent_Id       *int16             `json:"parent_id"`
+	Item_Id         *uint              `json:"item_id"`
+	Item            *ei.Item           `json:"item,omitempty"`
 }
 
 func (d Infra) ToResponse() ResponseDto {
diff --git a/internal/domain/main-entities/infra/entity.go b/internal/domain/main-entities/infra/entity.go
index 5a3f5730..01ef24e3 100644
--- a/internal/domain/main-entities/infra/entity.go
+++ b/internal/domain/main-entities/infra/entity.go
@@ -8,11 +8,11 @@ import (
 )
 
 type Infra struct {
-	ecore.SmallMain                     // adjust this according to the needs
-	Code            string              `json:"code" gorm:"unique;size:10"`
-	Name            string              `json:"name" gorm:"size:50"`
-	InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code" gorm:"size:10"`
-	Parent_Id       *int16              `json:"parent_id"`
-	Item_Id         *uint               `json:"item_id"`
-	Item            *ei.Item            `json:"item,omitempty" gorm:"foreignKey:Item_Id;references:Id"`
+	ecore.SmallMain                    // adjust this according to the needs
+	Code            string             `json:"code" gorm:"unique;size:10"`
+	Name            string             `json:"name" gorm:"size:50"`
+	InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code" gorm:"size:10"`
+	Parent_Id       *int16             `json:"parent_id"`
+	Item_Id         *uint              `json:"item_id"`
+	Item            *ei.Item           `json:"item,omitempty" gorm:"foreignKey:Item_Id;references:Id"`
 }
diff --git a/internal/domain/main-entities/item/dto.go b/internal/domain/main-entities/item/dto.go
index f9cf0b6d..b90cbd58 100644
--- a/internal/domain/main-entities/item/dto.go
+++ b/internal/domain/main-entities/item/dto.go
@@ -7,21 +7,21 @@ import (
 )
 
 type CreateDto struct {
-	Code           string             `json:"code"`
-	Name           string             `json:"name"`
-	ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code"`
-	Uom_Code       *string            `json:"uom_code"`
-	Infra_Id       *uint16            `json:"infra_id"`
-	Stock          *int               `json:"stock"`
+	Code           string            `json:"code"`
+	Name           string            `json:"name"`
+	ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"`
+	Uom_Code       *string           `json:"uom_code"`
+	Infra_Id       *uint16           `json:"infra_id"`
+	Stock          *int              `json:"stock"`
 }
 
 type ReadListDto struct {
-	Code           string             `json:"code"`
-	Name           string             `json:"name"`
-	ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code"`
-	Uom_Code       *string            `json:"uom_code"`
-	Infra_Id       *uint16            `json:"infra_id"`
-	Stock          *int               `json:"stock"`
+	Code           string            `json:"code"`
+	Name           string            `json:"name"`
+	ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"`
+	Uom_Code       *string           `json:"uom_code"`
+	Infra_Id       *uint16           `json:"infra_id"`
+	Stock          *int              `json:"stock"`
 
 	Page         int `json:"page"`
 	PageSize     int `json:"page_size"`
@@ -29,13 +29,13 @@ type ReadListDto struct {
 }
 
 type ReadDetailDto struct {
-	Id             uint16             `json:"id"`
-	Code           string             `json:"code"`
-	Name           string             `json:"name"`
-	ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code"`
-	Uom_Code       *string            `json:"uom_code"`
-	Infra_Id       *int16             `json:"infra_id"`
-	Stock          *int               `json:"stock"`
+	Id             uint16            `json:"id"`
+	Code           string            `json:"code"`
+	Name           string            `json:"name"`
+	ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"`
+	Uom_Code       *string           `json:"uom_code"`
+	Infra_Id       *int16            `json:"infra_id"`
+	Stock          *int              `json:"stock"`
 }
 
 type UpdateDto struct {
@@ -55,13 +55,13 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.Main
-	Code           string             `json:"code"`
-	Name           string             `json:"name"`
-	ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code"`
-	Uom_Code       *string            `json:"uom_code"`
-	Uom            *eu.Uom            `json:"uom,omitempty"`
-	Infra_Id       *uint16            `json:"infra_id"`
-	Stock          *int               `json:"stock"`
+	Code           string            `json:"code"`
+	Name           string            `json:"name"`
+	ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"`
+	Uom_Code       *string           `json:"uom_code"`
+	Uom            *eu.Uom           `json:"uom,omitempty"`
+	Infra_Id       *uint16           `json:"infra_id"`
+	Stock          *int              `json:"stock"`
 }
 
 func (d Item) ToResponse() ResponseDto {
diff --git a/internal/domain/main-entities/item/entity.go b/internal/domain/main-entities/item/entity.go
index 129a7f46..9ac471ad 100644
--- a/internal/domain/main-entities/item/entity.go
+++ b/internal/domain/main-entities/item/entity.go
@@ -8,12 +8,12 @@ import (
 )
 
 type Item struct {
-	ecore.Main                        // adjust this according to the needs
-	Code           string             `json:"code" gorm:"unique;size:50"`
-	Name           string             `json:"name" gorm:"size:100"`
-	ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code" gorm:"size:10"`
-	Uom_Code       *string            `json:"uom_code" gorm:"size:10"`
-	Uom            *eu.Uom            `json:"uom,omitempty" gorm:"foreignKey:Uom_Code;references:Code"`
-	Infra_Id       *uint16            `json:"infra_id"`
-	Stock          *int               `json:"stock"`
+	ecore.Main                       // adjust this according to the needs
+	Code           string            `json:"code" gorm:"unique;size:50"`
+	Name           string            `json:"name" gorm:"size:100"`
+	ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code" gorm:"size:10"`
+	Uom_Code       *string           `json:"uom_code" gorm:"size:10"`
+	Uom            *eu.Uom           `json:"uom,omitempty" gorm:"foreignKey:Uom_Code;references:Code"`
+	Infra_Id       *uint16           `json:"infra_id"`
+	Stock          *int              `json:"stock"`
 }
diff --git a/internal/use-case/main-use-case/medicine/helper.go b/internal/use-case/main-use-case/medicine/helper.go
index 3a389b18..899758b7 100644
--- a/internal/use-case/main-use-case/medicine/helper.go
+++ b/internal/use-case/main-use-case/medicine/helper.go
@@ -41,11 +41,10 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Medicine) {
 }
 
 func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
-	igcMed := ero.ITGCMedicine
 	itemCreate := ei.CreateDto{
 		Code:           pu.AddPrefix("med-", input.Code),
 		Name:           input.Name,
-		ItemGroup_Code: &igcMed,
+		ItemGroup_Code: ero.ITGCMedicine,
 		Uom_Code:       input.Uom_Code,
 		Infra_Id:       input.Infra_Id,
 		Stock:          input.Stock,