diff --git a/binaries/data/mods/public/globalscripts/Templates.js b/binaries/data/mods/public/globalscripts/Templates.js
index 8250848a44..083f3cca79 100644
--- a/binaries/data/mods/public/globalscripts/Templates.js
+++ b/binaries/data/mods/public/globalscripts/Templates.js
@@ -187,10 +187,11 @@ function GetTemplateDataHelper(template, player, auraTemplates, resources, damag
 				ret.attack[type] = {
 					"minRange": getAttackStat("MinRange"),
 					"maxRange": getAttackStat("MaxRange"),
-					"elevationBonus": getAttackStat("ElevationBonus")
+					"elevationBonus": getAttackStat("ElevationBonus"),
+					"damage": {}
 				};
 				for (let damageType of damageTypes.GetTypes())
-					ret.attack[type][damageType] = getAttackStat(damageType);
+					ret.attack[type].damage[damageType] = getAttackStat("Damage/" + damageType);
 
 				ret.attack[type].elevationAdaptedRange = Math.sqrt(ret.attack[type].maxRange *
 					(2 * ret.attack[type].elevationBonus + ret.attack[type].maxRange));
@@ -202,10 +203,11 @@ function GetTemplateDataHelper(template, player, auraTemplates, resources, damag
 				ret.attack[type].splash = {
 					// true if undefined
 					"friendlyFire": template.Attack[type].Splash.FriendlyFire != "false",
-					"shape": template.Attack[type].Splash.Shape
+					"shape": template.Attack[type].Splash.Shape,
+					"damage": {}
 				};
 				for (let damageType of damageTypes.GetTypes())
-					ret.attack[type].splash[damageType] = getAttackStat("Splash/" + damageType);
+					ret.attack[type].splash.damage[damageType] = getAttackStat("Splash/Damage/" + damageType);
 			}
 		}
 	}
@@ -213,10 +215,11 @@ function GetTemplateDataHelper(template, player, auraTemplates, resources, damag
 	if (template.DeathDamage)
 	{
 		ret.deathDamage = {
-			"friendlyFire": template.DeathDamage.FriendlyFire != "false"
+			"friendlyFire": template.DeathDamage.FriendlyFire != "false",
+			"damage": {}
 		};
 		for (let damageType of damageTypes.GetTypes())
-			ret.deathDamage[damageType] = getEntityValue("DeathDamage/" + damageType);
+			ret.deathDamage.damage[damageType] = getEntityValue("DeathDamage/Damage/" + damageType);
 	}
 
 	if (template.Auras && auraTemplates)
@@ -226,10 +229,10 @@ function GetTemplateDataHelper(template, player, auraTemplates, resources, damag
 		{
 			let aura = auraTemplates[auraID];
 			ret.auras[auraID] = {
-					"name": aura.auraName,
-					"description": aura.auraDescription || null,
-					"radius": aura.radius || null
-				};
+				"name": aura.auraName,
+				"description": aura.auraDescription || null,
+				"radius": aura.radius || null
+			};
 		}
 	}
 
diff --git a/binaries/data/mods/public/gui/common/tooltips.js b/binaries/data/mods/public/gui/common/tooltips.js
index e907c62597..55a917c399 100644
--- a/binaries/data/mods/public/gui/common/tooltips.js
+++ b/binaries/data/mods/public/gui/common/tooltips.js
@@ -274,7 +274,7 @@ function getAttackTooltip(template)
 				"details":
 					type == "Capture" ?
 						template.attack.Capture.value :
-						damageTypesToText(template.attack[type]),
+						damageTypesToText(template.attack[type].damage),
 				"rate": rate
 			}));
 			continue;
@@ -284,10 +284,9 @@ function getAttackTooltip(template)
 		let maxRange = Math.round(template.attack[type].maxRange);
 		let realRange = template.attack[type].elevationAdaptedRange;
 		let relativeRange = realRange ? Math.round(realRange - maxRange) : 0;
