diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2104747..b60afc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 3. bios_table: Remove pldm_bios_table_attr_value_entry_encode_string()
 4. bios_table: Remove pldm_bios_table_attr_value_entry_encode_integer()
 5. bios_table: Remove pldm_bios_table_append_pad_checksum()
+6. fru: Remove get_fru_record_by_option()
 
 ### Fixed
 
diff --git a/abi/aarch64/gcc.dump b/abi/aarch64/gcc.dump
index ba02e4a..824fd85 100644
--- a/abi/aarch64/gcc.dump
+++ b/abi/aarch64/gcc.dump
@@ -158,7 +158,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '108058' => {
+                            '107667' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -177,7 +177,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '108241' => {
+                            '107850' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -221,7 +221,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '108459' => {
+                            '108068' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -240,7 +240,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '108566' => {
+                            '108175' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -283,7 +283,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '108859' => {
+                            '108468' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -302,7 +302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '109037' => {
+                            '108646' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -346,7 +346,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '109235' => {
+                            '108844' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -365,7 +365,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '109337' => {
+                            '108946' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -408,7 +408,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '109630' => {
+                            '109239' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -427,22 +427,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '10972' => {
-                                         'Header' => 'bios.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1615'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_date_time_req'
-                                       },
-                            '109737' => {
+                            '109346' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -469,7 +454,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '109955' => {
+                            '109564' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -488,7 +473,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '110128' => {
+                            '10972' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '109737' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -515,7 +515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '110264' => {
+                            '109873' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -538,7 +538,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '110391' => {
+                            '110000' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -573,7 +573,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '110649' => {
+                            '110258' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -600,7 +600,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '110862' => {
+                            '110471' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -631,7 +631,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '111012' => {
+                            '110621' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -650,7 +650,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '111119' => {
+                            '110728' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -677,7 +677,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '111337' => {
+                            '110946' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -696,7 +696,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '111510' => {
+                            '111119' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -723,7 +723,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '111646' => {
+                            '111255' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -746,7 +746,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '111773' => {
+                            '111382' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -785,7 +785,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '112051' => {
+                            '111660' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -812,7 +812,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '112264' => {
+                            '111873' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -847,7 +847,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '112428' => {
+                            '112037' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -870,7 +870,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '112626' => {
+                            '112235' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -893,7 +893,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '112748' => {
+                            '112357' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -920,7 +920,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '112966' => {
+                            '112575' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -951,7 +951,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '113115' => {
+                            '112724' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -974,7 +974,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '113313' => {
+                            '112922' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1001,7 +1001,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '113443' => {
+                            '113052' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1028,7 +1028,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '113661' => {
+                            '113270' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1055,7 +1055,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '113790' => {
+                            '113399' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1090,7 +1090,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '113956' => {
+                            '113565' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1117,7 +1117,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '114165' => {
+                            '113774' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1152,7 +1152,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '114448' => {
+                            '114057' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1179,7 +1179,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '114577' => {
+                            '114186' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1202,7 +1202,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '114698' => {
+                            '114307' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1237,7 +1237,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '114945' => {
+                            '114554' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1264,7 +1264,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '115149' => {
+                            '114758' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1295,7 +1295,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '116095' => {
+                            '115704' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1326,7 +1326,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '116326' => {
+                            '115935' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1345,7 +1345,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '116414' => {
+                            '116023' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1372,7 +1372,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '116547' => {
+                            '116156' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1395,7 +1395,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '117586' => {
+                            '117195' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -5486,7 +5486,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_resp'
                                       },
-                            '71972' => {
+                            '71927' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5513,7 +5513,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_set_fru_record_table_resp'
                                        },
-                            '72195' => {
+                            '72150' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5540,7 +5540,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_set_fru_record_table_req'
                                        },
-                            '72362' => {
+                            '72317' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5575,7 +5575,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '72610' => {
+                            '72565' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5614,7 +5614,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '72868' => {
+                            '72823' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5641,7 +5641,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '73086' => {
+                            '73041' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5699,7 +5699,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_attribute_current_value_req'
                                       },
-                            '73247' => {
+                            '73202' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5738,7 +5738,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_resp'
                                        },
-                            '73556' => {
+                            '73511' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5777,7 +5777,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '73744' => {
+                            '73699' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5820,7 +5820,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_req'
                                        },
-                            '74037' => {
+                            '73992' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5855,65 +5855,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'get_fru_record_by_option_check'
                                        },
-                            '74463' => {
-                                         'Header' => 'fru.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'table',
-                                                               'type' => '6087'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'table_size',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'record_table',
-                                                               'type' => '2034'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'record_size',
-                                                               'type' => '8822'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'rsi',
-                                                               'type' => '4895'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'rt',
-                                                               'type' => '168'
-                                                             },
-                                                      '6' => {
-                                                               'name' => 'ft',
-                                                               'type' => '168'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'get_fru_record_by_option'
-                                       },
-                            '7461' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'msg',
-                                                              'type' => '2029'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'completion_code',
-                                                              'type' => '2034'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'next_transfer_handle',
-                                                              'type' => '2039'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
-                                      },
-                            '74900' => {
+                            '74509' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5956,7 +5898,30 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
-                            '75163' => {
+                            '7461' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'msg',
+                                                              'type' => '2029'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'completion_code',
+                                                              'type' => '2034'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'next_transfer_handle',
+                                                              'type' => '2039'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
+                                      },
+                            '74772' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5983,7 +5948,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_resp'
                                        },
-                            '75367' => {
+                            '74976' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6006,7 +5971,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '75483' => {
+                            '75092' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6053,42 +6018,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '7577' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'instance_id',
-                                                              'type' => '168'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'transfer_handle',
-                                                              'type' => '180'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'transfer_flag',
-                                                              'type' => '168'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'attribute_data',
-                                                              'type' => '6087'
-                                                            },
-                                                     '4' => {
-                                                              'name' => 'attribute_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '5' => {
-                                                              'name' => 'msg',
-                                                              'type' => '1615'
-                                                            },
-                                                     '6' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            }
-                                                   },
-                                        'Return' => '74',
-                                        'ShortName' => 'encode_set_bios_attribute_current_value_req'
-                                      },
-                            '75787' => {
+                            '75396' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6136,7 +6066,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '75994' => {
+                            '75603' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6155,7 +6085,42 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_req'
                                        },
-                            '77611' => {
+                            '7577' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'instance_id',
+                                                              'type' => '168'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'transfer_handle',
+                                                              'type' => '180'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'transfer_flag',
+                                                              'type' => '168'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'attribute_data',
+                                                              'type' => '6087'
+                                                            },
+                                                     '4' => {
+                                                              'name' => 'attribute_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '5' => {
+                                                              'name' => 'msg',
+                                                              'type' => '1615'
+                                                            },
+                                                     '6' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            }
+                                                   },
+                                        'Return' => '74',
+                                        'ShortName' => 'encode_set_bios_attribute_current_value_req'
+                                      },
+                            '77220' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6172,64 +6137,75 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'entities',
-                                                               'type' => '77924'
+                                                               'type' => '77533'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_extract'
                                        },
-                            '77944' => {
+                            '77553' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_is_empty_entity_assoc_tree'
                                        },
-                            '78004' => {
+                            '77613' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy_root'
                                        },
-                            '78067' => {
+                            '77676' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'org_tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              },
                                                       '1' => {
                                                                'name' => 'new_tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_copy_root'
                                        },
-                            '78283' => {
+                            '77892' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '77929'
+                                                               'type' => '77538'
                                                              }
                                                     },
-                                         'Return' => '77499',
+                                         'Return' => '77108',
                                          'ShortName' => 'pldm_entity_association_tree_find'
                                        },
+                            '78637' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '78886'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_pdr_remove_remote_pdrs'
+                                       },
                             '7865' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6265,23 +6241,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '79028' => {
+                            '78891' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79277'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_pdr_remove_remote_pdrs'
-                                       },
-                            '79282' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '79277'
+                                                               'type' => '78886'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6291,40 +6256,40 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
-                            '79551' => {
+                            '79160' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
                                                                'offset' => '-8',
-                                                               'type' => '76640'
+                                                               'type' => '76249'
                                                              },
                                                       '2' => {
                                                                'name' => 'node',
-                                                               'type' => '78278'
+                                                               'type' => '77887'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_find_entity_ref_in_tree'
                                        },
-                            '80068' => {
+                            '79677' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '77499'
+                                                               'type' => '77108'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '79277'
+                                                               'type' => '78886'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '77924'
+                                                               'type' => '77533'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6342,20 +6307,20 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '80284' => {
+                            '79893' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '77499'
+                                                               'type' => '77108'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '79277'
+                                                               'type' => '78886'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '77924'
+                                                               'type' => '77533'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6373,16 +6338,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node'
                                        },
-                            '80613' => {
+                            '80222' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '79277'
+                                                               'type' => '78886'
                                                              },
                                                       '2' => {
                                                                'name' => 'is_remote',
@@ -6423,27 +6388,27 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '82068' => {
+                            '81677' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'parent',
-                                                               'type' => '77499'
+                                                               'type' => '77108'
                                                              },
                                                       '1' => {
                                                                'name' => 'node',
-                                                               'type' => '77929'
+                                                               'type' => '77538'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '82157' => {
+                            '81766' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '77499'
+                                                               'type' => '77108'
                                                              },
                                                       '1' => {
                                                                'name' => 'association_type',
@@ -6453,60 +6418,60 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '82372' => {
+                            '81981' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '77499'
+                                                               'type' => '77108'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '82527' => {
+                            '82136' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '77499'
+                                                               'type' => '77108'
                                                              }
                                                     },
-                                         'Return' => '76640',
+                                         'Return' => '76249',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '82682' => {
+                            '82291' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '77499'
+                                                               'type' => '77108'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '82837' => {
+                            '82446' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
-                            '83016' => {
+                            '82625' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              },
                                                       '1' => {
                                                                'name' => 'entities',
-                                                               'type' => '77924'
+                                                               'type' => '77533'
                                                              },
                                                       '2' => {
                                                                'name' => 'size',
@@ -6547,16 +6512,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '83948' => {
+                            '83557' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '77999'
+                                                               'type' => '77608'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '77929'
+                                                               'type' => '77538'
                                                              },
                                                       '2' => {
                                                                'name' => 'entity_instance_number',
@@ -6564,21 +6529,32 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'parent',
-                                                               'type' => '77499'
+                                                               'type' => '77108'
                                                              },
                                                       '4' => {
                                                                'name' => 'association_type',
                                                                'type' => '168'
                                                              }
                                                     },
-                                         'Return' => '77499',
+                                         'Return' => '77108',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
-                            '84385' => {
+                            '83994' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '77999',
+                                         'Return' => '77608',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
+                            '84228' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '77108'
+                                                             }
+                                                    },
+                                         'Return' => '76249',
+                                         'ShortName' => 'pldm_entity_extract'
+                                       },
                             '8460' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6606,23 +6582,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '84619' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '77499'
-                                                             }
-                                                    },
-                                         'Return' => '76640',
-                                         'ShortName' => 'pldm_entity_extract'
-                                       },
-                            '85425' => {
+                            '85034' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79023'
+                                                               'type' => '78632'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6644,12 +6609,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
-                            '85765' => {
+                            '85374' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79023'
+                                                               'type' => '78632'
                                                              },
                                                       '1' => {
                                                                'name' => 'fru_rsi',
@@ -6672,15 +6637,15 @@
                                                                'type' => '8294'
                                                              }
                                                     },
-                                         'Return' => '85750',
+                                         'Return' => '85359',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '86096' => {
+                            '85705' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79277'
+                                                               'type' => '78886'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6710,12 +6675,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '86418' => {
+                            '86027' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79277'
+                                                               'type' => '78886'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6745,6 +6710,32 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set'
                                        },
+                            '86366' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'record',
+                                                               'type' => '85359'
+                                                             }
+                                                    },
+                                         'Return' => '6265',
+                                         'ShortName' => 'pldm_pdr_record_is_remote'
+                                       },
+                            '86521' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '78632'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'record',
+                                                               'type' => '85359'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_get_record_handle'
+                                       },
                             '8672' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6776,60 +6767,34 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '86757' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'record',
-                                                               'type' => '85750'
-                                                             }
-                                                    },
-                                         'Return' => '6265',
-                                         'ShortName' => 'pldm_pdr_record_is_remote'
-                                       },
-                            '86912' => {
+                            '86739' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79023'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'record',
-                                                               'type' => '85750'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_get_record_handle'
-                                       },
-                            '87130' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '79023'
+                                                               'type' => '78632'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '87261' => {
+                            '86870' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79023'
+                                                               'type' => '78632'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '87392' => {
+                            '87001' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79023'
+                                                               'type' => '78632'
                                                              },
                                                       '1' => {
                                                                'name' => 'pdr_type',
@@ -6837,7 +6802,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '85750'
+                                                               'type' => '85359'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
@@ -6848,19 +6813,19 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '85750',
+                                         'Return' => '85359',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
-                            '87570' => {
+                            '87179' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79023'
+                                                               'type' => '78632'
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '85750'
+                                                               'type' => '85359'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
@@ -6875,15 +6840,15 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '85750',
+                                         'Return' => '85359',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '87744' => {
+                            '87353' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79023'
+                                                               'type' => '78632'
                                                              },
                                                       '1' => {
                                                                'name' => 'record_handle',
@@ -6902,31 +6867,31 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '85750',
+                                         'Return' => '85359',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '87912' => {
+                            '87521' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79277'
+                                                               'type' => '78886'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '88067' => {
+                            '87676' => {
                                          'Header' => 'pdr.h',
-                                         'Return' => '79277',
+                                         'Return' => '78886',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '88139' => {
+                            '87748' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '79277'
+                                                               'type' => '78886'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -6952,6 +6917,37 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_check'
                                        },
+                            '88182' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '78886'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'data',
+                                                               'type' => '6087'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'size',
+                                                               'type' => '180'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'record_handle',
+                                                               'type' => '180'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'is_remote',
+                                                               'type' => '6265'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '4895'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_add'
+                                       },
                             '8832' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6979,36 +6975,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '88573' => {
-                                         'Header' => 'pdr.h',
+                            '89688' => {
+                                         'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '79277'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'data',
-                                                               'type' => '6087'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'size',
+                                                               'name' => 'dec',
                                                                'type' => '180'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'record_handle',
-                                                               'type' => '180'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6265'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '4895'
                                                              }
                                                     },
                                          'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_add'
+                                         'ShortName' => 'dec2bcd32'
                                        },
                             '8973' => {
                                         'Header' => 'bios.h',
@@ -7037,18 +7013,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '90079' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'dec',
-                                                               'type' => '180'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'dec2bcd32'
-                                       },
-                            '90171' => {
+                            '89780' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7059,7 +7024,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
-                            '90581' => {
+                            '90190' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7078,7 +7043,7 @@
                                          'Return' => '12204',
                                          'ShortName' => 'ver2str'
                                        },
-                            '90709' => {
+                            '90318' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7093,6 +7058,25 @@
                                          'Return' => '168',
                                          'ShortName' => 'crc8'
                                        },
+                            '91589' => {
+                                         'Header' => 'instance-id.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'ctx',
+                                                               'type' => '91797'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'tid',
+                                                               'type' => '90914'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'iid',
+                                                               'type' => '90926'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_instance_id_free'
+                                       },
                             '9179' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7128,72 +7112,53 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '91980' => {
+                            '91802' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92188'
+                                                               'type' => '91797'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '91305'
+                                                               'type' => '90914'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '91317'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_instance_id_free'
-                                       },
-                            '92193' => {
-                                         'Header' => 'instance-id.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'ctx',
-                                                               'type' => '92188'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'tid',
-                                                               'type' => '91305'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'iid',
-                                                               'type' => '92594'
+                                                               'type' => '92203'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '92599' => {
+                            '92208' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92188'
+                                                               'type' => '91797'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '92684' => {
+                            '92293' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92770'
+                                                               'type' => '92379'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '92775' => {
+                            '92384' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92770'
+                                                               'type' => '92379'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7203,12 +7168,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init'
                                        },
-                            '93922' => {
+                            '93531' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93260'
+                                                               'type' => '92869'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7223,15 +7188,15 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '93369',
+                                         'Return' => '92978',
                                          'ShortName' => 'pldm_send'
                                        },
-                            '94338' => {
+                            '93947' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93260'
+                                                               'type' => '92869'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7254,9 +7219,36 @@
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '93369',
+                                         'Return' => '92978',
                                          'ShortName' => 'pldm_send_recv'
                                        },
+                            '94423' => {
+                                         'Header' => 'pldm.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'eid',
+                                                               'type' => '92869'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'mctp_fd',
+                                                               'type' => '74'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'pldm_resp_msg',
+                                                               'type' => '68712'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'resp_msg_len',
+                                                               'type' => '8822'
+                                                             }
+                                                    },
+                                         'Return' => '92978',
+                                         'ShortName' => 'pldm_recv'
+                                       },
                             '9456' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7276,39 +7268,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_date_time_resp'
                                       },
-                            '94814' => {
+                            '94646' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93260'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'mctp_fd',
-                                                               'type' => '74'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'pldm_resp_msg',
-                                                               'type' => '68712'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'resp_msg_len',
-                                                               'type' => '8822'
-                                                             }
-                                                    },
-                                         'Return' => '93369',
-                                         'ShortName' => 'pldm_recv'
-                                       },
-                            '95037' => {
-                                         'Header' => 'pldm.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'eid',
-                                                               'type' => '93260'
+                                                               'type' => '92869'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7323,9 +7288,14 @@
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '93369',
+                                         'Return' => '92978',
                                          'ShortName' => 'pldm_recv_any'
                                        },
+                            '95088' => {
+                                         'Header' => 'pldm.h',
+                                         'Return' => '92978',
+                                         'ShortName' => 'pldm_open'
+                                       },
                             '9534' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7349,11 +7319,6 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_date_time_resp'
                                       },
-                            '95479' => {
-                                         'Header' => 'pldm.h',
-                                         'Return' => '93369',
-                                         'ShortName' => 'pldm_open'
-                                       },
                             '9723' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7593,7 +7558,6 @@
                                                  'encode_write_file_resp' => 1,
                                                  'entity_association_tree_find' => 1,
                                                  'find_entity_ref_in_tree' => 1,
-                                                 'get_fru_record_by_option' => 1,
                                                  'get_fru_record_by_option_check' => 1,
                                                  'is_present' => 1,
                                                  'is_time_legal' => 1,
@@ -9520,8 +9484,8 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '76405' => {
-                                       'BaseType' => '76422',
+                          '76014' => {
+                                       'BaseType' => '76031',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -9529,13 +9493,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '76417' => {
-                                       'BaseType' => '76405',
+                          '76026' => {
+                                       'BaseType' => '76014',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '76422' => {
+                          '76031' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -9552,12 +9516,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '77494'
+                                                            'type' => '77103'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '77494'
+                                                            'type' => '77103'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -9565,8 +9529,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '76482' => {
-                                       'BaseType' => '76499',
+                          '76091' => {
+                                       'BaseType' => '76108',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -9574,13 +9538,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '76494' => {
-                                       'BaseType' => '76482',
+                          '76103' => {
+                                       'BaseType' => '76091',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '76499' => {
+                          '76108' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -9602,7 +9566,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '77482'
+                                                            'type' => '77091'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -9620,7 +9584,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '76583' => {
+                          '76192' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -9644,16 +9608,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '76640' => {
-                                       'BaseType' => '76583',
+                          '76249' => {
+                                       'BaseType' => '76192',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '76684' => {
-                                       'BaseType' => '76696',
+                          '76293' => {
+                                       'BaseType' => '76305',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -9661,14 +9625,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '76696' => {
+                          '76305' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '77499'
+                                                            'type' => '77108'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -9681,8 +9645,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '76739' => {
-                                       'BaseType' => '76756',
+                          '76348' => {
+                                       'BaseType' => '76365',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -9690,19 +9654,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '76756' => {
+                          '76365' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '76640'
+                                                            'type' => '76249'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '76640'
+                                                            'type' => '76249'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -9712,12 +9676,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '77499'
+                                                            'type' => '77108'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '77499'
+                                                            'type' => '77108'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -9730,56 +9694,56 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '77482' => {
-                                       'BaseType' => '76499',
+                          '77091' => {
+                                       'BaseType' => '76108',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '77494' => {
-                                       'BaseType' => '76482',
+                          '77103' => {
+                                       'BaseType' => '76091',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '77499' => {
-                                       'BaseType' => '76739',
+                          '77108' => {
+                                       'BaseType' => '76348',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '77924' => {
-                                       'BaseType' => '77929',
+                          '77533' => {
+                                       'BaseType' => '77538',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '77929' => {
-                                       'BaseType' => '76640',
+                          '77538' => {
+                                       'BaseType' => '76249',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '77999' => {
-                                       'BaseType' => '76684',
+                          '77608' => {
+                                       'BaseType' => '76293',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78278' => {
-                                       'BaseType' => '77499',
+                          '77887' => {
+                                       'BaseType' => '77108',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79023' => {
-                                       'BaseType' => '76417',
+                          '78632' => {
+                                       'BaseType' => '76026',
                                        'Name' => 'pldm_pdr const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79277' => {
-                                       'BaseType' => '76405',
+                          '78886' => {
+                                       'BaseType' => '76014',
                                        'Name' => 'pldm_pdr*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9820,8 +9784,8 @@
                                      'Size' => '4',
                                      'Type' => 'Struct'
                                    },
-                          '85750' => {
-                                       'BaseType' => '76494',
+                          '85359' => {
+                                       'BaseType' => '76103',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -9878,7 +9842,7 @@
                                      'Size' => '8',
                                      'Type' => 'Struct'
                                    },
-                          '91305' => {
+                          '90914' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -9886,7 +9850,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '91317' => {
+                          '90926' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -9894,14 +9858,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '91694' => {
+                          '91303' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '91317'
+                                                            'type' => '90926'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -9914,14 +9878,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '91733' => {
+                          '91342' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '91775'
+                                                            'type' => '91384'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -9934,31 +9898,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '91775' => {
-                                       'BaseType' => '91694',
+                          '91384' => {
+                                       'BaseType' => '91303',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '92188' => {
-                                       'BaseType' => '91733',
+                          '91797' => {
+                                       'BaseType' => '91342',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '92594' => {
-                                       'BaseType' => '91317',
+                          '92203' => {
+                                       'BaseType' => '90926',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '92770' => {
-                                       'BaseType' => '92188',
+                          '92379' => {
+                                       'BaseType' => '91797',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93260' => {
+                          '92869' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -9966,7 +9930,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93272' => {
+                          '92881' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10027,8 +9991,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '93369' => {
-                                       'BaseType' => '93272',
+                          '92978' => {
+                                       'BaseType' => '92881',
                                        'Header' => 'pldm.h',
                                        'Line' => '28',
                                        'Name' => 'pldm_requester_rc_t',
diff --git a/abi/x86_64/gcc.dump b/abi/x86_64/gcc.dump
index 1b270a9..49b030d 100644
--- a/abi/x86_64/gcc.dump
+++ b/abi/x86_64/gcc.dump
@@ -165,7 +165,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_date_time_resp'
                                        },
-                            '109653' => {
+                            '109267' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -184,7 +184,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '109853' => {
+                            '109467' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -234,7 +234,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '110085' => {
+                            '109699' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -258,6 +258,71 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
+                            '109800' => {
+                                          'Header' => 'file_io.h',
+                                          'Param' => {
+                                                       '0' => {
+                                                                'name' => 'instance_id',
+                                                                'type' => '168'
+                                                              },
+                                                       '1' => {
+                                                                'name' => 'file_type',
+                                                                'type' => '5053'
+                                                              },
+                                                       '2' => {
+                                                                'name' => 'file_handle',
+                                                                'type' => '180'
+                                                              },
+                                                       '3' => {
+                                                                'name' => 'length',
+                                                                'type' => '46642'
+                                                              },
+                                                       '4' => {
+                                                                'name' => 'file_meta_data_1',
+                                                                'type' => '180'
+                                                              },
+                                                       '5' => {
+                                                                'name' => 'file_meta_data_2',
+                                                                'type' => '180'
+                                                              },
+                                                       '6' => {
+                                                                'name' => 'file_meta_data_3',
+                                                                'offset' => '0',
+                                                                'type' => '180'
+                                                              },
+                                                       '7' => {
+                                                                'name' => 'file_meta_data_4',
+                                                                'offset' => '8',
+                                                                'type' => '180'
+                                                              },
+                                                       '8' => {
+                                                                'name' => 'msg',
+                                                                'offset' => '16',
+                                                                'type' => '1632'
+                                                              }
+                                                     },
+                                          'Return' => '74',
+                                          'ShortName' => 'encode_new_file_with_metadata_req'
+                                        },
+                            '110097' => {
+                                          'Header' => 'file_io.h',
+                                          'Param' => {
+                                                       '0' => {
+                                                                'name' => 'instance_id',
+                                                                'type' => '168'
+                                                              },
+                                                       '1' => {
+                                                                'name' => 'completion_code',
+                                                                'type' => '168'
+                                                              },
+                                                       '2' => {
+                                                                'name' => 'msg',
+                                                                'type' => '1632'
+                                                              }
+                                                     },
+                                          'Return' => '74',
+                                          'ShortName' => 'encode_file_ack_with_meta_data_resp'
+                                        },
                             '11016' => {
                                          'Header' => 'bios.h',
                                          'Param' => {
@@ -304,72 +369,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '110186' => {
-                                          'Header' => 'file_io.h',
-                                          'Param' => {
-                                                       '0' => {
-                                                                'name' => 'instance_id',
-                                                                'type' => '168'
-                                                              },
-                                                       '1' => {
-                                                                'name' => 'file_type',
-                                                                'type' => '5053'
-                                                              },
-                                                       '2' => {
-                                                                'name' => 'file_handle',
-                                                                'type' => '180'
-                                                              },
-                                                       '3' => {
-                                                                'name' => 'length',
-                                                                'type' => '46642'
-                                                              },
-                                                       '4' => {
-                                                                'name' => 'file_meta_data_1',
-                                                                'type' => '180'
-                                                              },
-                                                       '5' => {
-                                                                'name' => 'file_meta_data_2',
-                                                                'type' => '180'
-                                                              },
-                                                       '6' => {
-                                                                'name' => 'file_meta_data_3',
-                                                                'offset' => '0',
-                                                                'type' => '180'
-                                                              },
-                                                       '7' => {
-                                                                'name' => 'file_meta_data_4',
-                                                                'offset' => '8',
-                                                                'type' => '180'
-                                                              },
-                                                       '8' => {
-                                                                'name' => 'msg',
-                                                                'offset' => '16',
-                                                                'type' => '1632'
-                                                              }
-                                                     },
-                                          'Return' => '74',
-                                          'ShortName' => 'encode_new_file_with_metadata_req'
-                                        },
-                            '110483' => {
-                                          'Header' => 'file_io.h',
-                                          'Param' => {
-                                                       '0' => {
-                                                                'name' => 'instance_id',
-                                                                'type' => '168'
-                                                              },
-                                                       '1' => {
-                                                                'name' => 'completion_code',
-                                                                'type' => '168'
-                                                              },
-                                                       '2' => {
-                                                                'name' => 'msg',
-                                                                'type' => '1632'
-                                                              }
-                                                     },
-                                          'Return' => '74',
-                                          'ShortName' => 'encode_file_ack_with_meta_data_resp'
-                                        },
-                            '110678' => {
+                            '110292' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -419,7 +419,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '110890' => {
+                            '110504' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -443,7 +443,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '110986' => {
+                            '110600' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -489,7 +489,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '111283' => {
+                            '110897' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -513,7 +513,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '111384' => {
+                            '110998' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -540,7 +540,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '111619' => {
+                            '111233' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -559,7 +559,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '111809' => {
+                            '111423' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -590,7 +590,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '111951' => {
+                            '111565' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -619,7 +619,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '112066' => {
+                            '111680' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -655,7 +655,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '112336' => {
+                            '111950' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -682,7 +682,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '112566' => {
+                            '112180' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -717,7 +717,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '112728' => {
+                            '112342' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -741,7 +741,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '112829' => {
+                            '112443' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -768,22 +768,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '11299' => {
-                                         'Header' => 'bios.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_date_time_req'
-                                       },
-                            '113064' => {
+                            '112678' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -802,7 +787,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '113254' => {
+                            '112868' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -833,7 +818,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '113396' => {
+                            '11299' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '113010' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -862,7 +862,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '113511' => {
+                            '113125' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -903,7 +903,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '113796' => {
+                            '113410' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -930,7 +930,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '114026' => {
+                            '113640' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -970,7 +970,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '114203' => {
+                            '113817' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -993,7 +993,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '114418' => {
+                            '114032' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1022,7 +1022,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '114528' => {
+                            '114142' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1049,7 +1049,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '114763' => {
+                            '114377' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1086,7 +1086,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '114918' => {
+                            '114532' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1109,7 +1109,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '115133' => {
+                            '114747' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1141,7 +1141,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '115269' => {
+                            '114883' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1168,7 +1168,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '115504' => {
+                            '115118' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1199,7 +1199,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '115639' => {
+                            '115253' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1239,7 +1239,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '115812' => {
+                            '115426' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1266,7 +1266,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '116038' => {
+                            '115652' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1302,7 +1302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '116335' => {
+                            '115949' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1333,7 +1333,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '116470' => {
+                            '116084' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1362,7 +1362,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '116579' => {
+                            '116193' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1398,7 +1398,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '116838' => {
+                            '116452' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1425,7 +1425,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '117059' => {
+                            '116673' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1460,7 +1460,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '118026' => {
+                            '117640' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1491,7 +1491,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '118274' => {
+                            '117888' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1515,7 +1515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '118357' => {
+                            '117971' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1546,7 +1546,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '118496' => {
+                            '118110' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1569,7 +1569,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '119565' => {
+                            '119179' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -5938,7 +5938,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_resp'
                                       },
-                            '73102' => {
+                            '73057' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5965,7 +5965,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_set_fru_record_table_resp'
                                        },
-                            '73342' => {
+                            '73297' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -5996,7 +5996,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_set_fru_record_table_req'
                                        },
-                            '73509' => {
+                            '73464' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6032,7 +6032,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp'
                                        },
-                            '73739' => {
+                            '73694' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6073,7 +6073,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_resp_safe'
                                        },
-                            '73987' => {
+                            '73942' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6100,7 +6100,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_req'
                                        },
-                            '74222' => {
+                            '74177' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6135,7 +6135,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_resp'
                                        },
-                            '74389' => {
+                            '74344' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6176,7 +6176,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_by_option_resp'
                                        },
-                            '74707' => {
+                            '74662' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6221,7 +6221,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_by_option_req'
                                        },
-                            '74909' => {
+                            '74864' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6298,7 +6298,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_set_bios_attribute_current_value_req'
                                       },
-                            '75206' => {
+                            '75161' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6334,43 +6334,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'get_fru_record_by_option_check'
                                        },
-                            '75629' => {
-                                         'Header' => 'fru.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'table',
-                                                               'type' => '6245'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'table_size',
-                                                               'type' => '123'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'record_table',
-                                                               'type' => '2082'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'record_size',
-                                                               'type' => '9084'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'rsi',
-                                                               'type' => '5053'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'rt',
-                                                               'type' => '168'
-                                                             },
-                                                      '6' => {
-                                                               'name' => 'ft',
-                                                               'offset' => '0',
-                                                               'type' => '168'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'get_fru_record_by_option'
-                                       },
-                            '76055' => {
+                            '75669' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6416,7 +6380,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_fru_record'
                                        },
-                            '76303' => {
+                            '75917' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6443,7 +6407,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_resp'
                                        },
-                            '76524' => {
+                            '76138' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6472,36 +6436,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_req'
                                        },
-                            '7662' => {
-                                        'Header' => 'bios.h',
-                                        'Param' => {
-                                                     '0' => {
-                                                              'name' => 'msg',
-                                                              'type' => '2077'
-                                                            },
-                                                     '1' => {
-                                                              'name' => 'payload_length',
-                                                              'type' => '123'
-                                                            },
-                                                     '2' => {
-                                                              'name' => 'completion_code',
-                                                              'type' => '2082'
-                                                            },
-                                                     '3' => {
-                                                              'name' => 'next_transfer_handle',
-                                                              'type' => '2087'
-                                                            }
-                                                   },
-                                        'Reg' => {
-                                                   '0' => 'rdi',
-                                                   '1' => 'rsi',
-                                                   '2' => 'rdx',
-                                                   '3' => 'rcx'
-                                                 },
-                                        'Return' => '74',
-                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
-                                      },
-                            '76628' => {
+                            '76242' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6552,7 +6487,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_fru_record_table_metadata_resp'
                                        },
-                            '76931' => {
+                            '76545' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6607,7 +6542,36 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_fru_record_table_metadata_resp'
                                        },
-                            '77141' => {
+                            '7662' => {
+                                        'Header' => 'bios.h',
+                                        'Param' => {
+                                                     '0' => {
+                                                              'name' => 'msg',
+                                                              'type' => '2077'
+                                                            },
+                                                     '1' => {
+                                                              'name' => 'payload_length',
+                                                              'type' => '123'
+                                                            },
+                                                     '2' => {
+                                                              'name' => 'completion_code',
+                                                              'type' => '2082'
+                                                            },
+                                                     '3' => {
+                                                              'name' => 'next_transfer_handle',
+                                                              'type' => '2087'
+                                                            }
+                                                   },
+                                        'Reg' => {
+                                                   '0' => 'rdi',
+                                                   '1' => 'rsi',
+                                                   '2' => 'rdx',
+                                                   '3' => 'rcx'
+                                                 },
+                                        'Return' => '74',
+                                        'ShortName' => 'decode_set_bios_attribute_current_value_resp'
+                                      },
+                            '76755' => {
                                          'Header' => 'fru.h',
                                          'Param' => {
                                                       '0' => {
@@ -6662,7 +6626,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_set_bios_attribute_current_value_req'
                                       },
-                            '78784' => {
+                            '78398' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6679,18 +6643,18 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'entities',
-                                                               'type' => '79097'
+                                                               'type' => '78711'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_extract'
                                        },
-                            '79117' => {
+                            '78731' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79166'
+                                                               'type' => '78780'
                                                              }
                                                     },
                                          'Reg' => {
@@ -6699,64 +6663,64 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_empty_entity_assoc_tree'
                                        },
-                            '79171' => {
+                            '78785' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79166'
+                                                               'type' => '78780'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy_root'
                                        },
-                            '79234' => {
+                            '78848' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'org_tree',
-                                                               'type' => '79166'
+                                                               'type' => '78780'
                                                              },
                                                       '1' => {
                                                                'name' => 'new_tree',
-                                                               'type' => '79166'
+                                                               'type' => '78780'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_copy_root'
                                        },
-                            '79450' => {
+                            '79064' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79166'
+                                                               'type' => '78780'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79102'
+                                                               'type' => '78716'
                                                              }
                                                     },
-                                         'Return' => '78672',
+                                         'Return' => '78286',
                                          'ShortName' => 'pldm_entity_association_tree_find'
                                        },
-                            '80232' => {
+                            '79846' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80481'
+                                                               'type' => '80095'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_remote_pdrs'
                                        },
-                            '80486' => {
+                            '80100' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80481'
+                                                               'type' => '80095'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -6766,6 +6730,25 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_remove_pdrs_by_terminus_handle'
                                        },
+                            '80369' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '78780'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'entity',
+                                                               'type' => '77427'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'node',
+                                                               'type' => '79059'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_find_entity_ref_in_tree'
+                                       },
                             '8072' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6802,39 +6785,20 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_current_value_by_handle_resp'
                                       },
-                            '80755' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '79166'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'entity',
-                                                               'type' => '77813'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'node',
-                                                               'type' => '79445'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_find_entity_ref_in_tree'
-                                       },
-                            '81267' => {
+                            '80881' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78672'
+                                                               'type' => '78286'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80481'
+                                                               'type' => '80095'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '79097'
+                                                               'type' => '78711'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6852,20 +6816,20 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '81485' => {
+                            '81099' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78672'
+                                                               'type' => '78286'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80481'
+                                                               'type' => '80095'
                                                              },
                                                       '2' => {
                                                                'name' => 'entities',
-                                                               'type' => '79097'
+                                                               'type' => '78711'
                                                              },
                                                       '3' => {
                                                                'name' => 'num_entities',
@@ -6883,16 +6847,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node'
                                        },
-                            '81821' => {
+                            '81435' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79166'
+                                                               'type' => '78780'
                                                              },
                                                       '1' => {
                                                                'name' => 'repo',
-                                                               'type' => '80481'
+                                                               'type' => '80095'
                                                              },
                                                       '2' => {
                                                                'name' => 'is_remote',
@@ -6906,16 +6870,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add'
                                        },
-                            '83293' => {
+                            '82907' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'parent',
-                                                               'type' => '78672'
+                                                               'type' => '78286'
                                                              },
                                                       '1' => {
                                                                'name' => 'node',
-                                                               'type' => '79102'
+                                                               'type' => '78716'
                                                              }
                                                     },
                                          'Reg' => {
@@ -6924,12 +6888,12 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '83382' => {
+                            '82996' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78672'
+                                                               'type' => '78286'
                                                              },
                                                       '1' => {
                                                                'name' => 'association_type',
@@ -6939,28 +6903,50 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '83597' => {
+                            '83211' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78672'
+                                                               'type' => '78286'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '83752' => {
+                            '83366' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78672'
+                                                               'type' => '78286'
                                                              }
                                                     },
-                                         'Return' => '77813',
+                                         'Return' => '77427',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
+                            '83521' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '78286'
+                                                             }
+                                                    },
+                                         'Return' => '6423',
+                                         'ShortName' => 'pldm_entity_is_node_parent'
+                                       },
+                            '83676' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '78780'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_tree_destroy'
+                                       },
                             '8379' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6992,38 +6978,16 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '83907' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '78672'
-                                                             }
-                                                    },
-                                         'Return' => '6423',
-                                         'ShortName' => 'pldm_entity_is_node_parent'
-                                       },
-                            '84062' => {
+                            '83855' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79166'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_tree_destroy'
-                                       },
-                            '84241' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '79166'
+                                                               'type' => '78780'
                                                              },
                                                       '1' => {
                                                                'name' => 'entities',
-                                                               'type' => '79097'
+                                                               'type' => '78711'
                                                              },
                                                       '2' => {
                                                                'name' => 'size',
@@ -7033,16 +6997,16 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_visit'
                                        },
-                            '85203' => {
+                            '84817' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'tree',
-                                                               'type' => '79166'
+                                                               'type' => '78780'
                                                              },
                                                       '1' => {
                                                                'name' => 'entity',
-                                                               'type' => '79102'
+                                                               'type' => '78716'
                                                              },
                                                       '2' => {
                                                                'name' => 'entity_instance_number',
@@ -7050,16 +7014,21 @@
                                                              },
                                                       '3' => {
                                                                'name' => 'parent',
-                                                               'type' => '78672'
+                                                               'type' => '78286'
                                                              },
                                                       '4' => {
                                                                'name' => 'association_type',
                                                                'type' => '168'
                                                              }
                                                     },
-                                         'Return' => '78672',
+                                         'Return' => '78286',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
+                            '85250' => {
+                                         'Header' => 'pdr.h',
+                                         'Return' => '78780',
+                                         'ShortName' => 'pldm_entity_association_tree_init'
+                                       },
                             '8531' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7095,28 +7064,23 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '85636' => {
-                                         'Header' => 'pdr.h',
-                                         'Return' => '79166',
-                                         'ShortName' => 'pldm_entity_association_tree_init'
-                                       },
-                            '85870' => {
+                            '85484' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'node',
-                                                               'type' => '78672'
+                                                               'type' => '78286'
                                                              }
                                                     },
-                                         'Return' => '77813',
+                                         'Return' => '77427',
                                          'ShortName' => 'pldm_entity_extract'
                                        },
-                            '86665' => {
+                            '86279' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80227'
+                                                               'type' => '79841'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7138,6 +7102,37 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
+                            '86639' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '79841'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'fru_rsi',
+                                                               'type' => '5053'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '8521'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'entity_type',
+                                                               'type' => '8521'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'entity_instance_num',
+                                                               'type' => '8521'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'container_id',
+                                                               'type' => '8521'
+                                                             }
+                                                    },
+                                         'Return' => '86624',
+                                         'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
+                                       },
                             '8693' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7165,43 +7160,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '87025' => {
+                            '86993' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80227'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'fru_rsi',
-                                                               'type' => '5053'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '8521'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'entity_type',
-                                                               'type' => '8521'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'entity_instance_num',
-                                                               'type' => '8521'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'container_id',
-                                                               'type' => '8521'
-                                                             }
-                                                    },
-                                         'Return' => '87010',
-                                         'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
-                                       },
-                            '87379' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80481'
+                                                               'type' => '80095'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7232,12 +7196,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '87717' => {
+                            '87331' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80481'
+                                                               'type' => '80095'
                                                              },
                                                       '1' => {
                                                                'name' => 'terminus_handle',
@@ -7267,60 +7231,60 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set'
                                        },
-                            '88070' => {
+                            '87684' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '87010'
+                                                               'type' => '86624'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '88225' => {
+                            '87839' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80227'
+                                                               'type' => '79841'
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '87010'
+                                                               'type' => '86624'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
-                            '88443' => {
+                            '88057' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80227'
+                                                               'type' => '79841'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '88574' => {
+                            '88188' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80227'
+                                                               'type' => '79841'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '88705' => {
+                            '88319' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80227'
+                                                               'type' => '79841'
                                                              },
                                                       '1' => {
                                                                'name' => 'pdr_type',
@@ -7328,7 +7292,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '87010'
+                                                               'type' => '86624'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
@@ -7344,19 +7308,19 @@
                                                     '3' => 'rcx',
                                                     '4' => 'r8'
                                                   },
-                                         'Return' => '87010',
+                                         'Return' => '86624',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
-                            '88877' => {
+                            '88491' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80227'
+                                                               'type' => '79841'
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '87010'
+                                                               'type' => '86624'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
@@ -7371,15 +7335,15 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '87010',
+                                         'Return' => '86624',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '89044' => {
+                            '88658' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80227'
+                                                               'type' => '79841'
                                                              },
                                                       '1' => {
                                                                'name' => 'record_handle',
@@ -7398,20 +7362,56 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '87010',
+                                         'Return' => '86624',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '89212' => {
+                            '88826' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80481'
+                                                               'type' => '80095'
                                                              }
                                                     },
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
+                            '88981' => {
+                                         'Header' => 'pdr.h',
+                                         'Return' => '80095',
+                                         'ShortName' => 'pldm_pdr_init'
+                                       },
+                            '89053' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '80095'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'data',
+                                                               'type' => '6245'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'size',
+                                                               'type' => '180'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'is_remote',
+                                                               'type' => '6423'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'terminus_handle',
+                                                               'type' => '5053'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'record_handle',
+                                                               'type' => '2087'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_pdr_add_check'
+                                       },
                             '8922' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7447,48 +7447,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '89367' => {
-                                         'Header' => 'pdr.h',
-                                         'Return' => '80481',
-                                         'ShortName' => 'pldm_pdr_init'
-                                       },
-                            '89439' => {
+                            '89491' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'repo',
-                                                               'type' => '80481'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'data',
-                                                               'type' => '6245'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'size',
-                                                               'type' => '180'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6423'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '5053'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'record_handle',
-                                                               'type' => '2087'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_pdr_add_check'
-                                       },
-                            '89877' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80481'
+                                                               'type' => '80095'
                                                              },
                                                       '1' => {
                                                                'name' => 'data',
@@ -7545,7 +7509,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '91376' => {
+                            '90990' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7556,7 +7520,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '91505' => {
+                            '91119' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7567,7 +7531,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
-                            '91906' => {
+                            '91520' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7589,7 +7553,7 @@
                                          'Return' => '12557',
                                          'ShortName' => 'ver2str'
                                        },
-                            '92034' => {
+                            '91648' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7631,72 +7595,72 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '93292' => {
+                            '92906' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93515'
+                                                               'type' => '93129'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '92614'
+                                                               'type' => '92228'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '92626'
+                                                               'type' => '92240'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '93520' => {
+                            '93134' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93515'
+                                                               'type' => '93129'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '92614'
+                                                               'type' => '92228'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '93941'
+                                                               'type' => '93555'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '93946' => {
+                            '93560' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93515'
+                                                               'type' => '93129'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '94031' => {
+                            '93645' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94117'
+                                                               'type' => '93731'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '94122' => {
+                            '93736' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '94117'
+                                                               'type' => '93731'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7742,12 +7706,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '95295' => {
+                            '94909' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94633'
+                                                               'type' => '94247'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7762,15 +7726,15 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '94742',
+                                         'Return' => '94356',
                                          'ShortName' => 'pldm_send'
                                        },
-                            '95714' => {
+                            '95328' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94633'
+                                                               'type' => '94247'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7793,15 +7757,15 @@
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '94742',
+                                         'Return' => '94356',
                                          'ShortName' => 'pldm_send_recv'
                                        },
-                            '96197' => {
+                            '95811' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94633'
+                                                               'type' => '94247'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7820,15 +7784,15 @@
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '94742',
+                                         'Return' => '94356',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '96423' => {
+                            '96037' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '94633'
+                                                               'type' => '94247'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7843,12 +7807,12 @@
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '94742',
+                                         'Return' => '94356',
                                          'ShortName' => 'pldm_recv_any'
                                        },
-                            '96868' => {
+                            '96482' => {
                                          'Header' => 'pldm.h',
-                                         'Return' => '94742',
+                                         'Return' => '94356',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9755' => {
@@ -8098,7 +8062,6 @@
                                                  'encode_write_file_resp' => 1,
                                                  'entity_association_tree_find' => 1,
                                                  'find_entity_ref_in_tree' => 1,
-                                                 'get_fru_record_by_option' => 1,
                                                  'get_fru_record_by_option_check' => 1,
                                                  'is_present' => 1,
                                                  'is_time_legal' => 1,
@@ -10025,8 +9988,8 @@
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '77578' => {
-                                       'BaseType' => '77595',
+                          '77192' => {
+                                       'BaseType' => '77209',
                                        'Header' => undef,
                                        'Line' => '15',
                                        'Name' => 'pldm_pdr',
@@ -10034,13 +9997,13 @@
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '77590' => {
-                                       'BaseType' => '77578',
+                          '77204' => {
+                                       'BaseType' => '77192',
                                        'Name' => 'pldm_pdr const',
                                        'Size' => '24',
                                        'Type' => 'Const'
                                      },
-                          '77595' => {
+                          '77209' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
@@ -10057,12 +10020,12 @@
                                                    '2' => {
                                                             'name' => 'first',
                                                             'offset' => '8',
-                                                            'type' => '78667'
+                                                            'type' => '78281'
                                                           },
                                                    '3' => {
                                                             'name' => 'last',
                                                             'offset' => '22',
-                                                            'type' => '78667'
+                                                            'type' => '78281'
                                                           }
                                                  },
                                        'Name' => 'struct pldm_pdr',
@@ -10070,8 +10033,8 @@
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '77655' => {
-                                       'BaseType' => '77672',
+                          '77269' => {
+                                       'BaseType' => '77286',
                                        'Header' => undef,
                                        'Line' => '20',
                                        'Name' => 'pldm_pdr_record',
@@ -10079,13 +10042,13 @@
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '77667' => {
-                                       'BaseType' => '77655',
+                          '77281' => {
+                                       'BaseType' => '77269',
                                        'Name' => 'pldm_pdr_record const',
                                        'Size' => '32',
                                        'Type' => 'Const'
                                      },
-                          '77672' => {
+                          '77286' => {
                                        'Header' => undef,
                                        'Line' => '9',
                                        'Memb' => {
@@ -10107,7 +10070,7 @@
                                                    '3' => {
                                                             'name' => 'next',
                                                             'offset' => '22',
-                                                            'type' => '78655'
+                                                            'type' => '78269'
                                                           },
                                                    '4' => {
                                                             'name' => 'is_remote',
@@ -10125,7 +10088,7 @@
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '77756' => {
+                          '77370' => {
                                        'Header' => 'pdr.h',
                                        'Line' => '310',
                                        'Memb' => {
@@ -10149,16 +10112,16 @@
                                        'Size' => '6',
                                        'Type' => 'Struct'
                                      },
-                          '77813' => {
-                                       'BaseType' => '77756',
+                          '77427' => {
+                                       'BaseType' => '77370',
                                        'Header' => 'pdr.h',
                                        'Line' => '314',
                                        'Name' => 'pldm_entity',
                                        'Size' => '6',
                                        'Type' => 'Typedef'
                                      },
-                          '77857' => {
-                                       'BaseType' => '77869',
+                          '77471' => {
+                                       'BaseType' => '77483',
                                        'Header' => undef,
                                        'Line' => '324',
                                        'Name' => 'pldm_entity_association_tree',
@@ -10166,14 +10129,14 @@
                                        'Size' => '16',
                                        'Type' => 'Typedef'
                                      },
-                          '77869' => {
+                          '77483' => {
                                        'Header' => undef,
                                        'Line' => '452',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
                                                             'offset' => '0',
-                                                            'type' => '78672'
+                                                            'type' => '78286'
                                                           },
                                                    '1' => {
                                                             'name' => 'last_used_container_id',
@@ -10186,8 +10149,8 @@
                                        'Size' => '16',
                                        'Type' => 'Struct'
                                      },
-                          '77912' => {
-                                       'BaseType' => '77929',
+                          '77526' => {
+                                       'BaseType' => '77543',
                                        'Header' => undef,
                                        'Line' => '329',
                                        'Name' => 'pldm_entity_node',
@@ -10195,19 +10158,19 @@
                                        'Size' => '40',
                                        'Type' => 'Typedef'
                                      },
-                          '77929' => {
+                          '77543' => {
                                        'Header' => undef,
                                        'Line' => '457',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
                                                             'offset' => '0',
-                                                            'type' => '77813'
+                                                            'type' => '77427'
                                                           },
                                                    '1' => {
                                                             'name' => 'parent',
                                                             'offset' => '6',
-                                                            'type' => '77813'
+                                                            'type' => '77427'
                                                           },
                                                    '2' => {
                                                             'name' => 'remote_container_id',
@@ -10217,12 +10180,12 @@
                                                    '3' => {
                                                             'name' => 'first_child',
                                                             'offset' => '22',
-                                                            'type' => '78672'
+                                                            'type' => '78286'
                                                           },
                                                    '4' => {
                                                             'name' => 'next_sibling',
                                                             'offset' => '36',
-                                                            'type' => '78672'
+                                                            'type' => '78286'
                                                           },
                                                    '5' => {
                                                             'name' => 'association_type',
@@ -10235,56 +10198,56 @@
                                        'Size' => '40',
                                        'Type' => 'Struct'
                                      },
-                          '78655' => {
-                                       'BaseType' => '77672',
+                          '78269' => {
+                                       'BaseType' => '77286',
                                        'Name' => 'struct pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78667' => {
-                                       'BaseType' => '77655',
+                          '78281' => {
+                                       'BaseType' => '77269',
                                        'Name' => 'pldm_pdr_record*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '78672' => {
-                                       'BaseType' => '77912',
+                          '78286' => {
+                                       'BaseType' => '77526',
                                        'Name' => 'pldm_entity_node*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79097' => {
-                                       'BaseType' => '79102',
+                          '78711' => {
+                                       'BaseType' => '78716',
                                        'Name' => 'pldm_entity**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79102' => {
-                                       'BaseType' => '77813',
+                          '78716' => {
+                                       'BaseType' => '77427',
                                        'Name' => 'pldm_entity*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79166' => {
-                                       'BaseType' => '77857',
+                          '78780' => {
+                                       'BaseType' => '77471',
                                        'Name' => 'pldm_entity_association_tree*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '79445' => {
-                                       'BaseType' => '78672',
+                          '79059' => {
+                                       'BaseType' => '78286',
                                        'Name' => 'pldm_entity_node**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80227' => {
-                                       'BaseType' => '77590',
+                          '79841' => {
+                                       'BaseType' => '77204',
                                        'Name' => 'pldm_pdr const*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '80481' => {
-                                       'BaseType' => '77578',
+                          '80095' => {
+                                       'BaseType' => '77192',
                                        'Name' => 'pldm_pdr*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
@@ -10325,18 +10288,18 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
+                          '86624' => {
+                                       'BaseType' => '77281',
+                                       'Name' => 'pldm_pdr_record const*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '869' => {
                                      'BaseType' => '830',
                                      'Name' => 'struct pldm_msg const',
                                      'Size' => '4',
                                      'Type' => 'Const'
                                    },
-                          '87010' => {
-                                       'BaseType' => '77667',
-                                       'Name' => 'pldm_pdr_record const*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
                           '874' => {
                                      'BaseType' => '168',
                                      'Name' => 'uint8_t[1]',
@@ -10383,7 +10346,7 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '92614' => {
+                          '92228' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -10391,7 +10354,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92626' => {
+                          '92240' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -10399,14 +10362,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93006' => {
+                          '92620' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '92626'
+                                                            'type' => '92240'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -10419,14 +10382,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '93045' => {
+                          '92659' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '93087'
+                                                            'type' => '92701'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10439,31 +10402,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '93087' => {
-                                       'BaseType' => '93006',
+                          '92701' => {
+                                       'BaseType' => '92620',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '93515' => {
-                                       'BaseType' => '93045',
+                          '93129' => {
+                                       'BaseType' => '92659',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93941' => {
-                                       'BaseType' => '92626',
+                          '93555' => {
+                                       'BaseType' => '92240',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94117' => {
-                                       'BaseType' => '93515',
+                          '93731' => {
+                                       'BaseType' => '93129',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '94633' => {
+                          '94247' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10471,7 +10434,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '94645' => {
+                          '94259' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10532,8 +10495,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '94742' => {
-                                       'BaseType' => '94645',
+                          '94356' => {
+                                       'BaseType' => '94259',
                                        'Header' => 'pldm.h',
                                        'Line' => '28',
                                        'Name' => 'pldm_requester_rc_t',
diff --git a/include/libpldm/fru.h b/include/libpldm/fru.h
index d046805..a369b9d 100644
--- a/include/libpldm/fru.h
+++ b/include/libpldm/fru.h
@@ -452,19 +452,6 @@
 	uint8_t *completion_code, uint32_t *next_transfer_handle,
 	uint8_t *transfer_flag, struct variable_field *fru_structure_data);
 
-/** @brief Get FRU Record Table By Option
- *  @param[in] table - The source fru record table
- *  @param[in] table_size - Size of the source fru record table
- *  @param[out] record_table - Fru table fetched based on the input option
- *  @param[in/out] record_size - Size of the table fetched by fru record option
- *  @param[in] rsi - FRU record set identifier
- *  @param[in] rt - FRU record type
- *  @param[in] ft - FRU field type
- */
-void get_fru_record_by_option(const uint8_t *table, size_t table_size,
-			      uint8_t *record_table, size_t *record_size,
-			      uint16_t rsi, uint8_t rt, uint8_t ft);
-
 /** @brief Get FRU Record Table By Option or return an error
  *  @param[in] table - The source fru record table
  *  @param[in] table_size - Size of the source fru record table
diff --git a/src/fru.c b/src/fru.c
index 4f6c496..b0cb864 100644
--- a/src/fru.c
+++ b/src/fru.c
@@ -211,17 +211,6 @@
 							    table_size);
 }
 
-LIBPLDM_ABI_DEPRECATED
-void get_fru_record_by_option(const uint8_t *table, size_t table_size,
-			      uint8_t *record_table, size_t *record_size,
-			      uint16_t rsi, uint8_t rt, uint8_t ft)
-{
-	int rc = get_fru_record_by_option_check(table, table_size, record_table,
-						record_size, rsi, rt, ft);
-	(void)rc;
-	assert(rc == PLDM_SUCCESS);
-}
-
 LIBPLDM_ABI_STABLE
 int get_fru_record_by_option_check(const uint8_t *table, size_t table_size,
 				   uint8_t *record_table, size_t *record_size,