diff --git a/libs/cart/driver/magento/src/queries/fragments/cart-item.ts b/libs/cart/driver/magento/src/queries/fragments/cart-item.ts
index 18cf2e92d4..8b0328851c 100644
--- a/libs/cart/driver/magento/src/queries/fragments/cart-item.ts
+++ b/libs/cart/driver/magento/src/queries/fragments/cart-item.ts
@@ -25,6 +25,7 @@ export const cartItemFragment = gql`
 		uid
     product {
       ...cartItemProduct
+      uid
     }
     quantity
     prices {
diff --git a/libs/cart/driver/magento/src/queries/fragments/cart-totals.ts b/libs/cart/driver/magento/src/queries/fragments/cart-totals.ts
index d1af552496..0bf398b280 100644
--- a/libs/cart/driver/magento/src/queries/fragments/cart-totals.ts
+++ b/libs/cart/driver/magento/src/queries/fragments/cart-totals.ts
@@ -13,7 +13,9 @@ export const cartTotalsFragment = gql`
         selected_shipping_method {
           ...selectedShippingMethod
         }
+        street
       }
+      street
     }
     prices {
       ...prices
diff --git a/libs/cart/driver/magento/src/queries/fragments/cart.ts b/libs/cart/driver/magento/src/queries/fragments/cart.ts
index 1a9db6ad2d..f593619af5 100644
--- a/libs/cart/driver/magento/src/queries/fragments/cart.ts
+++ b/libs/cart/driver/magento/src/queries/fragments/cart.ts
@@ -21,6 +21,7 @@ export const cartFragment = gql`
         selected_shipping_method {
           ...selectedShippingMethod
         }
+        street
       }
       available_shipping_methods {
         amount {
@@ -32,15 +33,19 @@ export const cartFragment = gql`
         carrier_title
         method_title
       }
