diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp
index 0ff5afb00..b6ebc00e8 100644
--- a/addons/jam/CfgMagazineWells.hpp
+++ b/addons/jam/CfgMagazineWells.hpp
@@ -92,8 +92,5 @@ class CfgMagazineWells {
         BI_rockets[] = {
             "RPG7_F"
         };
-        VN_rockets[] = {
-            "vn_rpg7_mag"
-        };
     };
 };
diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
new file mode 100644
index 000000000..14167e7a0
--- /dev/null
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -0,0 +1,197 @@
+class CfgMagazineWells {
+
+    class CBA_12g_6rnds {
+        VN_rounds[] = {
+            "vn_m1897_buck_mag",
+            "vn_m1897_fl_mag"
+        };
+    };
+
+    class CBA_12g_2rnds {
+        VN_rounds[] = {
+            "vn_izh54_mag",
+            "vn_izh54_so_mag"
+        };
+    };
+
+    class CBA_30Carbine_M1Carbine {
+        VN_mags[] = {
+            "vn_carbine_15_mag",
+            "vn_carbine_15_t_mag",
+            "vn_carbine_30_mag",
+            "vn_carbine_30_t_mag"
+        };
+    };
+
+    class CBA_32ACP_Vz61 {
+        VN_mags[] = {
+            "vn_vz61_mag"
+        };
+    };
+    class CBA_32ACP_Welrod {
+        VN_mags[] = {
+            "vn_welrod_mag"
+        };
+    };
+
+    class CBA_38_Special_6rnds {
+        VN_rounds[] = {
+            "vn_m10_mag"
+        };
+    };
+
+    class CBA_45ACP_1911 {
+        VN_mags[] = {
+            "vn_m1911_mag"
+        };
+    };
+
+    class CBA_45ACP_Grease {
+        VN_mags[] = {
+            "vn_m3a1_mag",
+            "vn_m3a1_t_mag"
+        };
+    };
+
+    class CBA_45ACP_Thompson_Stick {
+        VN_mags[] = {
+            "vn_m1a1_20_mag",
+            "vn_m1a1_20_t_mag",
+            "vn_m1a1_30_mag",
+            "vn_m1a1_30_t_mag"
+        };
+    };
+
+    class CBA_45ACP_Thompson_Drum {
+        VN_mags[] = {
+            "vn_m1928_mag",
+            "vn_m1928_t_mag"
+        };
+    };
+
+    class CBA_556x45_STANAG {
+        VN_mags[] = {
+            "vn_m16_20_mag",
+            "vn_m16_20_t_mag",
+            "vn_m16_30_mag",
+            "vn_m16_30_t_mag",
+            "vn_m16_40_mag",
+            "vn_m16_40_t_mag"
+        };
+    };
+
+    class CBA_762x25_PPS {
+        VN_mags[] = {
+            "vn_pps_mag",
+            "vn_pps_t_mag"
+        };
+    };
+
+    class CBA_762x25_PPSh_Drum {
+        VN_mags[] = {
+            "vn_ppsh41_71_mag",
+            "vn_ppsh41_71_t_mag"
+        };
+    };
+
+    class CBA_762x25_PPSh_Stick {
+        VN_mags[] = {
+            "vn_ppsh41_35_mag",
+            "vn_ppsh41_35_t_mag"
+        };
+    };
+
+    class CBA_762x25_TT {
+        VN_mags[] = {
+            "vn_tt33_mag"
+        };
+    };
+
+    class CBA_762x39_AK {
+        VN_mags[] = {
+            "vn_type56_mag",
+            "vn_type56_t_mag"
+        };
+    };
+
+    class CBA_762x39_SKS_Clip {
+        VN_clips[] = {
+            "vn_sks_mag",
+            "vn_sks_t_mag"
+        };
+    };
+
+    class CBA_762x51_5rnds {
+        VN_rounds[] = {
+            "vn_m40a1_mag",
+            "vn_m40a1_t_mag"
+        };
+    };
+
+    class CBA_762x51_LINKS {
+        VN_belts[] = {
+            "vn_m60_100_mag"
+        };
+    };
+
+    class CBA_762x51_M14 {
+        VN_mags[] = {
+            "vn_m14_10_mag",
+            "vn_m14_10_t_mag",
+            "vn_m14_mag",
+            "vn_m14_t_mag"
+        };
+    };
+
+    class CBA_762x54R_DPM {
+        VN_mags[] = {
+            "vn_dp28_mag"
+        };
+    };
+
+    class CBA_762x54R_LINKS {
+        VN_belts[] = {
+            "vn_pk_100_mag"
+        };
+    };
+
+    class CBA_762x54R_Mosin {
+        VN_clips[] = {
+            "vn_m38_mag",
+            "vn_m38_t_mag"
+        };
+    };
+
+    class CBA_763x25_M712 {
+        VN_mags[] = {
+            "vn_m712_mag"
+        };
+    };
+
+    class CBA_9x18_PM {
+        VN_mags[] = {
+            "vn_pm_mag"
+        };
+    };
+
+    class CBA_9x19_MP40 {
+        VN_mags[] = {
+            "vn_mp40_mag",
+            "vn_mp40_t_mag"
+        };
+    };
+
+    class CBA_9x19_STEN {
+        VN_mags[] = {
+            "vn_sten_mag",
+            "vn_sten_t_mag"
+        };
+    };
+
+    class CBA_RPG7 {
+        VN_rockets[] = {
+            "vn_rpg7_mag"
+        };
+    };
+
+};
diff --git a/addons/jam/jam_vn/config.cpp b/addons/jam/jam_vn/config.cpp
index 459b94ac4..1acabffa9 100644
--- a/addons/jam/jam_vn/config.cpp
+++ b/addons/jam/jam_vn/config.cpp
@@ -18,4 +18,5 @@ class CfgPatches {
     };
 };
 
