diff --git a/binaries/data/mods/official/entities/Template values - resources.xls b/binaries/data/mods/official/entities/Template values - resources.xls
index d92d4706d2..6fc55e09a4 100644
Binary files a/binaries/data/mods/official/entities/Template values - resources.xls and b/binaries/data/mods/official/entities/Template values - resources.xls differ
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
index 9d215fad6d..867d22d69d 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
@@ -23,18 +23,21 @@
  			</Resource>
 		</Creation>
 		
-</Traits>
 		<Armour>
 			<Hack>0.0</Hack>
 			<Pierce>50.0</Pierce>
 			<Crush>10.0</Crush>
 		</Armour>
+</Traits>
+
 
 	<Actions>
  		<Attack>
- 			<Hack>0.0</Hack>
- 			<Pierce>30.0</Pierce>
- 			<Crush>5.0</Crush>
+			<Melee>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>30.0</Pierce>
+ 				<Crush>5.0</Crush>
+			</Melee>
  		</Attack>
 	</Actions>
  
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
index cc9838b239..47a7fc3e95 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
@@ -22,20 +22,23 @@
 				<Metal>40</Metal>
  			</Resource>
 		</Creation>
-	</Traits>
-
 		<Armour>
 			<Hack>50.0</Hack>
 			<Pierce>15.0</Pierce>
 			<Crush>10.0</Crush>
 		</Armour>
+	</Traits>
+
+
 
 
 	<Actions>
  		<Attack>
- 			<Hack>50.0</Hack>
- 			<Pierce>20.0</Pierce>
- 			<Crush>0.0</Crush>
+			<Melee>
+ 				<Hack>50.0</Hack>
+ 				<Pierce>20.0</Pierce>
+ 				<Crush>0.0</Crush>
+			</Melee>
  		</Attack>
 	</Actions>
 
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
index 213de9c005..bb115a9875 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
@@ -22,20 +22,22 @@
 				<Wood>40</Wood>
  			</Resource>
 		</Creation>
-		
-	</Traits>
-
 		<Armour>
 			<Hack>20.0</Hack>
 			<Pierce>50.0</Pierce>
 			<Crush>5.0</Crush>
-		</Armour>
+		</Armour>		
+	</Traits>
+
+
 
 	<Actions>
  		<Attack>
- 			<Hack>0.0</Hack>
- 			<Pierce>50.0</Pierce>
- 			<Crush>0.0</Crush>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>50.0</Pierce>
+ 				<Crush>0.0</Crush>
+			</Ranged>
  		</Attack>
 	</Actions>
 	
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
index ee5e8c6791..9cf8c0a49e 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
@@ -22,20 +22,22 @@
 				<Wood>25</Wood>
  			</Resource>
 		</Creation>
-		
-	</Traits>
-
 		<Armour>
 			<Hack>0.0</Hack>
 			<Pierce>50.0</Pierce>
 			<Crush>0.0</Crush>
 		</Armour>
+	</Traits>
+
+
 
 	<Actions>
  		<Attack>
- 			<Hack>0.0</Hack>
- 			<Pierce>50.0</Pierce>
- 			<Crush>10.0</Crush>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>50.0</Pierce>
+ 				<Crush>10.0</Crush>
+			</Ranged>
  		</Attack>
 	</Actions>
 	
diff --git a/binaries/data/mods/official/entities/template_unit_hero.xml b/binaries/data/mods/official/entities/template_unit_hero.xml
index 5110bd00d6..29c88d981b 100644
--- a/binaries/data/mods/official/entities/template_unit_hero.xml
+++ b/binaries/data/mods/official/entities/template_unit_hero.xml
@@ -40,14 +40,13 @@
 		<MiniMap>
 			<Type>Hero</Type>
 		</MiniMap>
-
-	</Traits>
-	
 		<Armour>
 			<Hack>200.0</Hack>
 			<Pierce>130.0</Pierce>
 			<Crush>100.0</Crush>
 		</Armour>
