diff --git a/package-lock.json b/package-lock.json
index 45cca760..beab4607 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "morgan": "^1.10.0",
         "ncp": "^2.0.0",
         "typescript": "^5.5",
-        "warframe-public-export-plus": "^0.5.58",
+        "warframe-public-export-plus": "^0.5.59",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
@@ -3789,9 +3789,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.58",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.58.tgz",
-      "integrity": "sha512-2G3tKcoblUl7S3Rkk5k/qH+VGZBUmU2QjtIrEO/Bt6UlgO83s648elkNdDKOLBKXnxIsa194nVwz+ci1K86sXg=="
+      "version": "0.5.59",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.59.tgz",
+      "integrity": "sha512-/SUCVjngVDBz6gahz7CdVLywtHLODL6O5nmNtQcxFDUwrUGnF1lETcG8/UO+WLeGxBVAy4BDPbq+9ZWlYZM4uQ=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index 816118ff..e5deb9bc 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "morgan": "^1.10.0",
     "ncp": "^2.0.0",
     "typescript": "^5.5",
-    "warframe-public-export-plus": "^0.5.58",
+    "warframe-public-export-plus": "^0.5.59",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0"
diff --git a/src/helpers/nemesisHelpers.ts b/src/helpers/nemesisHelpers.ts
index 8959d985..3a146831 100644
--- a/src/helpers/nemesisHelpers.ts
+++ b/src/helpers/nemesisHelpers.ts
@@ -246,7 +246,6 @@ export const getWeaponsForManifest = (manifest: string): readonly string[] => {
     throw new Error(`unknown nemesis manifest: ${manifest}`);
 };
 
-// TODO: This sucks.
 export const getInnateDamageTag = (
     KillingSuit: string
 ):
@@ -257,78 +256,7 @@ export const getInnateDamageTag = (
     | "InnateMagDamage"
     | "InnateRadDamage"
     | "InnateToxinDamage" => {
-    const baseSuitType = ExportWarframes[KillingSuit].parentName;
-    switch (baseSuitType) {
-        case "/Lotus/Powersuits/Volt/VoltBaseSuit":
-        case "/Lotus/Powersuits/Excalibur/ExcaliburBaseSuit":
-        case "/Lotus/Powersuits/AntiMatter/NovaBaseSuit":
-        case "/Lotus/Powersuits/Banshee/BansheeBaseSuit":
-        case "/Lotus/Powersuits/Berserker/BerserkerBaseSuit":
-        case "/Lotus/Powersuits/Magician/MagicianBaseSuit":
-        case "/Lotus/Powersuits/Sentient/SentientBaseSuit":
-        case "/Lotus/Powersuits/Gyre/GyreBaseSuit":
-            return "InnateElectricityDamage";
-        case "/Lotus/Powersuits/Ember/EmberBaseSuit":
-        case "/Lotus/Powersuits/Dragon/DragonBaseSuit":
-        case "/Lotus/Powersuits/Nezha/NezhaBaseSuit":
-        case "/Lotus/Powersuits/Sandman/SandmanBaseSuit":
-        case "/Lotus/Powersuits/Trapper/TrapperBaseSuit":
-        case "/Lotus/Powersuits/Wisp/WispBaseSuit":
-        case "/Lotus/Powersuits/Odalisk/OdaliskBaseSuit":
-        case "/Lotus/Powersuits/PaxDuviricus/PaxDuviricusBaseSuit":
-        case "/Lotus/Powersuits/Choir/ChoirBaseSuit":
-        case "/Lotus/Powersuits/Temple/TempleBaseSuit":
-            return "InnateHeatDamage";
-        case "/Lotus/Powersuits/Frost/FrostBaseSuit":
-        case "/Lotus/Powersuits/Glass/GlassBaseSuit":
-        case "/Lotus/Powersuits/Fairy/FairyBaseSuit":
-        case "/Lotus/Powersuits/IronFrame/IronFrameBaseSuit":
-        case "/Lotus/Powersuits/Revenant/RevenantBaseSuit":
-        case "/Lotus/Powersuits/Trinity/TrinityBaseSuit":
-        case "/Lotus/Powersuits/Hoplite/HopliteBaseSuit":
-        case "/Lotus/Powersuits/Koumei/KoumeiBaseSuit":
-            return "InnateFreezeDamage";
-        case "/Lotus/Powersuits/Saryn/SarynBaseSuit":
-        case "/Lotus/Powersuits/Paladin/PaladinBaseSuit":
-        case "/Lotus/Powersuits/Brawler/BrawlerBaseSuit":
-        case "/Lotus/Powersuits/Infestation/InfestationBaseSuit":
-        case "/Lotus/Powersuits/Necro/NecroBaseSuit":
-        case "/Lotus/Powersuits/Khora/KhoraBaseSuit":
-        case "/Lotus/Powersuits/Ranger/RangerBaseSuit":
-        case "/Lotus/Powersuits/Dagath/DagathBaseSuit":
-            return "InnateToxinDamage";
-        case "/Lotus/Powersuits/Mag/MagBaseSuit":
-        case "/Lotus/Powersuits/Pirate/PirateBaseSuit":
-        case "/Lotus/Powersuits/Cowgirl/CowgirlBaseSuit":
-        case "/Lotus/Powersuits/Priest/PriestBaseSuit":
-        case "/Lotus/Powersuits/BrokenFrame/BrokenFrameBaseSuit":
-        case "/Lotus/Powersuits/Alchemist/AlchemistBaseSuit":
-        case "/Lotus/Powersuits/Yareli/YareliBaseSuit":
-        case "/Lotus/Powersuits/Geode/GeodeBaseSuit":
-        case "/Lotus/Powersuits/Frumentarius/FrumentariusBaseSuit":
-            return "InnateMagDamage";
-        case "/Lotus/Powersuits/Loki/LokiBaseSuit":
-        case "/Lotus/Powersuits/Ninja/NinjaBaseSuit":
-        case "/Lotus/Powersuits/Jade/JadeBaseSuit":
-        case "/Lotus/Powersuits/Bard/BardBaseSuit":
-        case "/Lotus/Powersuits/Harlequin/HarlequinBaseSuit":
-        case "/Lotus/Powersuits/Garuda/GarudaBaseSuit":
-        case "/Lotus/Powersuits/YinYang/YinYangBaseSuit":
-        case "/Lotus/Powersuits/Werewolf/WerewolfBaseSuit":
-        case "/Lotus/Powersuits/ConcreteFrame/ConcreteFrameBaseSuit":
-            return "InnateRadDamage";
-        case "/Lotus/Powersuits/Rhino/RhinoBaseSuit":
-        case "/Lotus/Powersuits/Tengu/TenguBaseSuit":
-        case "/Lotus/Powersuits/MonkeyKing/MonkeyKingBaseSuit":
-        case "/Lotus/Powersuits/Runner/RunnerBaseSuit":
-        case "/Lotus/Powersuits/Pacifist/PacifistBaseSuit":
-        case "/Lotus/Powersuits/Devourer/DevourerBaseSuit":
-        case "/Lotus/Powersuits/Wraith/WraithBaseSuit":
-        case "/Lotus/Powersuits/Pagemaster/PagemasterBaseSuit":
-            return "InnateImpactDamage";
-    }
-    logger.warn(`unknown innate damage type for ${KillingSuit}, using heat as a fallback`);
-    return "InnateHeatDamage";
+    return ExportWarframes[KillingSuit].nemesisUpgradeTag!;
 };
 
 // TODO: For -1399275245665749231n, the value should be 75306944, but we're off by 59 with 75307003.