+#include "CfgMagazineWells.hpp"
 #include "CfgWeapons.hpp"
diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp
index 5e5a20e90..eb4cb837c 100644
--- a/addons/jam/magwells_12gauge.hpp
+++ b/addons/jam/magwells_12gauge.hpp
@@ -1,21 +1,11 @@
     class CBA_12g_9rnds {};         // 9 loose rounds
     class CBA_12g_8rnds {};         // 8 loose rounds
     class CBA_12g_7rnds {};         // 7 loose rounds
-    class CBA_12g_6rnds {           // 6 loose rounds
-        VN_rounds[] = {
-            "vn_m1897_buck_mag",
-            "vn_m1897_fl_mag"
-        };
-    };
+    class CBA_12g_6rnds {};         // 6 loose rounds
     class CBA_12g_5rnds {};         // 5 loose rounds
     class CBA_12g_4rnds {};         // 4 loose rounds
     class CBA_12g_3rnds {};         // 3 loose rounds
-    class CBA_12g_2rnds {           // 2 loose rounds
-        VN_rounds[] = {
-            "vn_izh54_mag",
-            "vn_izh54_so_mag"
-        };
-    };
+    class CBA_12g_2rnds {};         // 2 loose rounds
     class CBA_12g_1rnd {};          // 1 loose round
 
     class CBA_12g_AA12 {};          // AA-12 Stick Magazines
diff --git a/addons/jam/magwells_30Carbine.hpp b/addons/jam/magwells_30Carbine.hpp
index 6117c6a4e..9218c28d7 100644
--- a/addons/jam/magwells_30Carbine.hpp
+++ b/addons/jam/magwells_30Carbine.hpp
@@ -1,8 +1 @@
-    class CBA_30Carbine_M1Carbine {          // M1 Carbine, M2 Carbine
-        VN_mags[] = {
-            "vn_carbine_15_mag",
-            "vn_carbine_15_t_mag",
-            "vn_carbine_30_mag",
-            "vn_carbine_30_t_mag"
-        };
-    };
+    class CBA_30Carbine_M1Carbine {};        // M1 Carbine, M2 Carbine
diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp
index 8e4cfb706..468a1451b 100644
--- a/addons/jam/magwells_32ACP.hpp
+++ b/addons/jam/magwells_32ACP.hpp
@@ -5,13 +5,5 @@
     class CBA_32ACP_PP {};          // Walther PP in .32 ACP (7.65x17mm Browning)
     class CBA_32ACP_PPK {};         // Walther PPK in .32 ACP (7.65x17mm Browning)
     class CBA_32ACP_Vz27 {};        // vz. 27
