Index: binaries/data/mods/public/globalscripts/Templates.js
===================================================================
--- binaries/data/mods/public/globalscripts/Templates.js
+++ binaries/data/mods/public/globalscripts/Templates.js
@@ -417,16 +417,16 @@
 	if (template.Upgrade)
 	{
 		ret.upgrades = [];
-		for (let upgradeName in template.Upgrade)
+		for (let upgradeName in template.Upgrade.Upgrades)
 		{
-			let upgrade = template.Upgrade[upgradeName];
+			let upgrade = template.Upgrade.Upgrades[upgradeName];
 
 			let cost = {};
 			if (upgrade.Cost)
 				for (let res in upgrade.Cost)
-					cost[res] = getEntityValue("Upgrade/" + upgradeName + "/Cost/" + res, "Upgrade/Cost/" + res);
+					cost[res] = getEntityValue("Upgrade/Upgrades/" + upgradeName + "/Cost/" + res, "Upgrade/Cost/" + res);
 			if (upgrade.Time)
-				cost.time = getEntityValue("Upgrade/" + upgradeName + "/Time", "Upgrade/Time");
+				cost.time = getEntityValue("Upgrade/Upgrades/" + upgradeName + "/Time", "Upgrade/Time");
 
 			ret.upgrades.push({
 				"entity": upgrade.Entity,
Index: binaries/data/mods/public/simulation/components/Upgrade.js
===================================================================
--- binaries/data/mods/public/simulation/components/Upgrade.js
+++ binaries/data/mods/public/simulation/components/Upgrade.js
@@ -3,56 +3,63 @@
 const UPGRADING_PROGRESS_INTERVAL = 250;
 
 Upgrade.prototype.Schema =
-	"<oneOrMore>" +
-		"<element>" +
-			"<anyName />" +
-			"<interleave>" +
-				"<element name='Entity' a:help='Entity to upgrade to'>" +
-					"<text/>" +
-				"</element>" +
-				"<optional>" +
-					"<element name='Icon' a:help='Icon to show in the GUI'>" +
+	"<element name='Upgrades'>" +
+		"<oneOrMore>" +
+			"<element>" +
+				"<anyName/>" +
+				"<interleave>" +
+					"<element name='Entity' a:help='Entity to upgrade to'>" +
 						"<text/>" +
 					"</element>" +
-				"</optional>" +
-				"<optional>" +
-					"<element name='Variant' a:help='The name of the variant to switch to when upgrading'>" +
-						"<text/>" +
-					"</element>" +
-				"</optional>" +
-				"<optional>" +
-					"<element name='Tooltip' a:help='This will be added to the tooltip to help the player choose why to upgrade.'>" +
-						"<text/>" +
-					"</element>" +
-				"</optional>" +
-				"<optional>" +
-					"<element name='Time' a:help='Time required to upgrade this entity, in seconds'>" +
-						"<data type='nonNegativeInteger'/>" +
-					"</element>" +
-				"</optional>" +
-				"<optional>" +
-					"<element name='Cost' a:help='Resource cost to upgrade this unit'>" +
-						"<oneOrMore>" +
+					"<optional>" +
+						"<element name='Icon' a:help='Icon to show in the GUI'>" +
+							"<text/>" +
+						"</element>" +
+					"</optional>" +
+					"<optional>" +
+						"<element name='Variant' a:help='The name of the variant to switch to when upgrading'>" +
+							"<text/>" +
+						"</element>" +
+					"</optional>" +
+					"<optional>" +
+						"<element name='Tooltip' a:help='This will be added to the tooltip to help the player choose why to upgrade.'>" +
+							"<text/>" +
+						"</element>" +
+					"</optional>" +
+					"<optional>" +
+						"<element name='Time' a:help='Time required to upgrade this entity, in seconds'>" +
+							"<data type='nonNegativeInteger'/>" +
+						"</element>" +
+					"</optional>" +
+					"<optional>" +
+						"<element name='Cost' a:help='Resource cost to upgrade this unit'>" +
+							"<oneOrMore>" +
+								"<choice>" +
+									Resources.BuildSchema("nonNegativeInteger") +
+								"</choice>" +
+							"</oneOrMore>" +
+						"</element>" +
+					"</optional>" +
+					"<optional>" +
+						"<element name='RequiredTechnology' a:help='Define what technology is required for this upgrade'>" +
 							"<choice>" +
-								Resources.BuildSchema("nonNegativeInteger") +
+								"<text/>" +
+								"<empty/>" +
 							"</choice>" +
-						"</oneOrMore>" +
-					"</element>" +
-				"</optional>" +
-				"<optional>" +
-					"<element name='RequiredTechnology' a:help='Define what technology is required for this upgrade'>" +
-						"<choice>" +
-							"<text/>" +
-							"<empty/>" +
-						"</choice>" +
-					"</element>" +
-				"</optional>" +
-				"<optional>" +
-					"<element name='CheckPlacementRestrictions' a:help='Upgrading will check for placement restrictions (nb:GUI only)'><empty/></element>" +
-				"</optional>" +
-			"</interleave>" +
+						"</element>" +
+					"</optional>" +
+					"<optional>" +
+						"<element name='CheckPlacementRestrictions' a:help='Upgrading will check for placement restrictions (nb:GUI only)'><empty/></element>" +
+					"</optional>" +
+				"</interleave>" +
+			"</element>" +
+		"</oneOrMore>" +
+	"</element>" +
+	"<optional>" +
+		"<element name='AutoUpgrade' a:help='Whether this entity will automatically upgrade itself.'>" +
+			"<empty/>" +
 		"</element>" +
-	"</oneOrMore>";
+	"</optional>";
 
 Upgrade.prototype.Init = function()
 {
@@ -64,16 +71,18 @@
 
 	this.upgradeTemplates = {};
 
-	for (let choice in this.template)
+	for (let choice in this.template.Upgrades)
 	{
 		let cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
-		let name = this.template[choice].Entity;
+		let name = this.template.Upgrades[choice].Entity;
 		if (cmpIdentity)
 			name = name.replace(/\{civ\}/g, cmpIdentity.GetCiv());
 		if (this.upgradeTemplates.name)
 			warn("Upgrade Component: entity " + this.entity + " has two upgrades to the same entity, only the last will be used.");
 		this.upgradeTemplates[name] = choice;
 	}
+
+	this.autoUpgrade = "AutoUpgrade" in this.template;
 };
 
 // This will also deal with the "OnDestroy" case.
@@ -82,8 +91,11 @@
 	if (!this.completed)
 		this.CancelUpgrade(msg.from);
 
-	if (msg.to != INVALID_PLAYER)
-		this.owner = msg.to;
+	if (msg.to == INVALID_PLAYER)
+		return;
+
+	this.owner = msg.to;
+	this.CheckAutoUpgrade();
 };
 
 Upgrade.prototype.ChangeUpgradedEntityCount = function(amount)
@@ -129,9 +141,9 @@
 
 	let cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
 
-	for (let option in this.template)
+	for (let option in this.template.Upgrades)
 	{
-		let choice = this.template[option];
+		let choice = this.template.Upgrades[option];
 		let templateName = cmpIdentity ? choice.Entity.replace(/\{civ\}/g, cmpIdentity.GetCiv()) : choice.Entity;
 
 		let cost = {};
@@ -179,23 +191,23 @@
 		return undefined;
 
 	// is undefined by default so use X in Y
-	return "CheckPlacementRestrictions" in this.template[this.upgradeTemplates[template]];
+	return "CheckPlacementRestrictions" in this.template.Upgrades[this.upgradeTemplates[template]];
 };
 
 Upgrade.prototype.GetRequiredTechnology = function(templateArg)
 {
 	let choice = this.upgradeTemplates[templateArg] || templateArg;
 
-	if (this.template[choice].RequiredTechnology)
-		return this.template[choice].RequiredTechnology;
+	if (this.template.Upgrades[choice].RequiredTechnology)
+		return this.template.Upgrades[choice].RequiredTechnology;
 
-	if (!("RequiredTechnology" in this.template[choice]))
+	if (!("RequiredTechnology" in this.template.Upgrades[choice]))
 		return undefined;
 
 	let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
 	let cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
 
-	let entType = this.template[choice].Entity;
+	let entType = this.template.Upgrades[choice].Entity;
 	if (cmpIdentity)
 		entType = entType.replace(/\{civ\}/g, cmpIdentity.GetCiv());
 
@@ -212,12 +224,12 @@
 		return clone(this.expendedResources);
 
 	let choice = this.upgradeTemplates[template];
-	if (!this.template[choice].Cost)
+	if (!this.template.Upgrades[choice].Cost)
 		return {};
 
 	let costs = {};
-	for (let r in this.template[choice].Cost)
-		costs[r] = ApplyValueModificationsToEntity("Upgrade/Cost/"+r, +this.template[choice].Cost[r], this.entity);
+	for (let r in this.template.Upgrades[choice].Cost)
+		costs[r] = ApplyValueModificationsToEntity("Upgrade/Cost/"+r, +this.template.Upgrades[choice].Cost[r], this.entity);
 
 	return costs;
 };
@@ -267,7 +279,7 @@
 
 	// Do not update visual actor if the animation didn't change.
 	let choice = this.upgradeTemplates[this.upgrading];
-	if (choice && this.template[choice].Variant)
+	if (choice && this.template.Upgrades[choice].Variant)
 	{
 		let cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
 		if (cmpVisual)
@@ -287,10 +299,10 @@
 	if (!choice)
 		return undefined;
 
-	if (!this.template[choice].Time)
+	if (!this.template.Upgrades[choice].Time)
 		return 0;
 
-	return ApplyValueModificationsToEntity("Upgrade/Time", +this.template[choice].Time, this.entity);
+	return ApplyValueModificationsToEntity("Upgrade/Time", +this.template.Upgrades[choice].Time, this.entity);
 };
 
 Upgrade.prototype.GetElapsedTime = function()
@@ -315,14 +327,14 @@
 {
 	let choice = this.upgradeTemplates[this.upgrading];
 
-	if (!choice || !this.template[choice].Variant)
+	if (!choice || !this.template.Upgrades[choice].Variant)
 		return;
 
 	let cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
 	if (!cmpVisual)
 		return;
 
-	cmpVisual.SelectAnimation(this.template[choice].Variant, false, 1.0);
+	cmpVisual.SelectAnimation(this.template.Upgrades[choice].Variant, false, 1.0);
 };
 
 Upgrade.prototype.UpgradeProgress = function(data, lateness)
@@ -345,4 +357,13 @@
 		PlaySound("upgraded", newEntity);
 };
 
+/**
+ * Checks for autoupgrade. And upgrades if applicable.
+ */
+Upgrade.prototype.CheckAutoUpgrade = function()
+{
+	if (this.autoUpgrade)
+		this.Upgrade(pickRandom(Object.keys(this.upgradeTemplates)));
+};
+
 Engine.RegisterComponentType(IID_Upgrade, "Upgrade", Upgrade);
Index: binaries/data/mods/public/simulation/components/tests/test_UpgradeModification.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_UpgradeModification.js
+++ binaries/data/mods/public/simulation/components/tests/test_UpgradeModification.js
@@ -37,10 +37,12 @@
 		"VisibleClasses": { '@datatype': "tokens", "_string": "" }
 	},
 	"Upgrade": {
-		"Tower": {
-			"Cost": { "stone": "100", "wood": "50" },
-			"Entity": "structures/{civ}_defense_tower",
-			"Time": "100"
+		"Upgrades": {
+			"Tower": {
+				"Cost": { "stone": "100", "wood": "50" },
+				"Entity": "structures/{civ}_defense_tower",
+				"Time": "100"
+			}
 		}
 	}
 };
@@ -159,3 +161,22 @@
 // T7: ...but with the upgrade cancelled, it now uses the modified value.
 cmpUpgrade.CancelUpgrade(playerID);
 TS_ASSERT_UNEVAL_EQUALS(cmpUpgrade.GetUpgrades()[0].cost, { "stone": 160, "wood": 25, "time": 90 });
+
+// Test automatic upgrading.
+template["Upgrade"] = {
+	"Upgrades": {
+		"Tower": {
+			"Cost": { "stone": "100", "wood": "50" },
+			"Entity": "structures/{civ}_defense_tower",
+			"Time": "100"
+		}
+	},
+	"AutoUpgrade": undefined
+};
+cmpUpgrade = ConstructComponent(20, "Upgrade", template.Upgrade);
+cmpUpgrade.OnOwnershipChanged({ "from": INVALID_PLAYER, "to": playerID });
+TS_ASSERT(cmpUpgrade.IsUpgrading());
+
+// Stop upgrading when dying.
+cmpUpgrade.OnOwnershipChanged({ "from": playerID, "to": INVALID_PLAYER });
+TS_ASSERT(!cmpUpgrade.IsUpgrading());
Index: binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
@@ -18,27 +18,29 @@
     <Actor>structures/hellenes/scout_tower.xml</Actor>
   </VisualActor>
   <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
+    <Upgrades>
+      <Tower1>
+        <Entity>structures/{civ}_tower_artillery</Entity>
+        <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <wood>150</wood>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower1>
+      <Tower2>
+        <Entity>structures/{civ}_tower_bolt</Entity>
+        <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <metal>100</metal>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower2>
+    </Upgrades>
   </Upgrade>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
@@ -19,27 +19,29 @@
     <Actor>structures/carthaginians/scout_tower.xml</Actor>
   </VisualActor>
   <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
+    <Upgrades>
+     <Tower1>
+        <Entity>structures/{civ}_tower_artillery</Entity>
+        <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <wood>150</wood>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower1>
+      <Tower2>
+        <Entity>structures/{civ}_tower_bolt</Entity>
+        <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <metal>100</metal>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower2>
+    </Upgrades>
   </Upgrade>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml
@@ -7,14 +7,16 @@
     <GenericName>Stone Wall</GenericName>
   </Identity>
   <Upgrade>
-    <Gate>
-      <Entity>structures/cart_s_wall_gate</Entity>
-      <Cost>
-        <stone>0</stone>
-        <wood>20</wood>
-      </Cost>
-      <Time>5</Time>
-    </Gate>
+    <Upgrades>
+      <Gate>
+        <Entity>structures/cart_s_wall_gate</Entity>
+        <Cost>
+          <stone>0</stone>
+          <wood>20</wood>
+        </Cost>
+        <Time>5</Time>
+      </Gate>
+    </Upgrades>
   </Upgrade>
   <VisualActor>
     <Actor>structures/carthaginians/short_wall_long.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml
@@ -4,12 +4,14 @@
     <Civ>iber</Civ>
   </Identity>
   <Upgrade>
-    <Tower>
-      <Cost>
-        <stone>250</stone>
-      </Cost>
-      <Time>120</Time>
-    </Tower>
+    <Upgrades>
+      <Tower>
+        <Cost>
+          <stone>250</stone>
+        </Cost>
+        <Time>120</Time>
+      </Tower>
+    </Upgrades>
   </Upgrade>
   <VisualActor>
     <Actor>structures/iberians/wooden_tower.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
@@ -15,28 +15,30 @@
     <HeightOffset>22.0</HeightOffset>
   </StatusBars>
   <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
+    <Upgrades>
+      <Tower1>
+        <Entity>structures/{civ}_tower_artillery</Entity>
+        <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <wood>150</wood>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower1>
+      <Tower2>
+        <Entity>structures/{civ}_tower_bolt</Entity>
+        <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <metal>100</metal>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower2>
+    </Upgrades>
   </Upgrade>
   <VisualActor>
     <Actor>structures/hellenes/scout_tower.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
@@ -8,16 +8,18 @@
     <HeightOffset>19.0</HeightOffset>
   </StatusBars>
   <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_double</Entity>
-      <Tooltip>Reinforce with stone block, and add a second rampart for up to 16 archers to stand upon. Infantry Archer exclusive tower. Devastating against melee troops, weak to siege and massed ranged units</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>70</stone>
-      </Cost>
-      <Time>200</Time>
-    </Tower1>
+    <Upgrades>
+      <Tower1>
+        <Entity>structures/{civ}_tower_double</Entity>
+        <Tooltip>Reinforce with stone block, and add a second rampart for up to 16 archers to stand upon. Infantry Archer exclusive tower. Devastating against melee troops, weak to siege and massed ranged units</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <wood>150</wood>
+          <stone>70</stone>
+        </Cost>
+        <Time>200</Time>
+      </Tower1>
+    </Upgrades>
   </Upgrade>
   <VisualActor>
     <Actor>structures/mauryas/scout_tower.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
@@ -42,12 +42,14 @@
     <Static width="35.0" depth="7.5"/>
   </Obstruction>
   <Upgrade>
-    <Gate>
-      <Cost>
-        <wood>60</wood>
-        <stone>0</stone>
-      </Cost>
-    </Gate>
+    <Upgrades>
+      <Gate>
+        <Cost>
+          <wood>60</wood>
+          <stone>0</stone>
+        </Cost>
+      </Gate>
+    </Upgrades>
   </Upgrade>
   <VisualActor>
     <Actor>structures/mauryas/wall_long.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
@@ -27,15 +27,17 @@
     <HeightOffset>9.0</HeightOffset>
   </StatusBars>
   <Upgrade>
-    <Gate>
-      <Entity>structures/palisades_gate</Entity>
-      <Cost>
-        <wood>20</wood>
-      </Cost>
-      <Time>5</Time>
-      <Tooltip>This will allow you to let units circulate through your fortifications.</Tooltip>
-      <Variant>upgrading</Variant>
-    </Gate>
+    <Upgrades>
+      <Gate>
+        <Entity>structures/palisades_gate</Entity>
+        <Cost>
+          <wood>20</wood>
+        </Cost>
+        <Time>5</Time>
+        <Tooltip>This will allow you to let units circulate through your fortifications.</Tooltip>
+        <Variant>upgrading</Variant>
+      </Gate>
+    </Upgrades>
   </Upgrade>
   <VisualActor>
     <Actor>props/special/palisade_rocks_long.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
@@ -18,27 +18,29 @@
     <Actor>structures/ptolemies/defense_tower.xml</Actor>
   </VisualActor>
   <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
+    <Upgrades>
+      <Tower1>
+        <Entity>structures/{civ}_tower_artillery</Entity>
+        <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <wood>150</wood>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower1>
+      <Tower2>
+        <Entity>structures/{civ}_tower_bolt</Entity>
+        <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <metal>100</metal>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower2>
+    </Upgrades>
   </Upgrade>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
@@ -18,27 +18,29 @@
     <Actor>structures/romans/scout_tower.xml</Actor>
   </VisualActor>
   <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
+    <Upgrades>
+      <Tower1>
+        <Entity>structures/{civ}_tower_artillery</Entity>
+        <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <wood>150</wood>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower1>
+      <Tower2>
+        <Entity>structures/{civ}_tower_bolt</Entity>
+        <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <metal>100</metal>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower2>
+    </Upgrades>
   </Upgrade>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
@@ -73,14 +73,16 @@
   </Obstruction>
   <TerritoryInfluence disable=""/>
   <Upgrade>
-    <Gate>
-      <Entity>structures/rome_siege_wall_gate</Entity>
-      <Cost>
-        <wood>80</wood>
-        <stone>0</stone>
-      </Cost>
-      <Variant>upgrading</Variant>
-    </Gate>
+    <Upgrades>
+      <Gate>
+        <Entity>structures/rome_siege_wall_gate</Entity>
+        <Cost>
+          <wood>80</wood>
+          <stone>0</stone>
+        </Cost>
+        <Variant>upgrading</Variant>
+      </Gate>
+    </Upgrades>
   </Upgrade>
   <VisualActor>
     <Actor>structures/romans/siege_wall_long.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
@@ -18,16 +18,18 @@
     <Actor>structures/seleucids/scout_tower.xml</Actor>
   </VisualActor>
   <Upgrade>
-    <Tower>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small torsion engines to upgrade this defense tower into an artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower>
+    <Upgrades>
+      <Tower>
+        <Entity>structures/{civ}_tower_artillery</Entity>
+        <Tooltip>Reinforce with stone block, and install small torsion engines to upgrade this defense tower into an artillery tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <wood>150</wood>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower>
+    </Upgrades>
   </Upgrade>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
@@ -18,16 +18,18 @@
     <Actor>structures/spartans/defense_tower.xml</Actor>
   </VisualActor>
   <Upgrade>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install small oxybeles to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
+    <Upgrades>
+      <Tower2>
+        <Entity>structures/{civ}_tower_bolt</Entity>
+        <Tooltip>Reinforce with stone block, and install small oxybeles to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
+        <RequiredTechnology>phase_city</RequiredTechnology>
+        <Cost>
+          <metal>100</metal>
+          <stone>100</stone>
+        </Cost>
+        <Time>200</Time>
+        <Variant>upgrading</Variant>
+      </Tower2>
+    </Upgrades>
   </Upgrade>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -55,16 +55,19 @@
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Upgrade>
-    <Tower>
-      <Entity>structures/{civ}_defense_tower</Entity>
-      <Tooltip>Reinforce with stone and upgrade to a defense tower.</Tooltip>
-      <RequiredTechnology>phase_town</RequiredTechnology>
-      <Cost>
-        <wood>50</wood>
-        <stone>100</stone>
-      </Cost>
-      <Variant>upgrading</Variant>
-      <Time>100</Time>
-    </Tower>
+    <Upgrades>
+      <Tower>
+        <Entity>structures/{civ}_defense_tower</Entity>
+        <Tooltip>Reinforce with stone and upgrade to a defense tower.</Tooltip>
+        <RequiredTechnology>phase_town</RequiredTechnology>
+        <Cost>
+          <wood>50</wood>
+          <stone>100</stone>
+        </Cost>
+        <Variant>upgrading</Variant>
+        <Time>100</Time>
+      </Tower>
+    </Upgrades>
+    <AutoUpgrade/>
   </Upgrade>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
@@ -47,15 +47,17 @@
   </Loot>
   <ProductionQueue disable=""/>
   <Upgrade>
-    <Gate>
-      <Entity>structures/{civ}_wall_gate</Entity>
-      <Tooltip>This will allow you to let units circulate through your fortifications.</Tooltip>
-      <Cost>
-        <stone>60</stone>
-      </Cost>
-      <Time>10</Time>
-      <Variant>upgrading</Variant>
-    </Gate>
+    <Upgrades>
+      <Gate>
+        <Entity>structures/{civ}_wall_gate</Entity>
+        <Tooltip>This will allow you to let units circulate through your fortifications.</Tooltip>
+        <Cost>
+          <stone>60</stone>
+        </Cost>
+        <Time>10</Time>
+        <Variant>upgrading</Variant>
+      </Gate>
+    </Upgrades>
   </Upgrade>
   <VisualActor>
     <FoundationActor>structures/fndn_9x3_wall.xml</FoundationActor>