diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
index a6904fb4b1..369b22ccc0 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
@@ -22,10 +22,10 @@
       units/brit_infantry_spearman_b
       units/brit_infantry_javelinist_b
       units/brit_infantry_slinger_b
+	  units/brit_champion_infantry_barracks
       units/brit_cavalry_swordsman_b
       units/brit_cavalry_javelinist_b
-	  units/brit_champion_infantry
-	  units/brit_champion_cavalry
+	  units/brit_champion_cavalry_barracks
     </Entities>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
index 67eb78d7c3..70dd8b637e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
@@ -28,6 +28,9 @@
       units/cart_infantry_archer_b
       units/cart_cavalry_javelinist_b
     </Entities>
+    <Technologies datatype="tokens">
+	  -unlock_champion_units
+    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/barracks.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
index bd7b76858f..11f2c2b29c 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
@@ -22,10 +22,10 @@
       units/gaul_infantry_spearman_b
       units/gaul_infantry_javelinist_b
       units/gaul_infantry_slinger_b
+	  units/gaul_champion_infantry_barracks
       units/gaul_cavalry_swordsman_b
       units/gaul_cavalry_javelinist_b
-	  units/gaul_champion_infantry
-	  units/gaul_champion_cavalry
+	  units/gaul_champion_cavalry_barracks
     </Entities>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml
index 349e2420a9..7e5861bde4 100644
--- a/binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml
@@ -25,13 +25,16 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/hele_infantry_spearman_b
-      units/hele_infantry_javelinist_b
-      units/hele_infantry_archer_b
-      units/hele_infantry_slinger_b
-      units/hele_cavalry_swordsman_b
-      units/hele_cavalry_javelinist_b
+	  units/hele_infantry_spearman_b
+	  units/hele_infantry_javelinist_b
+	  units/hele_infantry_archer_b
+	  units/hele_infantry_slinger_b
+	  units/hele_cavalry_swordsman_b
+	  units/hele_cavalry_javelinist_b
     </Entities>
+    <Technologies datatype="tokens">
+	  -unlock_champion_units
+    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/hellenes/barracks_new.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
index 3ee4bcdfb3..4b3c088bbb 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
@@ -17,10 +17,10 @@
       units/iber_infantry_swordsman_b
       units/iber_infantry_javelinist_b
       units/iber_infantry_slinger_b
+	  units/iber_champion_infantry_barracks
       units/iber_cavalry_spearman_b
       units/iber_cavalry_javelinist_b
-	  units/iber_champion_infantry
-	  units/iber_champion_cavalry
+	  units/iber_champion_cavalry_barracks
     </Entities>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
index d979579887..f15af84afb 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
@@ -29,10 +29,10 @@
       units/mace_infantry_javelinist_b
       units/mace_infantry_archer_b
       units/mace_infantry_slinger_b
+      units/mace_champion_infantry_a_barracks
       units/mace_cavalry_spearman_b
       units/mace_cavalry_javelinist_b
-      units/mace_champion_infantry_a_barracks
-      units/mace_champion_cavalry
+      units/mace_champion_cavalry_barracks
     </Entities>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
index 32a1310414..5a082a0548 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
@@ -17,11 +17,11 @@
       units/maur_infantry_spearman_b
       units/maur_infantry_swordsman_b
       units/maur_infantry_archer_b
+	  units/maur_champion_infantry_barracks
+	  units/maur_champion_maiden_barracks
       units/maur_cavalry_swordsman_b
       units/maur_cavalry_javelinist_b
-	  units/maur_champion_infantry
-	  units/maur_champion_maiden
-	  units/maur_champion_chariot
+	  units/maur_champion_chariot_barracks
     </Entities>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
index 2adb1db119..1a5c89d632 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
@@ -26,9 +26,9 @@
       units/rome_infantry_swordsman_b
       units/rome_infantry_spearman_a
       units/rome_infantry_javelinist_b
+	  units/rome_champion_infantry_barracks
       units/rome_cavalry_spearman_b
