diff --git a/addons/jam/config.cpp b/addons/jam/config.cpp
index beb25a618..f3bfcbd27 100644
--- a/addons/jam/config.cpp
+++ b/addons/jam/config.cpp
@@ -7,8 +7,6 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         weapons[] = {};
-        magazines[] = {};
-        ammo[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"cba_common"};
         version = VERSION;
diff --git a/addons/jr/cfgweapons.hpp b/addons/jr/Cfgweapons.hpp
similarity index 98%
rename from addons/jr/cfgweapons.hpp
rename to addons/jr/Cfgweapons.hpp
index 799e337f7..46916af17 100644
--- a/addons/jr/cfgweapons.hpp
+++ b/addons/jr/Cfgweapons.hpp
@@ -971,4 +971,30 @@ class CfgWeapons {
             };
         };
     };
+
+    // Contact DLC dummies
+    class acc_flashlight;
+    class acc_flashlight_broken: acc_flashlight {
+        scope = 1; // Optional protected class inheriting from a public base class.
+    };
+
+    class acc_pointer_IR;
+    class acc_pointer_IR_broken: acc_pointer_IR {
+        scope = 1;
+    };
+
+    class optic_Aco;
+    class optic_Aco_broken: optic_Aco {
+        scope = 1;
+    };
+
+    class optic_Hamr;
+    class optic_Hamr_broken: optic_Hamr {
+        scope = 1;
+    };
+
+    class optic_MRCO;
+    class optic_MRCO_broken: optic_MRCO {
+        scope = 1;
+    };
 };
diff --git a/addons/jr/jr_classes.hpp b/addons/jr/jr_classes.hpp
index b03c23599..085eba860 100644
--- a/addons/jr/jr_classes.hpp
+++ b/addons/jr/jr_classes.hpp
@@ -28,7 +28,9 @@ class asdg_FrontSideRail: asdg_SlotInfo { // Laser / flashlight rail
     iconPicture = "\a3\weapons_f\Data\ui\attachment_side";
     class compatibleItems {
         acc_flashlight = 1;
+        acc_flashlight_broken = 1; // Contact
         acc_pointer_IR = 1;
+        acc_pointer_IR_broken = 1; // Contact
     };
 };
 
@@ -46,6 +48,8 @@ class asdg_UnderSlot: asdg_SlotInfo { // Base under barrel slot
         bipod_03_F_blk = 1;
         bipod_03_F_oli = 1;
         bipod_01_F_khk = 1;
+        bipod_02_F_arid = 1; // Enoch
+        bipod_02_F_lush = 1; // Enoch
     };
 };
 
@@ -62,6 +66,7 @@ class asdg_PistolUnderRail: asdg_SlotInfo { // under rail for handguns
 class asdg_PistolOpticMount: asdg_OpticRail { // common handgun optic mount
     class compatibleItems {
         optic_MRD = 1;
+        optic_MRD_black = 1; // Enoch
     };
 };
 
@@ -71,9 +76,11 @@ class asdg_PistolOpticRail1913: asdg_OpticRail { // MIL-STD-1913 handgun optic r
     class compatibleItems {
         optic_Yorris = 1;
         optic_Holosight = 1;
-        optic_Holosight_smg = 1;
         optic_Holosight_blk_F = 1;
         optic_Holosight_khk_F = 1;
+        optic_Holosight_arid_F = 1; // Enoch
+        optic_Holosight_lush_F = 1; // Enoch
+        optic_Holosight_smg = 1;
         optic_Holosight_smg_blk_F = 1;
         optic_Holosight_smg_khk_F = 1;
     };
@@ -88,23 +95,35 @@ class asdg_OpticRail1913: asdg_OpticRail { // the "medium" rail, long enough to
         optic_SOS = 1;
         optic_SOS_khk_F = 1;
         optic_MRCO = 1;
+        optic_MRCO_broken = 1; // Contact
         optic_Arco = 1;
         optic_Arco_ghex_F = 1;
         optic_Arco_blk_F = 1;
+        optic_Arco_AK_arid_F = 1; // Enoch
+        optic_Arco_AK_blk_F = 1; // Enoch
+        optic_Arco_AK_lush_F = 1; // Enoch
+        optic_Arco_arid_F = 1; // Enoch
+        optic_Arco_lush_F = 1; // Enoch
         optic_aco = 1;
         optic_ACO_grn = 1;
+        optic_Aco_broken = 1; // Contact
         optic_aco_smg = 1;
         optic_ACO_grn_smg = 1;
         optic_hamr = 1;
         optic_Hamr_khk_F = 1;
+        optic_Hamr_broken = 1; // Contact
         optic_Holosight = 1;
-        optic_Holosight_smg = 1;
         optic_Holosight_blk_F = 1;
         optic_Holosight_khk_F = 1;
+        optic_Holosight_arid_F = 1; // Enoch
+        optic_Holosight_lush_F = 1; // Enoch
+        optic_Holosight_smg = 1;
         optic_Holosight_smg_blk_F = 1;
         optic_Holosight_smg_khk_F = 1;
         optic_DMS = 1;
         optic_DMS_ghex_F = 1;
+        optic_DMS_weathered_F = 1; // Enoch
+        optic_DMS_weathered_Kir_F = 1; // Enoch
         optic_LRPS = 1;
         optic_LRPS_ghex_F = 1;
         optic_LRPS_tna_F = 1;
@@ -182,6 +201,8 @@ class asdg_MuzzleSlot_762: asdg_MuzzleSlot { // for 7.62x51 universal mount supp
         muzzle_snds_B = 1;
         muzzle_snds_B_khk_F = 1;
         muzzle_snds_B_snd_F = 1;
+        muzzle_snds_B_arid_F = 1;
+        muzzle_snds_B_lush_F = 1;
     };
 };
 
@@ -193,6 +214,7 @@ class asdg_MuzzleSlot_65: asdg_MuzzleSlot_762 { // for 6.5 weapons, mostly to de
         muzzle_snds_65_TI_blk_F = 1;
         muzzle_snds_65_TI_hex_F = 1;
         muzzle_snds_65_TI_ghex_F = 1;
+        muzzle_tma_65 = 1; // Enoch
     };
 };