diff --git a/src/Controller/MachineStructureController.php b/src/Controller/MachineStructureController.php
index 70d9250..20c8d1c 100644
--- a/src/Controller/MachineStructureController.php
+++ b/src/Controller/MachineStructureController.php
@@ -711,6 +711,7 @@ class MachineStructureController extends AbstractController
         $pieces = [];
         foreach ($composant->getPieceSlots() as $slot) {
             $pieceData = [
+                'slotId'          => $slot->getId(),
                 'typePieceId'     => $slot->getTypePiece()?->getId(),
                 'quantity'        => $slot->getQuantity(),
                 'selectedPieceId' => $slot->getSelectedPiece()?->getId(),
@@ -769,16 +770,19 @@ class MachineStructureController extends AbstractController
 
     private function normalizeProduct(Product $product): array
     {
+        $type = $product->getTypeProduct();
+
         return [
-            'id'            => $product->getId(),
-            'name'          => $product->getName(),
-            'reference'     => $product->getReference(),
-            'supplierPrice' => $product->getSupplierPrice(),
-            'typeProductId' => $product->getTypeProduct()?->getId(),
-            'typeProduct'   => $this->normalizeModelType($product->getTypeProduct()),
-            'constructeurs' => $this->normalizeConstructeurs($product->getConstructeurs()),
-            'documents'     => [],
-            'customFields'  => [],
+            'id'                => $product->getId(),
+            'name'              => $product->getName(),
+            'reference'         => $product->getReference(),
+            'supplierPrice'     => $product->getSupplierPrice(),
+            'typeProductId'     => $type?->getId(),
+            'typeProduct'       => $this->normalizeModelType($type),
+            'constructeurs'     => $this->normalizeConstructeurs($product->getConstructeurs()),
+            'documents'         => [],
+            'customFields'      => $type ? $this->normalizeCustomFieldDefinitions($type->getProductCustomFields()) : [],
+            'customFieldValues' => $this->normalizeCustomFieldValues($product->getCustomFieldValues()),
         ];
     }