+	</Traits>
+	
 
 
 
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
index fdcca04bc2..f5c5f22ab2 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
@@ -23,20 +23,22 @@
 				<Metal>25</Metal>
  			</Resource>
 		</Creation>
-		
-	</Traits>
-	
 		<Armour>
 			<Hack>0.0</Hack>
 			<Pierce>20.0</Pierce>
 			<Crush>5.0</Crush>
-		</Armour>
+		</Armour>		
+	</Traits>
+	
+
 
 	<Actions>
  		<Attack>
- 			<Hack>0.0</Hack>
- 			<Pierce>20.0</Pierce>
- 			<Crush>10.0</Crush>
+			<Melee>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>20.0</Pierce>
+ 				<Crush>10.0</Crush>
+			</Melee>
  		</Attack>
 	</Actions>
 
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
index cebc18e9bb..09a10ba524 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
@@ -22,20 +22,22 @@
 				<Metal>40</Metal>
  			</Resource>
 		</Creation>
-		
-	</Traits>
-
 		<Armour>
 			<Hack>20.0</Hack>
 			<Pierce>10.0</Pierce>
 			<Crush>5.0</Crush>
-		</Armour>
+		</Armour>		
+	</Traits>
+
+
 
 	<Actions>
  		<Attack>
- 			<Hack>20.0</Hack>
- 			<Pierce>5.0</Pierce>
- 			<Crush>0.0</Crush>
+			<Melee>
+ 				<Hack>20.0</Hack>
+ 				<Pierce>5.0</Pierce>
+ 				<Crush>0.0</Crush>
+			</Melee>
  		</Attack>
 	</Actions>
 
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml
index 07900e01fb..06fe9c712d 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml
@@ -22,21 +22,23 @@
 				<Wood>35</Wood>
  			</Resource>
 		</Creation>
-				
-	</Traits>
-
-
 		<Armour>
 			<Hack>0.0</Hack>
 			<Pierce>20.0</Pierce>
 			<Crush>0.0</Crush>
-		</Armour>
+		</Armour>				
+	</Traits>
+
+
+
 
 	<Actions>
  		<Attack>
- 			<Hack>0.0</Hack>
- 			<Pierce>20.0</Pierce>
- 			<Crush>0.0</Crush>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>20.0</Pierce>
+ 				<Crush>0.0</Crush>
+			</Ranged>
  		</Attack>
 	</Actions>
 
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
index 0e14d3bfc8..989314bcda 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
@@ -22,20 +22,22 @@
 				<Wood>20</Wood>
  			</Resource>
 		</Creation>
-		
-	</Traits>
-
 		<Armour>
 			<Hack>0.0</Hack>
 			<Pierce>20.0</Pierce>
 			<Crush>0.0</Crush>
-		</Armour>
+		</Armour>		
+	</Traits>
+
+
 
 	<Actions>
  		<Attack>
- 			<Hack>0.0</Hack>
- 			<Pierce>20.0</Pierce>
- 			<Crush>0.0</Crush>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>20.0</Pierce>
+ 				<Crush>0.0</Crush>
+			</Ranged>
  		</Attack>
 	</Actions>
 	
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
index d8a5e0f771..f19b060534 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
@@ -23,21 +23,23 @@
 				<Stone>20</Stone>
  			</Resource>
 		</Creation>
-		
-	</Traits>
-
-
 		<Armour>
 			<Hack>0.0</Hack>
 			<Pierce>10.0</Pierce>
 			<Crush>20.0</Crush>
-		</Armour>
+		</Armour>		
+	</Traits>
+
+
+
 
 	<Actions>
  		<Attack>
- 			<Hack>0.0</Hack>
- 			<Pierce>0.0</Pierce>
- 			<Crush>20.0</Crush>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>0.0</Pierce>
+ 				<Crush>20.0</Crush>
+			</Ranged>
  		</Attack>
 	</Actions>
 	
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_ship_bireme.xml b/binaries/data/mods/official/entities/template_unit_mechanical_ship_bireme.xml
index b61c17f173..6d8daa6188 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_ship_bireme.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_ship_bireme.xml
@@ -19,13 +19,14 @@
 				<Metal>250</Metal>
  			</Resource>
 		</Creation>
