diff --git a/alert_system/etl/usgs_earthquake/transform.py b/alert_system/etl/usgs_earthquake/transform.py
index abb9bc6c4..a35d4f3d4 100644
--- a/alert_system/etl/usgs_earthquake/transform.py
+++ b/alert_system/etl/usgs_earthquake/transform.py
@@ -16,7 +16,10 @@ class USGSTransformer(BaseTransformerClass):
     # NOTE: This logic might change in future
     def compute_people_exposed(self, metadata_list) -> Optional[int]:
         for data in metadata_list:
-            if data["category"] == ImpactDetailsEnum.Category.PEOPLE and data["type"] == ImpactDetailsEnum.Type.AFFECTED_TOTAL:
+            if data["category"] == ImpactDetailsEnum.Category.PEOPLE and data["type"] in [
+                ImpactDetailsEnum.Type.DEATH,
+                ImpactDetailsEnum.Type.POTENTIALLY_AFFECTED,
+            ]:
                 return data["value"]
         return None
 
@@ -26,7 +29,7 @@ def compute_buildings_exposed(self, metadata_list) -> Optional[int]:
         Compute the 'buildings_exposed' field.
         """
         for data in metadata_list:
-            if data["category"] == "buildings" and data["type"] == "damaged":
+            if data["category"] == ImpactDetailsEnum.Category.BUILDINGS and data["type"] == ImpactDetailsEnum.Type.LOSS_COST:
                 return data["value"]
         return None
 
diff --git a/alert_system/models.py b/alert_system/models.py
index a74a8dd74..50c11c7bd 100644
--- a/alert_system/models.py
+++ b/alert_system/models.py
@@ -16,6 +16,9 @@ class Type(models.TextChoices):
         HIGHEST_RISK = "highest_risk", _("Highest Risk")
         AFFECTED_TOTAL = "affected_total", _("Affected Total")
         AFFECTED_DIRECT = "affected_direct", _("Affected Direct")
+        DEATH = "death", _("Death")
+        LOSS_COST = "cost", _("Cost")
+        DAMAGED = "damaged", _("Damaged")
 
     class Category(models.TextChoices):
         PEOPLE = "people", _("People")