-
 		tooltips.push(sprintf(g_RangeTooltipString[relativeRange ? "relative" : "non-relative"][minRange ? "minRange" : "no-minRange"], {
 			"attackLabel": attackLabel,
-			"damageTypes": damageTypesToText(template.attack[type]),
+			"damageTypes": damageTypesToText(template.attack[type].damage),
 			"rangeLabel": headerFont(translate("Range:")),
 			"minRange": minRange,
 			"maxRange": maxRange,
@@ -317,7 +316,7 @@ function getSplashDamageTooltip(template)
 
 		let splashDamageTooltip = sprintf(translate("%(label)s: %(value)s"), {
 			"label": headerFont(g_SplashDamageTypes[splash.shape]),
-			"value": damageTypesToText(splash)
+			"value": damageTypesToText(splash.damage)
 		});
 
 		if (g_AlwaysDisplayFriendlyFire || splash.friendlyFire)
diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json
index 650e25c738..4d80d624b4 100644
--- a/binaries/data/mods/public/gui/credits/texts/programming.json
+++ b/binaries/data/mods/public/gui/credits/texts/programming.json
@@ -87,6 +87,7 @@
 			{"nick": "Fire Giant", "name": "Malte Schwarzkopf"},
 			{"name": "Fork AD"},
 			{"nick": "fpre", "name": "Frederick Stallmeyer"},
+			{"nick": "Freagarach"},
 			{"nick": "freenity", "name": "Anton Galitch"},
 			{"nick": "Gallaecio", "name": "Adrián Chaves"},
 			{"nick": "gbish (aka Iny)", "name": "Grant Bishop"},
diff --git a/binaries/data/mods/public/simulation/ai/common-api/entity.js b/binaries/data/mods/public/simulation/ai/common-api/entity.js
index e6491e4168..fe2ce16d57 100644
--- a/binaries/data/mods/public/simulation/ai/common-api/entity.js
+++ b/binaries/data/mods/public/simulation/ai/common-api/entity.js
@@ -233,9 +233,9 @@ m.Template = m.Class({
 			return undefined;
 
 		return {
-			"Hack": +(this.get("Attack/" + type + "/Hack") || 0),
-			"Pierce": +(this.get("Attack/" + type + "/Pierce") || 0),
-			"Crush": +(this.get("Attack/" + type + "/Crush") || 0)
+			"Hack": +(this.get("Attack/" + type + "/Damage/Hack") || 0),
+			"Pierce": +(this.get("Attack/" + type + "/Damage/Pierce") || 0),
+			"Crush": +(this.get("Attack/" + type + "/Damage/Crush") || 0)
 		};
 	},
 
diff --git a/binaries/data/mods/public/simulation/components/Attack.js b/binaries/data/mods/public/simulation/components/Attack.js
index 77468b43a6..fae56cedd8 100644
--- a/binaries/data/mods/public/simulation/components/Attack.js
+++ b/binaries/data/mods/public/simulation/components/Attack.js
@@ -122,7 +122,9 @@ Attack.prototype.Schema =
 	"<optional>" +
 		"<element name='Melee'>" +
 			"<interleave>" +
-				DamageTypes.BuildSchema("damage strength") +
+				"<element name='Damage'>" +
+					DamageTypes.BuildSchema("damage strength") +
+				"</element>" +
 				"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='PrepareTime' a:help='Time from the start of the attack command until the attack actually occurs (in milliseconds). This value relative to RepeatTime should closely match the \"event\" point in the actor&apos;s attack animation'>" +
 					"<data type='nonNegativeInteger'/>" +
@@ -139,7 +141,9 @@ Attack.prototype.Schema =
 	"<optional>" +
 		"<element name='Ranged'>" +
 			"<interleave>" +
-				DamageTypes.BuildSchema("damage strength") +
+				"<element name='Damage'>" +
+					DamageTypes.BuildSchema("damage strength") +
+				"</element>" +
 				"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='MinRange' a:help='Minimum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<optional>"+
@@ -167,7 +171,9 @@ Attack.prototype.Schema =
 							"<element name='Shape' a:help='Shape of the splash damage, can be circular or linear'><text/></element>" +
 							"<element name='Range' a:help='Size of the area affected by the splash'><ref name='nonNegativeDecimal'/></element>" +
 							"<element name='FriendlyFire' a:help='Whether the splash damage can hurt non enemy units'><data type='boolean'/></element>" +
-							DamageTypes.BuildSchema("damage strength") +
+							"<element name='Damage'>" +
+								DamageTypes.BuildSchema("damage strength") +
+							"</element>" +
 							Attack.prototype.bonusesSchema +
 						"</interleave>" +
 					"</element>" +
@@ -227,7 +233,9 @@ Attack.prototype.Schema =
 	"<optional>" +
 		"<element name='Slaughter' a:help='A special attack to kill domestic animals'>" +
 			"<interleave>" +
-				DamageTypes.BuildSchema("damage strength") +
+				"<element name='Damage'>" +
+					DamageTypes.BuildSchema("damage strength") +
+				"</element>" +
 				"<element name='MaxRange'><ref name='nonNegativeDecimal'/></element>" + // TODO: how do these work?
 				Attack.prototype.bonusesSchema +
 				Attack.prototype.preferredClassesSchema +
@@ -448,10 +456,10 @@ Attack.prototype.GetAttackStrengths = function(type)
 	}
 
 	let applyMods = damageType =>
-		ApplyValueModificationsToEntity("Attack/" + type + splash + "/" + damageType, +(template[damageType] || 0), this.entity);
+		ApplyValueModificationsToEntity("Attack/" + type + splash + "/Damage/" + damageType, +(template.Damage[damageType] || 0), this.entity);
 
 	if (type == "Capture")
-		return { "value": applyMods("Value") };
+		return { "value": ApplyValueModificationsToEntity("Attack/Capture/Value", +(template.Value || 0), this.entity) };
 
 	let ret = {};
 	for (let damageType of DamageTypes.GetTypes())
@@ -465,7 +473,8 @@ Attack.prototype.GetSplashDamage = function(type)
 	if (!this.template[type].Splash)
 		return false;
 
-	let splash = this.GetAttackStrengths(type + ".Splash");
+	let splash = {};
+	splash.damage = this.GetAttackStrengths(type + ".Splash");
 	splash.friendlyFire = this.template[type].Splash.FriendlyFire != "false";
 	splash.shape = this.template[type].Splash.Shape;
 	return splash;
diff --git a/binaries/data/mods/public/simulation/components/DeathDamage.js b/binaries/data/mods/public/simulation/components/DeathDamage.js
index bfb0ca02d4..44f0da0097 100644
--- a/binaries/data/mods/public/simulation/components/DeathDamage.js
+++ b/binaries/data/mods/public/simulation/components/DeathDamage.js
@@ -31,7 +31,9 @@ DeathDamage.prototype.Schema =
 	"<element name='Shape' a:help='Shape of the splash damage, can be circular'><text/></element>" +
 	"<element name='Range' a:help='Size of the area affected by the splash'><ref name='nonNegativeDecimal'/></element>" +
 	"<element name='FriendlyFire' a:help='Whether the splash damage can hurt non enemy units'><data type='boolean'/></element>" +
-	DamageTypes.BuildSchema("damage strength") +
+	"<element name='Damage'>" +
+		DamageTypes.BuildSchema("damage strength") +
+	"</element>" +
 	DeathDamage.prototype.bonusesSchema;
 
 DeathDamage.prototype.Init = function()
@@ -44,7 +46,7 @@ DeathDamage.prototype.GetDeathDamageStrengths = function()
 {
 	// Work out the damage values with technology effects
 	let applyMods = damageType =>
-		ApplyValueModificationsToEntity("DeathDamage/" + damageType, +(this.template[damageType] || 0), this.entity);
+		ApplyValueModificationsToEntity("DeathDamage/Damage/" + damageType, +(this.template.Damage[damageType] || 0), this.entity);
 
 	let ret = {};
 	for (let damageType of DamageTypes.GetTypes())
diff --git a/binaries/data/mods/public/simulation/components/GuiInterface.js b/binaries/data/mods/public/simulation/components/GuiInterface.js
index 78e52d374f..f58aa8a530 100644
--- a/binaries/data/mods/public/simulation/components/GuiInterface.js
+++ b/binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -388,7 +388,12 @@ GuiInterface.prototype.GetEntityState = function(player, ent)
 
 		for (let type of types)
 		{
-			ret.attack[type] = cmpAttack.GetAttackStrengths(type);
+			ret.attack[type] = {};
+			if (type == "Capture")
+				ret.attack[type] = cmpAttack.GetAttackStrengths(type);
+			else
+				ret.attack[type].damage = cmpAttack.GetAttackStrengths(type);
+
 			ret.attack[type].splash = cmpAttack.GetSplashDamage(type);
 
 			let range = cmpAttack.GetRange(type);
diff --git a/binaries/data/mods/public/simulation/components/TechnologyManager.js b/binaries/data/mods/public/simulation/components/TechnologyManager.js
index 1313575a87..f341c9058f 100644
--- a/binaries/data/mods/public/simulation/components/TechnologyManager.js
+++ b/binaries/data/mods/public/simulation/components/TechnologyManager.js
@@ -36,7 +36,7 @@ TechnologyManager.prototype.Init = function()
 	//                 ]}
 	this.modifications = {};
 	this.modificationCache = {}; // Caches the values after technologies have been applied
-	                             // e.g. { "Attack/Melee/Hack" : {5: {"origValue": 8, "newValue": 10}, 7: {"origValue": 9, "newValue": 12}, ...}, ...}
+	                             // e.g. { "Attack/Melee/Damage/Hack" : {5: {"origValue": 8, "newValue": 10}, 7: {"origValue": 9, "newValue": 12}, ...}, ...}
 	                             // where 5 and 7 are entity id's
 
 	this.classCounts = {}; // stores the number of entities of each Class
diff --git a/binaries/data/mods/public/simulation/components/tests/test_Attack.js b/binaries/data/mods/public/simulation/components/tests/test_Attack.js
index affa894e22..338d9f7cbc 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_Attack.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_Attack.js
@@ -43,10 +43,12 @@ function attackComponentTest(defenderClass, isEnemy, test_function)
 	});
 
 	let cmpAttack = ConstructComponent(attacker, "Attack", {
-		"Melee" : {
-			"Hack": 11,
-			"Pierce": 5,
-			"Crush": 0,
+		"Melee": {
+			"Damage": {
+				"Hack": 11,
+				"Pierce": 5,
+				"Crush": 0
+			},
 			"MinRange": 3,
 			"MaxRange": 5,
 			"PreferredClasses": {
@@ -63,10 +65,12 @@ function attackComponentTest(defenderClass, isEnemy, test_function)
 				}
 			}
 		},
-		"Ranged" : {
-			"Hack": 0,
-			"Pierce": 10,
-			"Crush": 0,
+		"Ranged": {
+			"Damage": {
+				"Hack": 0,
+				"Pierce": 10,
+				"Crush": 0
+			},
 			"MinRange": 10,
 			"MaxRange": 80,
 			"PrepareTime": 300,
@@ -82,13 +86,15 @@ function attackComponentTest(defenderClass, isEnemy, test_function)
 			"RestrictedClasses": {
 				"_string": "Elephant"
 			},
-			"Splash" : {
+			"Splash": {
 				"Shape": "Circular",
 				"Range": 10,
 				"FriendlyFire": "false",
-				"Hack": 0.0,
-				"Pierce": 15.0,
-				"Crush": 35.0,
+				"Damage": {
+					"Hack": 0.0,
+					"Pierce": 15.0,
+					"Crush": 35.0
+				},
 				"Bonuses": {
 					"BonusCav": {
 						"Classes": "Cavalry",
@@ -97,7 +103,7 @@ function attackComponentTest(defenderClass, isEnemy, test_function)
 				}
 			}
 		},
-		"Capture" : {
+		"Capture": {
 			"Value": 8,
 			"MaxRange": 10,
 		},
@@ -128,7 +134,7 @@ function attackComponentTest(defenderClass, isEnemy, test_function)
 }
 
 // Validate template getter functions
-attackComponentTest(undefined, true ,(attacker, cmpAttack, defender) => {
+attackComponentTest(undefined, true, (attacker, cmpAttack, defender) => {
 
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackTypes(), ["Melee", "Ranged", "Capture"]);
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackTypes([]), ["Melee", "Ranged", "Capture"]);
@@ -151,7 +157,7 @@ attackComponentTest(undefined, true ,(attacker, cmpAttack, defender) => {
 		"Pierce": 10,
 		"Crush": 0
 	});
-	
+
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackStrengths("Ranged.Splash"), {
 		"Hack": 0.0,
 		"Pierce": 15.0,
@@ -169,9 +175,11 @@ attackComponentTest(undefined, true ,(attacker, cmpAttack, defender) => {
 	});
 
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetSplashDamage("Ranged"), {
-		"Hack": 0,
-		"Pierce": 15,
-		"Crush": 35,
+		"damage": {
+			"Hack": 0,
+			"Pierce": 15,
+			"Crush": 35,
+		},
 		"friendlyFire": false,
 		"shape": "Circular"
 	});
diff --git a/binaries/data/mods/public/simulation/components/tests/test_DeathDamage.js b/binaries/data/mods/public/simulation/components/tests/test_DeathDamage.js
index 534fa9e1b4..f0d5753384 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_DeathDamage.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_DeathDamage.js
@@ -12,7 +12,7 @@ let player = 1;
 
 ApplyValueModificationsToEntity = function(value, stat, ent)
 {
-	if (value == "DeathDamage/Pierce" && ent == deadEnt)
+	if (value == "DeathDamage/Damage/Pierce" && ent == deadEnt)
 		return stat + 200;
 	return stat;
 };
@@ -21,9 +21,11 @@ let template = {
 	"Shape": "Circular",
 	"Range": 10.7,
 	"FriendlyFire": "false",
-	"Hack": 0.0,
-	"Pierce": 15.0,
-	"Crush": 35.0
+	"Damage": {
+		"Hack": 0.0,
+		"Pierce": 15.0,
+		"Crush": 35.0
+	}
 };
 
 let modifiedDamage = {
diff --git a/binaries/data/mods/public/simulation/data/auras/structures/iber_monument.json b/binaries/data/mods/public/simulation/data/auras/structures/iber_monument.json
index 39dcaabe2c..8ebec8c51a 100644
--- a/binaries/data/mods/public/simulation/data/auras/structures/iber_monument.json
+++ b/binaries/data/mods/public/simulation/data/auras/structures/iber_monument.json
@@ -3,12 +3,12 @@
 	"radius": 50,
 	"affects": ["Soldier"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.20 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.20 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.20 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.20 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.20 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.20 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.20 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.20 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.20 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.20 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.20 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.20 }
 	],
 	"auraName": "Religious Fervor",
 	"auraDescription": "+20% attack damage for soldiers.",
diff --git a/binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json b/binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json
index 2c877ef91f..adcfed1659 100644
--- a/binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json
+++ b/binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json
@@ -3,12 +3,12 @@
 	"radius": 60,
 	"affects": ["Soldier"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.1 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.1 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.1 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.1 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.1 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.1 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.1 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.1 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.1 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.1 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.1 }
 	],
 	"auraName": "Exhortative Presence",
 	"auraDescription": "Soldiers near Large Pyramids +10% attack.",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/catafalques/gaul_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/gaul_catafalque_1.json
index f7e248668b..c410751d94 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/catafalques/gaul_catafalque_1.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/catafalques/gaul_catafalque_1.json
@@ -3,12 +3,12 @@
 	"affects": ["Soldier"],
 	"modifications": [
 		{ "value": "Promotion/RequiredXp", "multiply": 0.75 },
-		{ "value": "Attack/Melee/Hack", "multiply": 1.05 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.05 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.05 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.05 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.05 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.05 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.05 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.05 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.05 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.05 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.05 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.05 }
 
 	],
 	"auraName": "Ambush Slaughter",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_boudicca.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_boudicca.json
index 8c64b41fa8..dd7bd5870c 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_boudicca.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_boudicca.json
@@ -4,12 +4,12 @@
 	"affects": ["Champion"],
 	"modifications": [
 		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.1 },
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
 		{ "value": "Attack/Capture/Value", "add": 2 }
 	],
 	"auraName": "Champion Army",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hamilcar_2.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hamilcar_2.json
index ae028a3b08..0a9e5f6de2 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hamilcar_2.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hamilcar_2.json
@@ -4,12 +4,12 @@
 	"affects": ["Mercenary"],
 	"affectedPlayers": ["Enemy"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 0.8 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 0.8 },
-		{ "value": "Attack/Melee/Crush", "multiply": 0.8 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 0.8 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 0.8 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 0.8 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 0.8 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 0.8 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 0.8 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 0.8 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 0.8 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 0.8 }
 	],
 	"auraName": "Subduer of Mercenaries",
 	"auraDescription": "-20% attack for enemy mercenaries."
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hannibal.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hannibal.json
index 950598a5ca..b48642e14e 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hannibal.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hannibal.json
@@ -4,12 +4,12 @@
 	"affects": ["Soldier", "Siege"],
 	"affectedPlayers": ["Ally"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.20 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.20 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.20 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.20 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.20 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.20 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.20 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.20 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.20 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.20 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.20 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.20 },
 		{ "value": "Attack/Capture/Value", "add": 1 }
 	],
 	"auraName": "Tactician",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_maharbal.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_maharbal.json
index 7dd6e874a3..f493c0f396 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_maharbal.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_maharbal.json
@@ -3,9 +3,9 @@
 	"radius": 60,
 	"affects": ["Melee Cavalry"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.3 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.3 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.3 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.3 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.3 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.3 }
 	],
 	"auraName": "Cavalry Commander",
 	"auraDescription": "+30% attack for cavalry melee soldiers.",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_vercingetorix.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_vercingetorix.json
index 592b144abd..6caaf4fa98 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_vercingetorix.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_vercingetorix.json
@@ -3,12 +3,12 @@
 	"radius": 60,
 	"affects": ["Soldier", "Siege"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.20 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.20 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.20 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.20 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.20 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.20 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.20 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.20 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.20 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.20 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.20 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.20 },
 		{ "value": "Attack/Capture/Value", "add": 1 }
 	],
 	"auraName": "Celtic Warlord",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
index b5585acaae..041a7077cd 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
@@ -3,12 +3,12 @@
 	"radius": 60,
 	"affects": ["Champion"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
 		{ "value": "Attack/Capture/Value", "add": 2 }
 	],
 	"auraName": "Warrior Queen",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json
index 36271135e7..20f587a216 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json
@@ -7,12 +7,12 @@
 		{ "value": "Looter/Resource/wood", "multiply": 1.5 },
 		{ "value": "Looter/Resource/stone", "multiply": 1.5 },
 		{ "value": "Looter/Resource/metal", "multiply": 1.5 },
-		{ "value": "Attack/Melee/Hack", "multiply": 1.1 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.1 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.1 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.1 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.1 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.1 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.1 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.1 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.1 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.1 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.1 }
 	],
 	"auraName": "Savior of Kush",
 	"auraDescription": "Own units +10% attack.\nNastasen acquired lots of bounty from the defeated invaders. Gain +50% loot from killing enemy units."
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json
index 6f350e5ca2..f85167ad6f 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json
@@ -3,9 +3,9 @@
 	"radius": 60,
 	"affects": ["Infantry Pike"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
 		{ "value": "Attack/Capture/Value", "multiply": 1.2 }
 	],
 	"auraName": "Taxiarchès",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
index 54e299f4b6..e6f0139d19 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
@@ -6,12 +6,12 @@
 		{ "value": "Armour/Pierce", "add": 1 },
 		{ "value": "Armour/Hack", "add": 1 },
 		{ "value": "Armour/Crush", "add": 1 },
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
 		{ "value": "Attack/Ranged/MaxRange", "multiply": 1.1 },
 		{ "value": "Vision/Range", "multiply": 1.1 }
 	],
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json
index d553159080..bbd3b328b1 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json
@@ -3,12 +3,12 @@
 	"radius": 60,
 	"affects": ["Champion"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
 		{ "value": "Attack/Capture/Value", "add": 2 }
 	],
 	"auraName": "Rise of Macedon",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus.json
index c1ee28b43f..0e0a60f7ca 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus.json
@@ -2,12 +2,12 @@
 	"type": "global",
 	"affects": ["Soldier"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
 		{ "value": "Health/Max", "multiply": 0.85 }
 	],
 	"auraName": "Pyrrhic Victory",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json
index 11b43b0120..6c3f5fb906 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json
@@ -3,12 +3,12 @@
 	"radius": 45,
 	"affects": ["Cavalry"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
 		{ "value": "Attack/Capture/Value", "add": 1 }
 	],
 	"auraName": "Forefront Leader",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus_1.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus_1.json
index a006bde585..63e693da37 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus_1.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus_1.json
@@ -3,12 +3,12 @@
 	"radius": 60,
 	"affects": ["Cavalry"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.15 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.15 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.15 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.15 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.15 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.15 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.15 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.15 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.15 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.15 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.15 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.15 }
 	],
 	"auraName": "Sword of Rome",
 	"auraDescription": "+15% attack for cavalry.",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus_2.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus_2.json
index 1e2051d0c5..e28b26c35f 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus_2.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus_2.json
@@ -4,12 +4,12 @@
 	"affects": ["Infantry"],
 	"affectedPlayers": ["Enemy"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 0.9 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 0.9 },
-		{ "value": "Attack/Melee/Crush", "multiply": 0.9 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 0.9 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 0.9 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 0.9 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 0.9 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 0.9 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 0.9 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 0.9 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 0.9 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 0.9 }
 	],
 	"auraName": "Sword of Rome",
 	"auraDescription": "-10% attack for enemy infantry."
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_scipio.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_scipio.json
index e95d60642c..aafee2d6f7 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_scipio.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_scipio.json
@@ -3,12 +3,12 @@
 	"radius": 30,
 	"affects": ["Soldier", "Siege"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
 		{ "value": "Attack/Capture/Value", "add": 2 }
 	],
 	"auraName": "Triumph",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_victor.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_victor.json