-	</Traits>
-
 		<Armour>
 			<Hack>400.0</Hack>
 			<Pierce>500.0</Pierce>
 			<Crush>250.0</Crush>
 		</Armour>
+	</Traits>
+
+
 
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_ship_merchant.xml b/binaries/data/mods/official/entities/template_unit_mechanical_ship_merchant.xml
index 8897dcc43e..c8235e333a 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_ship_merchant.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_ship_merchant.xml
@@ -18,13 +18,14 @@
  				<Wood>250</Wood>
  			</Resource>
 		</Creation>
-	</Traits>
-
 		<Armour>
 			<Hack>200.0</Hack>
 			<Pierce>130.0</Pierce>
 			<Crush>70.0</Crush>
 		</Armour>
+	</Traits>
+
+
 
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_ship_quinquereme.xml b/binaries/data/mods/official/entities/template_unit_mechanical_ship_quinquereme.xml
index 85ce1331cb..b61c21194f 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_ship_quinquereme.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_ship_quinquereme.xml
@@ -18,13 +18,14 @@
 				<Metal>500</Metal>
  			</Resource>
 		</Creation>
-	</Traits>
-
 		<Armour>
 			<Hack>750.0</Hack>
 			<Pierce>600.0</Pierce>
 			<Crush>450.0</Crush>
 		</Armour>
+	</Traits>
+
+
 
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_ship_trireme.xml b/binaries/data/mods/official/entities/template_unit_mechanical_ship_trireme.xml
index d2879118e6..5eb5e09705 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_ship_trireme.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_ship_trireme.xml
@@ -17,13 +17,14 @@
 				<Metal>350</Metal>
  			</Resource>
 		</Creation>
-	</Traits>
-
 		<Armour>
 			<Hack>500.0</Hack>
 			<Pierce>600.0</Pierce>
 			<Crush>500.0</Crush>
 		</Armour>
+	</Traits>
+
+
 
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml
index 4d7de26252..5dae29b46d 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml
@@ -20,19 +20,22 @@
 				<Metal>100</Metal>
  			</Resource>
 		</Creation>
-	</Traits>
-	
 		<Armour>
 			<Hack>120.0</Hack>
 			<Pierce>150.0</Pierce>
 			<Crush>60.0</Crush>
 		</Armour>
+	</Traits>
+	
+
 
 	<Actions>
  		<Attack>
- 			<Hack>0.0</Hack>
- 			<Pierce>150.0</Pierce>
- 			<Crush>20.0</Crush>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>150.0</Pierce>
+ 				<Crush>20.0</Crush>
+			</Ranged>
  		</Attack>
 	</Actions>
 
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml
index 2d5935e3f6..f368bd27af 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml
@@ -19,19 +19,22 @@
 				<Stone>75</Stone>
  			</Resource>
 		</Creation>
-	</Traits>
-
 		<Armour>
 			<Hack>170.0</Hack>
 			<Pierce>90.0</Pierce>
 			<Crush>120.0</Crush>
 		</Armour>
+	</Traits>
+
+
 
 	<Actions>
  		<Attack>
- 			<Hack>20.0</Hack>
- 			<Pierce>80.0</Pierce>
- 			<Crush>150.0</Crush>
+			<Ranged>
+ 				<Hack>20.0</Hack>
+ 				<Pierce>80.0</Pierce>
+ 				<Crush>150.0</Crush>
+			</Ranged>
  		</Attack>
 	</Actions>
 
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
index ff1681287e..60dd28918a 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
@@ -18,20 +18,23 @@
 				<Metal>175</Metal>
  			</Resource>
 		</Creation>
-	</Traits>
-	
-
 		<Armour>
 			<Hack>200.0</Hack>
 			<Pierce>120.0</Pierce>
 			<Crush>220.0</Crush>
 		</Armour>
