Index: leahi_dialin/common/alarm_priorities.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r41de945f9c773e54e965e80d9e46def828beb732
--- leahi_dialin/common/alarm_priorities.py	(.../alarm_priorities.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/common/alarm_priorities.py	(.../alarm_priorities.py)	(revision 41de945f9c773e54e965e80d9e46def828beb732)
@@ -24,6 +24,7 @@
     ALARM_PRIORITY_MEDIUM = 2             # Medium priority alarm
     ALARM_PRIORITY_HIGH = 3               # High priority alarm
     NUM_OF_ALARM_PRIORITIES = 4           # Total number of alarm priorities
+AlarmPriorities._str_list = {}
 
 class AlarmPriority:
     ALARM_HIGH = 3
Index: leahi_dialin/common/msg_defs.py
===================================================================
diff -u -r4c6191b3a68f1167a0e443c975c51f3cb00b8000 -r41de945f9c773e54e965e80d9e46def828beb732
--- leahi_dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 4c6191b3a68f1167a0e443c975c51f3cb00b8000)
+++ leahi_dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 41de945f9c773e54e965e80d9e46def828beb732)
@@ -73,6 +73,7 @@
     REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PARAMETER = 45
     REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH = 46
     REQUEST_REJECT_REASON_TREATMENT_CANNOT_BE_RESUMED = 47
+RequestRejectReasons._str_list = {}
 
 class MsgFieldPositions:
     # Generic response msg field byte positions (where 32-bit data fields are used)
Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r2f02383569fba305dbacac4b90598cd71b3b2df1 -r41de945f9c773e54e965e80d9e46def828beb732
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 2f02383569fba305dbacac4b90598cd71b3b2df1)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 41de945f9c773e54e965e80d9e46def828beb732)
@@ -396,3 +396,4 @@
 
 
     MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF
+MsgIds._str_list = {}
Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -rbc8e675ee824cde3e3e967f37ba48acaead97db2 -r41de945f9c773e54e965e80d9e46def828beb732
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision bc8e675ee824cde3e3e967f37ba48acaead97db2)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 41de945f9c773e54e965e80d9e46def828beb732)
@@ -26,8 +26,10 @@
     TEST_CONFIG_DD_ENABLE_4WIRE_RINSE_PUMP = 3                  # (DD) Test configuration Enabling 4 wire rinse pump
     TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH = 4                       # (FP) Test configuration to skip pre-gen flush
     NUM_OF_TEST_CONFIGS = 5                                     # Number of Test Configs
+DDFPTestConfigOptions._str_list = {}
 
 @unique
 class TDTestConfigOptions(DialinEnum):
     TEST_CONFIG_ENABLE_BETA_1_9_HW = 0                          # Test configuration to switch to HW in development
     NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
+TDTestConfigOptions._str_list = {}
Index: leahi_dialin/dd/modules/blood_leak.py
===================================================================
diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r41de945f9c773e54e965e80d9e46def828beb732
--- leahi_dialin/dd/modules/blood_leak.py	(.../blood_leak.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
+++ leahi_dialin/dd/modules/blood_leak.py	(.../blood_leak.py)	(revision 41de945f9c773e54e965e80d9e46def828beb732)
@@ -41,6 +41,7 @@
     Q = 8       # Zero confirm command
     D = 9       # Display set point
     C = 10      # Calibration command
+EmbModeCommands._str_list = {}
 
 class DDBloodLeak(AbstractSubSystem):
     """
Index: leahi_dialin/td/modules/alarms.py
===================================================================
diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r41de945f9c773e54e965e80d9e46def828beb732
--- leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
+++ leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision 41de945f9c773e54e965e80d9e46def828beb732)
@@ -55,6 +55,7 @@
         TD_ALARM_RESPONSE_BUTTON_RINSEBACK = 1
         TD_ALARM_RESPONSE_BUTTON_END_TREATMENT = 2
         NUM_OF_TD_ALARM_RESPONSE_BUTTONS = 3
+    AlarmResponseButtons._str_list = {}
 
     # Alarm status message field positions
     START_POS_ALARM_STATE = DenaliMessage.PAYLOAD_START_INDEX
Index: leahi_dialin/utils/base.py
===================================================================
diff -u -r95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd -r41de945f9c773e54e965e80d9e46def828beb732
--- leahi_dialin/utils/base.py	(.../base.py)	(revision 95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd)
+++ leahi_dialin/utils/base.py	(.../base.py)	(revision 41de945f9c773e54e965e80d9e46def828beb732)
@@ -268,8 +268,6 @@
 
 
 class DialinEnum(Enum):
-    _ignore_ = ['_str_list']
-    _str_list = {}
 
     @classmethod
     def has_value(cls, value):
@@ -288,18 +286,18 @@
             elif label.lower() == enum_member.name.lower().replace('mode_', ''):
                 return enum_member
             # If it's in the string list provided for the enum
-            elif label.lower() in cls._str_list[enum_member.name]:
+            elif enum_member.name in cls._str_list and label.lower() in cls._str_list[enum_member.name]:
                 return enum_member
             # Replace _ with ' ' and check the list again
-            elif label.lower().replace('_', ' ') in cls._str_list[enum_member.name]:
+            elif enum_member.name in cls._str_list and label.lower().replace('_', ' ') in cls._str_list[enum_member.name]:
                 return enum_member
             # Replace _ with ' ' and check the list again with _ with ' '
-            elif label.lower().replace('_', ' ') in [enum_mem.lower().replace('_', ' ') for enum_mem in cls._str_list[enum_member.name] ]:
+            elif enum_member.name in cls._str_list and label.lower().replace('_', ' ') in [enum_mem.lower().replace('_', ' ') for enum_mem in cls._str_list[enum_member.name] ]:
                 return enum_member
             # If the enum is the NUM_ collector, then return stop as after that only aliases are present
             elif enum_member.name.lower().startswith('num_'):
                 return None
-        return False
+        return None
 
 
 class AlarmEnum(Enum):
Index: leahi_dialin/utils/nv_ops_utils.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r41de945f9c773e54e965e80d9e46def828beb732
--- leahi_dialin/utils/nv_ops_utils.py	(.../nv_ops_utils.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/utils/nv_ops_utils.py	(.../nv_ops_utils.py)	(revision 41de945f9c773e54e965e80d9e46def828beb732)
@@ -34,6 +34,7 @@
     NVDATAMGMT_USAGE_INFO_RECORD = 5
     NVDATAMGMT_SW_CONFIG_RECORD = 6
     NUM_OF_NVDATMGMT_RECORDS_JOBS = 7
+NVRecordsDG._str_list = {}
 
 class NVRecordsHD(DialinEnum):
     NVDATAMGMT_CALIBRATION_RECORD = 0
@@ -43,8 +44,8 @@
     NVDATAMGMT_USAGE_INFO_RECORD = 4
     NVDATAMGMT_SW_CONFIG_RECORD = 5
     NUM_OF_NVDATMGMT_RECORDS_JOBS = 6
+NVRecordsHD._str_list = {}
 
-
 class NVUtilsObserver(AbstractObserver):
     """
     Observation class