diff --git a/data/pldm_variables.py b/data/pldm_variables.py
index 9f40440..6e7f1e6 100755
--- a/data/pldm_variables.py
+++ b/data/pldm_variables.py
@@ -12,6 +12,7 @@
 PLDM_TYPE_BIOS = {'VALUE': '03', 'STRING': 'bios'}
 PLDM_TYPE_FRU = {'VALUE': '04', 'STRING': 'fru'}
 PLDM_TYPE_OEM = {'VALUE': '63', 'STRING': 'oem-ibm'}
+PLDM_SUPPORTED_TYPES = ['0(base)', '2(platform)', '3(bios)', '4(fru)', '63(oem-ibm)']
 
 VERSION_BASE = {'VALUE': ['f1', 'f0', 'f0', '00'], 'STRING': '1.0.0'}
 VERSION_PLATFORM = {'VALUE': ['f1', 'f2', 'f0', '00'], 'STRING': '1.2.0'}
@@ -92,64 +93,106 @@
 #      Only record handle 0, 1, 2 are supported as of now.
 
 RESPONSE_DICT_GETPDR_SETSTATEEFFECTER = {
-    'responsecount': ['29', '30'],
-    'pdrheaderversion': ['1'],
-    'pdrtype': ['State Effecter PDR(11)'],
-    'recordchangenumber': ['0'],
-    'datalength': ['19', '20'],
-    'pldmterminushandle': ['0'],
-    'effecterid': ['1', '2', '3'],
-    'entitytype': ['33', '45', '31'],
-    'entityinstancenumber': ['0'],
-    'containerid': ['0'],
-    'effectersemanticid': ['0'],
-    'effecterinit': ['0'],
-    'effecterdescriptionpdr': ['false'],
-    'compositeeffectercount': ['1'],
-    'statesetid': ['Boot Progress(196)',
-                   'System Power State(260)', 'Software Termination Status(129)'],
-    'possiblestatessize': ['1', '2'],
-    'possiblestates': ['6', '0', '64']}
+    'PDRHeaderVersion': [1],
+    'PDRType': ['State Effecter PDR'],
+    'recordChangeNumber': [0],
+    'PLDMTerminusHandle': [0, 1, 2],
+    'effecterID': [0, 1, 2, 3, 4],
+    'entityType': ['Virtual Machine Manager', 'System chassis (main enclosure)',
+                   'System Firmware', 'Processor Module', '32801(OEM)'],
+    'entityInstanceNumber': [0, 1],
+    'containerID': [0, 1],
+    'effecterSemanticID': [0],
+    'effecterInit': ['noInit'],
+    'effecterDescriptionPDR': [False],
+    'compositeEffecterCount': [1],
+    'stateSetID': ['Boot Progress(196)',
+                   'System Power State(260)', 'Software Termination Status(129)',
+                   'Boot/Restart Cause(192)']}
 
 RESPONSE_DICT_GETPDR_FRURECORDSETIDENTIFIER = {
-    'responsecount': ['20'],
-    'pdrheaderversion': ['1'],
-    'pdrtype': ['FRU Record Set PDR(20)'],
-    'recordchangenumber': ['0'],
-    'datalength': ['10'],
-    'pldmterminushandle': ['0', '2'],
-    'entitytype': ['System Board', 'Chassis front panel board (control panel)',
+    'PDRHeaderVersion': [1],
+    'PDRType': ['FRU Record Set PDR'],
+    'recordChangeNumber': [0],
+    'dataLength': [10],
+    'PLDMTerminusHandle': [0, 2],
+    'entityType': ['System Board', 'Chassis front panel board (control panel)',
                    'Management Controller', 'OEM', 'Power converter',
                    'System (logical)', 'System chassis (main enclosure)',
                    'Chassis front panel board (control panel)',
-                   'Processor Module', 'Memory Module', 'Power Supply'],
-    'containerid': ['0', '1', '2', '3']}
+                   'Processor Module', 'Memory Module', 'Power Supply',
+                   '24576(OEM)'],
+    'containerID': [0, 1, 2, 3]}
 
 RESPONSE_DICT_GETPDR_PDRENTITYASSOCIATION = {
-    'pdrheaderversion': ['1'],
-    'pdrtype': ['Entity Association PDR(15)'],
-    'recordchangenumber': ['0'],
-    'containerid': ['1', '2', '3'],
+    'PDRHeaderVersion': [1],
+    'PDRType': ['Entity Association PDR'],
+    'recordChangeNumber': [0],
+    'containerID': [1, 2, 3],
     'associationtype': ['Physical'],
-    'containerentitytype': ['System Board', 'System (logical)',
-                            'System chassis (main enclosure)']
-}
+    'containerentityType': ['System Board', 'System (logical)',
+                            'System chassis (main enclosure)']}
 
 RESPONSE_DICT_GETPDR_STATESENSORPDR = {
-    'entitytype': ['Communication Channel', 'Connector', 'Processor Module'],
-    'sensorinit': ['noInit'],
-    'sensorauxiliarynamespdr': ['false'],
-    'statesetid': ['Availability(2)', 'Configuration State(15)',
-                   'Operational Running Status(11)']
-}
+    'entityType': ['Communication Channel', 'Connector', 'Processor Module',
+                   '32774(OEM)', '57346(OEM)', '57347(OEM)', '32801(OEM)'],
+    'sensorInit': ['noInit'],
+    'sensorAuxiliaryNamesPDR': [False],
+    'stateSetID': ['Availability(2)', 'Configuration State(15)',
+                   'Operational Running Status(11)', 'Software Termination Status(129)']}
+
+RESPONSE_DICT_GETPDR_TERMINUSLOCATORPDR = {
+    'PDRHeaderVersion': [1],
+    'PDRType': ['Terminus Locator PDR'],
+    'recordChangeNumber': [0],
+    'PLDMTerminusHandle': [1],
+    'validity': ['valid'],
+    'TID': [1, 208],
+    'containerID': [0, 1],
+    'terminusLocatorType': ['MCTP_EID'],
+    'terminusLocatorValueSize': [1]}
+
+RESPONSE_DICT_GETPDR_NUMERICEFFECTERPDR = {
+    'PDRHeaderVersion': [1],
+    'PDRType': ['Numeric Effecter PDR'],
+    'recordChangeNumber': [0],
+    'PLDMTerminusHandle': [0, 1],
+    'entityInstanceNumber': [0, 1],
+    'containerID': [0],
+    'effecterSemanticID': [0],
+    'effecterInit': [0],
+    'effecterAuxiliaryNames': [False],
+    'baseUnit': [0, 72],
+    'unitModifier': [0],
+    'rateUnit': [0],
+    'baseOEMUnitHandle': [0],
+    'auxUnit': [0],
+    'auxUnitModifier': [0],
+    'auxrateUnit': [0],
+    'auxOEMUnitHandle': [0],
+    'resolution': [1, 0],
+    'offset': [0],
+    'accuracy': [0],
+    'plusTolerance': [0],
+    'minusTolerance': [0],
+    'stateTransitionInterval': [0],
+    'TransitionInterval': [0],
+    'minSettable': [0],
+    'rangeFieldSupport': [0],
+    'nominalValue': [0],
+    'normalMax': [0],
+    'normalMin': [0],
+    'ratedMax': [0],
+    'ratedMin': [0]}
 
 PLDM_PDR_TYPES = {
-    'PLDM_STATE_EFFECTER_PDR': 'State Effecter PDR(11)',
-    'PLDM_PDR_FRU_RECORD_SET': 'FRU Record Set PDR(20)',
-    'PLDM_PDR_ENTITY_ASSOCIATION': 'Entity Association PDR(15)',
-    'PLDM_STATE_SENSOR_PDR': 'State Sensor PDR(4)',
-    'PLDM_NUMERIC_EFFECTER_PDR': 'Numeric Effecter PDR(9)',
-    'PLDM_TERMINUS_LOCATOR_PDR': 'Terminus Locator PDR(1)'}
+    'PLDM_STATE_EFFECTER_PDR': 'State Effecter PDR',
+    'PLDM_PDR_FRU_RECORD_SET': 'FRU Record Set PDR',
+    'PLDM_PDR_ENTITY_ASSOCIATION': 'Entity Association PDR',
+    'PLDM_STATE_SENSOR_PDR': 'State Sensor PDR',
+    'PLDM_NUMERIC_EFFECTER_PDR': 'Numeric Effecter PDR',
+    'PLDM_TERMINUS_LOCATOR_PDR': 'Terminus Locator PDR',
+    'PLDM_COMPACT_NUMERIC_SENSOR_PDR': '21'}
 
 RESPONSE_LIST_GETBIOSTABLE_STRTABLE = [
     'Allowed', 'Disabled', 'Enabled', 'IPv4DHCP', 'IPv4Static', 'Not Allowed',
@@ -158,3 +201,14 @@
     'vmi-if-count', 'vmi-if0-ipv4-ipaddr', 'vmi-if0-ipv4-method',
     'vmi-if0-ipv4-prefix-length', 'vmi-if1-ipv4-ipaddr', 'vmi-if1-ipv4-method',
     'vmi-if1-ipv4-prefix-length', 'vmi-ipv4-gateway']
+
+
+RESPONSE_LIST_GETBIOSTABLE_ATTRTABLE = [
+    'pvm-fw-boot-side', 'pvm-inband-code-update', 'pvm-os-boot-side',
+    'pvm-pcie-error-inject', 'pvm-surveillance', 'pvm-system-name', 'vmi-hostname',
+    'vmi-if-count', 'vmi-if0-ipv4-ipaddr', 'vmi-if0-ipv4-method',
+    'vmi-if0-ipv4-prefix-length', 'vmi-if1-ipv4-ipaddr', 'vmi-if1-ipv4-method',
+    'vmi-if1-ipv4-prefix-length', 'vmi-ipv4-gateway']
+
+RESPONSE_LIST_GETBIOSTABLE_ATTRVALTABLE = [
+    'BIOSString', 'BIOSInteger', 'BIOSEnumeration']