+      street
     }
     items {
       ...cartItem
+      uid
     }
     available_payment_methods {
       ...availablePaymentMethod
+      code
     }
     selected_payment_method {
       ...selectedPaymentMethod
+      code
     }
     applied_coupons {
       ...cartCoupon
diff --git a/libs/cart/driver/magento/src/queries/get-selected-payment-method/query.ts b/libs/cart/driver/magento/src/queries/get-selected-payment-method/query.ts
index 603be8e66f..7f567eac4e 100644
--- a/libs/cart/driver/magento/src/queries/get-selected-payment-method/query.ts
+++ b/libs/cart/driver/magento/src/queries/get-selected-payment-method/query.ts
@@ -15,6 +15,7 @@ export const getSelectedPaymentMethod = (extraCartFragments: DocumentNode[] = []
     cart(cart_id: $cartId) {
       selected_payment_method {
         ...selectedPaymentMethod
+        code
       }
       ${daffBuildFragmentNameSpread(...extraCartFragments)}
     }
diff --git a/libs/cart/driver/magento/src/queries/get-selected-shipping-method/query.ts b/libs/cart/driver/magento/src/queries/get-selected-shipping-method/query.ts
index 330f12256d..6590ed5270 100644
--- a/libs/cart/driver/magento/src/queries/get-selected-shipping-method/query.ts
+++ b/libs/cart/driver/magento/src/queries/get-selected-shipping-method/query.ts
@@ -17,6 +17,7 @@ export const getSelectedShippingMethod = (extraCartFragments: DocumentNode[] = [
         selected_shipping_method {
           ...selectedShippingMethod
         }
+        street
       }
       ${daffBuildFragmentNameSpread(...extraCartFragments)}
     }
diff --git a/libs/cart/driver/magento/src/queries/get-shipping-address/query.ts b/libs/cart/driver/magento/src/queries/get-shipping-address/query.ts
index ddd31c59be..d59454f670 100644
--- a/libs/cart/driver/magento/src/queries/get-shipping-address/query.ts
+++ b/libs/cart/driver/magento/src/queries/get-shipping-address/query.ts
@@ -15,6 +15,7 @@ export const getShippingAddress = (extraCartFragments: DocumentNode[] = []) => g
     cart(cart_id: $cartId) {
       shipping_addresses {
         ...cartAddress
+        street
       }
       email
       ${daffBuildFragmentNameSpread(...extraCartFragments)}
diff --git a/libs/cart/driver/magento/src/queries/list-items/query.ts b/libs/cart/driver/magento/src/queries/list-items/query.ts
index 10ad167aae..db405f7f46 100644
--- a/libs/cart/driver/magento/src/queries/list-items/query.ts
+++ b/libs/cart/driver/magento/src/queries/list-items/query.ts
@@ -15,6 +15,7 @@ export const listCartItems = (extraCartFragments: DocumentNode[] = []) => gql<Ma
     cart(cart_id: $cartId) {
       items {
         ...cartItem
+        uid
       }
       ${daffBuildFragmentNameSpread(...extraCartFragments)}
     }
diff --git a/libs/cart/driver/magento/src/queries/list-payment-methods/query.ts b/libs/cart/driver/magento/src/queries/list-payment-methods/query.ts
index 205e3c6c75..d418df6932 100644
--- a/libs/cart/driver/magento/src/queries/list-payment-methods/query.ts
+++ b/libs/cart/driver/magento/src/queries/list-payment-methods/query.ts
@@ -15,6 +15,7 @@ export const listPaymentMethods = (extraCartFragments: DocumentNode[] = []) => g
     cart(cart_id: $cartId) {
       available_payment_methods {
         ...availablePaymentMethod
+        code
       }
       ${daffBuildFragmentNameSpread(...extraCartFragments)}
     }
diff --git a/libs/cart/driver/magento/src/queries/list-shipping-methods/query.ts b/libs/cart/driver/magento/src/queries/list-shipping-methods/query.ts
index 3a38c6365a..b8b0892b28 100644
--- a/libs/cart/driver/magento/src/queries/list-shipping-methods/query.ts
+++ b/libs/cart/driver/magento/src/queries/list-shipping-methods/query.ts
@@ -20,6 +20,8 @@ export const listShippingMethods = (extraCartFragments: DocumentNode[] = []) =>
 				street
         available_shipping_methods {
           ...availableShippingMethod
+          carrier_code
+          method_code
         }
       }
       ${daffBuildFragmentNameSpread(...extraCartFragments)}
diff --git a/libs/category/driver/magento/src/queries/get-category-and-products.ts b/libs/category/driver/magento/src/queries/get-category-and-products.ts
index c2e9407afe..aa6722ecda 100644
--- a/libs/category/driver/magento/src/queries/get-category-and-products.ts
+++ b/libs/category/driver/magento/src/queries/get-category-and-products.ts
@@ -21,6 +21,7 @@ query ${DAFF_MAGENTO_GET_CATEGORY_AND_PRODUCTS_QUERY_NAME}($categoryFilters: Cat
 {
   categoryList(filters: $categoryFilters) {
 		...categoryTree
+  uid
     ${daffBuildFragmentNameSpread(...extraCategoryFragments)}
 	}
 	products(filter: $productFilter, search: $search, pageSize: $pageSize, currentPage: $currentPage, sort: $sort)
@@ -28,6 +29,7 @@ query ${DAFF_MAGENTO_GET_CATEGORY_AND_PRODUCTS_QUERY_NAME}($categoryFilters: Cat
 		total_count
 		items {
 			...product
+   uid
       ${daffBuildFragmentNameSpread(...extraProductFragments)}
 		}
 		page_info {
diff --git a/libs/navigation/driver/magento/src/queries/fragments/category-node/category-node.spec.ts b/libs/navigation/driver/magento/src/queries/fragments/category-node/category-node.spec.ts
index dae8fe9379..df41787e18 100644
--- a/libs/navigation/driver/magento/src/queries/fragments/category-node/category-node.spec.ts
+++ b/libs/navigation/driver/magento/src/queries/fragments/category-node/category-node.spec.ts
@@ -92,6 +92,7 @@ describe('Navigation | Driver | Magento | getCategoryNodeFragment', () => {
         query TestQuery {
           categoryList {
             ...recursiveCategoryNode
+            uid
           }
         }
         ${fragment}
@@ -134,6 +135,7 @@ describe('Navigation | Driver | Magento | getCategoryNodeFragment', () => {
         query TestQuery {
           categoryList {
             ...recursiveCategoryNode
+            uid
           }
         }
         ${fragment}
@@ -176,6 +178,7 @@ describe('Navigation | Driver | Magento | getCategoryNodeFragment', () => {
         query TestQuery {
           categoryList {
             ...recursiveCategoryNode
+            uid
           }
         }
         ${fragment}
diff --git a/libs/navigation/driver/magento/src/queries/get-category-tree.ts b/libs/navigation/driver/magento/src/queries/get-category-tree.ts
index 588b96a853..83d85072b7 100644
--- a/libs/navigation/driver/magento/src/queries/get-category-tree.ts
+++ b/libs/navigation/driver/magento/src/queries/get-category-tree.ts
@@ -15,6 +15,7 @@ export function daffMagentoGetCategoryTree(depth: number = 3, extraFragments: Ar
     query ${DAFF_MAGENTO_GET_CATEGORY_TREE_QUERY_NAME}($filters: CategoryFilterInput!){
       categoryList(filters: $filters) {
         ...recursiveCategoryNode
+        uid
       }
     }
     ${getCategoryNodeFragment(depth, extraFragments)}
diff --git a/libs/product-composite/driver/magento/src/fragments/bundled-product.ts b/libs/product-composite/driver/magento/src/fragments/bundled-product.ts
index 431f6984ec..cebcdd0dce 100644
--- a/libs/product-composite/driver/magento/src/fragments/bundled-product.ts
+++ b/libs/product-composite/driver/magento/src/fragments/bundled-product.ts
@@ -38,6 +38,7 @@ fragment magentoBundledProduct on BundleProduct {
 						}
 					}
 				}
+    uid
 			}
 		}
 	}
diff --git a/libs/product-configurable/driver/magento/src/fragments/configurable-product.ts b/libs/product-configurable/driver/magento/src/fragments/configurable-product.ts
index 772ae62c5a..d5b20729f4 100644
--- a/libs/product-configurable/driver/magento/src/fragments/configurable-product.ts
+++ b/libs/product-configurable/driver/magento/src/fragments/configurable-product.ts
@@ -16,6 +16,7 @@ export const magentoConfigurableProductFragment = (extraVariantFragments: Array<
 				label
 				value_index
 			}
+   uid
 		}
 		variants {
 			${daffBuildFragmentNameSpread(...extraVariantFragments)}
@@ -42,8 +43,10 @@ export const magentoConfigurableProductFragment = (extraVariantFragments: Array<
 					url
 					label
 				}
+    uid
 			}
 		}
+  uid
   }
 ${daffBuildFragmentDefinition(...extraVariantFragments)}
 `;
diff --git a/libs/product/driver/magento/src/queries/fragments/product-page.ts b/libs/product/driver/magento/src/queries/fragments/product-page.ts
index 344c92f5d4..9ebefe3f62 100644
--- a/libs/product/driver/magento/src/queries/fragments/product-page.ts
+++ b/libs/product/driver/magento/src/queries/fragments/product-page.ts
@@ -16,6 +16,7 @@ export const magentoProductPageFragment = gql`
 		description {
 			html
 		}
+    uid
 	}
   ${magentoProductFragment}
 `;
diff --git a/libs/product/driver/magento/src/queries/fragments/product.ts b/libs/product/driver/magento/src/queries/fragments/product.ts
index 00b8740e53..21eab62ba9 100644
--- a/libs/product/driver/magento/src/queries/fragments/product.ts
+++ b/libs/product/driver/magento/src/queries/fragments/product.ts
@@ -14,6 +14,7 @@ export const magentoProductFragment = gql`
 		short_description {
 			html
 		}
+    uid
 	}
   ${magentoProductPreviewFragment}
 `;
diff --git a/libs/product/driver/magento/src/queries/get-all-products.ts b/libs/product/driver/magento/src/queries/get-all-products.ts
index 9954568bca..c2d0f2dbd3 100644
--- a/libs/product/driver/magento/src/queries/get-all-products.ts
+++ b/libs/product/driver/magento/src/queries/get-all-products.ts
@@ -16,6 +16,7 @@ export const getAllProducts = (extraProductFragments: DocumentNode[] = []) => gq
       total_count
       items {
         ...magentoProductPage
+        uid
         ${daffBuildFragmentNameSpread(...extraProductFragments)}
       }
       page_info {
diff --git a/libs/product/driver/magento/src/queries/get-product-by-url/query.ts b/libs/product/driver/magento/src/queries/get-product-by-url/query.ts
index 829e0ca84f..d872340054 100644
--- a/libs/product/driver/magento/src/queries/get-product-by-url/query.ts
+++ b/libs/product/driver/magento/src/queries/get-product-by-url/query.ts
@@ -17,6 +17,7 @@ export const getProductByUrl = (extraProductFragments: DocumentNode[] = []) => g
 		route(url: $url) {
       ... on ProductInterface {
         ...magentoProductPage
+        uid
         ${daffBuildFragmentNameSpread(...extraProductFragments)}
       }
     }
diff --git a/libs/product/driver/magento/src/queries/get-product.ts b/libs/product/driver/magento/src/queries/get-product.ts
index 4633d2c1e1..a7a8971173 100644
--- a/libs/product/driver/magento/src/queries/get-product.ts
+++ b/libs/product/driver/magento/src/queries/get-product.ts
@@ -19,6 +19,7 @@ export const getProduct = (extraProductFragments: DocumentNode[] = []) => gql`
     }){
       items {
         ...magentoProductPage
+        uid
         ${daffBuildFragmentNameSpread(...extraProductFragments)}
       }
     }
diff --git a/libs/product/integration-tests/driver/magento/custom-fields.spec.ts b/libs/product/integration-tests/driver/magento/custom-fields.spec.ts
index 1fb76bfb54..f2b8a00f1b 100644
--- a/libs/product/integration-tests/driver/magento/custom-fields.spec.ts
+++ b/libs/product/integration-tests/driver/magento/custom-fields.spec.ts
@@ -37,6 +37,7 @@ interface MyMagentoProduct extends MagentoProduct {
 const myProductFragment = gql`
   fragment MyProductFragment on ProductInterface {
     updated_at
+    uid
   }
 `;
 
diff --git a/libs/related-products/driver/magento/src/queries/fragments/related-products.ts b/libs/related-products/driver/magento/src/queries/fragments/related-products.ts
index a44e53c9ac..9d4f8c1638 100644
--- a/libs/related-products/driver/magento/src/queries/fragments/related-products.ts
+++ b/libs/related-products/driver/magento/src/queries/fragments/related-products.ts
@@ -11,8 +11,10 @@ export const magentoRelatedProductsFragment = (extraProductFragments: DocumentNo
   fragment relatedProducts on ProductInterface {
     related_products {
       ...magentoProductPreview
+      uid
       ${daffBuildFragmentNameSpread(...extraProductFragments)}
     }
+    uid
 	}
 	${magentoProductPreviewFragment}
   ${daffBuildFragmentDefinition(...extraProductFragments)}
diff --git a/libs/reviews/driver/magento/src/queries/get-product-reviews.ts b/libs/reviews/driver/magento/src/queries/get-product-reviews.ts
index b520e65bae..7dd09a733d 100644
--- a/libs/reviews/driver/magento/src/queries/get-product-reviews.ts
+++ b/libs/reviews/driver/magento/src/queries/get-product-reviews.ts
@@ -23,6 +23,7 @@ export const getProductReviews = gql`
             ...magentoSearchResultPageInfo
           }
         }
+        uid
       }
     }
   }
diff --git a/libs/search-category/driver/magento/src/queries/category-search.ts b/libs/search-category/driver/magento/src/queries/category-search.ts
index 502d13689d..d33dd23623 100644
--- a/libs/search-category/driver/magento/src/queries/category-search.ts
+++ b/libs/search-category/driver/magento/src/queries/category-search.ts
@@ -13,6 +13,7 @@ export const categorySearch = () => gql`
     }, pageSize: $pageSize) {
       items {
         ...categoryTree
+        uid
       }
     }
   }
