Index: ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
@@ -62,7 +62,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stables, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker'>" +
+		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStables, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stables, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker, Workshop'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
@@ -1,59 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Cost>
-    <BuildTime>300</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>200</stone>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="29.0" depth="27.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <List datatype="tokens">Elephant</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>3000</Max>
-  </Health>
+<Entity parent="template_structure_military_elephant_stables">
   <Identity>
     <Civ>maur</Civ>
-    <GenericName>Elephant Stables</GenericName>
     <SpecificName>Vāraṇaśālā</SpecificName>
     <RequiredTechnology>phase_town</RequiredTechnology>
-    <Icon>structures/elephant_stables.png</Icon>
-    <Tooltip>Train elephant units.</Tooltip>
     <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
   </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>50</stone>
-    <metal>50</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="30.0" depth="29.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_support_elephant
-      units/{civ}_elephant_archer_b
-      units/{civ}_champion_elephant
-    </Entities>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_elephant_stables.xml</select>
-      <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Radius>38</Radius>
-  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/mauryans/stables.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_elephant_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_elephant_stables.xml
@@ -1,58 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Cost>
-    <BuildTime>300</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>200</stone>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="29.0" depth="27.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <List datatype="tokens">Elephant</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>3000</Max>
-  </Health>
+<Entity parent="template_structure_military_elephant_stables">
   <Identity>
     <Civ>pers</Civ>
-    <GenericName>Elephant Stables</GenericName>
-    <SpecificName>?</SpecificName>
-    <RequiredTechnology>phase_city</RequiredTechnology>
-    <Icon>structures/elephant_stables.png</Icon>
-    <Tooltip>Train elephant units.</Tooltip>
+    <SpecificName>Persian Elephant Stables</SpecificName>
   </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>50</stone>
-    <metal>50</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="30.0" depth="29.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_support_elephant
-      units/{civ}_elephant_archer_b
-      units/{civ}_champion_elephant
-    </Entities>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_elephant_stables.xml</select>
-      <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Radius>38</Radius>
-  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/stables_elephant.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_elephant_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_elephant_stables.xml
@@ -1,58 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Cost>
-    <BuildTime>300</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>200</stone>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="29.0" depth="27.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <List datatype="tokens">Elephant</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>3000</Max>
-  </Health>
+<Entity parent="template_structure_military_elephant_stables">
   <Identity>
     <Civ>sele</Civ>
-    <GenericName>Elephant Stables</GenericName>
-    <SpecificName>?</SpecificName>
-    <RequiredTechnology>phase_city</RequiredTechnology>
-    <Icon>structures/elephant_stables.png</Icon>
-    <Tooltip>Train elephant units.</Tooltip>
+    <SpecificName>Seleucid Elephant Stables</SpecificName>
   </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>50</stone>
-    <metal>50</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="30.0" depth="29.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_support_elephant
-      units/{civ}_elephant_archer_b
-      units/{civ}_champion_elephant
-    </Entities>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_elephant_stables.xml</select>
-      <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Radius>38</Radius>
-  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/seleucids/stable_elephant.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military">
+  <BuildRestrictions>
+    <Category>Barracks</Category>
+  </BuildRestrictions>
+  <Cost>
+    <BuildTime>300</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>200</stone>
+      <metal>200</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="29.0" depth="27.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>5</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Elephant</List>
+    <BuffHeal>1</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
+  <Health>
+    <Max>3000</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <GenericName>Elephant Stables</GenericName>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+    <Icon>structures/elephant_stables.png</Icon>
+    <Tooltip>Train elephant units.</Tooltip>
+    <VisibleClasses datatype="tokens">City ElephantStables</VisibleClasses>
+  </Identity>
+  <Loot>
+    <wood>0</wood>
+    <stone>50</stone>
+    <metal>50</metal>
+  </Loot>
+  <Obstruction>
+    <Static width="30.0" depth="29.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}_support_elephant
+      units/{civ}_elephant_archer_b
+      units/{civ}_champion_elephant
+    </Entities>
+  </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+      <select>interface/select/building/sel_elephant_stables.xml</select>
+    </SoundGroups>
+  </Sound>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>38</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
+  <VisualActor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+  </VisualActor>
+</Entity>