-    class CBA_32ACP_Vz61 {          // Škorpion (vz. 61), M84
-        VN_mags[] = {
-            "vn_vz61_mag"
-        };
-    };
-    class CBA_32ACP_Welrod {        // Welrod MkII in .32 ACP (7.65x17mm Browning)
-        VN_mags[] = {
-            "vn_welrod_mag"
-        };
-    };
+    class CBA_32ACP_Vz61 {};        // Škorpion (vz. 61), M84
+    class CBA_32ACP_Welrod {};      // Welrod MkII in .32 ACP (7.65x17mm Browning)
diff --git a/addons/jam/magwells_38Spec.hpp b/addons/jam/magwells_38Spec.hpp
index 1b86becdf..abe20d323 100644
--- a/addons/jam/magwells_38Spec.hpp
+++ b/addons/jam/magwells_38Spec.hpp
@@ -1,9 +1,5 @@
     class CBA_38_Special_Clip_6rnds {}; // 6 round .38 Special moon clip
     class CBA_38_Special_Clip_5rnds {}; // 5 round .38 Special moon clip
 
-    class CBA_38_Special_6rnds {        // 6 loose rounds of .38 Special
-        VN_rounds[] = {
-            "vn_m10_mag"
-        };
-    };
+    class CBA_38_Special_6rnds {};      // 6 loose rounds of .38 Special
     class CBA_38_Special_5rnds {};      // 5 loose rounds of .38 Special
diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp
index 7b9039d6e..64a85bdad 100644
--- a/addons/jam/magwells_45ACP.hpp
+++ b/addons/jam/magwells_45ACP.hpp
@@ -2,9 +2,6 @@
         BI_mags[] = {
             "9Rnd_45ACP_Mag"
         };
-        VN_mags[] = {
-            "vn_m1911_mag"
-        };
     };
     class CBA_45ACP_C96 {};             // Mauser C-96 in .45 ACP
     class CBA_9x19_CZ97 {};             // CZ 97 in .45 ACP
@@ -19,25 +16,8 @@
             "30Rnd_45ACP_Mag_SMG_01_Tracer_Yellow"
         };
     };
-    class CBA_45ACP_Grease {            // Grease Gun
-        VN_mags[] = {
-            "vn_m3a1_mag",
-            "vn_m3a1_t_mag"
-        };
-    };
+    class CBA_45ACP_Grease {};          // Grease Gun
     class CBA_45ACP_Reising {};         // M50/M55 Reising
-    class CBA_45ACP_Thompson_Stick {    // Thompson stick magazines
-        VN_mags[] = {
-            "vn_m1a1_20_mag",
-            "vn_m1a1_20_t_mag",
-            "vn_m1a1_30_mag",
-            "vn_m1a1_30_t_mag"
-        };
-    };
-    class CBA_45ACP_Thompson_Drum {     // Thompson drum magazines
-        VN_mags[] = {
-            "vn_m1928_mag",
-            "vn_m1928_t_mag"
-        };
-    };
+    class CBA_45ACP_Thompson_Stick {};  // Thompson stick magazines
+    class CBA_45ACP_Thompson_Drum {};   // Thompson drum magazines
     class CBA_45ACP_UMP {};             // HK UMP 45
diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp
index 26fd400ed..06301bd02 100644
--- a/addons/jam/magwells_556x45.hpp
+++ b/addons/jam/magwells_556x45.hpp
@@ -50,14 +50,6 @@
             "30Rnd_556x45_Stanag_Sand_Tracer_Green",
             "30Rnd_556x45_Stanag_Sand_Tracer_Yellow"
         };
-        VN_mags[] = {
-            "vn_m16_20_mag",
-            "vn_m16_20_t_mag",
-            "vn_m16_30_mag",
-            "vn_m16_30_t_mag",
-            "vn_m16_40_mag",
-            "vn_m16_40_t_mag"
-        };
     };
 
     class CBA_556x45_STANAG_L {};       // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)
diff --git a/addons/jam/magwells_762x25.hpp b/addons/jam/magwells_762x25.hpp
index 463e90c80..0e2e2dfaa 100644
--- a/addons/jam/magwells_762x25.hpp
+++ b/addons/jam/magwells_762x25.hpp
@@ -4,26 +4,7 @@
     class CBA_762x25_PP19 {};       // PP-19 Bizon-2-07
     class CBA_762x25_PPD_Drum {};   // PPD-40 drum magazines
     class CBA_762x25_PPD_Stick {};  // PPD-40 stick magazines
-    class CBA_762x25_PPS {          // PPS-43
-        VN_mags[] = {
-            "vn_pps_mag",
-            "vn_pps_t_mag"
-        };
-    };
-    class CBA_762x25_PPSh_Drum {    // PPSh-41 drum magazines
-        VN_mags[] = {
-            "vn_ppsh41_71_mag",
-            "vn_ppsh41_71_t_mag"
-        };
-    };
-    class CBA_762x25_PPSh_Stick {   // PPSh-41 stick magazines
-        VN_mags[] = {
-            "vn_ppsh41_35_mag",
-            "vn_ppsh41_35_t_mag"
-        };
-    };
-    class CBA_762x25_TT {           // TT-30, TT-33 Tokarev
-        VN_mags[] = {
-            "vn_tt33_mag"
-        };
-    };
+    class CBA_762x25_PPS {};        // PPS-43
+    class CBA_762x25_PPSh_Drum {};  // PPSh-41 drum magazines
+    class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines
+    class CBA_762x25_TT {};         // TT-30, TT-33 Tokarev
diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp
index c9b96ab7a..7cec85095 100644
--- a/addons/jam/magwells_762x39.hpp
+++ b/addons/jam/magwells_762x39.hpp
@@ -5,10 +5,6 @@
             "30Rnd_762x39_Mag_Tracer_F",
             "30Rnd_762x39_Mag_Tracer_Green_F"
         };
-        VN_mags[] = {
-            "vn_type56_mag",
-            "vn_type56_t_mag"
-        };
     };
 
     class CBA_762x39_CZ807 {};          // 762x39mm CZ 807 magazines
@@ -24,9 +20,4 @@
     class CBA_762x39_VZ58 {};           // 762x39mm VZ58 magazine, cannot be used in AKs or vice versa
 
     class CBA_762x39_SKS {};            // 762x39mm SKS magazines
-    class CBA_762x39_SKS_Clip {         // 762x39mm SKS clip
-        VN_clips[] = {
-            "vn_sks_mag",
-            "vn_sks_t_mag"
-        };
-    };
+    class CBA_762x39_SKS_Clip {};       // 762x39mm SKS clip
diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp
index 854bb89db..9e079e2bc 100644
--- a/addons/jam/magwells_762x51.hpp
+++ b/addons/jam/magwells_762x51.hpp
@@ -2,12 +2,7 @@
     class CBA_762x51_2rnds {};      // 2 loose rounds of 7.62x51mm NATO
     class CBA_762x51_3rnds {};      // 3 loose rounds of 7.62x51mm NATO
     class CBA_762x51_4rnds {};      // 4 loose rounds of 7.62x51mm NATO
-    class CBA_762x51_5rnds {        // 5 loose rounds of 7.62x51mm NATO
-        VN_rounds[] = {
-            "vn_m40a1_mag",
-            "vn_m40a1_t_mag"
-        };
-    };
+    class CBA_762x51_5rnds {};      // 5 loose rounds of 7.62x51mm NATO
 
     class CBA_762x51_AICS {};       // AICS short action mag (5/10 rounds)
 
@@ -36,19 +31,9 @@
             "150Rnd_762x51_Box",
             "150Rnd_762x51_Box_Tracer"
         };
-        VN_belts[] = {
-            "vn_m60_100_mag"
-        };
     };
 
-    class CBA_762x51_M14 {          // M14
-        VN_mags[] = {
-            "vn_m14_10_mag",
-            "vn_m14_10_t_mag",
-            "vn_m14_mag",
-            "vn_m14_t_mag"
-        };
-    };
+    class CBA_762x51_M14 {};        // M14
     class CBA_762x51_M14_L {};      // M14 long mag (25/30 rounds)
     class CBA_762x51_M14_XL {};     // M14 drum mag (X-Products 50 round)
 
diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp
index cfe102df8..8dd9752e6 100644
--- a/addons/jam/magwells_762x54.hpp
+++ b/addons/jam/magwells_762x54.hpp
@@ -1,8 +1,4 @@
-    class CBA_762x54R_DPM {             // DP-27, DP-28, DPM, Degtyaryov LMG
-        VN_mags[] = {
-            "vn_dp28_mag"
-        };
-    };
+    class CBA_762x54R_DPM {};           // DP-27, DP-28, DPM, Degtyaryov LMG
     class CBA_762x54R_DT {};            // DT, DTM LMG
 
     class CBA_762x54R_LINKS {           // Links for PK, PKM, and similar
@@ -10,18 +6,10 @@
             "150Rnd_762x54_Box",
             "150Rnd_762x54_Box_Tracer"
         };
-        VN_belts[] = {
-            "vn_pk_100_mag"
-        };
     };
 
     class CBA_762x54R_Maxim {};         // Maxim gun in 7.62x54R
-    class CBA_762x54R_Mosin {           // M91/30, M38, M44 Mosin
-        VN_clips[] = {
-            "vn_m38_mag",
-            "vn_m38_t_mag"
-        };
-    };
+    class CBA_762x54R_Mosin {};         // M91/30, M38, M44 Mosin
 
     class CBA_762x54R_RP46 {};          // RP-46
 
diff --git a/addons/jam/magwells_763x25.hpp b/addons/jam/magwells_763x25.hpp
index 83924f8c5..fe0021ce4 100644
--- a/addons/jam/magwells_763x25.hpp
+++ b/addons/jam/magwells_763x25.hpp
@@ -1,8 +1,4 @@
     class CBA_763x25_C96 {};            // Mauser C-96 in 7.63x25mm
     class CBA_763x25_C96_Compact {};    // Compact Mauser C-96 in 7.63x25mm (6 rounds)
     class CBA_763x25_C96_Extended {};   // Extended Mauser C-96 in 7.63x25mm (20 rounds)
-    class CBA_763x25_M712 {             // Mauser M712 Schnellfeuer in 7.63x25mm
-        VN_mags[] = {
-            "vn_m712_mag"
-        };
-    };
+    class CBA_763x25_M712 {};           // Mauser M712 Schnellfeuer in 7.63x25mm
diff --git a/addons/jam/magwells_9x18.hpp b/addons/jam/magwells_9x18.hpp
index 4a9ae1410..7331db9c1 100644
--- a/addons/jam/magwells_9x18.hpp
+++ b/addons/jam/magwells_9x18.hpp
@@ -9,11 +9,7 @@
     class CBA_9x18_P64 {};      // FB P-64 CZAK
     class CBA_9x18_P83 {};      // FB P-83 Wanad
     class CBA_9x18_PA63 {};     // FEG PA-63
-    class CBA_9x18_PM {         // Makarov PM
-        VN_mags[] = {
-            "vn_pm_mag"
-        };
-    };
+    class CBA_9x18_PM {};       // Makarov PM
     class CBA_9x18_PM63 {};     // FB PM-63 RAK
     class CBA_9x18_PM84 {};     // FB PM-84 Glauberyt
     class CBA_9x18_PMM {};      // Makarov PMM
diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp
index 695a8dcc4..6299e77d6 100644
--- a/addons/jam/magwells_9x19.hpp
+++ b/addons/jam/magwells_9x19.hpp
@@ -16,12 +16,7 @@
     class CBA_9x19_M9 {};           // Beretta M9
     class CBA_9x19_MAB38 {};        // Beretta Model 38
     class CBA_9x19_MP28 {};         // MP18 Straight Magazines, MP28, MP35
-    class CBA_9x19_MP40 {           // MP40, MP38
-        VN_mags[] = {
-            "vn_mp40_mag",
-            "vn_mp40_t_mag"
-        };
-    };
+    class CBA_9x19_MP40 {};         // MP40, MP38
     class CBA_9x19_MP443 {};        // MP-443 Grach
     class CBA_9x19_MP5 {            // H&K MP5
         BI_mags[] = {
@@ -53,12 +48,7 @@
             "30Rnd_9x21_Green_Mag"
         };
     };
-    class CBA_9x19_STEN {           // STEN
-        VN_mags[] = {
-            "vn_sten_mag",
-            "vn_sten_t_mag"
-        };
-    };
+    class CBA_9x19_STEN {};         // STEN
     class CBA_9x19_STEYR {};        // AUG SMG, MPi, TMP
     class CBA_9x19_TT {};           // TT-33 Tokarev in 9x19mm (M48, Tokagypt 58, Type 54)
     class CBA_9x19_UMP {};          // HK UMP 9