diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
index db109dd605..e683647017 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
@@ -26,5 +26,6 @@
structures/carthaginians/barracks.xml
+ structures/fndn_5x5.xml
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
index d0506ea11f..cfca32246d 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -57,7 +57,7 @@
- 256
+ 200
65536
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
index 01cae1cd11..9f65cd2d32 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
@@ -44,7 +44,7 @@
8.0
- 64
+ 20
65536
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
index dbd66745da..99ba71604c 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
@@ -50,6 +50,10 @@
attack/destruction/building_collapse_large.xml
+
+ 40
+ 65536
+
units/{civ}_support_healer
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_scout_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_scout_tower.xml
index 3c10669674..8353f9c303 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_scout_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_scout_tower.xml
@@ -65,6 +65,10 @@
0.6
21.0
+
+ 60
+ 65536
+
100
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
index 69a95cd8a2..c3cf35aa53 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
@@ -41,6 +41,10 @@
attack/destruction/building_collapse_large.xml
+
+ 20
+ 65536
+
60
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
index 26500458f9..fbd4c85207 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
@@ -37,6 +37,10 @@
attack/destruction/building_collapse_large.xml
+
+ 40
+ 65536
+
units/{civ}_support_trader
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml
index 36a94e13aa..fe1c799c30 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml
@@ -42,6 +42,10 @@
attack/destruction/building_collapse_large.xml
+
+ 20
+ 65536
+
60
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
index a0ef247806..71c99b1df6 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -45,6 +45,10 @@
attack/destruction/building_collapse_large.xml
+
+ 80
+ 65536
+
40
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
index 4e928ff7a4..b10160b273 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -61,6 +61,10 @@
attack/destruction/building_collapse_large.xml
+
+ 120
+ 65536
+
80
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special.xml b/binaries/data/mods/public/simulation/templates/template_structure_special.xml
index 8e7b3aaf6d..978c05759c 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special.xml
@@ -19,6 +19,10 @@
+
+ 40
+ 65536
+
structures/fndn_5x5.xml