Index: binaries/data/mods/public/gui/session/unit_actions.js
===================================================================
--- binaries/data/mods/public/gui/session/unit_actions.js
+++ binaries/data/mods/public/gui/session/unit_actions.js
@@ -258,7 +258,7 @@
 		},
 		"getActionInfo": function(entState, targetState)
 		{
-			if (!entState.unitAI || !entState.unitAI.canPatrol)
+			if (!entState.unitAI || !entState.patrol)
 				return false;
 
 			return { "possible": true };
@@ -713,7 +713,7 @@
 		{
 			if (!targetState.guard ||
 			    !playerCheck(entState, targetState, ["Player", "Ally"]) ||
-			    !entState.unitAI || !entState.unitAI.canGuard ||
+			    !entState.unitAI || !entState.guard ||
 			    targetState.unitAI && targetState.unitAI.isGuarding)
 				return false;
 
@@ -1212,7 +1212,7 @@
 		"getInfo": function(entStates)
 		{
 			if (entStates.every(entState =>
-				!entState.unitAI || !entState.unitAI.canGuard || entState.unitAI.isGuarding))
+				!entState.unitAI || !entState.guard || entState.unitAI.isGuarding))
 				return false;
 
 			return {
@@ -1265,7 +1265,7 @@
 	"patrol": {
 		"getInfo": function(entStates)
 		{
-			if (!entStates.some(entState => entState.unitAI && entState.unitAI.canPatrol))
+			if (!entStates.some(entState => entState.unitAI && !!entState.patrol))
 				return false;
 
 			return {
@@ -1431,7 +1431,7 @@
 {
 	return entities.some(ent => {
 		let entState = GetEntityState(ent);
-		return entState && entState.unitAI && entState.unitAI.canPatrol;
+		return entState && entState.unitAI && !!entState.patrol;
 	});
 }
 
Index: binaries/data/mods/public/simulation/ai/common-api/entity.js
===================================================================
--- binaries/data/mods/public/simulation/ai/common-api/entity.js
+++ binaries/data/mods/public/simulation/ai/common-api/entity.js
@@ -540,7 +540,7 @@
 
 	"isCapturable": function() { return this.get("Capturable") !== undefined; },
 
-	"canGuard": function() { return this.get("UnitAI/CanGuard") === "true"; },
+	"canGuard": function() { return this.get("Guard") !== undefined; },
 
 	"canGarrison": function() { return "Garrisonable" in this._template; },
 });
Index: binaries/data/mods/public/simulation/components/GuiInterface.js
===================================================================
--- binaries/data/mods/public/simulation/components/GuiInterface.js
+++ binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -350,13 +350,15 @@
 			"state": cmpUnitAI.GetCurrentState(),
 			"orders": cmpUnitAI.GetOrders(),
 			"hasWorkOrders": cmpUnitAI.HasWorkOrders(),
-			"canGuard": cmpUnitAI.CanGuard(),
 			"isGuarding": cmpUnitAI.IsGuardOf(),
-			"canPatrol": cmpUnitAI.CanPatrol(),
 			"selectableStances": cmpUnitAI.GetSelectableStances(),
 			"isIdle": cmpUnitAI.IsIdle(),
 		};
 
+	let cmpPatrol = Engine.QueryInterface(ent, IID_Patrol);
+	if (cmpPatrol)
+		ret.patrol = true;
+
 	let cmpGuard = Engine.QueryInterface(ent, IID_Guard);
 	if (cmpGuard)
 		ret.guard = {
Index: binaries/data/mods/public/simulation/components/Patrol.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/components/Patrol.js
@@ -0,0 +1,13 @@
+function Patrol() {}
+
+/**
+ * Placeholder component saying an entity can patrol.
+ */
+Patrol.prototype.Schema =
+	"<empty/>";
+
+Patrol.prototype.Init = function() {};
+
+Patrol.prototype.Serialize = null;
+
+Engine.RegisterComponentType(IID_Patrol, "Patrol", Patrol);
Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -18,12 +18,6 @@
 	"<element name='FleeDistance'>" +
 		"<ref name='positiveDecimal'/>" +
 	"</element>" +
-	"<element name='CanGuard'>" +
-		"<data type='boolean'/>" +
-	"</element>" +
-	"<element name='CanPatrol'>" +
-		"<data type='boolean'/>" +
-	"</element>" +
 	"<optional>" +
 		"<interleave>" +
 			"<element name='NaturalBehaviour' a:help='Behaviour of the unit in the absence of player commands (intended for animals)'>" +
@@ -4985,18 +4979,16 @@
 
 	// Do not let a unit already guarded to guard. This would work in principle,
 	// but would clutter the gui with too much buttons to take all cases into account
-	var cmpGuard = Engine.QueryInterface(this.entity, IID_Guard);
-	if (cmpGuard && cmpGuard.GetEntities().length)
-		return false;
-
-	return this.template.CanGuard == "true";
+	let cmpGuard = Engine.QueryInterface(this.entity, IID_Guard);
+	return cmpGuard && !cmpGuard.GetEntities().length;
 };
 
 UnitAI.prototype.CanPatrol = function()
 {
 	// Formation controllers should always respond to commands
 	// (then the individual units can make up their own minds)
-	return this.IsFormationController() || this.template.CanPatrol == "true";
+	let cmpPatrol = Engine.QueryInterface(this.entity, IID_Patrol);
+	return this.IsFormationController() || cmpPatrol;
 };
 
 /**
Index: binaries/data/mods/public/simulation/components/interfaces/Patrol.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/components/interfaces/Patrol.js
@@ -0,0 +1 @@
+Engine.RegisterInterface("Patrol");
Index: binaries/data/mods/public/simulation/templates/template_bird.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_bird.xml
+++ binaries/data/mods/public/simulation/templates/template_bird.xml
@@ -24,8 +24,6 @@
     <DefaultStance>passive</DefaultStance>
     <NaturalBehaviour>passive</NaturalBehaviour>
     <FormationController>false</FormationController>
-    <CanGuard>false</CanGuard>
-    <CanPatrol>false</CanPatrol>
     <RoamDistance>1000.0</RoamDistance>
     <FleeDistance>10.0</FleeDistance>
     <RoamTimeMin>10000</RoamTimeMin>
Index: binaries/data/mods/public/simulation/templates/template_formation.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_formation.xml
+++ binaries/data/mods/public/simulation/templates/template_formation.xml
@@ -62,8 +62,6 @@
     <DefaultStance>aggressive</DefaultStance>
     <FormationController>true</FormationController>
     <FleeDistance>12.0</FleeDistance>
-    <CanGuard>true</CanGuard>
-    <CanPatrol>true</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <FormationController>true</FormationController>
Index: binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit.xml
+++ binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -71,6 +71,7 @@
   </Obstruction>
   <OverlayRenderer/>
   <Ownership/>
+  <Patrol/>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>upright</Anchor>
@@ -117,8 +118,6 @@
     <DefaultStance>aggressive</DefaultStance>
     <FleeDistance>12.0</FleeDistance>
     <FormationController>false</FormationController>
-    <CanGuard>true</CanGuard>
-    <CanPatrol>true</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <FormationController>false</FormationController>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -18,10 +18,9 @@
     <Type>food</Type>
     <Color r="227" g="130" b="141"/>
   </Minimap>
+  <Patrol disable=""/>
   <ResourceGatherer disable=""/>
   <UnitAI>
-    <CanGuard>false</CanGuard>
-    <CanPatrol>false</CanPatrol>
     <RoamDistance>8.0</RoamDistance>
     <FleeDistance>24.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -31,6 +31,7 @@
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
+  <Guard disable=""/>
   <Identity>
     <Classes datatype="tokens">FishingBoat -ConquestCritical</Classes>
     <Formations disable=""/>
@@ -42,6 +43,7 @@
     <wood>10</wood>
     <metal>0</metal>
   </Loot>
+  <Patrol disable=""/>
   <ResourceGatherer>
     <MaxDistance>6.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
@@ -63,8 +65,6 @@
   </StatusBars>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
-    <CanGuard>false</CanGuard>
-    <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -20,6 +20,7 @@
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
+  <Guard disable=""/>
   <Health>
     <Max>400</Max>
   </Health>
@@ -36,6 +37,7 @@
     <wood>15</wood>
     <metal>0</metal>
   </Loot>
+  <Patrol disable=""/>
   <ResourceGatherer>
     <MaxDistance>12.0</MaxDistance>
     <Capacities>
@@ -50,8 +52,6 @@
   </Trader>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
-    <CanGuard>false</CanGuard>
-    <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
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
@@ -53,6 +53,7 @@
     <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
     <Formations disable=""/>
   </Identity>
+  <Patrol disable=""/>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
@@ -88,9 +89,6 @@
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
     </SoundGroups>
   </Sound>
-  <UnitAI>
-    <CanPatrol>false</CanPatrol>
-  </UnitAI>
   <Vision>
     <Range>32</Range>
   </Vision>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -7,6 +7,7 @@
       <metal>80</metal>
     </Resources>
   </Cost>
+  <Guard disable=""/>
   <Health>
     <Max>100</Max>
   </Health>
@@ -17,6 +18,7 @@
     <Tooltip>Trade resources between your own markets and those of your allies.</Tooltip>
     <Formations disable=""/>
   </Identity>
+  <Patrol disable=""/>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
@@ -40,10 +42,6 @@
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
   </Trader>
-  <UnitAI>
-    <CanGuard>false</CanGuard>
-    <CanPatrol>false</CanPatrol>
-  </UnitAI>
   <Vision>
     <Range>60</Range>
   </Vision>
Index: binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
@@ -38,6 +38,7 @@
     <stone>10</stone>
     <metal>10</metal>
   </Loot>
+  <Patrol disable=""/>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
@@ -63,9 +64,6 @@
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
-  <UnitAI>
-    <CanPatrol>false</CanPatrol>
-  </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.6</WalkSpeed>
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
@@ -25,9 +25,7 @@
     <Icon>units/spart_support_female_citizen.png</Icon>
     <SelectionGroupName>units/spart_support_female_citizen</SelectionGroupName>
   </Identity>
-  <UnitAI>
-    <CanPatrol>true</CanPatrol>
-  </UnitAI>
+  <Patrol/>
   <VisualActor>
     <Actor>units/spartans/female_citizen.xml</Actor>
   </VisualActor>