diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a.xml
new file mode 100644
index 0000000000..10814be913
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="attack_ranged" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="attack_ranged" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_a.psa" name="attack_slaughter" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="units/romans/cavalry_javelinist_a_r.xml" attachpoint="rider"/>
+        <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="hyppikon-horse-texture-plain">
+      <textures><texture file="skeletal/horse_hele_a_1.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="hyppikon-horse-texture-stripe">
+      <textures><texture file="skeletal/horse_hele_a_2.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="horse-color-bay">
+      <colour>228 107 27</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-red-chestnut">
+      <colour>207 132 109</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-black-chestnut">
+      <colour>164 87 68</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-gray">
+      <colour>210 210 210</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-beige">
+      <colour>209 203 131</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-black">
+      <colour>81 81 85</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-chocolate">
+      <colour>98 68 58</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-chestnut">
+      <colour>248 132 86</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-roan">
+      <colour>242 219 164</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-liver">
+      <colour>172 95 68</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-brown">
+      <colour>255 148 89</colour>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Run">
+      <props>
+        <prop actor="particle/dust_cav.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>objectcolor.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml
new file mode 100644
index 0000000000..f4196063ab
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="40"/>
+        <animation event="0.59" file="biped/rider_javelin_atk_a.psa" load="0" name="attack_ranged" speed="50"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="attack_slaughter" speed="400"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="300"/>
+        <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="300"/>
+        <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
+      </animations>
+      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/samnite_a.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop actor="props/units/cape_m_med.xml" attachpoint="shoulders"/>
+        <prop actor="props/units/shields/samn_scutum_adv.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="pectoral-tripledisc">
+      <textures><texture file="skeletal/kart_csp_a_1.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="pectoral-square">
+      <textures><texture file="skeletal/kart_csp_a_2.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="pectoral-muscle">
+      <textures><texture file="skeletal/kart_csp_a_3.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="attack_ranged">
+      <props>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="attack_slaughter">
+      <props>
+        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="carry_meat">
+      <props>
+        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b.xml
new file mode 100644
index 0000000000..40ef3b0daf
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="attack_ranged" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="attack_ranged" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_a.psa" name="attack_slaughter" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="units/romans/cavalry_javelinist_b_r.xml" attachpoint="rider"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="3" name="horse texture black">
+      <textures><texture file="skeletal/horse_black_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="horse texture brown">
+      <textures><texture file="skeletal/horse_brown_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="horse texture chestnut">
+      <textures><texture file="skeletal/horse_chestnut_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="3" name="horse texture dun">
+      <textures><texture file="skeletal/horse_dun_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="horse texture white">
+      <textures><texture file="skeletal/horse_white_a.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Run">
+      <props>
+        <prop actor="particle/dust_cav.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>objectcolor.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml
new file mode 100644
index 0000000000..4649ea800c
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="40"/>
+        <animation event="0.59" file="biped/rider_javelin_atk_a.psa" load="0" name="attack_ranged" speed="50"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="attack_slaughter" speed="400"/>
+        <animation event="0.5" file="biped/rider_spear_shield_atk_a.psa" name="gather_meat" speed="300"/>
+        <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
+      </animations>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/rome_monte_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop actor="props/units/cape_m_med.xml" attachpoint="shoulders"/>
+        <prop actor="props/units/shields/samn_scutum_basic.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Tunic-1">
+      <textures><texture file="skeletal/kart_csp_b_1.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="Tunic-2">
+      <textures><texture file="skeletal/kart_csp_b_2.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="Tunic-3">
+      <textures><texture file="skeletal/kart_csp_b_3.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="Tunic-4">
+      <textures><texture file="skeletal/kart_csp_b_4.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="attack_slaughter">
+      <props>
+        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="carry_meat">
+      <props>
+        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e.xml
new file mode 100644
index 0000000000..5db841f3a9
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="attack_ranged" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="attack_ranged" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_a.psa" name="attack_slaughter" speed="20"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="units/romans/cavalry_javelinist_e_r.xml" attachpoint="rider"/>
+        <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="hyppikon-horse-texture-plain">
+      <textures><texture file="skeletal/horse_hele_csw_e_1.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="hyppikon-horse-texture-plain2">
+      <textures><texture file="skeletal/horse_hele_csw_e_2.png" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="hyppikon-horse-texture-blaze">
+      <textures><texture file="skeletal/horse_hele_csw_e_3.png" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="horse-color-bay">
+      <colour>228 107 27</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-red-chestnut">
+      <colour>207 132 109</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-black-chestnut">
+      <colour>164 87 68</colour>
+    </variant>
+    <variant frequency="5" name="horse-color-gray">
+      <colour>255 255 255</colour>
+    </variant>
+    <variant frequency="2" name="horse-color-beige">
+      <colour>251 254 146</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-black">
+      <colour>81 81 85</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-chocolate">
+      <colour>98 68 58</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-chestnut">
+      <colour>248 132 86</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-roan">
+      <colour>242 219 164</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-liver">
+      <colour>172 95 68</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-brown">
+      <colour>255 148 89</colour>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Run">
+      <props>
+        <prop actor="particle/dust_cav.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>objectcolor.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml
new file mode 100644
index 0000000000..2498fc139b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="40"/>
+        <animation event="0.59" file="biped/rider_javelin_atk_a.psa" load="0" name="attack_ranged" speed="50"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="attack_slaughter" speed="400"/>
+        <animation event="0.5" file="biped/rider_spear_shield_atk_a.psa" name="gather_meat" speed="300"/>
+        <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
+      </animations>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/samnite_elite.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop actor="props/units/cape_m_med.xml" attachpoint="shoulders"/>
+        <prop actor="props/units/shields/samn_scutum_elite.xml" attachpoint="shield"/>
+      </props>
+      <textures>
+        <texture file="skeletal/rome_isw_e.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="attack_slaughter">
+      <props>
+        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="carry_meat">
+      <props>
+        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/simulation/data/technologies/mauryans/special_archery_tradition.json b/binaries/data/mods/public/simulation/data/technologies/mauryans/special_archery_tradition.json
new file mode 100644
index 0000000000..eb40f256c0
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/mauryans/special_archery_tradition.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Archery Tradition",
+	"description": "The Indians had a tradition of fine archery and a penchant for using massed archers in battle.",
+	"cost": {"food": 200, "wood": 300, "stone": 0, "metal": 150},
+	"requirements": {"tech": "phase_village"},
+	"requirementsTooltip": "Unlocked in Village Phase.",
+	"icon": "armor_plates_ranged.png",
+	"researchTime": 60,
+	"tooltip": "Range +10 meters for bow-wielding units. Archer units train time -20%, but also -20% health.",
+	"modifications": [
+		{"value": "Attack/Ranged/MaxRange", "add": 10.0, "affects": ["Bow"]},
+		{"value": "Cost/BuildTime", "multiplier": 0.8, "affects": ["Archer"]},
+		{"value": "Health/Max", "multiplier": 0.8, "affects": ["Archer"]}],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/persians/special_archery_tradition.json b/binaries/data/mods/public/simulation/data/technologies/persians/special_archery_tradition.json
new file mode 100644
index 0000000000..a12c5f7154
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/persians/special_archery_tradition.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Archery Tradition",
+	"description": "The Persians had a tradition of fine archery and a penchant for using massed archers in battle.",
+	"cost": {"food": 200, "wood": 300, "stone": 0, "metal": 150},
+	"requirements": {"tech": "phase_village"},
+	"requirementsTooltip": "Unlocked in Village Phase.",
+	"icon": "armor_plates_ranged.png",
+	"researchTime": 60,
+	"tooltip": "Range +10 meters for bow-wielding units. Archer units train time -20%, but also -20% health.",
+	"modifications": [
+		{"value": "Attack/Ranged/MaxRange", "add": 10.0, "affects": ["Bow"]},
+		{"value": "Cost/BuildTime", "multiplier": 0.8, "affects": ["Archer"]},
+		{"value": "Health/Max", "multiplier": 0.8, "affects": ["Archer"]}],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
index 5a082a0548..f1d24caf65 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
@@ -23,6 +23,9 @@
       units/maur_cavalry_javelinist_b
 	  units/maur_champion_chariot_barracks
     </Entities>