+	</Traits>
+	
+
+
 
 	<Actions>
  		<Attack>
- 			<Hack>0.0</Hack>
- 			<Pierce>0.0</Pierce>
- 			<Crush>250.0</Crush>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>0.0</Pierce>
+ 				<Crush>250.0</Crush>
+			</Ranged>
  		</Attack>
 	</Actions>
 
diff --git a/binaries/data/mods/official/entities/template_unit_super_cavalry.xml b/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
index fa433121b4..0a9c265344 100644
--- a/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
@@ -36,14 +36,14 @@
 				<a>0.5</a>
 			</Trample>
 		</Auras>		
-		
-	</Traits>
-
 		<Armour>
 			<Hack>300.0</Hack>
 			<Pierce>240.0</Pierce>
 			<Crush>210.0</Crush>
-		</Armour>
+		</Armour>		
+	</Traits>
+
+
 
 	<Actions>
  		<Attack>
diff --git a/binaries/data/mods/official/entities/template_unit_super_infantry.xml b/binaries/data/mods/official/entities/template_unit_super_infantry.xml
index 7670425bb4..79dd94fa9f 100644
--- a/binaries/data/mods/official/entities/template_unit_super_infantry.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_infantry.xml
@@ -20,13 +20,14 @@
 				<Metal>75</Metal>
  			</Resource>
 		</Creation>
-	</Traits>
-
 		<Armour>
 			<Hack>250.0</Hack>
 			<Pierce>210.0</Pierce>
 			<Crush>180.0</Crush>
 		</Armour>
+	</Traits>
+
+
 
 	<Actions>
  		<Attack>
diff --git a/binaries/data/mods/official/entities/template_unit_super_siege.xml b/binaries/data/mods/official/entities/template_unit_super_siege.xml
index 44d1416913..ac2084fd5c 100644
--- a/binaries/data/mods/official/entities/template_unit_super_siege.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_siege.xml
@@ -26,14 +26,15 @@
 			<ConformX>3.141592</ConformX>
 			<ConformZ>3.141592</ConformZ>
 		</Anchor>
-		
-	</Traits>
-
 		<Armour>
 			<Hack>550.0</Hack>
 			<Pierce>600.0</Pierce>
 			<Crush>200.0</Crush>
 		</Armour>
+		
+	</Traits>
+
+
 
 	<Actions>
  		<Attack>
diff --git a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
index 16197f6e9a..4b9563b3b5 100644
--- a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
@@ -37,14 +37,14 @@
 				<a>0.5</a>
 			</Allure>
 		</Auras>		
-		
-	</Traits>
-
 		<Armour>
 			<Hack>1.0</Hack>
 			<Pierce>5.0</Pierce>
 			<Crush>1.0</Crush>
-		</Armour>
+		</Armour>		
+	</Traits>
+
+
 
 
 	<Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_support_healer.xml b/binaries/data/mods/official/entities/template_unit_support_healer.xml
index 2dd24be293..d5d603fe9a 100644
--- a/binaries/data/mods/official/entities/template_unit_support_healer.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_healer.xml
@@ -19,13 +19,14 @@
  				<Food>50</Food>
  			</Resource>
 		</Creation>
-	</Traits>
 
 		<Armour>
 			<Hack>5.0</Hack>
 			<Pierce>1.0</Pierce>
 			<Crush>5.0</Crush>
 		</Armour>
+	</Traits>
+
 
 	
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_support_trader.xml b/binaries/data/mods/official/entities/template_unit_support_trader.xml
index bab78e914a..a73baf34fa 100644
--- a/binaries/data/mods/official/entities/template_unit_support_trader.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_trader.xml
@@ -22,13 +22,14 @@
 				<Metal>75</Metal>
  			</Resource>
 		</Creation>
-	</Traits>
-
 		<Armour>
 			<Hack>5.0</Hack>
 			<Pierce>5.0</Pierce>
 			<Crush>1.0</Crush>
 		</Armour>
+	</Traits>
+
+
 
 	
 </Entity>
\ No newline at end of file