Index: binaries/data/mods/_test.sim/simulation/templates/special/filter/foundation.xml
===================================================================
--- binaries/data/mods/_test.sim/simulation/templates/special/filter/foundation.xml
+++ binaries/data/mods/_test.sim/simulation/templates/special/filter/foundation.xml
@@ -3,9 +3,7 @@
   <AIProxy merge=""/>
   <BuildRestrictions merge=""/>
   <!-- Don't provide population bonuses yet (but still do take up population cost) -->
-  <Cost merge="">
-    <PopulationBonus>0</PopulationBonus>
-  </Cost>
+  <Cost merge=""/>
   <Decay merge=""/>
   <Health>
     <Initial>1</Initial>
@@ -23,6 +21,9 @@
   </Obstruction>
   <OverlayRenderer merge=""/>
   <Ownership merge=""/>
+  <Population>
+    <Bonus>0</Bonus>
+  </Population>
   <Position merge=""/>
   <RallyPoint merge=""/>
   <RallyPointRenderer merge=""/>
Index: binaries/data/mods/public/globalscripts/Templates.js
===================================================================
--- binaries/data/mods/public/globalscripts/Templates.js
+++ binaries/data/mods/public/globalscripts/Templates.js
@@ -300,13 +300,15 @@
 		if (template.Cost.Population)
 			ret.cost.population = getEntityValue("Cost/Population");
 
-		if (template.Cost.PopulationBonus)
-			ret.cost.populationBonus = getEntityValue("Cost/PopulationBonus");
-
 		if (template.Cost.BuildTime)
 			ret.cost.time = getEntityValue("Cost/BuildTime");
 	}
 
