Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
@@ -23,15 +23,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/britons/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
@@ -23,15 +23,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/celts/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
@@ -14,15 +14,6 @@
     <wood>20</wood>
     <stone>40</stone>
   </Loot>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/barracks.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
@@ -25,13 +25,8 @@
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_a_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
     <Technologies datatype="tokens">
       upgrade_rank_advanced_mercenary
-      unlock_champion_units
     </Technologies>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
@@ -19,15 +19,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_maiden_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/mauryas/barracks.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
@@ -20,6 +20,8 @@
       -units/{civ}_cavalry_spearman_b
       -units/{civ}_cavalry_javelinist_b
       -units/{civ}_cavalry_archer_b
+      -units/{civ}_champion_cavalry_barracks
+      -units/{civ}_champion_chariot_barracks
     </Entities>
     <Technologies datatype="tokens">
       persians/training_levy_infantry
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
@@ -24,15 +24,6 @@
   <Obstruction>
     <Static width="22.0" depth="22.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -42,10 +42,15 @@
       units/{civ}_cavalry_spearman_b
       units/{civ}_cavalry_javelinist_b
       units/{civ}_cavalry_archer_b
+      units/{civ}_champion_infantry_barracks
+      units/{civ}_champion_maiden_barracks
+      units/{civ}_champion_cavalry_barracks
+      units/{civ}_champion_chariot_barracks
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
       training_conscription
+      unlock_champion_units
       archery_tradition
     </Technologies>
   </ProductionQueue>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_a">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/mace_champion_infantry_e_barracks</Entity>
-  </Promotion>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_barracks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace_champion_infantry_a">
+  <Identity>
+    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_e">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>