+    <Technologies datatype="tokens">
+	  mauryans/special_archery_tradition
+    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/mauryans/barracks.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
index 5867f4ec9f..576dc7fdb8 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
@@ -16,6 +16,7 @@
     <Technologies datatype="tokens">
 	  persians/training_levy_infantry
 	  persians/training_conscription_infantry
+	  persians/special_archery_tradition
 	  -pair_levy_01
 	  -training_conscription
 	  -unlock_champion_units
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
index 1a5c89d632..cc0f833be1 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
@@ -28,6 +28,7 @@
       units/rome_infantry_javelinist_b
 	  units/rome_champion_infantry_barracks
       units/rome_cavalry_spearman_b
+      units/rome_cavalry_javelinist_b
 	  units/rome_champion_cavalry_barracks
     </Entities>
   </ProductionQueue>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
index fa6dfd5027..5d759d6393 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -33,7 +33,7 @@
     <Max>180</Max>
   </Health>
   <Identity>
-	<Classes datatype="tokens">Bow</Classes>
+	<Classes datatype="tokens">Archer Bow</Classes>
     <GenericName>Cavalry Archer</GenericName>
     <History>A very rare unit in Part 1. It was used by the Persians, but it didn't gain much traction until the Parthians, Huns, Mongols, and other people of the nomadic steeps introduced them to Western Europe. This was the most effective unit on the battlefield for several hundred years until the well armoured knight came along. Therefore, this unit will gain much more prominence in Part 2.</History>
     <Tooltip>Classes: Ranged Cavalry Archer.
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
index acf2b11087..51876b6e93 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -35,7 +35,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <Classes datatype="tokens">Ranged Archer</Classes>
+    <Classes datatype="tokens">Ranged Archer Bow</Classes>
     <GenericName>Champion Cavalry Archer.</GenericName>
 	<Tooltip>Classes: Champion Ranged Cavalry Archer.
 Counters: 2x vs. Swordsmen, 1.5x vs. Spearmen. 
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
index 01090f7802..7db9d60cf9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -42,7 +42,7 @@
     <Max>120</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Ranged Bow</Classes>
