diff --git a/definitions/staging/stg_agent_status_history_report.sqlx b/definitions/staging/stg_agent_status_history_report.sqlx
index ca61a06..7c7a27b 100644
--- a/definitions/staging/stg_agent_status_history_report.sqlx
+++ b/definitions/staging/stg_agent_status_history_report.sqlx
@@ -42,7 +42,9 @@ select  ags.AGENT_ID,
         ags.SKILL_AVAILABILITY,	
         ags.AVAILABLE_FOR_VM,
         ags.STATE,
-        COALESCE(mas.STATE_GROUP, 'NOT_MAPPED') as STATE_GROUP,
+        mas.STATE_ID,
+        masg.STATE_GROUP_ID,
+        COALESCE(masg.STATE_GROUP, 'NOT_MAPPED') as STATE_GROUP,
         ags.UNPAID_TIME,
         regexp_replace(
             cast(time(timestamp_seconds(cast(ags.UNPAID_TIME as int))) as string), 
@@ -58,7 +60,11 @@ select  ags.AGENT_ID,
 from ${ref("stg_agent_status")} ags
 left join ${ref("stg_AGENT")} a
 on ags.AGENT_ID = a.AGENT_ID
-left join ${ref("MAPPING_AGENT_STATE")} mas
+left join ${ref("stg_MAPPING_AGENT_STATE_ID")} mas
 on ags.STATE = mas.STATE
+left join ${ref("stg_MAPPING_AGENT_STATE_GROUP_ID")} masgi
+on mas.STATE_ID = masgi.STATE_ID
+left join ${ref("stg_MAPPING_AGENT_GROUP")} masg
+on masgi.STATE_GROUP_ID = masg.STATE_GROUP_ID
 ${ when(incremental(), `where date(ags.TIMESTAMP) >= DATE_SUB(CURRENT_DATE(), INTERVAL 7 DAY)
                         and date(ags.TIMESTAMP) < CURRENT_DATE()`) }
\ No newline at end of file
diff --git a/definitions/staging/stg_agent_status_report.sqlx b/definitions/staging/stg_agent_status_report.sqlx
index 9164e62..58319b7 100644
--- a/definitions/staging/stg_agent_status_report.sqlx
+++ b/definitions/staging/stg_agent_status_report.sqlx
@@ -43,7 +43,9 @@ select  ags.AGENT_ID,
         ags.SKILL_AVAILABILITY,	
         ags.AVAILABLE_FOR_VM,
         ags.STATE,
-        COALESCE(mas.STATE_GROUP, 'NOT_MAPPED') as STATE_GROUP,
+        mas.STATE_ID,
+        masg.STATE_GROUP_ID,
+        COALESCE(masg.STATE_GROUP, 'NOT_MAPPED') as STATE_GROUP,
         ags.UNPAID_TIME,
         regexp_replace(
             cast(time(timestamp_seconds(cast(ags.UNPAID_TIME as int))) as string), 
@@ -59,7 +61,11 @@ select  ags.AGENT_ID,
 from ${ref("stg_agent_status")} ags
 left join ${ref("stg_AGENT")} a
 on ags.AGENT_ID = a.AGENT_ID
-left join ${ref("MAPPING_AGENT_STATE")} mas
+left join ${ref("stg_MAPPING_AGENT_STATE_ID")} mas
 on ags.STATE = mas.STATE
+left join ${ref("stg_MAPPING_AGENT_STATE_GROUP_ID")} masgi
+on mas.STATE_ID = masgi.STATE_ID
+left join ${ref("stg_MAPPING_AGENT_GROUP")} masg
+on masgi.STATE_GROUP_ID = masg.STATE_GROUP_ID
 where date(ags.TIMESTAMP) >= DATE_SUB(CURRENT_DATE(), INTERVAL 7 DAY)
 and date(ags.TIMESTAMP) < CURRENT_DATE()
\ No newline at end of file