diff --git a/data/json/professions.json b/data/json/professions.json
index 9786e4a89978c..a08ff6f57435b 100644
--- a/data/json/professions.json
+++ b/data/json/professions.json
@@ -15,17 +15,31 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_cell_phone",
-    "ammo": 100,
-    "magazine": 100,
-    "entries": [ { "item": "cell_phone" } ]
+    "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "cell_phone" } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_flashlight",
-    "ammo": 100,
-    "magazine": 100,
-    "entries": [ { "item": "flashlight" } ]
+    "entries": [ { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "flashlight" } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "charged_mp3",
+    "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "mp3" } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "charged_two_way_radio",
+    "entries": [ { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "two_way_radio" } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "charged_tazer",
+    "entries": [ { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } ]
   },
   {
     "type": "item_group",
@@ -332,10 +346,10 @@
           "knife_folding",
           "water_clean",
           "matches",
-          "two_way_radio",
           "wristwatch"
         ],
         "entries": [
+          { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "m1911", "ammo-item": "45_acp", "charges": 7, "container-item": "holster" },
           { "item": "45_acp", "charges": 23 },
@@ -359,19 +373,8 @@
     "skills": [ { "level": 4, "name": "tailor" } ],
     "items": {
       "both": {
-        "items": [
-          "polo_shirt",
-          "blazer",
-          "pants",
-          "socks",
-          "dress_shoes",
-          "knit_scarf",
-          "tailors_kit",
-          "thread",
-          "scissors",
-          "wristwatch"
-        ],
-        "entries": [ { "group": "charged_cell_phone" } ]
+        "items": [ "polo_shirt", "blazer", "pants", "socks", "dress_shoes", "knit_scarf", "scissors", "wristwatch" ],
+        "entries": [ { "group": "charged_cell_phone" }, { "item": "tailors_kit", "ammo-item": "thread", "charges": 100 } ]
       },
       "male": [ "briefs" ],
       "female": [ "bra", "panties" ]
@@ -427,18 +430,10 @@
       { "level": 2, "name": "mechanics" }
     ],
     "items": {
-      "both": [
-        "dress_shirt",
-        "pants",
-        "socks",
-        "boots",
-        "coat_lab",
-        "gloves_rubber",
-        "glasses_safety",
-        "chemistry_set",
-        "smart_phone",
-        "wristwatch"
-      ],
+      "both": {
+        "items": [ "dress_shirt", "pants", "socks", "boots", "coat_lab", "gloves_rubber", "glasses_safety", "smart_phone", "wristwatch" ],
+        "entries": [ { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "chemistry_set" } ]
+      },
       "male": [ "briefs" ],
       "female": [ "bra", "panties" ]
     }
@@ -452,23 +447,13 @@
     "skills": [ { "level": 3, "name": "mechanics" } ],
     "items": {
       "both": {
-        "ammo": 100,
-        "magazine": 100,
-        "items": [
-          "slingpack",
-          "tank_top",
-          "jeans",
-          "socks",
-          "boots_steel",
-          "tool_belt",
-          "wrench",
-          "duct_tape",
-          "screwdriver",
-          "wristwatch",
-          "mag_cars",
-          "welder"
-        ],
-        "entries": [ { "item": "goggles_welding", "custom-flags": [ "no_auto_equip" ] }, { "group": "charged_cell_phone" } ]
+        "items": [ "slingpack", "tank_top", "jeans", "socks", "boots_steel", "duct_tape", "screwdriver", "wristwatch", "mag_cars" ],
+        "entries": [
+          { "item": "goggles_welding", "custom-flags": [ "no_auto_equip" ] },
+          { "group": "charged_cell_phone" },
+          { "item": "wrench", "container-item": "tool_belt" },
+          { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "welder" }
+        ]
       },
       "male": [ "boxer_shorts" ],
       "female": [ "bra", "boy_shorts" ]
@@ -562,7 +547,6 @@
     "items": {
       "both": {
         "items": [
-          "foodperson_mask",
           "pants_cargo",
           "briefs",
           "cape_fp",
@@ -574,7 +558,12 @@
           "chestguard_hard",
           "boots_rubber"
         ],
-        "entries": [ { "item": "medium_disposable_cell" }, { "group": "snacks_fancy" }, { "group": "snacks" }, { "item": "bat" } ]
+        "entries": [
+          { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "foodperson_mask" },
+          { "group": "snacks_fancy" },
+          { "group": "snacks" },
+          { "item": "bat" }
+        ]
       }
     }
   },
@@ -630,11 +619,11 @@
           "gloves_tactical",
           "socks",
           "boots_combat",
-          "two_way_radio",
           "wristwatch",
           "molle_pack"
         ],
         "entries": [
+          { "group": "charged_two_way_radio" },
           { "item": "modularvest", "contents-group": "army_mags_m4" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "knife_combat", "container-item": "sheath" },
@@ -943,19 +932,10 @@
     "pets": [ { "name": "mon_dog_gshepherd", "amount": 1 } ],
     "items": {
       "both": {
-        "items": [
-          "pants_army",
-          "socks",
-          "badge_deputy",
-          "sheriffshirt",
-          "police_belt",
-          "boots",
-          "dog_whistle",
-          "two_way_radio",
-          "wristwatch"
-        ],
+        "items": [ "pants_army", "socks", "badge_deputy", "sheriffshirt", "police_belt", "boots", "dog_whistle", "wristwatch" ],
         "entries": [
           { "group": "charged_cell_phone" },
+          { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
           { "item": "legpouch_large", "contents-group": "army_mags_usp45" }
@@ -1002,19 +982,10 @@
     "traits": [ "PROF_POLICE" ],
     "items": {
       "both": {
-        "items": [
-          "pants_army",
-          "socks",
-          "badge_deputy",
-          "sheriffshirt",
-          "police_belt",
-          "boots",
-          "whistle",
-          "two_way_radio",
-          "wristwatch"
-        ],
+        "items": [ "pants_army", "socks", "badge_deputy", "sheriffshirt", "police_belt", "boots", "whistle", "wristwatch" ],
         "entries": [
           { "group": "charged_cell_phone" },
+          { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
           { "item": "legpouch_large", "contents-group": "army_mags_usp45" }
@@ -1047,12 +1018,12 @@
           "wristwatch",
           "socks",
           "dress_shoes",
-          "two_way_radio",
           "cig",
           "ref_lighter"
         ],
         "entries": [
           { "group": "charged_cell_phone" },
+          { "group": "charged_two_way_radio" },
           { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 6, "container-item": "sholster" },
           { "item": "357mag_fmj", "charges": 24 }
         ]
@@ -1073,18 +1044,9 @@
     "traits": [ "PROF_SWAT" ],
     "items": {
       "both": {
-        "items": [
-          "socks",
-          "swat_armor",
-          "police_belt",
-          "tac_helmet",
-          "boots_combat",
-          "gloves_tactical",
-          "badge_swat",
-          "two_way_radio",
-          "wristwatch"
-        ],
+        "items": [ "socks", "swat_armor", "police_belt", "tac_helmet", "boots_combat", "gloves_tactical", "badge_swat", "wristwatch" ],
         "entries": [
+          { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "chestrig", "contents-group": [ "army_mags_mp5", "army_mags_usp9" ] },
           { "item": "grenadebandolier", "contents-item": [ "flashbang", "flashbang" ] },
@@ -1117,17 +1079,9 @@
     "traits": [ "PROF_SWAT" ],
     "items": {
       "both": {
-        "items": [
-          "socks",
-          "swat_armor",
-          "tac_fullhelmet",
-          "boots_combat",
-          "gloves_tactical",
-          "badge_swat",
-          "two_way_radio",
-          "wristwatch"
-        ],
+        "items": [ "socks", "swat_armor", "tac_fullhelmet", "boots_combat", "gloves_tactical", "badge_swat", "wristwatch" ],
         "entries": [
+          { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "shot_00", "charges": 12, "container-item": "bandolier_shotgun" },
           { "item": "shot_slug", "charges": 12, "container-item": "bandolier_shotgun" },
@@ -1151,7 +1105,6 @@
     "traits": [ "PROF_POLICE" ],
     "items": {
       "both": {
-        "ammo": 100,
         "items": [
           "socks",
           "pants_army",
@@ -1164,10 +1117,10 @@
           "hat_ball",
           "badge_deputy",
           "wristwatch",
-          "two_way_radio",
           "powered_earmuffs"
         ],
         "entries": [
+          { "group": "charged_two_way_radio" },
           { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
           { "item": "legpouch_large", "contents-group": "army_mags_usp45" },
           { "item": "m14mag", "ammo-item": "762_51", "charges": 20, "container-item": "chestrig" },
@@ -1205,15 +1158,15 @@
           "armguard_hard",
           "legguard_hard",
           "badge_deputy",
-          "two_way_radio",
           "wristwatch",
           "gasbomb"
         ],
         "entries": [
+          { "group": "charged_two_way_radio" },
           { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
           { "item": "legpouch_large", "contents-group": "army_mags_usp45" },
           { "item": "tonfa", "container-item": "police_belt" },
-          { "item": "tazer", "charges": 100 }
+          { "group": "charged_tazer" }
         ]
       },
       "male": [ "boxer_shorts" ],
@@ -1404,18 +1357,8 @@
     "skills": [ { "level": 3, "name": "electronics" } ],
     "items": {
       "both": {
-        "ammo": 100,
-        "magazine": 100,
-        "items": [
-          "jumpsuit",
-          "socks",
-          "boots",
-          "tool_belt",
-          "flashlight",
-          "wristwatch",
-          { "item": "light_battery_cell", "charges": 100 }
-        ],
-        "entries": [ { "group": "charged_cell_phone" } ]
+        "items": [ "jumpsuit", "socks", "boots", "tool_belt", "wristwatch" ],
+        "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_flashlight" } ]
       },
       "male": [ "boxer_briefs" ],
       "female": [ "bra", "panties" ]
@@ -1429,17 +1372,10 @@
     "points": 1,
     "skills": [ { "level": 4, "name": "computer" } ],
     "items": {
-      "both": [
-        "pants",
-        [ "tshirt_text", "allyourbase" ],
-        "socks",
-        "sneakers",
-        "portable_game",
-        "mbag",
-        "laptop",
-        "smart_phone",
-        "caffeine"
-      ],
+      "both": {
+        "items": [ "pants", "tshirt_text", "socks", "sneakers", "mbag", "laptop", "smart_phone", "caffeine" ],
+        "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "portable_game" } ]
+      },
       "male": [ "briefs" ],
       "female": [ "panties" ]
     }
@@ -1712,19 +1648,19 @@
     "skills": [ { "level": 1, "name": "gun" }, { "level": 1, "name": "pistol" } ],
     "items": {
       "both": {
-        "ammo": 100,
         "items": [
           "tac_fullhelmet",
+          "police_belt",
           "pants_cargo",
           "under_armor",
           "socks",
           "boots",
           "badge_cybercop",
           "smart_phone",
-          "wristwatch",
-          "two_way_radio"
+          "wristwatch"
         ],
         "entries": [
+          { "group": "charged_two_way_radio" },
           { "item": "glock_18c", "ammo-item": "9mmP", "container-item": "holster" },
           { "item": "magbandolier", "contents-group": "army_mags_glock17" }
         ]
@@ -1806,7 +1742,6 @@
     ],
     "items": {
       "both": {
-        "ammo": 100,
         "items": [
           "winter_pants_army",
           "winter_jacket_army",
@@ -1815,10 +1750,10 @@
           "tac_helmet",
           "socks",
           "boots_combat",
-          "wristwatch",
-          "two_way_radio"
+          "wristwatch"
         ],
         "entries": [
+          { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "sheath", "contents-item": "knife_combat" },
           { "item": "h&k416a5", "ammo-item": "556", "contents-item": [ "shoulder_strap", "acog_scope" ] },
@@ -1855,8 +1790,6 @@
     ],
     "items": {
       "both": {
-        "ammo": 100,
-        "magazine": 100,
         "items": [
           "winter_pants_army",
           "army_top",
@@ -1868,16 +1801,16 @@
           "socks",
           "boots_combat",
           "canteen",
-          "two_way_radio",
           "wristwatch",
           "tent_kit",
           "rollmat",
-          "mil_mess_kit",
           "e_tool",
           "binoculars",
           "knife_hunting"
         ],
         "entries": [
+          { "item": "medium_plus_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "mil_mess_kit" },
+          { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "hat_boonie", "custom-flags": [ "no_auto_equip" ] },
           {
@@ -2163,11 +2096,10 @@
           "weed",
           "tobacco",
           "rolling_paper",
-          "mp3",
           "ref_lighter",
           "wristwatch"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
+        "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_mp3" } ]
       },
       "male": [ "pants_cargo", "tank_top", "boxer_shorts" ],
       "female": [ "skirt", "corset", "boxer_shorts" ]
@@ -2219,10 +2151,9 @@
           "rolling_paper",
           "tobacco",
           "wristwatch",
-          "mp3",
           "ref_lighter"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
+        "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_mp3" } ]
       },
       "male": [ "briefs" ],
       "female": [ "bra", "panties" ]
@@ -2777,7 +2708,7 @@
         ],
         "entries": [
           { "group": "charged_cell_phone" },
-          { "item": "sw_619", "ammo-item": "38_special", "container-item": "holster" },
+          { "item": "sw_619", "ammo-item": "38_special", "charges": 7, "container-item": "holster" },
           { "item": "38_special", "charges": 33 }
         ]
       },
@@ -2910,18 +2841,9 @@
     ],
     "items": {
       "both": {
-        "ammo": 100,
-        "items": [
-          "survivor_vest",
-          "wsurvivor_suit",
-          "socks",
-          "boots_wsurvivor",
-          "hood_wsurvivor",
-          "gloves_wsurvivor",
-          "mess_kit",
-          "wristwatch"
-        ],
+        "items": [ "survivor_vest", "wsurvivor_suit", "socks", "boots_wsurvivor", "hood_wsurvivor", "gloves_wsurvivor", "wristwatch" ],
         "entries": [
+          { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" },
           { "item": "kukri", "container-item": "sheath" },
           { "item": "crossbow", "ammo-item": "bolt_wood", "contents-item": "shoulder_strap" },
           { "item": "bolt_wood", "charges": 29, "container-item": "quiver_large" }
@@ -2992,19 +2914,23 @@
           "balclava",
           "boots_combat",
           "gloves_tactical",
-          "chestrig",
           "tac_helmet",
           "canteen",
-          "mil_mess_kit",
           "wristwatch",
-          "two_way_radio",
           "quikclot"
         ],
         "entries": [
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "knife_combat", "container-item": "sheath" },
           { "item": "m4a1", "ammo-item": "556", "contents-item": "shoulder_strap" },
-          { "item": "stanag30", "ammo-item": "556", "count": 2 }
+          {
+            "item": "medium_plus_battery_cell",
+            "ammo-item": "battery",
+            "charges": 600,
+            "container-item": "mil_mess_kit"
+          },
+          { "group": "charged_two_way_radio" },
+          { "item": "chestrig", "contents-group": "army_mags_m4" }
         ]
       },
       "male": [ "boxer_shorts" ],
@@ -3030,7 +2956,6 @@
     ],
     "items": {
       "both": {
-        "ammo": 100,
         "items": [
           "tank_top",
           "pants_leather",
@@ -3045,16 +2970,16 @@
           "canteen",
           "whistle",
           "binoculars",
-          "wearable_light",
           "duct_tape",
           "ref_lighter",
-          "wristwatch",
-          "gasoline_cooker"
+          "wristwatch"
         ],
         "entries": [
           { "item": "knife_combat", "container-item": "sheath" },
+          { "item": "gasoline_cooker", "ammo_item": "gasoline", "charges": 500 },
           { "item": "XL_holster", "contents-group": "shotgun_d_roadwarrior" },
-          { "item": "reloaded_shot_00", "charges": 18, "container-item": "bandolier_shotgun" }
+          { "item": "reloaded_shot_00", "charges": 18, "container-item": "bandolier_shotgun" },
+          { "item": "light_battery_cell", "charges": 100, "container-item": "wearable_light" }
         ]
       },
       "male": [ "boxer_shorts" ],
@@ -3164,19 +3089,8 @@
     "points": 0,
     "items": {
       "both": {
-        "items": [
-          "pants",
-          "socks",
-          "boots",
-          "longshirt",
-          "jacket_light",
-          "baton",
-          "tazer",
-          "medium_disposable_cell",
-          "pockknife",
-          "wristwatch"
-        ],
-        "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_flashlight" } ]
+        "items": [ "pants", "socks", "boots", "longshirt", "jacket_light", "baton", "pockknife", "wristwatch" ],
+        "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_flashlight" }, { "group": "charged_tazer" } ]
       },
       "male": [ "boxer_shorts" ],
       "female": [ "bra", "boy_shorts" ]
@@ -3243,8 +3157,6 @@
           "fishing_waders",
           "knit_scarf",
           "fishing_rod_professional",
-          "fish_bait",
-          "fish_trap",
           "vest",
           "hat_boonie",
           "wristwatch",
@@ -3252,6 +3164,8 @@
         ],
         "entries": [
           { "group": "charged_cell_phone" },
+          { "item": "fish_trap", "ammo-item": "fish_bait", "charges": 5 },
+          { "item": "fish_bait", "charges": 15 },
           { "item": "lighter", "charges": 100 },
           { "item": "knife_hunting", "container-item": "sheath" }
         ]
@@ -3277,21 +3191,24 @@
         "items": [ "stockings", "pockknife", "matches", "pipe_tobacco", "tobacco" ],
         "entries": [ { "group": "charged_cell_phone" } ]
       },
-      "male": [
-        "knee_high_boots",
-        "breeches",
-        "waistcoat",
-        "peacoat",
-        "leather_belt",
-        "knit_scarf",
-        "tricorne",
-        "shoulder_strap",
-        "flintlock_pouch",
-        "rifle_flintlock",
-        "flintlock_ammo",
-        "hatchet",
-        "hardtack"
-      ],
+      "male": {
+        "items": [
+          "knee_high_boots",
+          "breeches",
+          "waistcoat",
+          "peacoat",
+          "leather_belt",
+          "knit_scarf",
+          "tricorne",
+          "hatchet",
+          "hardtack"
+        ],
+        "entries": [
+          { "item": "rifle_flintlock", "ammo-item": "flintlock_ammo", "charges": 1, "contents-item": "shoulder_strap" },
+          { "item": "flintlock_ammo", "charges": 14, "container-item": "flintlock_pouch" },
+          { "item": "flintlock_ammo", "charges": 15 }
+        ]
+      },
       "female": [
         "dress",
         "apron_leather",
@@ -3339,21 +3256,24 @@
         "cornmeal",
         "salt"
       ],
-      "female": [
-        "knee_high_boots",
-        "breeches",
-        "waistcoat",
-        "peacoat",
-        "leather_belt",
-        "knit_scarf",
-        "tricorne",
-        "shoulder_strap",
-        "flintlock_pouch",
-        "rifle_flintlock",
-        "flintlock_ammo",
-        "hatchet",
-        "hardtack"
-      ]
+      "female": {
+        "items": [
+          "knee_high_boots",
+          "breeches",
+          "waistcoat",
+          "peacoat",
+          "leather_belt",
+          "knit_scarf",
+          "tricorne",
+          "hatchet",
+          "hardtack"
+        ],
+        "entries": [
+          { "item": "rifle_flintlock", "ammo-item": "flintlock_ammo", "charges": 1, "contents-item": "shoulder_strap" },
+          { "item": "flintlock_ammo", "charges": 14, "container-item": "flintlock_pouch" },
+          { "item": "flintlock_ammo", "charges": 15 }
+        ]
+      }
     }
   },
   {
@@ -3583,8 +3503,11 @@
     "points": 0,
     "items": {
       "both": {
-        "items": [ "pants", "dress_shirt", "blazer", "socks", "dress_shoes", "camera_pro", "wristwatch" ],
-        "entries": [ { "group": "charged_cell_phone" } ]
+        "items": [ "pants", "dress_shirt", "blazer", "socks", "dress_shoes", "wristwatch" ],
+        "entries": [
+          { "group": "charged_cell_phone" },
+          { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" }
+        ]
       },
       "male": [ "boxer_shorts" ],
       "female": [ "boy_shorts", "bra" ]
@@ -3659,7 +3582,6 @@
           "boots_steel",
           "gloves_work",
           "knee_pads",
-          "miner_hat",
           "jumpsuit",
           "mask_gas",
           "jackhammer",
@@ -3672,8 +3594,8 @@
         ],
         "entries": [
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "light_disposable_cell", "charges": 100 },
-          { "item": "light_disposable_cell", "charges": 100 }
+          { "item": "light_minus_disposable_cell", "charges": 100 },
+          { "item": "light_minus_disposable_cell", "charges": 100, "container-item": "miner_hat" }
         ]
       },
       "male": [ "boxer_shorts" ],
diff --git a/data/mods/Aftershock/player/afs_professions.json b/data/mods/Aftershock/player/afs_professions.json
index 4a88d7f55a72f..a42b13cf739a2 100644
--- a/data/mods/Aftershock/player/afs_professions.json
+++ b/data/mods/Aftershock/player/afs_professions.json
@@ -32,17 +32,8 @@
     "points": 2,
     "skills": [ { "level": 5, "name": "computer" } ],
     "items": {
-      "both": [
-        "laptop",
-        "software_useless",
-        "eink_tablet_pc",
-        "linuxtshirt",
-        "pants_cargo",
-        "socks",
-        "slingpack",
-        "sneakers",
-        "smart_phone"
-      ],
+      "both": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ],
+      "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ],
       "male": [ "briefs" ],
       "female": [ "bra", "panties" ]
     }
diff --git a/data/mods/more_classes_scenarios/cs_classes.json b/data/mods/more_classes_scenarios/cs_classes.json
index c01f27016f533..37e9a15a3a98b 100644
--- a/data/mods/more_classes_scenarios/cs_classes.json
+++ b/data/mods/more_classes_scenarios/cs_classes.json
@@ -147,14 +147,16 @@
           "roadmap",
           "restaurantmap",
           "shavingkit",
-          "mess_kit",
           "aluminum_foil",
           "can_chowder",
           "apple_cider",
           "fruit_leather",
           "suitcase_m"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
+        "entries": [
+          { "group": "charged_cell_phone" },
+          { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" }
+        ]
       },
       "male": [ "boxer_shorts" ],
       "female": [ "bra", "panties" ]
@@ -312,7 +314,7 @@
     "description": "You were awoken in the middle of the night by a noise. Armed only with a flashlight you went to investigate, now you face the cataclysm.",
     "points": 0,
     "items": {
-      "both": [ "slippers", "flashlight" ],
+      "both": { "items": [ "slippers" ], "entries": [ { "group": "charged_flashlight" } ] },
       "male": [ "boxer_shorts", "socks", "house_coat" ],
       "female": [ "bra", "panties", "stockings", "gown" ]
     }
@@ -349,18 +351,13 @@
     "points": 4,
     "skills": [ { "level": 1, "name": "mechanics" } ],
     "items": {
-      "both": [
-        "socks",
-        "wearable_light",
-        "goggles_welding",
-        "jumpsuit",
-        "gloves_work",
-        "boots_steel",
-        "tool_belt",
-        "apron_leather",
-        "oxy_torch",
-        "tinyweldtank"
-      ],
+      "both": {
+        "items": [ "socks", "goggles_welding", "jumpsuit", "gloves_work", "boots_steel", "tool_belt", "apron_leather" ],
+        "entries": [
+          { "item": "tinyweldtank", "ammo-item": "oxyacetylene", "charges": 60, "container-item": "oxy_torch" },
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 100, "container-item": "wearable_light" }
+        ]
+      },
       "male": [ "boxer_shorts" ],
       "female": [ "bra", "boxer_shorts" ]
     }