diff --git a/binaries/data/mods/public/art/actors/units/mauryans/hero_ashoka.xml b/binaries/data/mods/public/art/actors/units/mauryans/hero_ashoka.xml
index 877ee6077e..f30d1a9c52 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/hero_ashoka.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/hero_ashoka.xml
@@ -19,28 +19,6 @@
   </group>
   <group>
     <variant file="biped/attack_ranged_archer.xml"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/attack_slaughter.xml"/>
-    <variant file="biped/gather_tree.xml"/>
-    <variant file="biped/gather_grain.xml"/>
-    <variant file="biped/gather_fruit.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/gather_rock.xml"/>
-    <variant file="biped/gather_ore.xml"/>
-    <variant file="biped/gather_ruins.xml"/>
-    <variant file="biped/gather_praise.xml"/>
-    <variant file="biped/build.xml"/>
-    <variant file="biped/build_farm.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-    <variant file="biped/carry_food_idle.xml"/>
-    <variant file="biped/carry_meat_idle.xml"/>
-    <variant file="biped/carry_wood_idle.xml"/>
-    <variant file="biped/carry_stone_idle.xml"/>
-    <variant file="biped/carry_metal_idle.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml
new file mode 100644
index 0000000000..43dd421ffb
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_javelinist">
+  <Auras datatype="tokens">
+    units/heroes/brit_hero_boudicca
+  </Auras>
+  <Identity>
+    <Civ>brit</Civ>
+    <GenericName>Boudicca (Sword)</GenericName>
+    <SpecificName>Boadicea</SpecificName>
+    <Gender>female</Gender>
+    <Icon>units/brit_hero_boudicca.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/celts/boudicca_horse.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml
new file mode 100644
index 0000000000..833a4fd460
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_swordsman">
+  <Auras datatype="tokens">
+    units/heroes/gaul_hero_vercingetorix
+  </Auras>
+  <Identity>
+    <Civ>gaul</Civ>
+    <SpecificName>Vercingetorix</SpecificName>
+    <Icon>units/gaul_hero_vercingetorix.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/celts/vercingetorix.xml</Actor>
+  </VisualActor>
+</Entity>
+
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml
new file mode 100644
index 0000000000..2964419f07
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_spearman">
+  <Auras datatype="tokens">
+    units/heroes/iber_hero_indibil
+  </Auras>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Indibil</SpecificName>
+    <Icon>units/iber_hero_indibil.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/iberians/hero_indibil_infantry.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml b/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml
new file mode 100644
index 0000000000..ac19f4ee64
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_archer">
+  <Auras datatype="tokens">
+    units/heroes/maur_hero_ashoka
+  </Auras>
+  <Identity>
+    <Civ>maur</Civ>
+    <GenericName>Ashoka the Great</GenericName>
+    <SpecificName>Aśoka Devānāmpriya</SpecificName>
+    <Icon>units/maur_hero_ashoka.png</Icon>
+    <Tooltip>Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime.</Tooltip>
+  </Identity>
+  <VisualActor>
+    <Actor>units/mauryans/hero_ashoka.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml b/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml
new file mode 100644
index 0000000000..94bb3ab5c9
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_swordsman">
+  <Auras datatype="tokens">
+    units/heroes/rome_hero_marcellus_1
+    units/heroes/rome_hero_marcellus_2
+  </Auras>
+  <Identity>
+    <Civ>rome</Civ>
+    <Lang>latin</Lang>
+    <SpecificName>Marcus Claudius Marcellus</SpecificName>
+    <Icon>units/rome_hero_marcellus.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/romans/hero_marcellus.xml</Actor>
+  </VisualActor>
+</Entity>
+
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml b/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml
new file mode 100644
index 0000000000..0078646ebd
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_swordsman">
+  <Auras datatype="tokens">
+    units/heroes/rome_hero_maximus
+  </Auras>
+  <Identity>
+    <Civ>rome</Civ>
+    <Lang>latin</Lang>
+    <SpecificName>Quintus Fabius Maximus</SpecificName>
+    <Icon>units/rome_hero_maximus.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/romans/hero_maximus.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml b/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml
new file mode 100644
index 0000000000..129bdc9a09
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/spart_hero_leonidas">
+  <VisualActor>
+    <Actor>units/spartans/leonidas_300.xml</Actor>
+  </VisualActor>
+</Entity>