diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WAR/1677_How to Train Your Warrior.json b/QuestPaths/3.x - Heavensward/Class Quests/WAR/1677_How to Train Your Warrior.json
index f4a6cf5d4..232e311c6 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/WAR/1677_How to Train Your Warrior.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WAR/1677_How to Train Your Warrior.json	
@@ -15,9 +15,11 @@
           "TerritoryId": 138,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Western La Noscea - Aleport",
-          "SkipIf": [
-            "AetheryteShortcutIfInSameTerritory"
-          ]
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WAR/585_Better Axe Around.json b/QuestPaths/3.x - Heavensward/Class Quests/WAR/585_Better Axe Around.json
index de49082bc..8885fb29f 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/WAR/585_Better Axe Around.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WAR/585_Better Axe Around.json	
@@ -15,9 +15,11 @@
           "TerritoryId": 137,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
-          "SkipIf": [
-            "AetheryteShortcutIfInSameTerritory"
-          ]
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WAR/586_Duty and the Beast.json b/QuestPaths/3.x - Heavensward/Class Quests/WAR/586_Duty and the Beast.json
index a329c15ad..8df193e0c 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/WAR/586_Duty and the Beast.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WAR/586_Duty and the Beast.json	
@@ -15,9 +15,11 @@
           "TerritoryId": 139,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake",
-          "SkipIf": [
-            "AetheryteShortcutIfInSameTerritory"
-          ]
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WAR/588_The Bear Necessity.json b/QuestPaths/3.x - Heavensward/Class Quests/WAR/588_The Bear Necessity.json
index 7dce67c3a..8d1ab80b8 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/WAR/588_The Bear Necessity.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WAR/588_The Bear Necessity.json	
@@ -15,9 +15,11 @@
           "TerritoryId": 139,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake",
-          "SkipIf": [
-            "AetheryteShortcutIfInSameTerritory"
-          ]
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -72,9 +74,11 @@
           "InteractionType": "Interact",
           "Fly": true,
           "StopDistance": 0.25,
-          "SkipIf": [
-            "FlyingLocked"
-          ]
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Locked"
+            }
+          }
         },
         {
           "DataId": 2005574,
@@ -86,9 +90,11 @@
           "TerritoryId": 398,
           "InteractionType": "Interact",
           "Fly": false,
-          "SkipIf": [
-            "FlyingUnlocked"
-          ]
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
         }
       ]
     },
@@ -111,9 +117,11 @@
           ],
           "Fly": true,
           "StopDistance": 0.25,
-          "SkipIf": [
-            "FlyingLocked"
-          ]
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Locked"
+            }
+          }
         },
         {
           "DataId": 2005573,
@@ -131,9 +139,11 @@
           ],
           "Fly": false,
           "StopDistance": 0.25,
-          "SkipIf": [
-            "FlyingUnlocked"
-          ]
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
         }
       ]
     },
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WAR/596_Pirates of Shallow Water.json b/QuestPaths/3.x - Heavensward/Class Quests/WAR/596_Pirates of Shallow Water.json
index 51827b051..d3fd9cf75 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/WAR/596_Pirates of Shallow Water.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WAR/596_Pirates of Shallow Water.json	
@@ -15,9 +15,11 @@
           "TerritoryId": 139,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake",
-          "SkipIf": [
-            "AetheryteShortcutIfInSameTerritory"
-          ]
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WAR/598_Slap an' Chop.json b/QuestPaths/3.x - Heavensward/Class Quests/WAR/598_Slap an' Chop.json
index 2c6ff8c75..73e1eef12 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/WAR/598_Slap an' Chop.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WAR/598_Slap an' Chop.json	
@@ -15,9 +15,11 @@
           "TerritoryId": 139,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake",
-          "SkipIf": [
-            "AetheryteShortcutIfInSameTerritory"
-          ]
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WAR/601_And My Axe.json b/QuestPaths/3.x - Heavensward/Class Quests/WAR/601_And My Axe.json
index 28b025bcb..6d85bf0f8 100644
--- a/QuestPaths/3.x - Heavensward/Class Quests/WAR/601_And My Axe.json	
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WAR/601_And My Axe.json	
@@ -15,9 +15,11 @@
           "TerritoryId": 139,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake",
-          "SkipIf": [
-            "AetheryteShortcutIfInSameTerritory"
-          ]
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },