diff --git a/compendium/wfrp4e-archives3.items.json b/compendium/wfrp4e-archives3.items.json
new file mode 100644
index 0000000..2cb489f
--- /dev/null
+++ b/compendium/wfrp4e-archives3.items.json
@@ -0,0 +1,91 @@
+{
+  "label": "Items (Archives Vol. III)",
+  "folders":  {
+    "Armour": "Armures",
+    "Careers": "Carrières",
+    "Skills": "Compétences",
+    "Spells": "Sorts"
+  },
+  "mapping": {
+    "description": "system.description.value",
+    "trappings": "system.trappings",
+    "class": {
+      "path": "system.class.value",
+      "converter": "generic_localization"
+    },
+    "skills": {
+      "path": "system.skills",
+      "converter": "career_skills"
+    },
+    "careergroup": {
+      "path": "system.careergroup.value",
+      "converter": "career_careergroup"
+    },
+    "talents": {
+      "path": "system.talents",
+      "converter": "career_talents"
+    },
+    "pduration": {
+      "path": "system.duration.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "prange": {
+      "path": "system.range.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "ptarget": {
+      "path": "system.target.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "pdamage": {
+      "path": "system.damage.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "test": {
+      "path": "system.test",
+      "converter": "role_skills"
+    },
+    "tests": "system.tests.value",
+    "maxcost": {
+      "path": "system.cost.max",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "sduration": {
+      "path": "system.duration.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "srange": {
+      "path": "system.range.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "starget": {
+      "path": "system.target.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "sdamage": {
+      "path": "system.damage.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "penalty": "system.penalty.value",
+    "location": {
+      "path": "system.location.value",
+      "converter": "generic_localization"
+    },
+    "durationValue": "system.duration.value",
+    "durationUnit": "system.duration.unit",
+    "contraction": "system.contraction.value",
+    "incubationValue": "system.incubation.value",
+    "incubationUnit": "system.incubation.unit",
+    "symptoms": "system.symptoms.value",
+    "permanent": "system.permanent.value",
+    "special": "system.special.value",
+    "qualities": {
+      "path": "system.qualities.value",
+      "converter": "trapping_qualities_flaws"
+    },
+    "flaws": {
+      "path": "system.flaws.value",
+      "converter": "trapping_qualities_flaws"
+    }
+  }
+}
\ No newline at end of file
diff --git a/compendium/wfrp4e-lustria.items.json b/compendium/wfrp4e-lustria.items.json
new file mode 100644
index 0000000..884d3a5
--- /dev/null
+++ b/compendium/wfrp4e-lustria.items.json
@@ -0,0 +1,94 @@
+{
+  "label": "Items (Lustria)",
+  "folders":  {
+    "Careers": "Carrières",
+    "Spells": "Sorts",
+    "Trappings": "Possessions",
+    "Weapons": "Armes"
+  },
+  "mapping": {
+    "description": "system.description.value",
+    "trappings": "system.trappings",
+    "class": {
+      "path": "system.class.value",
+      "converter": "generic_localization"
+    },
+    "skills": {
+      "path": "system.skills",
+      "converter": "career_skills"
+    },
+    "modType": "system.modType.value",
+    "careergroup": {
+      "path": "system.careergroup.value",
+      "converter": "career_careergroup"
+    },
+    "talents": {
+      "path": "system.talents",
+      "converter": "career_talents"
+    },
+    "pduration": {
+      "path": "system.duration.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "prange": {
+      "path": "system.range.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "ptarget": {
+      "path": "system.target.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "pdamage": {
+      "path": "system.damage.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "test": {
+      "path": "system.test",
+      "converter": "role_skills"
+    },
+    "tests": "system.tests.value",
+    "sduration": {
+      "path": "system.duration.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "srange": {
+      "path": "system.range.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "starget": {
+      "path": "system.target.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "sdamage": {
+      "path": "system.damage.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "penalty": "system.penalty.value",
+    "location": {
+      "path": "system.location.value",
+      "converter": "generic_localization"
+    },
+    "durationValue": "system.duration.value",
+    "durationUnit": {
+      "path": "system.duration.unit",
+      "converter": "disease_duration_unit"
+    },
+    "contraction": "system.contraction.value",
+    "incubationValue": "system.incubation.value",
+    "incubationUnit": {
+      "path": "system.incubation.unit",
+      "converter": "disease_duration_unit"
+    },
+    "symptoms": "system.symptoms.value",
+    "permanent": "system.permanent.value",
+    "special": "system.special.value",
+    "qualities": {
+      "path": "system.qualities.value",
+      "converter": "trapping_qualities_flaws"
+    },
+    "flaws": {
+      "path": "system.flaws.value",
+      "converter": "trapping_qualities_flaws"
+    }
+  }
+}
\ No newline at end of file
diff --git a/compendium/wfrp4e-owb2.items.json b/compendium/wfrp4e-owb2.items.json
new file mode 100644
index 0000000..ae44e21
--- /dev/null
+++ b/compendium/wfrp4e-owb2.items.json
@@ -0,0 +1,103 @@
+{
+  "label": "Items (Old World Bundle II)",
+  "folders":  {
+    "Lore of the Beasts": "Domaine des Bêtes",
+    "Lore of Death": "Domaine de la Mort",
+    "Lore of Fire": "Domaine du Feu",
+    "Lore of Heavens": "Domaine des Cieux",
+    "Lore of Hedgecraft": "Magie des Haies",
+    "Lore of Life": "Domaine de la Vie",
+    "Lore of Light": "Domaine de la Lumière",
+    "Lore of Metal": "Domaine du Métal",
+    "Lore of Shadows": "Domaine des Ombres",
+    "Lore of Witchcraft": "Sorcellerie"
+  },
+  "mapping": {
+    "description": "system.description.value",
+    "trappings": "system.trappings",
+    "class": {
+      "path": "system.class.value",
+      "converter": "generic_localization"
+    },
+    "skills": {
+      "path": "system.skills",
+      "converter": "career_skills"
+    },
+    "careergroup": {
+      "path": "system.careergroup.value",
+      "converter": "career_careergroup"
+    },
+    "talents": {
+      "path": "system.talents",
+      "converter": "career_talents"
+    },
+    "pduration": {
+      "path": "system.duration.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "prange": {
+      "path": "system.range.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "ptarget": {
+      "path": "system.target.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "pdamage": {
+      "path": "system.damage.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "test": {
+      "path": "system.test",
+      "converter": "role_skills"
+    },
+    "tests": "system.tests.value",
+    "maxcost": {
+      "path": "system.cost.max",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "sduration": {
+      "path": "system.duration.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "srange": {
+      "path": "system.range.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "starget": {
+      "path": "system.target.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "sdamage": {
+      "path": "system.damage.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "penalty": "system.penalty.value",
+    "location": {
+      "path": "system.location.value",
+      "converter": "generic_localization"
+    },
+    "durationValue": "system.duration.value",
+    "durationUnit": {
+      "path": "system.duration.unit",
+      "converter": "disease_duration_unit"
+    },
+    "contraction": "system.contraction.value",
+    "incubationValue": "system.incubation.value",
+    "incubationUnit": {
+      "path": "system.incubation.unit",
+      "converter": "disease_duration_unit"
+    },
+    "symptoms": "system.symptoms.value",
+    "permanent": "system.permanent.value",
+    "special": "system.special.value",
+    "qualities": {
+      "path": "system.qualities.value",
+      "converter": "trapping_qualities_flaws"
+    },
+    "flaws": {
+      "path": "system.flaws.value",
+      "converter": "trapping_qualities_flaws"
+    }
+  }
+}
\ No newline at end of file
diff --git a/compendium/wfrp4e-salzenmund.items.json b/compendium/wfrp4e-salzenmund.items.json
new file mode 100644
index 0000000..3606797
--- /dev/null
+++ b/compendium/wfrp4e-salzenmund.items.json
@@ -0,0 +1,89 @@
+{
+  "label": "Items (Salzenmund)",
+  "mapping": {
+    "effects": {
+      "converter": "process_effects",
+      "path": "effects"
+    },
+    "careergroup": {
+        "converter": "career_careergroup",
+        "path": "system.careergroup.value"
+    },
+    "class": {
+        "converter": "generic_localization",
+        "path": "system.class.value"
+    },
+    "contraction": "system.contraction.value",
+    "description": "system.description.value",
+    "durationUnit": "system.duration.unit",
+    "durationValue": "system.duration.value",
+    "flaws": {
+        "converter": "trapping_qualities_flaws",
+        "path": "system.flaws.value"
+    },
+    "incubationUnit": "system.incubation.unit",
+    "incubationValue": "system.incubation.value",
+    "location": {
+        "converter": "generic_localization",
+        "path": "system.location.value"
+    },
+    "modifier": {
+        "converter": "mutations_modifier",
+        "path": "system.modifier.value"
+    },
+    "mutationType": {
+        "converter": "generic_localization",
+        "path": "system.mutationType.value"
+    },
+    "pdamage": {
+        "converter": "spells_duration_range_target_damage",
+        "path": "system.damage.value"
+    },
+    "pduration": {
+        "converter": "spells_duration_range_target_damage",
+        "path": "system.duration.value"
+    },
+    "penalty": "system.penalty.value",
+    "permanent": "system.permanent.value",
+    "prange": {
+        "converter": "spells_duration_range_target_damage",
+        "path": "system.range.value"
+    },
+    "ptarget": {
+        "converter": "spells_duration_range_target_damage",
+        "path": "system.target.value"
+    },
+    "qualities": {
+        "converter": "trapping_qualities_flaws",
+        "path": "system.qualities.value"
+    },
+    "sdamage": {
+        "converter": "spells_duration_range_target_damage",
+        "path": "system.damage.value"
+    },
+    "sduration": {
+        "converter": "spells_duration_range_target_damage",
+        "path": "system.duration.value"
+    },
+    "skills": {
+        "converter": "career_skills",
+        "path": "system.skills"
+    },
+    "special": "system.special.value",
+    "srange": {
+        "converter": "spells_duration_range_target_damage",
+        "path": "system.range.value"
+    },
+    "starget": {
+        "converter": "spells_duration_range_target_damage",
+        "path": "system.target.value"
+    },
+    "symptoms": "system.symptoms.value",
+    "talents": {
+        "converter": "career_talents",
+        "path": "system.talents"
+    },
+    "tests": "system.tests.value",
+    "trappings": "system.trappings"
+  }
+}
\ No newline at end of file
diff --git a/compendium/wfrp4e-zoo.items.json b/compendium/wfrp4e-zoo.items.json
new file mode 100644
index 0000000..98076c3
--- /dev/null
+++ b/compendium/wfrp4e-zoo.items.json
@@ -0,0 +1,95 @@
+{
+  "label": "Items (Imperial Zoo)",
+  "folders":  {
+    "Ammunition": "Munitions",
+    "Careers": "Carrières",
+    "Prayers": "Prières",
+    "Trappings": "Possessions",
+    "Weapons": "Armes"
+  },
+  "mapping": {
+    "description": "system.description.value",
+    "trappings": "system.trappings",
+    "class": {
+      "path": "system.class.value",
+      "converter": "generic_localization"
+    },
+    "skills": {
+      "path": "system.skills",
+      "converter": "career_skills"
+    },
+    "modType": "system.modType.value",
+    "careergroup": {
+      "path": "system.careergroup.value",
+      "converter": "career_careergroup"
+    },
+    "talents": {
+      "path": "system.talents",
+      "converter": "career_talents"
+    },
+    "pduration": {
+      "path": "system.duration.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "prange": {
+      "path": "system.range.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "ptarget": {
+      "path": "system.target.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "pdamage": {
+      "path": "system.damage.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "test": {
+      "path": "system.test",
+      "converter": "role_skills"
+    },
+    "tests": "system.tests.value",
+    "sduration": {
+      "path": "system.duration.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "srange": {
+      "path": "system.range.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "starget": {
+      "path": "system.target.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "sdamage": {
+      "path": "system.damage.value",
+      "converter": "spells_duration_range_target_damage"
+    },
+    "penalty": "system.penalty.value",
+    "location": {
+      "path": "system.location.value",
+      "converter": "generic_localization"
+    },
+    "durationValue": "system.duration.value",
+    "durationUnit": {
+      "path": "system.duration.unit",
+      "converter": "disease_duration_unit"
+    },
+    "contraction": "system.contraction.value",
+    "incubationValue": "system.incubation.value",
+    "incubationUnit": {
+      "path": "system.incubation.unit",
+      "converter": "disease_duration_unit"
+    },
+    "symptoms": "system.symptoms.value",
+    "permanent": "system.permanent.value",
+    "special": "system.special.value",
+    "qualities": {
+      "path": "system.qualities.value",
+      "converter": "trapping_qualities_flaws"
+    },
+    "flaws": {
+      "path": "system.flaws.value",
+      "converter": "trapping_qualities_flaws"
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/babele-register.js b/modules/babele-register.js
index 004ec3f..688372b 100644
--- a/modules/babele-register.js
+++ b/modules/babele-register.js
@@ -257,8 +257,12 @@ Hooks.once('init', () => {
                     s1 = res[1].trim() + " ( )";
                     translItem = game.babele.translate(compData.metadata.id, { name: s1, type: "skill" }, true)
                     translw = translItem?.name || undefined
-                    let res2 = re.exec(translw);
-                    transl = res2[1] + "(" + subword + ")";
+                    if(translw) {
+                      let res2 = re.exec(translw);
+                      transl = res2[1] + "(" + subword + ")";
+                    } else {
+                      transl = res[1] + " (" + subword + ")";
+                    }
                   }
                 }
               }
@@ -658,6 +662,10 @@ Hooks.once('init', () => {
       // Auto-translate duration
       "spells_duration_range_target_damage": (value) => {
         return WFRP4FrTranslation.processSpellContent(value);
+      },
+      // Auto-translate disease duration units
+      "disease_duration_unit": (unit) => {
+        return game.i18n.localize(unit).capitalize();
       }
   });
   }