diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
index 7b755c7563..320415b74b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -8,9 +8,8 @@
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
-      <food>100</food>
-      <wood>0</wood>
-      <stone>0</stone>
+      <food>300</food>
+      <wood>200</wood>
       <metal>250</metal>
     </Resources>
   </Cost>
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 45e1ce95d3..c537318887 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
@@ -14,14 +14,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <BuildTime>45</BuildTime>
-    <Resources>
-      <food>100</food>
-      <wood>100</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Hero Cavalry Archer</GenericName>
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 e4db2b003d..2f69462935 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
@@ -14,14 +14,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <BuildTime>45</BuildTime>
-    <Resources>
-      <food>100</food>
-      <wood>100</wood>
-      <metal>75</metal>
-    </Resources>
-  </Cost>
   <Footprint>
     <Circle radius="3.0"/>
     <Height>3.0</Height>
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 85c2c05263..6bf90a2074 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
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Armour>
-    <Hack>11</Hack>
-    <Pierce>10</Pierce>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Melee>
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 a23a8e4252..2119e6a17e 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
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Armour>
-    <Hack>11</Hack>
-    <Pierce>9</Pierce>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">1</Pierce>
   </Armour>
   <Attack>
     <Melee>
@@ -11,10 +11,16 @@
      <Crush>0.0</Crush>
      <MaxRange>6.0</MaxRange>
      <PrepareTime>500</PrepareTime>
-     <RepeatTime>1000</RepeatTime>
+     <RepeatTime>750</RepeatTime>
      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Melee>
   </Attack>
+  <Cost>
+    <Resources>
+      <wood>150</wood>
+      <metal op="add">50</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Hero Cavalry Swordsman</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
index e570135828..d11036e47f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -8,8 +8,9 @@
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
-      <food>50</food>
-      <metal>200</metal>
+      <food>200</food>
+      <wood>200</wood>
+      <metal>150</metal>
     </Resources>
   </Cost>
   <Footprint>
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 273811fe9c..c5f49d79a7 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
@@ -14,12 +14,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <BuildTime>35</BuildTime>
-    <Resources>
-      <wood>200</wood>
-    </Resources>
-  </Cost>
   <Identity>
     <GenericName>Hero Archer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
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 9aeb71cf62..2217bb3a05 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
@@ -14,12 +14,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <BuildTime>35</BuildTime>
-    <Resources>
-      <wood>200</wood>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
     <GenericName>Hero Skirmisher</GenericName>
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 144aea4f7c..365e3a3696 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
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
-    <Hack>17</Hack>
-    <Pierce>17</Pierce>
-    <Crush>25</Crush>
+    <Hack op="add">9</Hack>
+    <Pierce op="add">9</Pierce>
   </Armour>
   <Attack>
     <Melee>
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 262ddd456c..97c34bc880 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
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
-    <Hack>12</Hack>
-    <Pierce>12</Pierce>
+    <Hack op="add">4</Hack>
+    <Pierce op="add">4</Pierce>
   </Armour>
   <Attack>
     <Melee>
@@ -10,8 +10,8 @@
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <PrepareTime>450</PrepareTime>
+      <RepeatTime>900</RepeatTime>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
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 f824a8d790..332f5c9d7e 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
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
-    <Hack>12</Hack>
-    <Pierce>12</Pierce>
+    <Hack op="add">4</Hack>
+    <Pierce op="add">4</Pierce>
   </Armour>
   <Attack>
     <Melee>
@@ -11,10 +11,16 @@
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Melee>
   </Attack>
+  <Cost>
+    <Resources>
+      <wood>150</wood>
+      <metal op="add">50</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Hero Swordsman</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
index 670d32824e..99cffae0b4 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
@@ -12,10 +12,11 @@
   </Auras>
   <Cost>
     <Population>2</Population>
-    <BuildTime>60</BuildTime>
+    <BuildTime>40</BuildTime>
     <Resources>
-      <food>100</food>
-      <metal>250</metal>
+      <food>200</food>
+      <wood>150</wood>
+      <metal>200</metal>
     </Resources>
   </Cost>
   <Heal>