diff --git a/data/boot_table_redfish.json b/data/boot_table_redfish.json
index d406c6c..4099355 100644
--- a/data/boot_table_redfish.json
+++ b/data/boot_table_redfish.json
@@ -6,13 +6,13 @@
         "start": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$"
         },
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -28,13 +28,13 @@
         "start": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$"
         },
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -57,7 +57,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -77,7 +77,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -97,7 +97,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -117,7 +117,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -133,7 +133,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -142,7 +142,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -162,7 +162,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -171,7 +171,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -187,7 +187,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -196,7 +196,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -211,7 +211,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -220,7 +220,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -236,7 +236,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -245,7 +245,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -265,7 +265,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -281,7 +281,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -294,7 +294,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -303,7 +303,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -323,7 +323,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -337,7 +337,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -346,7 +346,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -367,7 +367,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -381,7 +381,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -390,7 +390,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -411,7 +411,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -425,7 +425,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -434,7 +434,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -455,7 +455,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -469,7 +469,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -478,7 +478,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -499,7 +499,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^Off$",
-            "operating_system": "^Inactive$",
+            "boot_progress": "^Unspecified$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
@@ -515,7 +515,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -524,7 +524,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -541,7 +541,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -550,7 +550,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -566,7 +566,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -575,7 +575,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -591,7 +591,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -600,7 +600,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -616,7 +616,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -625,7 +625,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -641,7 +641,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -650,7 +650,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -666,7 +666,7 @@
         "start": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -675,7 +675,7 @@
         "end": {
             "rest": "^1$",
             "chassis": "^On$",
-            "operating_system": "^Standby|BootComplete$",
+            "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",