diff --git a/orders_cases_events/models/core/fact_order_event.sql b/orders_cases_events/models/core/fact_order_event.sql
index 0d7e578..cc1d5a3 100644
--- a/orders_cases_events/models/core/fact_order_event.sql
+++ b/orders_cases_events/models/core/fact_order_event.sql
@@ -1 +1,6 @@
-SELECT * FROM {{ ref("stg_order_event") }}
\ No newline at end of file
+SELECT 
+      soe.*
+    , fo.customer_id
+FROM        {{ ref("stg_order_event") }} soe
+LEFT JOIN   {{ ref("fact_order") }}      fo
+    ON soe.order_id = fo.order_id
diff --git a/orders_cases_events/models/core/fact_support_case.sql b/orders_cases_events/models/core/fact_support_case.sql
index f731215..b903c1d 100644
--- a/orders_cases_events/models/core/fact_support_case.sql
+++ b/orders_cases_events/models/core/fact_support_case.sql
@@ -1 +1,6 @@
-SELECT * FROM {{ ref("stg_support_case") }}
\ No newline at end of file
+SELECT
+    ssc.*
+  , fo.customer_id
+FROM      {{ ref("stg_support_case") }} ssc
+LEFT JOIN {{ ref("fact_order") }}       fo
+    ON ssc.order_id = fo.order_id
\ No newline at end of file
diff --git a/orders_cases_events/models/core/fact_support_case_event.sql b/orders_cases_events/models/core/fact_support_case_event.sql
index 05db383..02c4958 100644
--- a/orders_cases_events/models/core/fact_support_case_event.sql
+++ b/orders_cases_events/models/core/fact_support_case_event.sql
@@ -1 +1,10 @@
-SELECT * FROM {{ ref("stg_support_case_event") }}
\ No newline at end of file
+SELECT
+    ssce.*
+  , fsc.order_id
+  , fo.customer_id
+FROM      {{ ref("stg_support_case_event") }} ssce
+LEFT JOIN {{ ref("fact_support_case") }}       fsc
+    ON ssce.support_case_id = fsc.support_case_id
+LEFT JOIN {{ ref("fact_order") }}              fo
+    ON fsc.order_id = fo.order_id
+    
\ No newline at end of file
diff --git a/orders_cases_events/models/semantic_models/fact_order_event.yml b/orders_cases_events/models/semantic_models/fact_order_event.yml
index 5e0df5a..7c12e39 100644
--- a/orders_cases_events/models/semantic_models/fact_order_event.yml
+++ b/orders_cases_events/models/semantic_models/fact_order_event.yml
@@ -14,6 +14,9 @@ semantic_models:
       - name: order
         expr: order_id
         type: foreign
+      - name: customer
+        expr: customer_id
+        type: foreign
     measures:
       - name: count_order_events
         expr: 1
diff --git a/orders_cases_events/models/semantic_models/fact_support_case.yml b/orders_cases_events/models/semantic_models/fact_support_case.yml
index f80e3cb..9f07874 100644
--- a/orders_cases_events/models/semantic_models/fact_support_case.yml
+++ b/orders_cases_events/models/semantic_models/fact_support_case.yml
@@ -11,6 +11,9 @@ semantic_models:
       - name: support_case
         expr: support_case_id
         type: primary
+      - name: customer
+        expr: customer_id
+        type: foreign
     measures:
       - name: count_support_cases
         expr: 1
diff --git a/orders_cases_events/models/semantic_models/fact_support_case_event.yml b/orders_cases_events/models/semantic_models/fact_support_case_event.yml
index d89b282..628baeb 100644
--- a/orders_cases_events/models/semantic_models/fact_support_case_event.yml
+++ b/orders_cases_events/models/semantic_models/fact_support_case_event.yml
@@ -14,6 +14,9 @@ semantic_models:
       - name: support_case
         expr: support_case_id
         type: foreign
+      - name: customer
+        expr: customer_id
+        type: foreign
     measures:
       - name: count_support_case_events
         expr: 1