diff --git a/PYAS_Engine.py b/PYAS_Engine.py
index 3d1abad..75c0a53 100644
--- a/PYAS_Engine.py
+++ b/PYAS_Engine.py
@@ -161,9 +161,14 @@ class rule_scanner:
             matches = self.rules.match(filepath=file_path)
             if matches:
                 rule_name = str(matches[0])
-                label = rule_name.split("_")[0]
-                level = rule_name.split("_")[-1]
-                return f"{label}:WinPE/Unknown.{level}!yr", level
+                try:
+                    label = rule_name.split("_")[0]
+                    platform = rule_name.split("_")[1]
+                    family = rule_name.split("_")[2]
+                    
+                    return f"{label}:{platform}/{family}.{len(matches)}!yr", 100
+                except Exception:
+                    return rule_name, 100
 
             return False, False
         except Exception:
@@ -177,9 +182,14 @@ class rule_scanner:
             matches = self.rules.match(pid=pid)
             if matches:
                 rule_name = str(matches[0])
-                label = rule_name.split("_")[0]
-                level = rule_name.split("_")[-1]
-                return f"{label}:WinPE/Unknown.{level}!ym", level
+                try:
+                    label = rule_name.split("_")[0]
+                    platform = rule_name.split("_")[1]
+                    family = rule_name.split("_")[2]
+                    
+                    return f"{label}:{platform}/{family}.{len(matches)}!ym", 100
+                except Exception:
+                    return rule_name, 100
 
             return False, False
         except Exception:
@@ -1166,9 +1176,9 @@ class pe_scanner:
 
             score = int(prob * 100)
             if score >= 80:
-                return f"General:WinPE/Malware.{score}!ml", score
+                return f"Malware:WinPE/General.{score}!ml", score
             elif enhanced_mode and score >= 50:
-                return f"General:WinPE/Suspicious.{score}!ml", score
+                return f"Suspicious:WinPE/General.{score}!ml", score
 
             return False, False
         except Exception:
@@ -1305,7 +1315,7 @@ class cloud_scanner:
                             sim_malicious_count += 1
 
                 if is_malicious and (valid_sim_count == 0 or sim_malicious_count == valid_sim_count):
-                    return f"General:WinPE/Malware.{score}!cl"
+                    return f"Malware:WinPE/General.{score}!cl"
 
         except Exception:
             pass
diff --git a/PYAS_Inno.iss b/PYAS_Inno.iss
index caf9dba..d1b87b0 100644
--- a/PYAS_Inno.iss
+++ b/PYAS_Inno.iss
@@ -1,6 +1,6 @@
 #define AppId "{{a7d7bac3-93b8-4630-8308-c7a56bf7fdf4}"
 #define AppName "PYAS"
-#define AppVersion "3.6.9.0"
+#define AppVersion "3.7.0.0"
 #define AppPublisher "PYAS Security"
 #define AppURL "https://github.com/87owo/PYAS"
 #define AppExeName "PYAS.exe"
diff --git a/PYAS_Version.py b/PYAS_Version.py
index 418ad27..43e2fe2 100644
--- a/PYAS_Version.py
+++ b/PYAS_Version.py
@@ -2,7 +2,7 @@ import pyinstaller_versionfile
 
 pyinstaller_versionfile.create_versionfile(
     output_file="versionfile.txt",
-    version='3.6.9.0',
+    version='3.7.0.0',
     company_name="PYAS Security",
     file_description="PYAS Security Antivirus",
     internal_name="PYAS",