+	if (template.Population && template.Population.Bonus)
+		ret.population = {
+			"bonus": getEntityValue("Population/Bonus")
+		};
+
 	if (template.Footprint)
 	{
 		ret.footprint = { "height": template.Footprint.Height };
Index: binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- binaries/data/mods/public/gui/common/tooltips.js
+++ binaries/data/mods/public/gui/common/tooltips.js
@@ -10,7 +10,7 @@
 
 function getCostTypes()
 {
-	return g_ResourceData.GetCodes().concat(["population", "populationBonus", "time"]);
+	return g_ResourceData.GetCodes().concat(["population", "time"]);
 }
 
 var g_DamageTypesMetadata = new DamageTypesMetadata();
@@ -612,7 +612,7 @@
 	let costs = [];
 	for (let type of getCostTypes())
 		// Population bonus is shown in the tooltip
-		if (type != "populationBonus" && totalCosts[type])
+		if (totalCosts[type])
 			costs.push(sprintf(translate("%(component)s %(cost)s"), {
 				"component": resourceIcon(type),
 				"cost": totalCosts[type]
@@ -806,10 +806,10 @@
 function getPopulationBonusTooltip(template)
 {
 	let popBonus = "";
-	if (template.cost && template.cost.populationBonus)
-		popBonus = sprintf(translate("%(label)s %(populationBonus)s"), {
+	if (template.population && template.population.bonus)
+		popBonus = sprintf(translate("%(label)s %(bonus)s"), {
 			"label": headerFont(translate("Population Bonus:")),
-			"populationBonus": template.cost.populationBonus
+			"bonus": template.population.bonus
 		});
 	return popBonus;
 }
Index: binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- binaries/data/mods/public/gui/credits/texts/programming.json
+++ binaries/data/mods/public/gui/credits/texts/programming.json
@@ -143,6 +143,7 @@
 				{ "nick": "Link Mauve", "name": "Emmanuel Gil Peyrot" },
 				{ "nick": "LittleDev" },
 				{ "nick": "livingaftermidnight", "name": "Will Dull" },
+				{ "nick": "lonehawk", "name": "Vignesh Krishnan" },
 				{ "nick": "Louhike" },
 				{ "nick": "lsdh" },
 				{ "nick": "Ludovic", "name": "Ludovic Rousseau" },
Index: binaries/data/mods/public/gui/session/selection_details.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_details.js
+++ binaries/data/mods/public/gui/session/selection_details.js
@@ -319,6 +319,7 @@
 		getGatherTooltip,
 		getSpeedTooltip,
 		getGarrisonTooltip,
+		getPopulationBonusTooltip,
 		getProjectilesTooltip,
 		getResourceTrickleTooltip,
 		getLootTooltip
Index: binaries/data/mods/public/l10n/public-gui-other.pot
===================================================================
--- binaries/data/mods/public/l10n/public-gui-other.pot
+++ binaries/data/mods/public/l10n/public-gui-other.pot
@@ -1077,7 +1077,7 @@
 
 #: gui/common/tooltips.js:810
 #, javascript-format
-msgid "%(label)s %(populationBonus)s"
+msgid "%(label)s %(bonus)s"
 msgstr ""
 
 #: gui/common/tooltips.js:811
Index: binaries/data/mods/public/maps/random/fortress.js
===================================================================
--- binaries/data/mods/public/maps/random/fortress.js
+++ binaries/data/mods/public/maps/random/fortress.js
@@ -109,7 +109,7 @@
 
 	// Fortress
 	// To take into account houses that offer a lower population bonus
-	if (Engine.GetTemplate("structures/" + civ + "_house").Cost.PopulationBonus <= 5)
+	if (Engine.GetTemplate("structures/" + civ + "_house").Population.Bonus <= 5)
 	{
 		var wall = ["gate", "tower", "long",
 			"cornerIn", "long", "barracks", "tower", "long", "tower", "house", "long",
Index: binaries/data/mods/public/simulation/ai/common-api/entity.js
===================================================================
--- binaries/data/mods/public/simulation/ai/common-api/entity.js
+++ binaries/data/mods/public/simulation/ai/common-api/entity.js
@@ -194,7 +194,7 @@
 
 	"isRepairable": function() { return this.get("Repairable") !== undefined; },
 
-	"getPopulationBonus": function() { return +this.get("Cost/PopulationBonus"); },
+	"getPopulationBonus": function() { return +this.get("Population/Bonus"); },
 
 	"resistanceStrengths": function() {
 		let resistanceTypes = this.get("Resistance");
Index: binaries/data/mods/public/simulation/ai/petra/researchManager.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/researchManager.js
+++ binaries/data/mods/public/simulation/ai/petra/researchManager.js
@@ -46,7 +46,7 @@
 		if (!tech[1]._template.modifications)
 			continue;
 		// TODO may-be loop on all modifs and check if the effect if positive ?
-		if (tech[1]._template.modifications[0].value !== "Cost/PopulationBonus")
+		if (tech[1]._template.modifications[0].value !== "Population/Bonus")
 			continue;
 		queues.minorTech.addPlan(new PETRA.ResearchPlan(gameState, tech[0]));
 		break;
Index: binaries/data/mods/public/simulation/components/AIInterface.js
===================================================================
--- binaries/data/mods/public/simulation/components/AIInterface.js
+++ binaries/data/mods/public/simulation/components/AIInterface.js
@@ -256,7 +256,7 @@
 			let newValue = ApplyValueModificationsToTemplate(valName, oldValue, msg.player, template);
 			// Apply the same roundings as in the components
 			if (valName === "Player/MaxPopulation" || valName === "Cost/Population" ||
-			    valName === "Cost/PopulationBonus")
+			    valName === "Population/Bonus")
 				newValue = Math.round(newValue);
 			// TODO in some cases, we can have two opposite changes which bring us to the old value,
 			// and we should keep it. But how to distinguish it ?
@@ -305,7 +305,7 @@
 			let newValue = ApplyValueModificationsToEntity(valName, oldValue, ent);
 			// Apply the same roundings as in the components
 			if (valName === "Player/MaxPopulation" || valName === "Cost/Population" ||
-			    valName === "Cost/PopulationBonus")
+			    valName === "Population/Bonus")
 				newValue = Math.round(newValue);
 			// TODO in some cases, we can have two opposite changes which bring us to the old value,
 			// and we should keep it. But how to distinguish it ?
Index: binaries/data/mods/public/simulation/components/Cost.js
===================================================================
--- binaries/data/mods/public/simulation/components/Cost.js
+++ binaries/data/mods/public/simulation/components/Cost.js
@@ -4,7 +4,6 @@
 	"<a:help>Specifies the construction/training costs of this entity.</a:help>" +
 	"<a:example>" +
 		"<Population>1</Population>" +
-		"<PopulationBonus>15</PopulationBonus>" +
 		"<BuildTime>20.0</BuildTime>" +
 		"<Resources>" +
 			"<food>50</food>" +
@@ -16,9 +15,6 @@
 	"<element name='Population' a:help='Population cost'>" +
 		"<data type='nonNegativeInteger'/>" +
 	"</element>" +
-	"<element name='PopulationBonus' a:help='Population cap increase while this entity exists'>" +
-		"<data type='nonNegativeInteger'/>" +
-	"</element>" +
 	"<element name='BuildTime' a:help='Time taken to construct/train this entity (in seconds)'>" +
 		"<ref name='nonNegativeDecimal'/>" +
 	"</element>" +
@@ -29,7 +25,6 @@
 Cost.prototype.Init = function()
 {
 	this.populationCost = +this.template.Population;
-	this.populationBonus = +this.template.PopulationBonus;
 };
 
 Cost.prototype.GetPopCost = function()
@@ -37,11 +32,6 @@
 	return this.populationCost;
 };
 
-Cost.prototype.GetPopBonus = function()
-{
-	return this.populationBonus;
-};
-
 Cost.prototype.GetBuildTime = function()
 {
 	return ApplyValueModificationsToEntity("Cost/BuildTime", +this.template.BuildTime, this.entity);
@@ -69,28 +59,12 @@
 	return costs;
 };
 
-Cost.prototype.OnOwnershipChanged = function(msg)
-{
-	if (msg.from != INVALID_PLAYER)
-	{
-		let cmpPlayer = QueryPlayerIDInterface(msg.from);
-		if (cmpPlayer)
-			cmpPlayer.AddPopulationBonuses(-this.GetPopBonus());
-	}
-	if (msg.to != INVALID_PLAYER)
-	{
-		let cmpPlayer = QueryPlayerIDInterface(msg.to);
-		if (cmpPlayer)
-			cmpPlayer.AddPopulationBonuses(this.GetPopBonus());
-	}
-};
-
 Cost.prototype.OnValueModification = function(msg)
 {
 	if (msg.component != "Cost")
 		return;
 
-	// foundations shouldn't give a pop bonus and a pop cost
+	// Foundations shouldn't give a pop cost.
 	var cmpFoundation = Engine.QueryInterface(this.entity, IID_Foundation);
 	if (cmpFoundation)
 		return;
@@ -100,18 +74,11 @@
 	var popCostDifference = newPopCost - this.populationCost;
 	this.populationCost = newPopCost;
 
-	// update the population bonuses
-	var newPopBonus = Math.round(ApplyValueModificationsToEntity("Cost/PopulationBonus", +this.template.PopulationBonus, this.entity));
-	var popDifference = newPopBonus - this.populationBonus;
-	this.populationBonus = newPopBonus;
-
 	var cmpPlayer = QueryOwnerInterface(this.entity);
 	if (!cmpPlayer)
 		return;
 	if (popCostDifference)
 		cmpPlayer.AddPopulation(popCostDifference);
-	if (popDifference)
-		cmpPlayer.AddPopulationBonuses(popDifference);
 };
 
 Engine.RegisterComponentType(IID_Cost, "Cost", Cost);
Index: binaries/data/mods/public/simulation/components/GuiInterface.js
===================================================================
--- binaries/data/mods/public/simulation/components/GuiInterface.js
+++ binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -303,6 +303,12 @@
 			"progress": cmpPack.GetProgress()
 		};
 
+	let cmpPopulation = Engine.QueryInterface(ent, IID_Population);
+	if (cmpPopulation)
+		ret.population = {
+			"bonus": cmpPopulation.GetPopBonus()
+		};
+
 	let cmpUpgrade = Engine.QueryInterface(ent, IID_Upgrade);
 	if (cmpUpgrade)
 		ret.upgrade = {
@@ -1177,7 +1183,6 @@
  *     'stone': ...,
  *     'metal': ...,
  *     'population': ...,
- *     'populationBonus': ...,
  *   }
  * }
  *
@@ -1329,7 +1334,7 @@
 
 	let result = {
 		"pieces": [],
-		"cost": { "population": 0, "populationBonus": 0, "time": 0 }
+		"cost": { "population": 0, "time": 0 }
 	};
 	for (let res of Resources.GetCodes())
 		result.cost[res] = 0;
@@ -1606,7 +1611,7 @@
 			// copied over, so we need to fetch it from the template instead).
 			// TODO: We should really use a Cost object or at least some utility functions for this, this is mindless
 			// boilerplate that's probably duplicated in tons of places.
-			for (let res of Resources.GetCodes().concat(["population", "populationBonus", "time"]))
+			for (let res of Resources.GetCodes().concat(["population", "time"]))
 				result.cost[res] += tplData.cost[res];
 		}
 
Index: binaries/data/mods/public/simulation/components/Population.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/components/Population.js
@@ -0,0 +1,60 @@
+function Population() {}
+
+Population.prototype.Schema =
+	"<a:help>Specifies the Population cap increase generated by this entity.</a:help>" +
+	"<a:example>" +
+		"<Bonus>15</Bonus>" +
+	"</a:example>" +
+	"<element name='Bonus' a:help='Population cap increase while this entity exists.'>" +
+		"<data type='nonNegativeInteger'/>" +
+	"</element>";
+
+Population.prototype.Init = function()
+{
+	this.bonus = +this.template.Bonus;
+};
+
+Population.prototype.GetPopBonus = function()
+{
+	return this.bonus;
+};
+
+Population.prototype.OnOwnershipChanged = function(msg)
+{
+	if (msg.from != INVALID_PLAYER)
+	{
+		let cmpPlayer = QueryPlayerIDInterface(msg.from);
+		if (cmpPlayer)
+			cmpPlayer.AddPopulationBonuses(-this.GetPopBonus());
+	}
+	if (msg.to != INVALID_PLAYER)
+	{
+		let cmpPlayer = QueryPlayerIDInterface(msg.to);
+		if (cmpPlayer)
+			cmpPlayer.AddPopulationBonuses(this.GetPopBonus());
+	}
+};
+
+Population.prototype.OnValueModification = function(msg)
+{
+	if (msg.component != "Population")
+		return;
+
+	// Foundations shouldn't give a pop bonus.
+	let cmpFoundation = Engine.QueryInterface(this.entity, IID_Foundation);
+	if (cmpFoundation)
+		return;
+
+	// Update the population bonuses.
+	let newPopBonus = Math.round(ApplyValueModificationsToEntity("Population/Bonus", +this.template.Bonus, this.entity));
+	let popDifference = newPopBonus - this.bonus;
+	this.bonus = newPopBonus;
+
+	if (!popDifference)
+		return;
+	let cmpPlayer = QueryOwnerInterface(this.entity);
+	if (cmpPlayer)
+		cmpPlayer.AddPopulationBonuses(popDifference);
+};
+
+Engine.RegisterComponentType(IID_Population, "Population", Population);
Index: binaries/data/mods/public/simulation/components/interfaces/Population.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/components/interfaces/Population.js
@@ -0,0 +1 @@
+Engine.RegisterInterface("Population");
Index: binaries/data/mods/public/simulation/components/tests/test_Foundation.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Foundation.js
+++ binaries/data/mods/public/simulation/components/tests/test_Foundation.js
@@ -6,6 +6,7 @@
 Engine.LoadComponentScript("interfaces/Foundation.js");
 Engine.LoadComponentScript("interfaces/Health.js");
 Engine.LoadComponentScript("interfaces/ModifiersManager.js");
+Engine.LoadComponentScript("interfaces/Population.js");
 Engine.LoadComponentScript("interfaces/StatisticsTracker.js");
 Engine.LoadComponentScript("interfaces/TerritoryDecay.js");
 Engine.LoadComponentScript("interfaces/Trigger.js");
Index: binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js
+++ binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js
@@ -20,6 +20,7 @@
 Engine.LoadComponentScript("interfaces/Loot.js");
 Engine.LoadComponentScript("interfaces/Market.js");
 Engine.LoadComponentScript("interfaces/Pack.js");
+Engine.LoadComponentScript("interfaces/Population.js");
 Engine.LoadComponentScript("interfaces/ProductionQueue.js");
 Engine.LoadComponentScript("interfaces/Promotion.js");
 Engine.LoadComponentScript("interfaces/Repairable.js");
Index: binaries/data/mods/public/simulation/data/technologies/pop_house_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/pop_house_01.json
+++ binaries/data/mods/public/simulation/data/technologies/pop_house_01.json
@@ -17,7 +17,7 @@
 	"researchTime": 40,
 	"tooltip": "Houses +20% population cap bonus.",
 	"modifications": [
-		{ "value": "Cost/PopulationBonus", "multiply": 1.2 }
+		{ "value": "Population/Bonus", "multiply": 1.2 }
 	],
 	"affects": ["House"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/pop_house_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/pop_house_02.json
+++ binaries/data/mods/public/simulation/data/technologies/pop_house_02.json
@@ -12,7 +12,7 @@
 	"researchTime": 40,
 	"tooltip": "Houses +20% population cap bonus.",
 	"modifications": [
-		{ "value": "Cost/PopulationBonus", "multiply": 1.2 }
+		{ "value": "Population/Bonus", "multiply": 1.2 }
 	],
 	"affects": ["House"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/templates/other/celt_hut.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/celt_hut.xml
+++ binaries/data/mods/public/simulation/templates/other/celt_hut.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
   <Cost>
-    <PopulationBonus>2</PopulationBonus>
     <Resources>
       <food>0</food>
       <wood>50</wood>
@@ -23,6 +22,9 @@
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <ProductionQueue disable=""/>
   <StatusBars>
     <HeightOffset>7.0</HeightOffset>
Index: binaries/data/mods/public/simulation/templates/other/celt_longhouse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/celt_longhouse.xml
+++ binaries/data/mods/public/simulation/templates/other/celt_longhouse.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>300</BuildTime>
     <Resources>
       <food>0</food>
@@ -23,6 +22,9 @@
   <Obstruction>
     <Static width="10.0" depth="14.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue disable=""/>
   <VisualActor>
     <Actor>structures/celts/longhouse.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
+++ binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
@@ -4,7 +4,6 @@
     <Category>Special</Category>
   </BuildRestrictions>
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>200</BuildTime>
     <Resources>
       <food>0</food>
@@ -32,6 +31,9 @@
   <Obstruction>
     <Static width="26.0" depth="30.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue disable=""/>
   <TerritoryInfluence>
     <Root>false</Root>
Index: binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
+++ binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
@@ -4,7 +4,6 @@
     <Category>Stoa</Category>
   </BuildRestrictions>
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>110</BuildTime>
     <Resources>
       <food>0</food>
@@ -32,6 +31,9 @@
   <Obstruction>
     <Static width="26.0" depth="10.5"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <TerritoryInfluence>
Index: binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
+++ binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
@@ -3,10 +3,7 @@
   <AIProxy merge=""/>
   <AutoBuildable merge=""/>
   <BuildRestrictions merge=""/>
-  <!-- Don't provide population bonuses yet (but still do take up population cost) -->
-  <Cost merge="">
-    <PopulationBonus>0</PopulationBonus>
-  </Cost>
+  <Cost merge=""/>
   <Decay merge=""/>
   <Fogging merge=""/>
   <Footprint merge=""/>
@@ -25,6 +22,10 @@
   </Obstruction>
   <OverlayRenderer merge=""/>
   <Ownership merge=""/>
+  <!-- Don't provide population bonuses yet -->
+  <Population>
+    <Bonus>0</Bonus>
+  </Population>
   <Position merge=""/>
   <RallyPoint merge=""/>
   <RallyPointRenderer merge=""/>
Index: binaries/data/mods/public/simulation/templates/special/spy.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/spy.xml
+++ binaries/data/mods/public/simulation/templates/special/spy.xml
@@ -2,7 +2,6 @@
 <Entity>
   <Cost>
     <Population>0</Population>
-    <PopulationBonus>0</PopulationBonus>
     <BuildTime>0</BuildTime>
     <Resources>
       <food>0</food>
@@ -18,6 +17,9 @@
     <RequiredTechnology>unlock_spies</RequiredTechnology>
     <Undeletable>true</Undeletable>
   </Identity>
+  <Population>
+    <Bonus>0</Bonus>
+  </Population>
   <VisionSharing>
     <Bribable>false</Bribable>
     <Duration>15</Duration>
Index: binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Cost>
-    <PopulationBonus>4</PopulationBonus>
     <Resources>
       <wood>300</wood>
       <stone>0</stone>
@@ -25,6 +24,9 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>4</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/britons/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_dock.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_dock">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>8.0</Height>
@@ -17,6 +14,9 @@
   <Obstruction>
     <Static width="10.0" depth="22.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/britons/dock.xml</Actor>
     <FoundationActor>structures/fndn_celt_dock.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_farmstead.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="12.0" depth="12.0"/>
   </Footprint>
@@ -16,6 +13,9 @@
   <Obstruction>
     <Static width="10.0" depth="10.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/britons/farmstead.xml</Actor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_forge.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_forge.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_forge.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_forge">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Gobanion</SpecificName>
   </Identity>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/britons/blacksmith.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
-  <Cost>
-    <PopulationBonus>12</PopulationBonus>
-  </Cost>
   <Footprint replace="">
     <Circle radius="17.0"/>
     <Height>18.0</Height>
@@ -17,6 +14,9 @@
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>12</Bonus>
+  </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
Index: binaries/data/mods/public/simulation/templates/structures/brit_market.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_market.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_market.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
-  <Cost>
-    <PopulationBonus>5</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="26.0" depth="24.0"/>
     <Height>8.0</Height>
@@ -17,6 +14,9 @@
   <Obstruction>
     <Static width="25.0" depth="23.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/britons/market.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_storehouse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_storehouse.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_storehouse.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_storehouse">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="18.0" depth="18.0"/>
   </Footprint>
@@ -13,6 +10,9 @@
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/britons/storehouse.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="structures/cart_house">
   <Cost>
-    <PopulationBonus>15</PopulationBonus>
     <BuildTime>75</BuildTime>
     <Resources>
       <wood>225</wood>
@@ -19,6 +18,9 @@
   <Loot>
     <wood>45</wood>
   </Loot>
+  <Population>
+    <Bonus>15</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/carthaginians/apartment.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
@@ -13,7 +13,6 @@
     <GarrisonRegenRate>10</GarrisonRegenRate>
   </Capturable>
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>500</BuildTime>
     <Resources>
       <wood>300</wood>
@@ -52,6 +51,9 @@
   <Obstruction>
     <Static width="42.0" depth="58.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Cost>
-    <PopulationBonus>4</PopulationBonus>
     <Resources>
       <wood>300</wood>
       <stone>0</stone>
@@ -25,6 +24,9 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>4</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/celts/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_dock.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_dock">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>8.0</Height>
@@ -17,6 +14,9 @@
   <Obstruction>
     <Static width="10.0" depth="22.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/celts/dock.xml</Actor>
     <FoundationActor>structures/fndn_celt_dock.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_farmstead.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="19.0" depth="18.0"/>
   </Footprint>
@@ -13,6 +10,9 @@
   <Obstruction>
     <Static width="17.0" depth="16.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/gauls/farmstead.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_forge.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_forge.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_forge.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_forge">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Gobanion</SpecificName>
   </Identity>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/gauls/blacksmith.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
-  <Cost>
-    <PopulationBonus>12</PopulationBonus>
-  </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Dunon</SpecificName>
   </Identity>
+  <Population>
+    <Bonus>12</Bonus>
+  </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
Index: binaries/data/mods/public/simulation/templates/structures/gaul_market.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_market.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_market.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
-  <Cost>
-    <PopulationBonus>5</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="26.0" depth="24.0"/>
     <Height>8.0</Height>
@@ -17,6 +14,9 @@
   <Obstruction>
     <Static width="25.0" depth="23.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/gauls/market.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_storehouse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_storehouse.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_storehouse.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_storehouse">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="15.0" depth="17.0"/>
   </Footprint>
@@ -13,6 +10,9 @@
   <Obstruction>
     <Static width="13.0" depth="15.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <VisualActor>
     <Actor>structures/gauls/storehouse.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>100</wood>
@@ -32,6 +31,9 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
@@ -9,7 +9,6 @@
     <DefaultArrowCount>2</DefaultArrowCount>
   </BuildingAI>
   <Cost>
-    <PopulationBonus>5</PopulationBonus>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>50</wood>
@@ -38,6 +37,9 @@
   <Obstruction>
     <Static width="14.0" depth="14.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
   <StatusBars>
     <HeightOffset>17.0</HeightOffset>
   </StatusBars>
Index: binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Cost>
-    <PopulationBonus>15</PopulationBonus>
     <BuildTime op="mul">1.5</BuildTime>
     <Resources>
       <stone>1200</stone>
@@ -20,6 +19,9 @@
   <Obstruction>
     <Static width="27.0" depth="27.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>15</Bonus>
+  </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
Index: binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
@@ -7,7 +7,6 @@
     <Category>TempleOfAmun</Category>
   </BuildRestrictions>
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>300</BuildTime>
     <Resources>
       <stone>500</stone>
@@ -38,6 +37,9 @@
   <Obstruction>
     <Static width="28" depth="56.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_amun
Index: binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>200</BuildTime>
-    <PopulationBonus>10</PopulationBonus>
     <Resources>
       <stone>200</stone>
       <metal>200</metal>
@@ -27,6 +26,9 @@
   <Obstruction>
     <Static width="36.0" depth="12.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
@@ -5,7 +5,6 @@
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
-    <PopulationBonus>10</PopulationBonus>
     <Resources>
       <stone>300</stone>
       <metal>200</metal>
@@ -38,6 +37,9 @@
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/structures/pers_apartment_block.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_apartment_block.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_apartment_block.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Cost>
-    <PopulationBonus>15</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="25.0" depth="14.0"/>
     <Height>10.0</Height>
@@ -17,6 +14,9 @@
   <Obstruction>
     <Static width="23.0" depth="12.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>15</Bonus>
+  </Population>
   <TerritoryInfluence>
     <Radius>25</Radius>
   </TerritoryInfluence>
Index: binaries/data/mods/public/simulation/templates/structures/pers_house_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_house_b.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_house_b.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Cost>
-    <PopulationBonus>10</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="17.0" depth="14.0"/>
     <Height>10.0</Height>
@@ -17,6 +14,9 @@
   <Obstruction>
     <Static width="15.0" depth="12.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <VisualActor>
     <Actor>props/structures/persians/alt_building_05.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/pers_inn.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_inn.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_inn.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
-  <Cost>
-    <PopulationBonus>15</PopulationBonus>
-  </Cost>
   <Footprint>
     <Square width="30.0" depth="17.0"/>
     <Height>10.0</Height>
@@ -17,6 +14,9 @@
   <Obstruction>
     <Static width="28.0" depth="15.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>15</Bonus>
+  </Population>
   <TerritoryInfluence>
     <Radius>26</Radius>
   </TerritoryInfluence>
Index: binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>300</BuildTime>
-    <PopulationBonus>10</PopulationBonus>
     <Resources>
       <wood>200</wood>
       <stone>400</stone>
@@ -34,6 +33,9 @@
   <Obstruction>
     <Static width="38.5" depth="22.5"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue disable=""/>
   <TerritoryInfluence>
     <Root>true</Root>
Index: binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -45,7 +45,6 @@
     <GarrisonRegenRate>3.0</GarrisonRegenRate>
   </Capturable>
   <Cost>
-    <PopulationBonus>5</PopulationBonus>
     <BuildTime>250</BuildTime>
     <Resources>
       <wood>500</wood>
@@ -81,6 +80,9 @@
   <Obstruction>
     <Static width="36.0" depth="36.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_structure.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure.xml
+++ binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -17,7 +17,6 @@
   </Capturable>
   <Cost>
     <Population>0</Population>
-    <PopulationBonus>0</PopulationBonus>
     <BuildTime>10</BuildTime>
     <Resources>
       <food>0</food>
@@ -75,6 +74,9 @@
   </Obstruction>
   <OverlayRenderer/>
   <Ownership/>
+  <Population>
+    <Bonus>0</Bonus>
+  </Population>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>upright</Anchor>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -50,7 +50,6 @@
     <RegenRate>5.0</RegenRate>
   </Capturable>
   <Cost>
-    <PopulationBonus>20</PopulationBonus>
     <BuildTime>500</BuildTime>
     <Resources>
       <wood>500</wood>
@@ -91,6 +90,9 @@
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>20</Bonus>
+  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
@@ -8,7 +8,6 @@
     <GarrisonRegenRate>4.0</GarrisonRegenRate>
   </Capturable>
   <Cost>
-    <PopulationBonus>5</PopulationBonus>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>75</wood>
@@ -43,6 +42,9 @@
   <Obstruction>
     <Static width="11.0" depth="11.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_support_female_citizen_house
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_house_big.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_house_big.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_house_big.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_house">
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>50</BuildTime>
     <Resources>
       <wood>150</wood>
@@ -23,6 +22,9 @@
   <Obstruction>
     <Static width="14.0" depth="14.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <TerritoryInfluence>
     <Radius>20</Radius>
     <Weight>40000</Weight>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
@@ -4,7 +4,6 @@
     <Category>Stoa</Category>
   </BuildRestrictions>
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>150</BuildTime>
     <Resources>
       <stone>100</stone>
@@ -42,6 +41,9 @@
   <Obstruction>
     <Static width="28.0" depth="20.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
@@ -7,7 +7,6 @@
     <Category>Temple</Category>
   </BuildRestrictions>
   <Cost>
-    <PopulationBonus>5</PopulationBonus>
     <BuildTime>200</BuildTime>
     <Resources>
       <stone>300</stone>
@@ -43,6 +42,9 @@
   <Obstruction>
     <Static width="17.5" depth="30.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
@@ -6,7 +6,6 @@
     <Category>Dock</Category>
   </BuildRestrictions>
   <Cost>
-    <PopulationBonus>5</PopulationBonus>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>200</wood>
@@ -38,6 +37,9 @@
   <Obstruction>
     <Static width="18.0" depth="18.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>5</Bonus>
+  </Population>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -43,7 +43,6 @@
     <RegenRate>10.0</RegenRate>
   </Capturable>
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>500</BuildTime>
     <Resources>
       <stone>1000</stone>
@@ -79,6 +78,9 @@
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Technologies datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
@@ -5,7 +5,6 @@
   </Auras>
   <Cost>
     <BuildTime>100</BuildTime>
-    <PopulationBonus>2</PopulationBonus>
     <Resources>
       <wood>200</wood>
       <stone>100</stone>
@@ -29,6 +28,9 @@
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
+  <Population>
+    <Bonus>2</Bonus>
+  </Population>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit.xml
+++ binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -3,7 +3,6 @@
   <AIProxy/>
   <Cost>
     <Population>1</Population>
-    <PopulationBonus>0</PopulationBonus>
     <BuildTime>1</BuildTime>
     <Resources>
       <food>0</food>