diff --git a/raw/iw3/partclassification.csv b/raw/iw3/partclassification.csv
new file mode 100644
index 00000000..66ac687f
--- /dev/null
+++ b/raw/iw3/partclassification.csv
@@ -0,0 +1,21 @@
+J_Hip_RI,right_leg_upper
+J_Hip_LE,left_leg_upper
+J_Knee_RI,right_leg_lower
+J_SpineUpper,torso_upper
+J_Knee_LE,left_leg_lower
+J_Ankle_RI,right_foot
+J_Ankle_LE,left_foot
+J_Clavicle_RI,torso_upper
+J_Clavicle_LE,torso_upper
+J_Shoulder_RI,right_arm_upper
+J_Shoulder_LE,left_arm_upper
+J_Neck,neck
+J_Head,head
+J_Elbow_RI,right_arm_lower
+J_Elbow_LE,left_arm_lower
+J_Wrist_RI,right_hand
+J_Wrist_LE,left_hand
+J_MainRoot,torso_lower
+TAG_WEAPON_LEFT,gun
+TAG_WEAPON_RIGHT,gun
+J_Helmet,helmet
diff --git a/raw/iw3/partclassification_mp.csv b/raw/iw3/partclassification_mp.csv
new file mode 100644
index 00000000..87ee201f
--- /dev/null
+++ b/raw/iw3/partclassification_mp.csv
@@ -0,0 +1,19 @@
+J_Hip_RI,right_leg_upper
+J_Hip_LE,left_leg_upper
+J_Knee_RI,right_leg_lower
+J_SpineUpper,torso_lower
+J_SpineLower,torso_lower
+J_MainRoot,torso_lower
+J_Knee_LE,left_leg_lower
+J_Ankle_RI,right_foot
+J_Ankle_LE,left_foot
+J_Clavicle_RI,torso_upper
+J_Clavicle_LE,torso_upper
+J_Shoulder_RI,right_arm_upper
+J_Shoulder_LE,left_arm_upper
+J_Neck,neck
+J_Head,head
+J_Elbow_RI,right_arm_lower
+J_Elbow_LE,left_arm_lower
+J_Wrist_RI,right_hand
+J_Wrist_LE,left_hand
diff --git a/src/Common/Game/IW3/IW3_Assets.h b/src/Common/Game/IW3/IW3_Assets.h
index 2208f241..a1c2448b 100644
--- a/src/Common/Game/IW3/IW3_Assets.h
+++ b/src/Common/Game/IW3/IW3_Assets.h
@@ -2879,6 +2879,7 @@ namespace IW3
         HITLOC_L_LEG_LWR = 0xF,
         HITLOC_R_FOOT = 0x10,
         HITLOC_L_FOOT = 0x11,
+        HITLOC_GUN = 0x12,
 
         HITLOC_COUNT,
     };
diff --git a/src/ObjCommon/XModel/XModelConstants.h.template b/src/ObjCommon/XModel/XModelConstants.h.template
index 29807b4f..d075a60b 100644
--- a/src/ObjCommon/XModel/XModelConstants.h.template
+++ b/src/ObjCommon/XModel/XModelConstants.h.template
@@ -17,7 +17,7 @@
 #endif
 
 // This file was templated.
-// See JsonXModel.h.template.
+// See XModelConstants.h.template.
 // Do not modify, changes will be lost.
 #pragma once
 
@@ -48,11 +48,9 @@ namespace GAME
         "left_leg_lower",
         "right_foot",
         "left_foot",
-#if defined(FEATURE_IW4) || defined(FEATURE_IW5) || defined(FEATURE_T5) || defined(FEATURE_T6)
         "gun",
 #if defined(FEATURE_IW4) || defined(FEATURE_IW5) || defined(FEATURE_T6)
         "shield",
-#endif
 #endif
     };
     static_assert(std::extent_v<decltype(HITLOC_NAMES)> == HITLOC_COUNT);