+    <Classes datatype="tokens">Ranged Archer Bow</Classes>
     <GenericName>Champion Archer</GenericName>
 	<Tooltip>Classes: Champion Ranged Infantry Archer.
 Counters: 2x vs. Swordsmen, 1.25x vs. Cavalry Spearmen. 
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
index 3dd44dee39..fd93bdcbcb 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -44,7 +44,7 @@
     <Max>800</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Hero Bow -Javelin</Classes>
+    <Classes datatype="tokens">Hero Bow Archer -Javelin</Classes>
     <GenericName>Hero Cavalry Archer</GenericName>
     <Tooltip>Hero Aura: n/a.
 Ranged attack 2x vs. spearmen. Ranged attack 1.5x vs. Swordsmen.</Tooltip>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
index 83345c7d46..0cf8d85c65 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -37,7 +37,7 @@
   </Health>
   <Identity>
     <GenericName>Hero Archer</GenericName>
-    <Classes datatype="tokens">Hero</Classes>
+    <Classes datatype="tokens">Hero Archer Bow</Classes>
 	<Tooltip>Hero Archer.
 Counters: 2x vs. Swordsmen, 1.25x vs. Cavalry Spearmen. 
 Countered by: Cavalry Swordsmen, Cavalry Skirmishers.</Tooltip>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
index aa3b423048..3143bba254 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -35,7 +35,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <Classes datatype="tokens">Bow</Classes>
+    <Classes datatype="tokens">Archer Bow</Classes>
     <GenericName>Archer</GenericName>
     <History>They tended to be lightly armoured. They usually only participated in the first stage of a battle, sending a volley of arrows raining down the enemy. Of course they would have to stop shooting once the melee units closed in. This means their job was largely over once the 'true battle' was underway. They spent hours training with a bow, but if you were hit by an arrow it was more likely an act of random chance than being specifically targeted by an archer.</History>
     <Tooltip>Classes: Ranged Infantry Archer.
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
index 12136d21b0..c1b437b1fd 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
@@ -44,7 +44,7 @@
   <Identity>
     <GenericName>Light Warship</GenericName>
     <Tooltip>Classes: Light Warship Ranged</Tooltip>
-    <Classes datatype="tokens">Warship Light</Classes>
+    <Classes datatype="tokens">Warship Light Bow</Classes>
 	<RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <ResourceGatherer disable=""/>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
index c80797b2f6..fc1eb1d873 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
@@ -18,7 +18,6 @@
           <Multiplier>1.5</Multiplier>
         </BonusSecondary>
       </Bonuses>
-      <RestrictedClasses datatype="tokens">-StoneWall</RestrictedClasses>
     </Ranged>
   </Attack>
   <Cost>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_a.xml
index b50975df7b..235f83f63e 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_a.xml
@@ -8,11 +8,11 @@
   <Attack>
     <Ranged>
       <Spread>1.3</Spread>
-      <MaxRange>68.0</MaxRange>
+      <MaxRange>54.0</MaxRange>
     </Ranged>
   </Attack>
   <Health>
-    <Max>80</Max>
+    <Max>95</Max>
   </Health>
   <Identity>
     <Rank>Advanced</Rank>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml
