diff --git a/fusion_claims/data/service_rate_data.xml b/fusion_claims/data/service_rate_data.xml
index a380169b..b5c65989 100644
--- a/fusion_claims/data/service_rate_data.xml
+++ b/fusion_claims/data/service_rate_data.xml
@@ -8,7 +8,7 @@
             <field name="rate_kind">callout</field><field name="category">standard</field>
             <field name="timing">normal</field><field name="unit">fixed</field>
             <field name="included_labour_min">30</field><field name="price">95.0</field>
-            <field name="product_id" ref="product_callout_standard_normal_product_variant"/>
+            <field name="product_id" ref="product_callout_standard_normal"/>
             <field name="sequence">10</field>
         </record>
         <record id="rate_callout_standard_rush" model="fusion.service.rate">
@@ -17,7 +17,7 @@
             <field name="rate_kind">callout</field><field name="category">standard</field>
             <field name="timing">rush</field><field name="unit">fixed</field>
             <field name="adds_per_km" eval="True"/><field name="price">120.0</field>
-            <field name="product_id" ref="product_callout_standard_rush_product_variant"/>
+            <field name="product_id" ref="product_callout_standard_rush"/>
             <field name="sequence">11</field>
         </record>
         <record id="rate_callout_standard_afterhours" model="fusion.service.rate">
@@ -26,7 +26,7 @@
             <field name="rate_kind">callout</field><field name="category">standard</field>
             <field name="timing">afterhours</field><field name="unit">fixed</field>
             <field name="adds_per_km" eval="True"/><field name="price">140.0</field>
-            <field name="product_id" ref="product_callout_standard_afterhours_product_variant"/>
+            <field name="product_id" ref="product_callout_standard_afterhours"/>
             <field name="sequence">12</field>
         </record>
         <record id="rate_callout_lift_normal" model="fusion.service.rate">
@@ -35,7 +35,7 @@
             <field name="rate_kind">callout</field><field name="category">lift</field>
             <field name="timing">normal</field><field name="unit">fixed</field>
             <field name="included_labour_min">30</field><field name="price">160.0</field>
-            <field name="product_id" ref="product_callout_lift_normal_product_variant"/>
+            <field name="product_id" ref="product_callout_lift_normal"/>
             <field name="sequence">20</field>
         </record>
         <record id="rate_callout_lift_rush" model="fusion.service.rate">
@@ -44,7 +44,7 @@
             <field name="rate_kind">callout</field><field name="category">lift</field>
             <field name="timing">rush</field><field name="unit">fixed</field>
             <field name="adds_per_km" eval="True"/><field name="price">185.0</field>
-            <field name="product_id" ref="product_callout_lift_rush_product_variant"/>
+            <field name="product_id" ref="product_callout_lift_rush"/>
             <field name="sequence">21</field>
         </record>
         <record id="rate_callout_lift_afterhours" model="fusion.service.rate">
@@ -53,7 +53,7 @@
             <field name="rate_kind">callout</field><field name="category">lift</field>
             <field name="timing">afterhours</field><field name="unit">fixed</field>
             <field name="adds_per_km" eval="True"/><field name="price">205.0</field>
-            <field name="product_id" ref="product_callout_lift_afterhours_product_variant"/>
+            <field name="product_id" ref="product_callout_lift_afterhours"/>
             <field name="sequence">22</field>
         </record>
 
@@ -62,19 +62,19 @@
             <field name="name">Labour — On-Site</field><field name="code">labour_onsite</field>
             <field name="rate_kind">labour</field><field name="category">standard</field>
             <field name="timing">na</field><field name="unit">per_hour</field><field name="price">85.0</field>
-            <field name="product_id" ref="product_labour_onsite_product_variant"/><field name="sequence">30</field>
+            <field name="product_id" ref="product_labour_onsite"/><field name="sequence">30</field>
         </record>
         <record id="rate_labour_lift" model="fusion.service.rate">
             <field name="name">Labour — Lift &amp; Elevating</field><field name="code">labour_lift</field>
             <field name="rate_kind">labour</field><field name="category">lift</field>
             <field name="timing">na</field><field name="unit">per_hour</field><field name="price">110.0</field>
-            <field name="product_id" ref="product_labour_lift_product_variant"/><field name="sequence">31</field>
+            <field name="product_id" ref="product_labour_lift"/><field name="sequence">31</field>
         </record>
         <record id="rate_labour_inshop" model="fusion.service.rate">
             <field name="name">Labour — In-Shop</field><field name="code">labour_inshop</field>
             <field name="rate_kind">labour</field><field name="category">na</field><field name="in_shop" eval="True"/>
             <field name="timing">na</field><field name="unit">per_hour</field><field name="price">75.0</field>