diff --git a/libs/search-category/driver/magento/src/queries/fragments/category-result.ts b/libs/search-category/driver/magento/src/queries/fragments/category-result.ts
index d98e29b3ca..724802f21d 100644
--- a/libs/search-category/driver/magento/src/queries/fragments/category-result.ts
+++ b/libs/search-category/driver/magento/src/queries/fragments/category-result.ts
@@ -10,6 +10,7 @@ export const magentoSearchCategoryResultFragment = gql`
 		products {
 			items {
 				sku
+    uid
 			}
 		}
   }
diff --git a/libs/search-product/driver/magento/src/queries/product-incremental.ts b/libs/search-product/driver/magento/src/queries/product-incremental.ts
index a1127a462b..0bd2555a39 100644
--- a/libs/search-product/driver/magento/src/queries/product-incremental.ts
+++ b/libs/search-product/driver/magento/src/queries/product-incremental.ts
@@ -17,6 +17,7 @@ export const daffSearchProductIncrementalQuery = (extraProductFragments: Documen
     products(search: $search, pageSize: $pageSize) {
       items {
         ...product
+        uid
         ${daffBuildFragmentNameSpread(...extraProductFragments)}
       }
 		  total_count
diff --git a/libs/search-product/driver/magento/src/queries/product-search.ts b/libs/search-product/driver/magento/src/queries/product-search.ts
index 89d6dffe94..425c23b4bd 100644
--- a/libs/search-product/driver/magento/src/queries/product-search.ts
+++ b/libs/search-product/driver/magento/src/queries/product-search.ts
@@ -25,6 +25,7 @@ export const productSearch = (extraProductFragments: DocumentNode[] = []) => gql
     products(filter: $filter, search: $search, pageSize: $pageSize, currentPage: $currentPage, sort: $sort) {
       items {
         ...product
+        uid
         ${daffBuildFragmentNameSpread(...extraProductFragments)}
       }
       page_info {
diff --git a/libs/upsell-products/driver/magento/src/queries/fragments/upsell-products.ts b/libs/upsell-products/driver/magento/src/queries/fragments/upsell-products.ts
index 76147c44a5..8d1bb645e5 100644
--- a/libs/upsell-products/driver/magento/src/queries/fragments/upsell-products.ts
+++ b/libs/upsell-products/driver/magento/src/queries/fragments/upsell-products.ts
@@ -11,8 +11,10 @@ export const magentoUpsellProductsFragment = (extraProductFragments: DocumentNod
   fragment upsellProducts on ProductInterface {
     upsell_products {
       ...magentoProductPreview
+      uid
       ${daffBuildFragmentNameSpread(...extraProductFragments)}
     }
+    uid
 	}
 	${magentoProductPreviewFragment}
   ${daffBuildFragmentDefinition(...extraProductFragments)}