diff --git a/src/pynxtools_apm/utils/oasis_apsuite_reader.py b/src/pynxtools_apm/utils/oasis_apsuite_reader.py
index 667e4e0..6dccb9d 100644
--- a/src/pynxtools_apm/utils/oasis_apsuite_reader.py
+++ b/src/pynxtools_apm/utils/oasis_apsuite_reader.py
@@ -59,20 +59,19 @@ def __init__(self, file_path: str = "", entry_id: int = 1, verbose: bool = False
 
     def parse_event_statistics(self, template: dict) -> dict:
         """Interpret event statistics resulting from hit-finding algorithm."""
-        event_type_names = ["Golden", "Incomplete", "Multiple", "Partials", "Records"]
-        vals = []
-        for evn_name in event_type_names:
-            vals.append(f"fTotalEvent{evn_name}")
-
-        if all(val in self.yml for val in vals):
-            trg = f"/ENTRY[entry{self.entry_id}]/atom_probe/hit_finding/"
-            template[f"{trg}hit_quality_types"] = str(
-                [evn_name.lower() for evn_name in event_type_names]
-            )
-            cnts = np.zeros((5,), np.uint64)
-            for idx, evn_name in enumerate(event_type_names):
-                cnts[idx] = self.yml[f"fTotalEvent{evn_name}"]
-            template[f"{trg}total_hit_quality"] = cnts
+        event_type_names = [
+            ("Golden", "golden"),
+            ("Incomplete", "incomplete"),
+            ("Multiple", "multiple"),
+            ("Partials", "partial"),
+            ("Records", "record"),
+        ]
+        trg = f"/ENTRY[entry{self.entry_id}]/atom_probe/hit_finding/"
+        for cameca_name, nexus_name in event_type_names:
+            if f"fTotalEvent{cameca_name}" in self.yml:
+                template[f"{trg}total_event_{nexus_name}"] = self.yml[
+                    f"fTotalEvent{cameca_name}"
+                ]
         return template
 
     def parse_versions(self, template: dict) -> dict:
@@ -186,7 +185,6 @@ def parse_ranging_definitions(self, template: dict) -> dict:
                     template[f"{trg}nuclide_list"] = ion.nuclide_list.values
                     template[f"{trg}name"] = ion.name.values
 
-                    """
                     if ion.charge_state_model["n_cand"] > 0:
                         path = f"{trg}charge_state_analysis/"
                         template[f"{path}nuclides"] = np.asarray(
@@ -264,7 +262,6 @@ def parse_ranging_definitions(self, template: dict) -> dict:
                                 "strength": 1,
                             }
                             template[f"{path}shortest_half_life/@units"] = "s"
-                    """
 
                 trg = f"/ENTRY[entry{self.entry_id}]/atom_probe/ranging/peak_identification/"
                 template[f"{trg}number_of_ion_types"] = np.uint32(ion_id)