-            <field name="product_id" ref="product_labor_hourly_product_variant"/><field name="sequence">32</field>
+            <field name="product_id" ref="product_labour_inshop"/><field name="sequence">32</field>
         </record>
 
         <!-- TRAVEL -->
@@ -82,7 +82,7 @@
             <field name="name">Travel — per km (2-way)</field><field name="code">per_km</field>
             <field name="rate_kind">travel</field><field name="category">na</field>
             <field name="timing">na</field><field name="unit">per_km</field><field name="price">0.70</field>
-            <field name="product_id" ref="product_per_km_product_variant"/><field name="sequence">40</field>
+            <field name="product_id" ref="product_per_km"/><field name="sequence">40</field>
         </record>
 
         <!-- DELIVERY / PICKUP -->
@@ -90,19 +90,19 @@
             <field name="name">Delivery / Pickup — Local</field><field name="code">delivery_local</field>
             <field name="rate_kind">delivery</field><field name="category">na</field><field name="timing">na</field>
             <field name="unit">fixed</field><field name="price">35.0</field>
-            <field name="product_id" ref="product_delivery_local_product_variant"/><field name="sequence">50</field>
+            <field name="product_id" ref="product_delivery_local"/><field name="sequence">50</field>
         </record>
         <record id="rate_delivery_outside" model="fusion.service.rate">
             <field name="name">Delivery / Pickup — Outside Local Area</field><field name="code">delivery_outside</field>
             <field name="rate_kind">delivery</field><field name="category">na</field><field name="timing">na</field>
             <field name="unit">fixed</field><field name="price">60.0</field>
-            <field name="product_id" ref="product_delivery_outside_product_variant"/><field name="sequence">51</field>
+            <field name="product_id" ref="product_delivery_outside"/><field name="sequence">51</field>
         </record>
         <record id="rate_setup_stairlift" model="fusion.service.rate">
             <field name="name">Stairlift — Delivery &amp; Set-up</field><field name="code">setup_stairlift</field>
             <field name="rate_kind">delivery</field><field name="category">lift</field><field name="timing">na</field>
             <field name="unit">fixed</field><field name="price">300.0</field>
-            <field name="product_id" ref="product_setup_stairlift_product_variant"/><field name="sequence">52</field>
+            <field name="product_id" ref="product_setup_stairlift"/><field name="sequence">52</field>
         </record>
     </data>
 </odoo>
diff --git a/fusion_claims/data/service_rate_products.xml b/fusion_claims/data/service_rate_products.xml
index 6c2c7862..9782f266 100644
--- a/fusion_claims/data/service_rate_products.xml
+++ b/fusion_claims/data/service_rate_products.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data noupdate="1">
         <!-- Call-outs (unit) -->
-        <record id="product_callout_standard_normal" model="product.template">
+        <record id="product_callout_standard_normal" model="product.product">
             <field name="name">Service Call — Standard</field>
             <field name="default_code">SVC-STD</field>
             <field name="type">service</field>
@@ -10,7 +10,7 @@
             <field name="sale_ok" eval="True"/>
             <field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_callout_standard_rush" model="product.template">
+        <record id="product_callout_standard_rush" model="product.product">
             <field name="name">Service Call — Standard Rush</field>
             <field name="default_code">SVC-STD-RUSH</field>
             <field name="type">service</field>
@@ -18,7 +18,7 @@
             <field name="sale_ok" eval="True"/>
             <field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_callout_standard_afterhours" model="product.template">
+        <record id="product_callout_standard_afterhours" model="product.product">
             <field name="name">Service Call — Standard After-Hours</field>
             <field name="default_code">SVC-STD-AH</field>
             <field name="type">service</field>
@@ -26,7 +26,7 @@
             <field name="sale_ok" eval="True"/>
             <field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_callout_lift_normal" model="product.template">
+        <record id="product_callout_lift_normal" model="product.product">
             <field name="name">Service Call — Lift &amp; Elevating</field>
             <field name="default_code">SVC-LIFT</field>
             <field name="type">service</field>
@@ -34,7 +34,7 @@
             <field name="sale_ok" eval="True"/>
             <field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_callout_lift_rush" model="product.template">
