diff --git a/Config/common/combat_tactics.cwt b/Config/common/combat_tactics.cwt
index 5fb942b2..a506ba8f 100644
--- a/Config/common/combat_tactics.cwt
+++ b/Config/common/combat_tactics.cwt
@@ -42,6 +42,10 @@ combat_tactic = {
 	enum[attack_defend] = float
 	## cardinality = 0..1
 	attacker_movement_speed = float
+	## cardinality = 0..1
+	defender_org_damage_modifier = float
+	## cardinality = 0..1
+	attacker_org_damage_modifier = float
 	alias_name[unit_stat] = alias_match_left[unit_stat]
 }
 
diff --git a/Config/common/equipment.cwt b/Config/common/equipment.cwt
index 7245ae02..a2572743 100644
--- a/Config/common/equipment.cwt
+++ b/Config/common/equipment.cwt
@@ -365,6 +365,13 @@ equipment = {
 		## cardinality = ~1..inf
 		<upgrade>
 	}
+	## cardinality = 0..inf
+	upgrade_window_override = {
+		## cardinality = ~1..1
+		upgrade = <upgrade>
+		## cardinality = ~1..1
+		override = <upgrade>
+	}
 }
 
 upgrade = {
diff --git a/Config/common/national_focus_inlay_window.cwt b/Config/common/national_focus_inlay_window.cwt
index 909e1122..90129eb9 100644
--- a/Config/common/national_focus_inlay_window.cwt
+++ b/Config/common/national_focus_inlay_window.cwt
@@ -17,6 +17,7 @@ focus_inlay_window = {
 		alias_name[trigger] = alias_match_left[trigger]
 	}
 	### List of images that should have dynamic sprites
+	## cardinality = 0..1
     scripted_images = {
 		### Name of the icon (must be a subcomponent of "gui_component_name")
 		## cardinality = 1..inf
diff --git a/Config/triggers.cwt b/Config/triggers.cwt
index ba7e9ece..5b5c355a 100644
--- a/Config/triggers.cwt
+++ b/Config/triggers.cwt
@@ -368,6 +368,10 @@ alias[trigger:has_government] = <ideology>
 ## scope = country
 alias[trigger:has_government] = enum[sub_ideology]
 
+### Does country government (ruling party) belong to ideology group.
+## scope = country
+alias[trigger:has_government] = value[variable]
+
 ### Does country government (ruling party) belong to ideology group.
 ## scope = country
 alias[trigger:has_country_leader_ideology] = <ideology>
@@ -859,6 +863,10 @@ alias[trigger:casualties] = int
 ## scope = any
 alias[trigger:custom_trigger_tooltip] = {
 	tooltip = localisation
+	tooltip = {
+		localization_key = localisation
+		INDEX = int
+	}
 	alias_name[trigger] = alias_match_left[trigger]
 }
 
diff --git a/Config/triggers_goe.cwt b/Config/triggers_goe.cwt
new file mode 100644
index 00000000..30d82b23
--- /dev/null
+++ b/Config/triggers_goe.cwt
@@ -0,0 +1,6 @@
+### Check if the country owns any of the states in the list
+## scope = country
+alias[trigger:owns_any_state_of] = {
+    ## cardinality = ~1..inf
+	<state>
+}