index 626eabe17b..b2be2589bd 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
-  <Attack>
-    <Ranged>
-      <MaxRange>64.0</MaxRange>
-      <ProjectileSpeed>65.0</ProjectileSpeed>
-    </Ranged>
-  </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/maur_elephant_stables
@@ -13,12 +7,6 @@
       structures/{civ}_wonder
     </Entities>
   </Builder>
-  <Cost>
-    <BuildTime>7</BuildTime>
-  </Cost>
-  <Health>
-    <Max>70</Max>
-  </Health>
   <Identity>
     <Civ>maur</Civ>
 	<SelectionGroupName>units/maur_infantry_archer_b</SelectionGroupName>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_e.xml
index 2ccc29bd6d..a29de0918e 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_e.xml
@@ -8,11 +8,11 @@
   <Attack>
     <Ranged>
       <Spread>1.0</Spread>
-      <MaxRange>71.0</MaxRange>
+      <MaxRange>58.0</MaxRange>
     </Ranged>
   </Attack>
   <Health>
-    <Max>90</Max>
+    <Max>105</Max>
   </Health>
   <Identity>
     <Rank>Elite</Rank>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_a.xml
index bc3b4c70f1..9c5f3161bf 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_a.xml
@@ -8,11 +8,11 @@
   <Attack>
     <Ranged>
       <Spread>1.3</Spread>
-      <MaxRange>64.0</MaxRange>
+      <MaxRange>54.0</MaxRange>
     </Ranged>
   </Attack>
   <Health>
-    <Max>85</Max>
+    <Max>95</Max>
   </Health>
   <Identity>
     <Rank>Advanced</Rank>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
index 3361570dfa..4dff2d5fc2 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
-  <Attack>
-    <Ranged>
-	  <MaxRange>60.0</MaxRange>
-	  <ProjectileSpeed>65.0</ProjectileSpeed>
-    </Ranged>
-  </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/pers_stables
@@ -13,12 +7,6 @@
       structures/{civ}_wonder
     </Entities>
   </Builder>
-  <Cost>
-    <BuildTime>7.5</BuildTime>
-  </Cost>
-  <Health>
-    <Max>75</Max>
-  </Health>
   <Identity>
     <Civ>pers</Civ>
 	<SelectionGroupName>units/pers_infantry_archer_b</SelectionGroupName>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_e.xml
index 13567f3a06..fe143ec4b5 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_e.xml
@@ -8,11 +8,11 @@
   <Attack>
     <Ranged>
       <Spread>1.0</Spread>
-      <MaxRange>68.0</MaxRange>
+      <MaxRange>58.0</MaxRange>
     </Ranged>
   </Attack>
   <Health>
-    <Max>95</Max>
+    <Max>105</Max>
   </Health>
   <Identity>
     <Rank>Elite</Rank>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml
new file mode 100644
index 0000000000..e4768edbe1
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/rome_cavalry_javelinist_b">
+  <Armour>
+    <Hack>2</Hack>
+    <Pierce>4</Pierce>
+    <Crush>2</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <MaxRange>48</MaxRange>
+      <Spread>1.3</Spread>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>160</Max>
+  </Health>
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/rome_cavalry_javelinist_e</Entity>
+  </Promotion>
+  <ResourceGatherer>
+    <BaseSpeed>0.75</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>13.5</WalkSpeed>
+    <Run>
+      <Speed>27.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/romans/cavalry_javelinist_a.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml
new file mode 100644
index 0000000000..4b377e2b0b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_cavalry_ranged_javelinist">
+  <Identity>
+    <Civ>rome</Civ>
+	<SelectionGroupName>units/rome_cavalry_javelinist_b</SelectionGroupName>
+    <GenericName>Italian Allied Cavalry</GenericName>
+	<SpecificName>Sociae Equitis</SpecificName>
+    <History>Rome's Italian allies frequently supplied Rome's armies with light cavalry, an arm in which Rome was often deficient.</History>
+    <Icon>units/hele_cavalry_javelinist.png</Icon>
+  </Identity>
+  <Promotion>
+    <Entity>units/rome_cavalry_javelinist_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/romans/cavalry_javelinist_b.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml
new file mode 100644
index 0000000000..6ee537c855
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/rome_cavalry_javelinist_a">
+  <Armour>
+    <Hack>3</Hack>
+    <Pierce>5</Pierce>
+    <Crush>3</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <MaxRange>52</MaxRange>
+      <Spread>1.0</Spread>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>170</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>13.0</WalkSpeed>
+    <Run>
+      <Speed>26.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/romans/cavalry_javelinist_e.xml</Actor>
+  </VisualActor>
+</Entity>