-	  units/rome_champion_infantry
-	  units/rome_champion_cavalry
+	  units/rome_champion_cavalry_barracks
     </Entities>
   </ProductionQueue>
   <VisualActor>
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 b535abf5c8..9246efb6b2 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
@@ -11,7 +11,7 @@
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>16.0</MaxRange>
-      <MinRange>10.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>25.0</ProjectileSpeed>
       <PrepareTime>900</PrepareTime>
       <RepeatTime>1500</RepeatTime>
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 b648f6229e..69556a1fe6 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
@@ -6,7 +6,7 @@
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>56.0</MaxRange>
-      <MinRange>20.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
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 c4c7c25fbf..90a160e7bf 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
@@ -6,7 +6,7 @@
       <Pierce>25.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>44</MaxRange>
-      <MinRange>16.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
index 55091f0aab..6649980e07 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
@@ -6,7 +6,7 @@
   <Identity>
     <GenericName>Champion Unit</GenericName>
     <Classes datatype="tokens">Champion Organic</Classes>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>150</xp>
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 4eb8759c5f..790accafc2 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
@@ -11,7 +11,7 @@
       <Pierce>30.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>58</MaxRange>
-      <MinRange>10.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
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 4cdce1f03a..872593e9fa 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
@@ -11,7 +11,7 @@
       <Pierce>30.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>56</MaxRange>
-      <MinRange>16.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</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 8e8373e8c1..f3f7db2c7f 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
@@ -11,7 +11,7 @@
       <Pierce>15.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>58</MaxRange>
-      <MinRange>10.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
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 b0d404c849..4d4102bf55 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
@@ -11,7 +11,7 @@
       <Pierce>25.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>48</MaxRange>
-      <MinRange>12.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
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 a52b45fa54..f4564c416a 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
@@ -11,7 +11,7 @@
       <Pierce>15.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>50.0</MaxRange>
-      <MinRange>10.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
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 6021bb9de4..6bdf019578 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
@@ -11,7 +11,7 @@
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>36</MaxRange>
-      <MinRange>10.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>50.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
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 ebb4f5e7dc..8ae1e09032 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
@@ -11,7 +11,7 @@
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>48.0</MaxRange>
-      <MinRange>16.0</MinRange>
+      <MinRange>0.0</MinRange>
       <ProjectileSpeed>60.0</ProjectileSpeed>
       <PrepareTime>900</PrepareTime>
       <RepeatTime>1500</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml
new file mode 100644
index 0000000000..aaf5817cd6
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/brit_champion_cavalry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/brit_champion_cavalry</SelectionGroupName>
+  </Identity>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml
new file mode 100644
index 0000000000..013d39cd06
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/brit_champion_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/brit_champion_infantry</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml
new file mode 100644
index 0000000000..8f42c3dfe4
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/gaul_champion_cavalry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/gaul_champion_cavalry</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml
new file mode 100644
index 0000000000..519ffa9364
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/gaul_champion_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/gaul_champion_infantry</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
new file mode 100644
index 0000000000..cecc67a54c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/iber_champion_cavalry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/iber_champion_cavalry</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml
new file mode 100644
index 0000000000..301f502d3f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/iber_champion_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/iber_champion_infantry</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
new file mode 100644
index 0000000000..eb40471b97
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace_champion_cavalry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/mace_champion_cavalry</SelectionGroupName>
+  </Identity>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
index 5d2888eeb3..26ff3a950f 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_champion_infantry_a">
   <Identity>
-	<SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/mace_champion_infantry_e</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot_barracks.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot_barracks.xml
new file mode 100644
index 0000000000..583ff55813
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/maur_champion_chariot">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/maur_champion_chariot</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml
new file mode 100644
index 0000000000..46daa8cc9a
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/maur_champion_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/maur_champion_infantry</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml
new file mode 100644
index 0000000000..beb42e1041
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/maur_champion_maiden">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/maur_champion_maiden</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_topless.xml b/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_topless.xml
new file mode 100644
index 0000000000..54b9f7c8e5
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_topless.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_support_female_citizen">
+  <Identity>
+    <Civ>maur</Civ>
+    <SpecificName>Naari</SpecificName>
+    <History>Mauryan Female Citizen</History>
+    <Icon>units/maur_support_female_citizen.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/mauryans/female_citizen_topless.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
new file mode 100644
index 0000000000..ed0aaa59f0
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/rome_champion_cavalry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/rome_champion_cavalry</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml
new file mode 100644
index 0000000000..6667c14d57
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/rome_champion_infantry">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+	<SelectionGroupName>units/rome_champion_infantry</SelectionGroupName>
+  </Identity>
+</Entity>
\ No newline at end of file