Index: binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -34,9 +34,18 @@
       structures/{civ}_farmstead
       structures/{civ}_field
       structures/{civ}_corral
+      structures/{civ}_outpost
+      structures/wallset_palisade
+      structures/{civ}_sentry_tower
       structures/{civ}_dock
+      structures/{civ}_barracks
+      structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market
+      structures/{civ}_defense_tower
+      structures/{civ}_wallset_stone
+      structures/{civ}_workshop
+      structures/{civ}_fortress
       structures/{civ}_wonder
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/athen_tower_artillery
+      structures/athen_gymnasium
+      structures/athen_theater
+      structures/athen_prytaneion
+      structures/athen_royal_stoa
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Gýnē Athēnaía</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/cart_tower_artillery
+      structures/cart_super_dock
+      structures/cart_embassy_celtic
+      structures/cart_embassy_iberian
+      structures/cart_embassy_italiote
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Aštāh</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/gaul_tavern
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Celtic Woman</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/iber_monument
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Emazteki</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/kush_pyramid_small
+      structures/kush_pyramid_large
+      structures/kush_temple_amun
+      structures/kush_blemmye_camp
+      structures/kush_nuba_village
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Shmt</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/mace_tower_artillery
+      structures/mace_theater
+      structures/mace_library
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Gýnē Makedonikḗ</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/maur_elephant_stables
+      structures/maur_pillar_ashoka
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Naari</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/pers_stable
+      structures/pers_apadana
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/ptol_tower_artillery
+      structures/ptol_lighthouse
+      structures/ptol_library
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Gýnē Aigýptia</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/rome_tower_artillery
+      structures/rome_army_camp
+      structures/rome_wallset_siege
+      structures/rome_temple_vesta
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
Index: binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/sele_tower_artillery
+      structures/sele_library
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
Index: binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
@@ -9,9 +9,10 @@
   </Attack>
   <Builder>
     <Entities datatype="tokens">
-      structures/wallset_palisade
-      structures/{civ}_defense_tower
-      structures/{civ}_sentry_tower
+      structures/spart_syssiton
+      structures/spart_theater
+      structures/spart_royal_stoa
+      -structures/{civ}_wallset_stone
     </Entities>
   </Builder>
   <Health>