+        <record id="product_callout_lift_rush" model="product.product">
             <field name="name">Service Call — Lift &amp; Elevating Rush</field>
             <field name="default_code">SVC-LIFT-RUSH</field>
             <field name="type">service</field>
@@ -42,7 +42,7 @@
             <field name="sale_ok" eval="True"/>
             <field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_callout_lift_afterhours" model="product.template">
+        <record id="product_callout_lift_afterhours" model="product.product">
             <field name="name">Service Call — Lift &amp; Elevating After-Hours</field>
             <field name="default_code">SVC-LIFT-AH</field>
             <field name="type">service</field>
@@ -52,7 +52,7 @@
         </record>
 
         <!-- Labour (hour) -->
-        <record id="product_labour_onsite" model="product.template">
+        <record id="product_labour_onsite" model="product.product">
             <field name="name">Labour — On-Site</field>
             <field name="default_code">LAB-ONSITE</field>
             <field name="type">service</field>
@@ -61,7 +61,7 @@
             <field name="sale_ok" eval="True"/>
             <field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_labour_lift" model="product.template">
+        <record id="product_labour_lift" model="product.product">
             <field name="name">Labour — Lift &amp; Elevating</field>
             <field name="default_code">LAB-LIFT</field>
             <field name="type">service</field>
@@ -71,8 +71,18 @@
             <field name="purchase_ok" eval="False"/>
         </record>
 
+        <record id="product_labour_inshop" model="product.product">
+            <field name="name">Labour — In-Shop</field>
+            <field name="default_code">LAB-INSHOP</field>
+            <field name="type">service</field>
+            <field name="list_price">75.00</field>
+            <field name="uom_id" ref="uom.product_uom_hour"/>
+            <field name="sale_ok" eval="True"/>
+            <field name="purchase_ok" eval="False"/>
+        </record>
+
         <!-- Travel (unit; qty = km x 2) -->
-        <record id="product_per_km" model="product.template">
+        <record id="product_per_km" model="product.product">
             <field name="name">Travel — per km (2-way)</field>
             <field name="default_code">SVC-KM</field>
             <field name="type">service</field>
@@ -82,43 +92,43 @@
         </record>
 
         <!-- Delivery / pickup (unit) -->
-        <record id="product_delivery_local" model="product.template">
+        <record id="product_delivery_local" model="product.product">
             <field name="name">Delivery / Pickup — Local</field>
             <field name="default_code">DEL-LOCAL</field>
             <field name="type">service</field><field name="list_price">35.00</field>
             <field name="sale_ok" eval="True"/><field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_delivery_outside" model="product.template">
+        <record id="product_delivery_outside" model="product.product">
             <field name="name">Delivery / Pickup — Outside Local Area</field>
             <field name="default_code">DEL-OUT</field>
             <field name="type">service</field><field name="list_price">60.00</field>
             <field name="sale_ok" eval="True"/><field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_delivery_rush" model="product.template">
+        <record id="product_delivery_rush" model="product.product">
             <field name="name">Rush Pickup / Delivery</field>
             <field name="default_code">DEL-RUSH</field>
             <field name="type">service</field><field name="list_price">60.00</field>
             <field name="sale_ok" eval="True"/><field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_setup_liftchair" model="product.template">
+        <record id="product_setup_liftchair" model="product.product">
             <field name="name">Lift Chair — Delivery &amp; Set-up</field>
             <field name="default_code">SETUP-LIFTCHAIR</field>
             <field name="type">service</field><field name="list_price">120.00</field>
             <field name="sale_ok" eval="True"/><field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_setup_hospitalbed" model="product.template">
+        <record id="product_setup_hospitalbed" model="product.product">
             <field name="name">Hospital Bed — Delivery &amp; Set-up</field>
             <field name="default_code">SETUP-BED</field>
             <field name="type">service</field><field name="list_price">120.00</field>
             <field name="sale_ok" eval="True"/><field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_setup_stairlift" model="product.template">
+        <record id="product_setup_stairlift" model="product.product">
             <field name="name">Stairlift — Delivery &amp; Set-up</field>
             <field name="default_code">SETUP-STAIRLIFT</field>
             <field name="type">service</field><field name="list_price">300.00</field>
             <field name="sale_ok" eval="True"/><field name="purchase_ok" eval="False"/>
         </record>
-        <record id="product_removal_stairlift" model="product.template">
+        <record id="product_removal_stairlift" model="product.product">
             <field name="name">Stairlift — Removal</field>
             <field name="default_code">RMV-STAIRLIFT</field>
             <field name="type">service</field><field name="list_price">300.00</field>