index ca040af95e..73505c0f59 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_victor.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_victor.json
@@ -4,8 +4,8 @@
 	"affects": ["Elephant Champion"],
 	"modifications": [
 		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }
 	],
 	"auraName": "Zooiarchos",
 	"auraDescription": "+20% attack and movement speed for war elephants.",
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
index a00767a795..89952bd899 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
@@ -3,7 +3,7 @@
 	"radius": 60,
 	"affects": ["Javelin Infantry Citizen"],
 	"modifications": [
-		{ "value": "Attack/Ranged/Pierce", "multiply": 1.25 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.25 },
 		{ "value": "Armour/Pierce", "add": 1 },
 		{ "value": "Armour/Hack", "add": 1 },
 		{ "value": "Armour/Crush", "add": 1 }
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
index ff435b27d6..19e5e98e78 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
@@ -3,9 +3,9 @@
 	"radius": 30,
 	"affects": ["Spear"],
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.25 },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.25 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.25 },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.25 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.25 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.25 },
 		{ "value": "Attack/Capture/Value", "add": 1 }
 	],
 	"auraName": "Last Stand",
diff --git a/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json b/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
index c476a6f2e9..6694dfa5e8 100644
--- a/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
+++ b/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
@@ -14,8 +14,8 @@
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
 		{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2, "affects": "Melee" },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2, "affects": "Melee" },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/HP", "add": 5, "affects": "Healer" },
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json b/binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json
index 86e9073121..4a94637a78 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json
@@ -16,7 +16,7 @@
 	"icon": "spear_cavalry.png",
 	"researchTime": 40,
 	"tooltip": "Equip your melee cavalry with better weapons. Melee Cavalry +2 Hack Attack.",
