diff --git a/Scripts/smbios.py b/Scripts/smbios.py
index ce5f7b2..83ea885 100644
--- a/Scripts/smbios.py
+++ b/Scripts/smbios.py
@@ -65,7 +65,9 @@ class SMBIOS:
     def select_smbios_model(self, hardware_report, macos_version):
         smbios_model = "iMacPro1,1"
 
-        if  "Laptop" in hardware_report.get("Motherboard").get("Platform") and \
+        platform = "NUC" if "NUC" in hardware_report.get("Motherboard").get("Name") else hardware_report.get("Motherboard").get("Platform")
+
+        if  "Laptop" in platform and \
             "AMD" in hardware_report.get("CPU").get("Manufacturer") and \
             "Integrated GPU" in list(hardware_report.get("GPU").items())[-1][-1].get("Device Type"):
             smbios_model = "MacBookPro16,3"
@@ -75,63 +77,63 @@ class SMBIOS:
 
             codename = list(hardware_report.get("GPU").items())[-1][-1].get("Codename")
             if "Sandy Bridge" in codename:
-                if "Desktop" in hardware_report.get("Motherboard").get("Platform"):
+                if "Desktop" in platform:
                     if self.utils.parse_darwin_version(macos_version) < self.utils.parse_darwin_version("18.0.0"):
                         smbios_model = "iMac12,2"
                     else:
                         smbios_model = "MacPro6,1"
-                elif "NUC" in hardware_report.get("Motherboard").get("Platform"):
+                elif "NUC" in platform:
                     smbios_model = "Macmini5,1" if int(hardware_report.get("CPU").get("Core Count")) < 4 else "Macmini5,3"
                 else:
                     smbios_model = "MacBookPro8,1" if int(hardware_report.get("CPU").get("Core Count")) < 4 else "MacBookPro8,2"
             elif "Ivy Bridge" in codename:
                 if self.utils.parse_darwin_version(macos_version) < self.utils.parse_darwin_version("21.0.0"):
-                    if "Desktop" in hardware_report.get("Motherboard").get("Platform"):
+                    if "Desktop" in platform:
                         smbios_model = "iMac14,4" if "Integrated GPU" in list(hardware_report.get("GPU").items())[0][-1].get("Device Type") else "iMac15,1"
-                    elif "NUC" in hardware_report.get("Motherboard").get("Platform"):
+                    elif "NUC" in platform:
                         smbios_model = "Macmini7,1"
                     else:
                         smbios_model = "MacBookPro11,1" if int(hardware_report.get("CPU").get("Core Count")) < 4 else "MacBookPro11,5"
                 elif self.utils.parse_darwin_version(macos_version) < self.utils.parse_darwin_version("20.0.0"):
-                    if "Desktop" in hardware_report.get("Motherboard").get("Platform"):
+                    if "Desktop" in platform:
                         smbios_model = "iMac13,1" if "Integrated GPU" in list(hardware_report.get("GPU").items())[0][-1].get("Device Type") else "iMac13,2"
-                    elif "NUC" in hardware_report.get("Motherboard").get("Platform"):
+                    elif "NUC" in platform:
                         smbios_model = "Macmini6,1" if int(hardware_report.get("CPU").get("Core Count")) < 4 else "Macmini6,2"
                     else:
                         smbios_model = "MacBookPro10,2" if int(hardware_report.get("CPU").get("Core Count")) < 4 else "MacBookPro10,1"
                 else:
                     smbios_model = "MacPro6,1"
             elif "Haswell" in codename:
-                if "Desktop" in hardware_report.get("Motherboard").get("Platform"):
+                if "Desktop" in platform:
                     smbios_model = "iMac14,4" if "Integrated GPU" in list(hardware_report.get("GPU").items())[0][-1].get("Device Type") else "iMac15,1"
                     if self.utils.parse_darwin_version(macos_version) < self.utils.parse_darwin_version("22.0.0"):
                         smbios_model = "iMac16,2" if "Integrated GPU" in list(hardware_report.get("GPU").items())[0][-1].get("Device Type") else "iMac17,1"
-                elif "NUC" in hardware_report.get("Motherboard").get("Platform"):
+                elif "NUC" in platform:
                     smbios_model = "Macmini7,1"
                 else:
                     smbios_model = "MacBookPro11,1" if self.utils.parse_darwin_version(macos_version) < self.utils.parse_darwin_version("21.0.0") and int(hardware_report.get("CPU").get("Core Count")) < 4 else "MacBookPro11,5"
             elif "Broadwell" in codename:
-                if "Desktop" in hardware_report.get("Motherboard").get("Platform"):
+                if "Desktop" in platform:
                     smbios_model = "iMac16,2" if "Integrated GPU" in list(hardware_report.get("GPU").items())[0][-1].get("Device Type") else "iMac17,1"
-                elif "NUC" in hardware_report.get("Motherboard").get("Platform"):
+                elif "NUC" in platform:
                     smbios_model = "iMac16,1"
                 else:
                     smbios_model = "MacBookPro12,1" if int(hardware_report.get("CPU").get("Core Count")) < 4 else "MacBookPro11,5"
             elif "Skylake" in codename:
                 smbios_model = "iMac17,1"
-                if "Laptop" in hardware_report.get("Motherboard").get("Platform"):
+                if "Laptop" in platform:
                     smbios_model = "MacBookPro13,1" if int(hardware_report.get("CPU").get("Core Count")) < 4 else "MacBookPro13,3"
             elif "Kaby Lake" in codename:
                 smbios_model = "iMac18,1" if "Integrated GPU" in list(hardware_report.get("GPU").items())[0][-1].get("Device Type") else "iMac18,3"
-                if "Laptop" in hardware_report.get("Motherboard").get("Platform"):
+                if "Laptop" in platform:
                     smbios_model = "MacBookPro14,1" if int(hardware_report.get("CPU").get("Core Count")) < 4 else "MacBookPro14,3"
             elif "Coffee Lake" in codename:
                 smbios_model = "Macmini8,1"
-                if "Desktop" in hardware_report.get("Motherboard").get("Platform"):
+                if "Desktop" in platform:
                     smbios_model = "iMac18,3" if self.utils.parse_darwin_version(macos_version) < self.utils.parse_darwin_version("18.0.0") else "iMac19,1"
                     if "Comet Lake" in hardware_report.get("CPU").get("Codename"):
                         smbios_model = "iMac20,1" if int(hardware_report.get("CPU").get("Core Count")) < 10 else "iMac20,2"
-                elif "Laptop" in hardware_report.get("Motherboard").get("Platform"):
+                elif "Laptop" in platform:
                     if "-8" in hardware_report.get("CPU").get("Processor Name"):
                         smbios_model = "MacBookPro15,2" if int(hardware_report.get("CPU").get("Core Count")) < 6 else "MacBookPro15,3"
                     else: