Index: binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json
+++ binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json
@@ -5,8 +5,13 @@
 	},
 	"description": "Advances from a bustling town to a veritable metropolis, full of the wonders of modern technology. This is the Athenian city phase, where metal gathering rates are boosted because of the 'Silver Owls' bonus.",
 	"cost": { "food": 0, "wood": 0, "stone": 750, "metal": 750 },
-	"requirements": { "entity": { "class": "Town", "number": 4 } },
-	"requirementsTooltip": "Requires 4 new Town Phase structures (except Walls and Civic Centers).",
+	"requirements": {
+		"all": [
+			{ "entity": { "class": "Blacksmith", "number": 1 } },
+			{ "entity": { "class": "Market", "number": 1 } },
+			{ "entity": { "class": "Temple", "number": 1 } }
+		]
+	},
 	"supersedes": "phase_town_athen",
 	"replaces": ["phase_city"],
 	"icon": "city_phase.png",
Index: binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json
+++ binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json
@@ -6,8 +6,13 @@
 	},
 	"description": "Advances from a bustling town to a veritable metropolis, full of the wonders of modern technology.",
 	"cost": { "food": 0, "wood": 0, "stone": 750, "metal": 750 },
-	"requirements": { "entity": { "class": "Town", "number": 4 } },
-	"requirementsTooltip": "Requires 4 new Town Phase structures (except Walls and Civic Centers).",
+	"requirements": {
+		"all": [
+			{ "entity": { "class": "Blacksmith", "number": 1 } },
+			{ "entity": { "class": "Market", "number": 1 } },
+			{ "entity": { "class": "Temple", "number": 1 } }
+		]
+	},
 	"supersedes": "phase_town_generic",
 	"replaces": ["phase_city"],
 	"icon": "city_phase.png",
Index: binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json
+++ binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json
@@ -5,8 +5,14 @@
 	},
 	"description": "Advances from a small village to a bustling town, ready to expand rapidly. This is the Athenian town phase, where metal gathering rates are boosted because of the 'Silver Owls' bonus.",
 	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 0 },
-	"requirements": { "entity": { "class": "Village", "number": 5 } },
-	"requirementsTooltip": "Requires 5 Village Phase structures (except Palisades and Farm Fields).",
+	"requirements": {
+		"all": [
+			{ "entity": { "class": "Corral", "number": 1 } },
+			{ "entity": { "class": "Farmstead", "number": 1 } },
+			{ "entity": { "class": "House", "number": 1 } },
+			{ "entity": { "class": "Storehouse", "number": 1 } }
+		]
+	},
 	"supersedes": "phase_village",
 	"replaces": ["phase_town"],
 	"icon": "town_phase.png",
Index: binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json
+++ binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json
@@ -6,8 +6,14 @@
 	},
 	"description": "Advances from a small village to a bustling town, ready to expand rapidly.",
 	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 0 },
-	"requirements": { "entity": { "class": "Village", "number": 5 } },
-	"requirementsTooltip": "Requires 5 Village Phase structures (except Palisades and Farm Fields).",
+	"requirements": {
+		"all": [
+			{ "entity": { "class": "Corral", "number": 1 } },
+			{ "entity": { "class": "Farmstead", "number": 1 } },
+			{ "entity": { "class": "House", "number": 1 } },
+			{ "entity": { "class": "Storehouse", "number": 1 } }
+		]
+	},
 	"supersedes": "phase_village",
 	"replaces": ["phase_town"],
 	"icon": "town_phase.png",