-	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
+	"modifications": [{"value": "Attack/Melee/Damage/Hack", "add": 2.0}],
 	"affects": ["Cavalry Melee"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json
index fdc026aab2..912a1932b8 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json
@@ -15,9 +15,9 @@
 	"icon": "horse_trainer.png",
 	"researchTime": 40,
 	"tooltip": "+20% melee cavalry attack.",
-	"modifications": [{"value": "Attack/Melee/Hack", "multiply": 1.2},
-		{"value": "Attack/Melee/Pierce", "multiply": 1.2},
-		{"value": "Attack/Melee/Crush", "multiply": 1.2}],
+	"modifications": [{"value": "Attack/Melee/Damage/Hack", "multiply": 1.2},
+		{"value": "Attack/Melee/Damage/Pierce", "multiply": 1.2},
+		{"value": "Attack/Melee/Damage/Crush", "multiply": 1.2}],
 	"affects": ["Cavalry Melee"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json
index 69b71fb9c8..3d90804788 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json
@@ -16,9 +16,9 @@
 	"icon": "spear_cavalry.png",
 	"researchTime": 40,
 	"tooltip": "Equip your melee cavalry with better weapons. +20% melee cavalry attack.",
-	"modifications": [{"value": "Attack/Melee/Hack", "multiply": 1.2},
-		{"value": "Attack/Melee/Pierce", "multiply": 1.2},
-		{"value": "Attack/Melee/Crush", "multiply": 1.2}],
+	"modifications": [{"value": "Attack/Melee/Damage/Hack", "multiply": 1.2},
+		{"value": "Attack/Melee/Damage/Pierce", "multiply": 1.2},
+		{"value": "Attack/Melee/Damage/Crush", "multiply": 1.2}],
 	"affects": ["Cavalry Melee"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json
index 80f75b13eb..cb2a94573a 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json
@@ -15,9 +15,9 @@
 	"icon": "horse_rider.png",
 	"researchTime": 40,
 	"tooltip": "+20% ranged cavalry attack.",
-	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
-		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
-		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
+	"modifications": [{"value": "Attack/Ranged/Damage/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Crush", "multiply": 1.2}],
 	"affects": ["Cavalry Ranged"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json
index 7b780468d6..5fa052f583 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json
@@ -16,9 +16,9 @@
 	"icon": "horse_rider.png",
 	"researchTime": 40,
 	"tooltip": "Equip your ranged cavalry with better weapons. +20% ranged cavalry attack.",
-	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
-		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
-		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
+	"modifications": [{"value": "Attack/Ranged/Damage/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Crush", "multiply": 1.2}],
 	"affects": ["Cavalry Ranged"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_champions_elite.json b/binaries/data/mods/public/simulation/data/technologies/attack_champions_elite.json
index 0b4ed4d756..694ecd86e4 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_champions_elite.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_champions_elite.json
@@ -16,8 +16,8 @@
 	"researchTime": 40,
 	"tooltip": "Guard units have uncommon courage and valor in battle. Champions +2 attack.",
 	"modifications": [
-		{"value": "Attack/Melee/Hack", "add": 2.0, "affects": "Champion Melee"},
-		{"value": "Attack/Ranged/Pierce", "add": 2.0, "affects": "Champion Ranged"}
+		{"value": "Attack/Melee/Damage/Hack", "add": 2.0, "affects": "Champion Melee"},
+		{"value": "Attack/Ranged/Damage/Pierce", "add": 2.0, "affects": "Champion Ranged"}
 	],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json
index ccefcd034c..aa70c859d0 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json
@@ -15,9 +15,9 @@
 	"icon": "sword.png",
 	"researchTime": 40,
 	"tooltip": "+20% melee infantry attack.",
-	"modifications": [{"value": "Attack/Melee/Hack", "multiply": 1.2},
-		{"value": "Attack/Melee/Pierce", "multiply": 1.2},
-		{"value": "Attack/Melee/Crush", "multiply": 1.2}],
+	"modifications": [{"value": "Attack/Melee/Damage/Hack", "multiply": 1.2},
+		{"value": "Attack/Melee/Damage/Pierce", "multiply": 1.2},
+		{"value": "Attack/Melee/Damage/Crush", "multiply": 1.2}],
 	"affects": ["Infantry Melee"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json
index c33e6f3aa4..0fc504b7b2 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json
@@ -8,9 +8,9 @@
 	"icon": "sword_cross.png",
 	"researchTime": 40,
 	"tooltip": "+20% melee infantry attack.",
-	"modifications": [{"value": "Attack/Melee/Hack", "multiply": 1.2},
-		{"value": "Attack/Melee/Pierce", "multiply": 1.2},
-		{"value": "Attack/Melee/Crush", "multiply": 1.2}],
+	"modifications": [{"value": "Attack/Melee/Damage/Hack", "multiply": 1.2},
+		{"value": "Attack/Melee/Damage/Pierce", "multiply": 1.2},
+		{"value": "Attack/Melee/Damage/Crush", "multiply": 1.2}],
 	"affects": ["Infantry Melee"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json
index 113c08a55c..cfe1f9fb78 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json
@@ -14,9 +14,9 @@
 	"icon": "arrow.png",
 	"researchTime": 40,
 	"tooltip": "+20% ranged infantry attack.",
-	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
-		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
-		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
+	"modifications": [{"value": "Attack/Ranged/Damage/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Crush", "multiply": 1.2}],
 	"affects": ["Infantry Ranged"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json
index 4b6df6cfed..f43a892192 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json
@@ -15,9 +15,9 @@
 	"icon": "javelin_thong.png",
 	"researchTime": 40,
 	"tooltip": "+20% ranged infantry attack.",
-	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
-		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
-		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
+	"modifications": [{"value": "Attack/Ranged/Damage/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Crush", "multiply": 1.2}],
 	"affects": ["Infantry Ranged"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_soldiers_will.json b/binaries/data/mods/public/simulation/data/technologies/attack_soldiers_will.json
index 3e1a68f80f..22cc606e14 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_soldiers_will.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_soldiers_will.json
@@ -15,12 +15,12 @@
 	"researchTime": 40,
 	"tooltip": "Inspire your troops with higher pay. All land and naval army +25% attack.",
 	"modifications": [
-		{"value": "Attack/Melee/Hack", "multiply": 1.25},
-		{"value": "Attack/Melee/Pierce", "multiply": 1.25},
-		{"value": "Attack/Melee/Crush", "multiply": 1.25},
-		{"value": "Attack/Ranged/Hack", "multiply": 1.25},
-		{"value": "Attack/Ranged/Pierce", "multiply": 1.25},
-		{"value": "Attack/Ranged/Crush", "multiply": 1.25}
+		{"value": "Attack/Melee/Damage/Hack", "multiply": 1.25},
+		{"value": "Attack/Melee/Damage/Pierce", "multiply": 1.25},
+		{"value": "Attack/Melee/Damage/Crush", "multiply": 1.25},
+		{"value": "Attack/Ranged/Damage/Hack", "multiply": 1.25},
+		{"value": "Attack/Ranged/Damage/Pierce", "multiply": 1.25},
+		{"value": "Attack/Ranged/Damage/Crush", "multiply": 1.25}
 	],
 	"affects": ["Melee", "Ranged"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json b/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
index 2a2d0b437c..e345494959 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
@@ -12,8 +12,8 @@
 	"researchTime": 60,
 	"tooltip": "+20% Hack attack for all swordsmen and macemen.",
 	"modifications": [
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Crush", "multiply": 1.2 }
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }
 	],
 	"affects": ["Sword", "Maceman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
diff --git a/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json b/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
index da30c641e8..d747895a21 100644
--- a/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
+++ b/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
@@ -14,8 +14,8 @@
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
 		{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
-		{ "value": "Attack/Melee/Hack", "multiply": 1.2, "affects": "Melee" },
-		{ "value": "Attack/Melee/Pierce", "multiply": 1.2, "affects": "Melee" },
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/HP", "add": 5, "affects": "Healer" },
diff --git a/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json b/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
index 7a615128c1..eff222cc6b 100644
--- a/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
+++ b/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
@@ -12,7 +12,7 @@
 	"icon": "spear.png",
 	"researchTime": 40,
 	"tooltip": "Spearmen +2 hack attack.",
-	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
+	"modifications": [{"value": "Attack/Melee/Damage/Hack", "add": 2.0}],
 	"affects": ["Infantry Spear"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/melee_inf_sidearms.json b/binaries/data/mods/public/simulation/data/technologies/melee_inf_sidearms.json
index f5f6079766..d4061e0107 100644
--- a/binaries/data/mods/public/simulation/data/technologies/melee_inf_sidearms.json
+++ b/binaries/data/mods/public/simulation/data/technologies/melee_inf_sidearms.json
@@ -16,7 +16,7 @@
 	"icon": "sword.png",
 	"researchTime": 40,
 	"tooltip": "Melee infantry +1 hack attack.",
-	"modifications": [{"value": "Attack/Melee/Hack", "add": 1.0}],
+	"modifications": [{"value": "Attack/Melee/Damage/Hack", "add": 1.0}],
 	"affects": ["Infantry Melee"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json b/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
index 5e6d993bf0..0b8cafc262 100644
--- a/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
+++ b/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
@@ -14,7 +14,7 @@
 	"icon": "spear.png",
 	"researchTime": 40,
 	"tooltip": "All Spear units +2 hack attack.",
-	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
+	"modifications": [{"value": "Attack/Melee/Damage/Hack", "add": 2.0}],
 	"affects": ["Spear"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/ranged_inf_irregulars.json b/binaries/data/mods/public/simulation/data/technologies/ranged_inf_irregulars.json
index 113c08a55c..cfe1f9fb78 100644
--- a/binaries/data/mods/public/simulation/data/technologies/ranged_inf_irregulars.json
+++ b/binaries/data/mods/public/simulation/data/technologies/ranged_inf_irregulars.json
@@ -14,9 +14,9 @@
 	"icon": "arrow.png",
 	"researchTime": 40,
 	"tooltip": "+20% ranged infantry attack.",
-	"modifications": [{"value": "Attack/Ranged/Hack", "multiply": 1.2},
-		{"value": "Attack/Ranged/Pierce", "multiply": 1.2},
-		{"value": "Attack/Ranged/Crush", "multiply": 1.2}],
+	"modifications": [{"value": "Attack/Ranged/Damage/Hack", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2},
+		{"value": "Attack/Ranged/Damage/Crush", "multiply": 1.2}],
 	"affects": ["Infantry Ranged"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json b/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
index c0ad79451d..a8f629be1e 100644
--- a/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
+++ b/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
@@ -16,7 +16,7 @@
 	"researchTime": 30,
 	"tooltip": "All Javelin units +2 pierce attack and +4 range.",
 	"modifications": [
-		{"value": "Attack/Ranged/Pierce", "add": 2.0},
+		{"value": "Attack/Ranged/Damage/Pierce", "add": 2.0},
 		{"value": "Attack/Ranged/MaxRange", "add": 4.0},
 		{"value": "Vision/Range", "add": 4.0}],
 	"affects": ["Javelin"],
diff --git a/binaries/data/mods/public/simulation/data/technologies/siege_attack.json b/binaries/data/mods/public/simulation/data/technologies/siege_attack.json
index df628b44fa..cd15510404 100644
--- a/binaries/data/mods/public/simulation/data/technologies/siege_attack.json
+++ b/binaries/data/mods/public/simulation/data/technologies/siege_attack.json
@@ -8,8 +8,8 @@
 	"researchTime": 40,
 	"tooltip": "All siege weapons +25% Crush damage.",
 	"modifications": [
-		{"value": "Attack/Melee/Crush", "multiply": 1.25},
-		{"value": "Attack/Ranged/Crush", "multiply": 1.25}],
+		{"value": "Attack/Melee/Damage/Crush", "multiply": 1.25},
+		{"value": "Attack/Ranged/Damage/Crush", "multiply": 1.25}],
 	"affects": ["Siege"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/helpers/DamageTypes.js b/binaries/data/mods/public/simulation/helpers/DamageTypes.js
index 3aacd70220..fabd6d8b45 100644
--- a/binaries/data/mods/public/simulation/helpers/DamageTypes.js
+++ b/binaries/data/mods/public/simulation/helpers/DamageTypes.js
@@ -1,8 +1,8 @@
 DamageTypes.prototype.BuildSchema = function(helptext = "")
 {
-	return this.GetTypes().reduce((schema, type) =>
+	return "<interleave>" + this.GetTypes().reduce((schema, type) =>
 		schema + "<element name='"+type+"' a:help='"+type+" "+helptext+"'><ref name='nonNegativeDecimal'/></element>",
-		"");
+	"") + "</interleave>";
 };
 
 DamageTypes = new DamageTypes();
diff --git a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
index 1babe0b29b..88c5c26806 100644
--- a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
+++ b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_structure_civic_civil_centre">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>25.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>25.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>50.0</MaxRange>
       <MinRange>1.0</MinRange>
       <PrepareTime>1200</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
index a9133c36b6..867247592e 100644
--- a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
+++ b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_structure_civic_civil_centre">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>25.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>25.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>50.0</MaxRange>
       <MinRange>1.0</MinRange>
       <PrepareTime>1200</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
index bc8f5db0b5..886e337ff9 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
-      <Hack>20.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>20.0</Crush>
+      <Damage>
+        <Hack>20.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>20.0</Crush>
+      </Damage>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
index f51b258771..8eca4f2a08 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
-      <Hack>12.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>12.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>1.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
index 493a152f9b..ff9a4d3b31 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
-      <Hack>30.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>30.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>8.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
index d38ed0e636..08024792f3 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
-      <Hack>20.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>20.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
index 6f3da3993d..29a5273012 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
-      <Hack>20.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>20.0</Crush>
+      <Damage>
+        <Hack>20.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>20.0</Crush>
+      </Damage>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
index 78d06b792f..dd28ed68ef 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
-      <Hack>30.0</Hack>
-      <Pierce>20.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>30.0</Hack>
+        <Pierce>20.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
index 53fd4b2734..3d1e5fc92f 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
@@ -7,9 +7,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>15.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>15.0</Hack>
+        <Pierce>10.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>4.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml b/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
index f074e82b6b..c11ec70fb0 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -12,9 +12,11 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>25.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>25.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>60.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1200</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
index d65e1a7253..8de2d9f98b 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -17,9 +17,11 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>12.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>12.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1200</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
index 12ee26f82a..bae83cfc92 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_structure_defensive">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
index 37cbf3a777..2768147515 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
@@ -12,7 +12,9 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Pierce>16</Pierce>
+      <Damage>
+        <Pierce>16</Pierce>
+      </Damage>
       <MaxRange>55</MaxRange>
       <MinRange>13</MinRange>
       <ElevationBonus>0</ElevationBonus>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
index 80a14319c4..0a42cb9c01 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -7,7 +7,9 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Pierce>9</Pierce>
+      <Damage>
+        <Pierce>9</Pierce>
+      </Damage>
       <MaxRange>70</MaxRange>
       <MinRange>10</MinRange>
       <ElevationBonus>9</ElevationBonus>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
index fa70cba673..c9ba20988c 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
@@ -2,7 +2,9 @@
 <Entity parent="template_structure_defensive_tower">
   <Attack>
     <Ranged>
-      <Pierce>12</Pierce>
+      <Damage>
+        <Pierce>12</Pierce>
+      </Damage>
       <MaxRange>76</MaxRange>
       <MinRange>10</MinRange>
       <ElevationBonus>15</ElevationBonus>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
index 4142cfdb90..3354b10973 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_structure_defensive_wall">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>8.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>8.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>12.0</MinRange>
       <PrepareTime>1200</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
index eae48d15ba..67eaf62714 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -7,9 +7,11 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>16.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>16.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1200</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index 5dde911f20..6633eda27b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -13,9 +13,11 @@
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
     <Slaughter>
-      <Hack>100.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>100.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
index c893473418..60db4dc368 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>13</Hack>
-      <Pierce>0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>13</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
index 2d95c9c4d7..90533ce295 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -2,8 +2,10 @@
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>5.0</Pierce>
+      <Damage>
+        <Hack>6.0</Hack>
+        <Pierce>5.0</Pierce>
+      </Damage>
       <MaxRange>4.5</MaxRange>
       <Bonuses>
         <BonusCavMelee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
index d07f224610..698a26045b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.5</Hack>
-      <Pierce>0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>6.5</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
index 8a7df35006..7e28d4bfea 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_cavalry">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>9.0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>9.0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>16.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1000</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
index b6b3089ab5..0b3c5e5a3c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>7.0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>7.0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>500</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
index 7dad7a0a44..d183cfdb4b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>18.0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>18.0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>28.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>750</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
index 613f339ee1..0427bb3bfc 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>14.0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>14.0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>76.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>500</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
index b02a8bd75f..b3636b34cf 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>36.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>36.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>32.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>750</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
index 7b52109eb0..658ddb928c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>12.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>12.0</Hack>
+        <Pierce>10.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>4.5</MaxRange>
       <Bonuses>
         <BonusCavMelee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
index 461e810926..6038c8b1f8 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>13.0</Hack>
-      <Pierce>0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>13.0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
index e17f5cf894..4aa0a21d56 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_champion_elephant">
   <Attack replace="">
     <Melee>
-      <Hack>20</Hack>
-      <Pierce>0</Pierce>
-      <Crush>150.0</Crush>
+      <Damage>
+        <Hack>20</Hack>
+        <Pierce>0</Pierce>
+        <Crush>150.0</Crush>
+      </Damage>
       <MaxRange>8.0</MaxRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1500</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
index eb59a4a834..80559428de 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>6.5</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>6.5</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>76</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>300</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
index d57ab46744..56cf4ff34a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>26.0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>26.0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>28.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>500</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
index 7b39b4a4e7..ddd17eee1a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>0</Hack>
-      <Pierce>0</Pierce>
-      <Crush>10.5</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>10.5</Crush>
+      </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
index 6905226aba..ba27bafac2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -7,9 +7,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>2.0</Hack>
-      <Pierce>6.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>2.0</Hack>
+        <Pierce>6.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>7</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
index 371338c725..2b131a2d0a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>5.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>6.0</Hack>
+        <Pierce>5.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>4.5</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>900</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
index 10f6bd2799..2c339a3a7e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>11.0</Hack>
-      <Pierce>0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>11.0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
index 035f1764eb..5f3a0bbb0f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -7,9 +7,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7</Hack>
-      <Pierce>2</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>7</Hack>
+        <Pierce>2</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
index 3850664cf4..793ed998c4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_hunt">
   <Attack>
     <Melee>
-      <Hack>1</Hack>
-      <Pierce>1</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>4</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
index ee501d8175..a898194429 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
@@ -6,9 +6,11 @@
   </Footprint>
   <Attack>
     <Melee>
-      <Hack>1</Hack>
-      <Pierce>5</Pierce>
-      <Crush>2</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
       <MaxRange>4</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
index ff24bdc79e..d9478ab24c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -7,9 +7,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>25.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>20.0</Crush>
+      <Damage>
+        <Hack>25.0</Hack>
+        <Pierce>10.0</Pierce>
+        <Crush>20.0</Crush>
+      </Damage>
       <MaxRange>6.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
index b0e17810d7..c0a96c36fa 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_hunt">
   <Attack>
     <Melee>
-      <Hack>1</Hack>
-      <Pierce>1</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>4</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
index 4e802276b6..ac4d2156cb 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_wild">
   <Attack>
     <Melee>
-      <Hack>1</Hack>
-      <Pierce>1</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>4</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
index f11e23aaaf..0c1a6becc3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
@@ -2,8 +2,10 @@
 <Entity parent="template_unit_fauna_wild_aggressive_wolf">
   <Attack>
     <Melee>
-      <Hack>7</Hack>
-      <Pierce>2</Pierce>
+      <Damage>
+        <Hack>7</Hack>
+        <Pierce>2</Pierce>
+      </Damage>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
     </Melee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
index c6c58984a2..b237657564 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>10.0</Hack>
+        <Pierce>10.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
index b8811e63f8..bd9e655abc 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_wild_defensive">
   <Attack>
     <Melee>
-      <Hack>2.5</Hack>
-      <Pierce>5.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>2.5</Hack>
+        <Pierce>5.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>3.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
index 4d439f208b..216abdc565 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_fauna_wild">
   <Attack>
     <Melee>
-      <Hack>1</Hack>
-      <Pierce>1</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>4</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
index 3d28e23772..4b28119739 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>35</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>35</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>80.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1200</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
index e240fc99d7..892c36b5f6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>60.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>60.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>36.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>750</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
index bd719a1f0b..90d15916a6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>24.0</Hack>
-      <Pierce>20.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>24.0</Hack>
+        <Pierce>20.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>4.5</MaxRange>
       <Bonuses>
         <BonusCavMelee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
index dd35803c32..30831fe464 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-     <Hack>26.0</Hack>
-     <Pierce>0.0</Pierce>
-     <Crush>0.0</Crush>
+      <Damage>
+        <Hack>26.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
      <MaxRange>3.5</MaxRange>
      <PrepareTime>375</PrepareTime>
      <RepeatTime>750</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
index 4e4be20262..4372320162 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -7,9 +7,11 @@
   </Armour>
   <Attack replace="">
     <Melee>
-      <Hack>20.0</Hack>
-      <Pierce>0</Pierce>
-      <Crush>50.0</Crush>
+      <Damage>
+        <Hack>20.0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>50.0</Crush>
+      </Damage>
       <MaxRange>8.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
index a01af392ad..49e4669daa 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>8.0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>8.0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>80</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>200</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
index 408fb6d6b1..6e029b9bcd 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>50.0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>50.0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>32.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>600</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
index 436211f728..8fb759eab0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>4.0</Hack>
-      <Pierce>20.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>4.0</Hack>
+        <Pierce>20.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>7</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
index 6430e6663c..3066268a10 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>12.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>12.0</Hack>
+        <Pierce>10.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>4.5</MaxRange>
       <PrepareTime>450</PrepareTime>
       <RepeatTime>900</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
index 168b57dfdd..0af89f0eff 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>22.0</Hack>
-      <Pierce>0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>22.0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index 6403ac8541..8927f82de6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -13,9 +13,11 @@
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
     <Slaughter>
-      <Hack>50.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>50.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
index 646660440b..65f9500c02 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_infantry">
   <Attack>
     <Melee>
-      <Hack>1</Hack>
-      <Pierce>0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
index b30d169de7..0eb19beae7 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -6,8 +6,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>1</Hack>
-      <Pierce>3</Pierce>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>3</Pierce>
+      </Damage>
       <MaxRange>7</MaxRange>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
index 51655f7b94..6c1d5fe1a3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -6,8 +6,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>3.0</Hack>
-      <Pierce>2.5</Pierce>
+      <Damage>
+        <Hack>3.0</Hack>
+        <Pierce>2.5</Pierce>
+      </Damage>
       <MaxRange>4.5</MaxRange>
       <Bonuses>
         <BonusCavMelee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
index a0138b24e0..fd3d0844ce 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -6,8 +6,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>5.5</Hack>
-      <Pierce>0</Pierce>
+      <Damage>
+        <Hack>5.5</Hack>
+        <Pierce>0</Pierce>
+      </Damage>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
index e9f62b6792..43ebfc34ff 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -7,9 +7,11 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>1.5</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>1.5</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>10.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>750</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
index e9f5d7c7cf..232c192499 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>6.0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>6.0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>600</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
index ac51e2c4ef..745d092fe0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>16.0</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>16.0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>24.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>750</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
index c3e1744853..131d2caa89 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -6,9 +6,11 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>9.5</Pierce>
-      <Crush>1.0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>9.5</Pierce>
+        <Crush>1.0</Crush>
+      </Damage>
       <MaxRange>48.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>500</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
index d24f74605e..8d4b41a655 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>35.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>35.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>45.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1000</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
index d0de3418b4..4c248a6cd3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>10.0</Crush>
+      <Damage>
+        <Hack>10.0</Hack>
+        <Pierce>10.0</Pierce>
+        <Crush>10.0</Crush>
+      </Damage>
       <MaxRange>8.0</MaxRange>
       <PrepareTime>50</PrepareTime>
       <RepeatTime>100</RepeatTime>
@@ -20,9 +22,11 @@
     <Shape>Circular</Shape>
     <Range>30</Range>
     <FriendlyFire>true</FriendlyFire>
-    <Hack>300.0</Hack>
-    <Pierce>300.0</Pierce>
-    <Crush>300.0</Crush>
+    <Damage>
+      <Hack>300.0</Hack>
+      <Pierce>300.0</Pierce>
+      <Crush>300.0</Crush>
+    </Damage>
   </DeathDamage>
   <Footprint>
     <Square width="8.0" depth="24.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
index 5520942265..a1d296b76d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -7,9 +7,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>10.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
index 450a4ec7ab..f21566401a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>100.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>10.0</Pierce>
+        <Crush>100.0</Crush>
+      </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>10.0</MinRange>
       <PrepareTime>2000</PrepareTime>
@@ -14,9 +16,11 @@
         <Shape>Circular</Shape>
         <Range>10</Range>
         <FriendlyFire>false</FriendlyFire>
-        <Hack>0.0</Hack>
-        <Pierce>15.0</Pierce>
-        <Crush>35.0</Crush>
+        <Damage>
+          <Hack>0.0</Hack>
+          <Pierce>15.0</Pierce>
+          <Crush>35.0</Crush>
+        </Damage>
       </Splash>
       <Projectile>
         <Speed>37.5</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
index ec710fd51a..675654c252 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>35.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>35.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>55.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1000</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
index 7ef663955d..bdb4e94aa4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>150.0</Pierce>
-      <Crush>25.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>150.0</Pierce>
+        <Crush>25.0</Crush>
+      </Damage>
       <MaxRange>80.0</MaxRange>
       <MinRange>26.0</MinRange>
       <PrepareTime>3000</PrepareTime>
@@ -14,9 +16,11 @@
         <Shape>Linear</Shape>
         <Range>8.0</Range>
         <FriendlyFire>false</FriendlyFire>
-        <Hack>0.0</Hack>
-        <Pierce>75.0</Pierce>
-        <Crush>5.0</Crush>
+        <Damage>
+          <Hack>0.0</Hack>
+          <Pierce>75.0</Pierce>
+          <Crush>5.0</Crush>
+        </Damage>
       </Splash>
       <Projectile>
         <Speed>150.0</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
index 46b4cc25e6..0e370df3a5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Melee>
-      <Hack>0.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>150.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>150.0</Crush>
+      </Damage>
       <MaxRange>6.5</MaxRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1500</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
index 5f0ed890a8..6723cb3f56 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>10.0</Pierce>
-      <Crush>100.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>10.0</Pierce>
+        <Crush>100.0</Crush>
+      </Damage>
       <MaxRange>80.0</MaxRange>
       <MinRange>26.0</MinRange>
       <PrepareTime>4000</PrepareTime>
@@ -22,9 +24,11 @@
         <Shape>Circular</Shape>
         <Range>10</Range>
         <FriendlyFire>false</FriendlyFire>
-        <Hack>0.0</Hack>
-        <Pierce>15.0</Pierce>
-        <Crush>35.0</Crush>
+        <Damage>
+          <Hack>0.0</Hack>
+          <Pierce>15.0</Pierce>
+          <Crush>35.0</Crush>
+        </Damage>
       </Splash>
       <PreferredClasses datatype="tokens">Structure</PreferredClasses>
     </Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
index b6c4cf9c57..ae2f508d65 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>12.0</Pierce>
-      <Crush>2.5</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>12.0</Pierce>
+        <Crush>2.5</Crush>
+      </Damage>
       <MaxRange>55.0</MaxRange>
       <MinRange>10.0</MinRange>
       <ElevationBonus>10</ElevationBonus>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 26a8e7cdc6..28bdd1aa36 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -2,17 +2,21 @@
 <Entity parent="template_unit_support">
   <Attack>
     <Melee>
-      <Hack>2.0</Hack>
-      <Pierce>0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>2.0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
     </Melee>
     <Slaughter>
-      <Hack>25.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
+      <Damage>
+        <Hack>25.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml b/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
index 39d1a69ca5..812344002c 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_champion_infantry_archer">
   <Attack>
     <Ranged>
-      <Hack>0</Hack>
-      <Pierce>6.5</Pierce>
-      <Crush>0</Crush>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>6.5</Pierce>
+        <Crush>0</Crush>
+      </Damage>
       <MaxRange>76</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>2320</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
index 7b105d80f2..9365e81b49 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
@@ -2,8 +2,10 @@
 <Entity parent="template_unit_champion_cavalry_javelinist">
   <Attack>
     <Ranged>
-      <Pierce>5</Pierce>
-      <Crush>15</Crush>
+      <Damage>
+        <Pierce>5</Pierce>
+        <Crush>15</Crush>
+      </Damage>
     </Ranged>
   </Attack>
   <Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
index 997f0b51b6..9465df7761 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -5,8 +5,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>3.0</Hack>
-      <Crush>2.5</Crush>
+      <Damage>
+        <Hack>3.0</Hack>
+        <Crush>2.5</Crush>
+      </Damage>
     </Melee>
   </Attack>
   <Builder>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
index c88b81c890..13c5788e25 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -7,9 +7,11 @@
   <Attack>
     <Capture disable=""/>
     <Ranged>
-      <Hack op="mul">1.5</Hack>
-      <Pierce op="mul">1.5</Pierce>
-      <Crush op="mul">1.5</Crush>
+      <Damage>
+        <Hack op="mul">1.5</Hack>
+        <Pierce op="mul">1.5</Pierce>
+        <Crush op="mul">1.5</Crush>
+      </Damage>
       <RepeatTime op="mul">0.75</RepeatTime>
     </Ranged>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
index 40a232ee47..871c3f768b 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -6,7 +6,9 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack op="add">-2</Hack>
+      <Damage>
+        <Hack op="add">-2</Hack>
+      </Damage>
     </Melee>
   </Attack>
   <Cost>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/pers_siege_ram.xml
index 1e879b7496..2cbf43fb86 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_siege_ram.xml
@@ -2,7 +2,9 @@
 <Entity parent="template_unit_siege_ram">
   <Attack>
     <Melee>
-      <Crush op="mul">1.2</Crush>
+      <Damage>
+        <Crush op="mul">1.2</Crush>
+      </Damage>
     </Melee>
   </Attack>
   <Footprint replace="">
diff --git a/binaries/data/mods/public/simulation/templates/units/plane.xml b/binaries/data/mods/public/simulation/templates/units/plane.xml
index c261205efa..ff83da5053 100644
--- a/binaries/data/mods/public/simulation/templates/units/plane.xml
+++ b/binaries/data/mods/public/simulation/templates/units/plane.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>100.0</Pierce>
-      <Crush>227.0</Crush>
+      <Damage>
+        <Hack>0.0</Hack>
+        <Pierce>100.0</Pierce>
+        <Crush>227.0</Crush>
+      </Damage>
       <MaxRange>120</MaxRange>
       <MinRange>80</MinRange>
       <PrepareTime>0</PrepareTime>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml b/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
index 47a87e2af6..e085a814e2 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
@@ -2,7 +2,9 @@
 <Entity parent="units/rome_legionnaire_imperial">
   <Attack>
     <Melee>
-      <Hack>20</Hack>
+      <Damage>
+        <Hack>20</Hack>
+      </Damage>
     </Melee>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
index 8e913c7aa5..103955ccff 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
@@ -2,7 +2,9 @@
 <Entity parent="units/rome_legionnaire_marian">
   <Attack>
     <Melee>
-      <Hack>18.5</Hack>
+      <Damage>
+        <Hack>18.5</Hack>
+      </Damage>
     </Melee>
   </Attack>
   <Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml b/binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml
index 24c39fcd57..70ea90be7e 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml
@@ -2,12 +2,16 @@
 <Entity parent="template_unit_siege_stonethrower">
   <Attack>
     <Ranged>
-      <Pierce op="mul">1.1</Pierce>
-      <Crush op="mul">1.1</Crush>
-      <MaxRange op="add">8.0</MaxRange>
-      <Splash>
+      <Damage>
         <Pierce op="mul">1.1</Pierce>
         <Crush op="mul">1.1</Crush>
+      </Damage>
+      <MaxRange op="add">8.0</MaxRange>
+      <Splash>
+        <Damage>
+          <Pierce op="mul">1.1</Pierce>
+          <Crush op="mul">1.1</Crush>
+        </Damage>
       </Splash>
     </Ranged>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml b/binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml
index 9b15dc3ade..90a15942b3 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml
@@ -10,9 +10,11 @@
         <Shape>Circular</Shape>
         <Range>10</Range>
         <FriendlyFire>false</FriendlyFire>
-        <Hack>40.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>40.0</Crush>
+        <Damage>
+          <Hack>40.0</Hack>
+          <Pierce>0.0</Pierce>
+          <Crush>40.0</Crush>
+        </Damage>
       </Splash>
       <Projectile>
         <Speed>37.5</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/rome_siege_ram.xml
index 8593573c54..8b15c2e174 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_siege_ram.xml
@@ -2,7 +2,9 @@
 <Entity parent="template_unit_siege_ram">
   <Attack>
     <Melee>
-      <Crush op="mul">1.2</Crush>
+      <Damage>
+        <Crush op="mul">1.2</Crush>
+      </Damage>
     </Melee>
   </Attack>
   <Footprint replace="">
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml b/binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml
index c5a7015f27..a655401a06 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml
@@ -2,8 +2,10 @@
 <Entity parent="template_unit_siege_boltshooter">
   <Attack>
     <Ranged>
-      <Pierce op="mul">1.2</Pierce>
-      <Crush op="mul">0.5</Crush>
+      <Damage>
+        <Pierce op="mul">1.2</Pierce>
+        <Crush op="mul">0.5</Crush>
+      </Damage>
       <MaxRange op="add">8.0</MaxRange>
     </Ranged>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
index f4f311fe92..70bb4d55a5 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
@@ -2,7 +2,9 @@
 <Entity parent="template_unit_support_female_citizen">
   <Attack>
     <Melee>
-       <Hack op="mul">1.5</Hack>
+      <Damage>
+        <Hack op="mul">1.5</Hack>
+      </Damage>
     </Melee>
   </Attack>
   <Builder>
diff --git a/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml b/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
index dcd28e8459..32b9388985 100644
--- a/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
+++ b/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
@@ -2,9 +2,11 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
-      <Hack>50.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>50.0</Crush>
+      <Damage>
+        <Hack>50.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>50.0</Crush>
+      </Damage>
       <MaxRange>12</MaxRange>
       <MinRange>8.0</MinRange>
       <PrepareTime>2000</PrepareTime>
@@ -22,9 +24,11 @@
     <Shape>Circular</Shape>
     <Range>20</Range>
     <FriendlyFire>true</FriendlyFire>
-    <Hack>200.0</Hack>
-    <Pierce>200.0</Pierce>
-    <Crush>200.0</Crush>
+    <Damage>
+      <Hack>200.0</Hack>
+      <Pierce>200.0</Pierce>
+      <Crush>200.0</Crush>
+    </Damage>
   </DeathDamage>
   <Footprint replace="">
     <Square width="6.0" depth="20.0"/>