diff --git a/CHANGELOG.md b/CHANGELOG.md
index a371241..413a23d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
 7. pdr: Make is_present() static
 8. pdr: Remove pldm_pdr_add()
 9. pdr: Remove pldm_pdr_add_fru_record_set()
+10. pdr: Remove pldm_entity_association_pdr_add_from_node()
 
 ### Fixed
 
diff --git a/abi/aarch64/gcc.dump b/abi/aarch64/gcc.dump
index 6686218..599d423 100644
--- a/abi/aarch64/gcc.dump
+++ b/abi/aarch64/gcc.dump
@@ -115,6 +115,25 @@
                                          'Return' => '74',
                                          'ShortName' => 'decode_get_date_time_resp'
                                        },
+                            '106791' => {
+                                          'Header' => 'file_io.h',
+                                          'Param' => {
+                                                       '0' => {
+                                                                'name' => 'instance_id',
+                                                                'type' => '168'
+                                                              },
+                                                       '1' => {
+                                                                'name' => 'completion_code',
+                                                                'type' => '168'
+                                                              },
+                                                       '2' => {
+                                                                'name' => 'msg',
+                                                                'type' => '1615'
+                                                              }
+                                                     },
+                                          'Return' => '74',
+                                          'ShortName' => 'encode_new_file_with_metadata_resp'
+                                        },
                             '10693' => {
                                          'Header' => 'bios.h',
                                          'Param' => {
@@ -158,26 +177,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '107114' => {
-                                          'Header' => 'file_io.h',
-                                          'Param' => {
-                                                       '0' => {
-                                                                'name' => 'instance_id',
-                                                                'type' => '168'
-                                                              },
-                                                       '1' => {
-                                                                'name' => 'completion_code',
-                                                                'type' => '168'
-                                                              },
-                                                       '2' => {
-                                                                'name' => 'msg',
-                                                                'type' => '1615'
-                                                              }
-                                                     },
-                                          'Return' => '74',
-                                          'ShortName' => 'encode_new_file_with_metadata_resp'
-                                        },
-                            '107297' => {
+                            '106974' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -221,7 +221,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '107515' => {
+                            '107192' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -240,7 +240,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '107622' => {
+                            '107299' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -283,7 +283,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '107915' => {
+                            '107592' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -302,7 +302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '108093' => {
+                            '107770' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -346,7 +346,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '108291' => {
+                            '107968' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -365,7 +365,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '108393' => {
+                            '108070' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -408,7 +408,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
-                            '108686' => {
+                            '108363' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -427,7 +427,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_resp'
                                         },
-                            '108793' => {
+                            '108470' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -454,7 +454,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_req'
                                         },
-                            '109011' => {
+                            '108688' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -473,7 +473,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '109184' => {
+                            '108861' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -500,7 +500,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '109320' => {
+                            '108997' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -523,7 +523,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '109447' => {
+                            '109124' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -558,7 +558,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '109705' => {
+                            '109382' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -585,22 +585,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_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'
-                                       },
-                            '109918' => {
+                            '109595' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -631,7 +616,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '110068' => {
+                            '10972' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1615'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '109745' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -650,7 +650,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '110175' => {
+                            '109852' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -677,7 +677,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '110393' => {
+                            '110070' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -696,7 +696,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '110566' => {
+                            '110243' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -723,7 +723,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '110702' => {
+                            '110379' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -746,7 +746,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '110829' => {
+                            '110506' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -785,7 +785,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '111107' => {
+                            '110784' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -812,7 +812,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '111320' => {
+                            '110997' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -847,7 +847,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '111484' => {
+                            '111161' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -870,7 +870,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '111682' => {
+                            '111359' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -893,7 +893,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '111804' => {
+                            '111481' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -920,7 +920,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '112022' => {
+                            '111699' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -951,7 +951,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '112171' => {
+                            '111848' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -974,7 +974,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '112369' => {
+                            '112046' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1001,7 +1001,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '112499' => {
+                            '112176' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1028,7 +1028,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '112717' => {
+                            '112394' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1055,7 +1055,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '112846' => {
+                            '112523' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1090,7 +1090,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '113012' => {
+                            '112689' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1117,7 +1117,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '113221' => {
+                            '112898' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1152,7 +1152,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '113504' => {
+                            '113181' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1179,7 +1179,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '113633' => {
+                            '113310' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1202,7 +1202,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '113754' => {
+                            '113431' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1237,7 +1237,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '114001' => {
+                            '113678' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1264,7 +1264,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '114205' => {
+                            '113882' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1295,7 +1295,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '115151' => {
+                            '114828' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1326,7 +1326,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '115382' => {
+                            '115059' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1345,7 +1345,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '115470' => {
+                            '115147' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1372,7 +1372,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '115603' => {
+                            '115280' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1395,7 +1395,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '116642' => {
+                            '116319' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -6307,38 +6307,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '79893' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '77108'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'repo',
-                                                               'type' => '78886'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'entities',
-                                                               'type' => '77533'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'num_entities',
-                                                               'type' => '123'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6265'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '4895'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_pdr_add_from_node'
-                                       },
-                            '80375' => {
+                            '80046' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6388,7 +6357,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '81989' => {
+                            '81660' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6403,7 +6372,7 @@
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '82078' => {
+                            '81749' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6418,7 +6387,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '82293' => {
+                            '81964' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6429,7 +6398,7 @@
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '82448' => {
+                            '82119' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6440,7 +6409,7 @@
                                          'Return' => '76249',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
-                            '82603' => {
+                            '82274' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6451,7 +6420,7 @@
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_entity_is_node_parent'
                                        },
-                            '82758' => {
+                            '82429' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6462,7 +6431,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_destroy'
                                        },
-                            '82937' => {
+                            '82608' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6512,7 +6481,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '83869' => {
+                            '83540' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6539,12 +6508,12 @@
                                          'Return' => '77108',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
-                            '84306' => {
+                            '83977' => {
                                          'Header' => 'pdr.h',
                                          'Return' => '77608',
                                          'ShortName' => 'pldm_entity_association_tree_init'
                                        },
-                            '84540' => {
+                            '84211' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6582,7 +6551,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '85346' => {
+                            '85017' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6609,7 +6578,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
-                            '85686' => {
+                            '85357' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6637,10 +6606,10 @@
                                                                'type' => '8294'
                                                              }
                                                     },
-                                         'Return' => '85671',
+                                         'Return' => '85342',
                                          'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
                                        },
-                            '86017' => {
+                            '85688' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6675,18 +6644,18 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '86339' => {
+                            '86016' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '85671'
+                                                               'type' => '85342'
                                                              }
                                                     },
                                          'Return' => '6265',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '86494' => {
+                            '86171' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6695,13 +6664,13 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '85671'
+                                                               'type' => '85342'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
-                            '86707' => {
+                            '86384' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6712,6 +6681,44 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
+                            '86515' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '78632'
+                                                             }
+                                                    },
+                                         'Return' => '180',
+                                         'ShortName' => 'pldm_pdr_get_record_count'
+                                       },
+                            '86646' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'repo',
+                                                               'type' => '78632'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'pdr_type',
+                                                               'type' => '168'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'curr_record',
+                                                               'type' => '85342'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'data',
+                                                               'type' => '68712'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'size',
+                                                               'type' => '2039'
+                                                             }
+                                                    },
+                                         'Return' => '85342',
+                                         'ShortName' => 'pldm_pdr_find_record_by_type'
+                                       },
                             '8672' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6743,45 +6750,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '86838' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '78632'
-                                                             }
-                                                    },
-                                         'Return' => '180',
-                                         'ShortName' => 'pldm_pdr_get_record_count'
-                                       },
-                            '86969' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'repo',
-                                                               'type' => '78632'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'pdr_type',
-                                                               'type' => '168'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'curr_record',
-                                                               'type' => '85671'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'data',
-                                                               'type' => '68712'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'size',
-                                                               'type' => '2039'
-                                                             }
-                                                    },
-                                         'Return' => '85671',
-                                         'ShortName' => 'pldm_pdr_find_record_by_type'
-                                       },
-                            '87146' => {
+                            '86823' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6790,7 +6759,7 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '85671'
+                                                               'type' => '85342'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
@@ -6805,10 +6774,10 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '85671',
+                                         'Return' => '85342',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '87320' => {
+                            '86997' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6832,10 +6801,10 @@
                                                                'type' => '2039'
                                                              }
                                                     },
-                                         'Return' => '85671',
+                                         'Return' => '85342',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '87488' => {
+                            '87165' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6846,12 +6815,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '87643' => {
+                            '87320' => {
                                          'Header' => 'pdr.h',
                                          'Return' => '78886',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '87715' => {
+                            '87392' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6909,7 +6878,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '89135' => {
+                            '88812' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -6920,7 +6889,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '89227' => {
+                            '88904' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -6931,7 +6900,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
-                            '89637' => {
+                            '89314' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -6950,6 +6919,21 @@
                                          'Return' => '12204',
                                          'ShortName' => 'ver2str'
                                        },
+                            '89442' => {
+                                         'Header' => 'utils.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'data',
+                                                               'type' => '1434'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'size',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '168',
+                                         'ShortName' => 'crc8'
+                                       },
                             '8973' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6977,81 +6961,81 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '89765' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'data',
-                                                               'type' => '1434'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'size',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '168',
-                                         'ShortName' => 'crc8'
-                                       },
-                            '91036' => {
+                            '90713' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '91244'
+                                                               'type' => '90921'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '90361'
+                                                               'type' => '90038'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '90373'
+                                                               'type' => '90050'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
-                            '91249' => {
+                            '90926' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '91244'
+                                                               'type' => '90921'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '90361'
+                                                               'type' => '90038'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '91650'
+                                                               'type' => '91327'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_alloc'
                                        },
-                            '91655' => {
+                            '91332' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '91244'
+                                                               'type' => '90921'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '91740' => {
+                            '91417' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '91826'
+                                                               'type' => '91503'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
+                            '91508' => {
+                                         'Header' => 'instance-id.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'ctx',
+                                                               'type' => '91503'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'dbpath',
+                                                               'type' => '12199'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_instance_db_init'
+                                       },
                             '9179' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7087,27 +7071,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '91831' => {
-                                         'Header' => 'instance-id.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'ctx',
-                                                               'type' => '91826'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'dbpath',
-                                                               'type' => '12199'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_instance_db_init'
-                                       },
-                            '92978' => {
+                            '92655' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '92316'
+                                                               'type' => '91993'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7122,15 +7091,15 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '92425',
+                                         'Return' => '92102',
                                          'ShortName' => 'pldm_send'
                                        },
-                            '93394' => {
+                            '93071' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '92316'
+                                                               'type' => '91993'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7153,15 +7122,15 @@
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '92425',
+                                         'Return' => '92102',
                                          'ShortName' => 'pldm_send_recv'
                                        },
-                            '93870' => {
+                            '93547' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '92316'
+                                                               'type' => '91993'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7180,15 +7149,15 @@
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '92425',
+                                         'Return' => '92102',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '94093' => {
+                            '93770' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '92316'
+                                                               'type' => '91993'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7203,12 +7172,12 @@
                                                                'type' => '8822'
                                                              }
                                                     },
-                                         'Return' => '92425',
+                                         'Return' => '92102',
                                          'ShortName' => 'pldm_recv_any'
                                        },
-                            '94535' => {
+                            '94212' => {
                                          'Header' => 'pldm.h',
-                                         'Return' => '92425',
+                                         'Return' => '92102',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9456' => {
@@ -7552,7 +7521,6 @@
                                                  'pldm_bios_table_string_find_by_handle' => 1,
                                                  'pldm_bios_table_string_find_by_string' => 1,
                                                  'pldm_entity_association_pdr_add' => 1,
-                                                 'pldm_entity_association_pdr_add_from_node' => 1,
                                                  'pldm_entity_association_pdr_add_from_node_check' => 1,
                                                  'pldm_entity_association_pdr_extract' => 1,
                                                  'pldm_entity_association_tree_add' => 1,
@@ -9558,7 +9526,7 @@
                                      },
                           '76305' => {
                                        'Header' => undef,
-                                       'Line' => '429',
+                                       'Line' => '433',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
@@ -9587,7 +9555,7 @@
                                      },
                           '76365' => {
                                        'Header' => undef,
-                                       'Line' => '434',
+                                       'Line' => '438',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
@@ -9715,7 +9683,7 @@
                                      'Size' => '4',
                                      'Type' => 'Struct'
                                    },
-                          '85671' => {
+                          '85342' => {
                                        'BaseType' => '76103',
                                        'Name' => 'pldm_pdr_record const*',
                                        'Size' => '8',
@@ -9773,7 +9741,7 @@
                                      'Size' => '8',
                                      'Type' => 'Struct'
                                    },
-                          '90361' => {
+                          '90038' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -9781,7 +9749,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '90373' => {
+                          '90050' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -9789,14 +9757,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '90750' => {
+                          '90427' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '90373'
+                                                            'type' => '90050'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -9809,14 +9777,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '90789' => {
+                          '90466' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '90831'
+                                                            'type' => '90508'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -9829,31 +9797,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '90831' => {
-                                       'BaseType' => '90750',
+                          '90508' => {
+                                       'BaseType' => '90427',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '91244' => {
-                                       'BaseType' => '90789',
+                          '90921' => {
+                                       'BaseType' => '90466',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '91650' => {
-                                       'BaseType' => '90373',
+                          '91327' => {
+                                       'BaseType' => '90050',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '91826' => {
-                                       'BaseType' => '91244',
+                          '91503' => {
+                                       'BaseType' => '90921',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '92316' => {
+                          '91993' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -9861,7 +9829,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92328' => {
+                          '92005' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -9922,8 +9890,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '92425' => {
-                                       'BaseType' => '92328',
+                          '92102' => {
+                                       'BaseType' => '92005',
                                        '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 ad73721..9d4b9f0 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'
                                        },
-                            '108720' => {
+                            '108379' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -184,7 +184,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_resp'
                                         },
-                            '108920' => {
+                            '108579' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -234,7 +234,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_req'
                                         },
-                            '109152' => {
+                            '108811' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -258,7 +258,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_with_metadata_resp'
                                         },
-                            '109253' => {
+                            '108912' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -304,7 +304,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_with_metadata_req'
                                         },
-                            '109550' => {
+                            '109209' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -323,7 +323,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_resp'
                                         },
-                            '109745' => {
+                            '109404' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -373,7 +373,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_req'
                                         },
-                            '109957' => {
+                            '109616' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -397,7 +397,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_with_meta_data_resp'
                                         },
-                            '110053' => {
+                            '109712' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -443,6 +443,57 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_with_meta_data_req'
                                         },
+                            '110009' => {
+                                          'Header' => 'file_io.h',
+                                          'Param' => {
+                                                       '0' => {
+                                                                'name' => 'msg',
+                                                                'type' => '2077'
+                                                              },
+                                                       '1' => {
+                                                                'name' => 'payload_length',
+                                                                'type' => '123'
+                                                              },
+                                                       '2' => {
+                                                                'name' => 'completion_code',
+                                                                'type' => '2082'
+                                                              }
+                                                     },
+                                          'Reg' => {
+                                                     '0' => 'rdi',
+                                                     '1' => 'rsi',
+                                                     '2' => 'rdx'
+                                                   },
+                                          'Return' => '74',
+                                          'ShortName' => 'decode_file_ack_resp'
+                                        },
+                            '110110' => {
+                                          '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' => 'file_status',
+                                                                'type' => '168'
+                                                              },
+                                                       '4' => {
+                                                                'name' => 'msg',
+                                                                'type' => '1632'
+                                                              }
+                                                     },
+                                          'Return' => '74',
+                                          'ShortName' => 'encode_file_ack_req'
+                                        },
                             '11016' => {
                                          'Header' => 'bios.h',
                                          'Param' => {
@@ -489,58 +540,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'encode_get_date_time_resp'
                                        },
-                            '110350' => {
-                                          'Header' => 'file_io.h',
-                                          'Param' => {
-                                                       '0' => {
-                                                                'name' => 'msg',
-                                                                'type' => '2077'
-                                                              },
-                                                       '1' => {
-                                                                'name' => 'payload_length',
-                                                                'type' => '123'
-                                                              },
-                                                       '2' => {
-                                                                'name' => 'completion_code',
-                                                                'type' => '2082'
-                                                              }
-                                                     },
-                                          'Reg' => {
-                                                     '0' => 'rdi',
-                                                     '1' => 'rsi',
-                                                     '2' => 'rdx'
-                                                   },
-                                          'Return' => '74',
-                                          'ShortName' => 'decode_file_ack_resp'
-                                        },
-                            '110451' => {
-                                          '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' => 'file_status',
-                                                                'type' => '168'
-                                                              },
-                                                       '4' => {
-                                                                'name' => 'msg',
-                                                                'type' => '1632'
-                                                              }
-                                                     },
-                                          'Return' => '74',
-                                          'ShortName' => 'encode_file_ack_req'
-                                        },
-                            '110686' => {
+                            '110345' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -559,7 +559,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_file_ack_resp'
                                         },
-                            '110876' => {
+                            '110535' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -590,7 +590,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_file_ack_req'
                                         },
-                            '111018' => {
+                            '110677' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -619,7 +619,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_resp'
                                         },
-                            '111133' => {
+                            '110792' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -655,7 +655,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_req'
                                         },
-                            '111403' => {
+                            '111062' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -682,7 +682,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_resp'
                                         },
-                            '111633' => {
+                            '111292' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -717,7 +717,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_req'
                                         },
-                            '111795' => {
+                            '111454' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -741,7 +741,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_resp'
                                         },
-                            '111896' => {
+                            '111555' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -768,7 +768,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_req'
                                         },
-                            '112131' => {
+                            '111790' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -787,7 +787,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_new_file_resp'
                                         },
-                            '112321' => {
+                            '111980' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -818,7 +818,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_new_file_req'
                                         },
-                            '112463' => {
+                            '112122' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -847,7 +847,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_resp'
                                         },
-                            '112578' => {
+                            '112237' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -888,7 +888,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_req'
                                         },
-                            '112863' => {
+                            '112522' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -915,22 +915,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_by_type_memory_resp'
                                         },
-                            '11299' => {
-                                         'Header' => 'bios.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'instance_id',
-                                                               'type' => '168'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'msg',
-                                                               'type' => '1632'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'encode_get_date_time_req'
-                                       },
-                            '113093' => {
+                            '112752' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -970,7 +955,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_by_type_memory_req'
                                         },
-                            '113270' => {
+                            '112929' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -993,7 +978,22 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_resp'
                                         },
-                            '113485' => {
+                            '11299' => {
+                                         'Header' => 'bios.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'instance_id',
+                                                               'type' => '168'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'msg',
+                                                               'type' => '1632'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'encode_get_date_time_req'
+                                       },
+                            '113144' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1022,7 +1022,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_resp'
                                         },
-                            '113595' => {
+                            '113254' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1049,7 +1049,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_write_file_req'
                                         },
-                            '113830' => {
+                            '113489' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1086,7 +1086,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_write_file_req'
                                         },
-                            '113985' => {
+                            '113644' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1109,7 +1109,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_resp'
                                         },
-                            '114200' => {
+                            '113859' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1141,7 +1141,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_resp'
                                         },
-                            '114336' => {
+                            '113995' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1168,7 +1168,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_read_file_req'
                                         },
-                            '114571' => {
+                            '114230' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1199,7 +1199,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_read_file_req'
                                         },
-                            '114706' => {
+                            '114365' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1239,7 +1239,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_resp'
                                         },
-                            '114879' => {
+                            '114538' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1266,7 +1266,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_req'
                                         },
-                            '115105' => {
+                            '114764' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1302,7 +1302,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_file_table_resp'
                                         },
-                            '115402' => {
+                            '115061' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1333,7 +1333,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_file_table_req'
                                         },
-                            '115537' => {
+                            '115196' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1362,7 +1362,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_resp'
                                         },
-                            '115646' => {
+                            '115305' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1398,7 +1398,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_req'
                                         },
-                            '115905' => {
+                            '115564' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1425,7 +1425,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_rw_file_memory_resp'
                                         },
-                            '116126' => {
+                            '115785' => {
                                           'Header' => 'file_io.h',
                                           'Param' => {
                                                        '0' => {
@@ -1460,7 +1460,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_rw_file_memory_req'
                                         },
-                            '117093' => {
+                            '116752' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1491,7 +1491,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_resp'
                                         },
-                            '117341' => {
+                            '117000' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1515,7 +1515,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_req'
                                         },
-                            '117424' => {
+                            '117083' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1546,7 +1546,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'decode_get_alert_status_resp'
                                         },
-                            '117563' => {
+                            '117222' => {
                                           'Header' => 'host.h',
                                           'Param' => {
                                                        '0' => {
@@ -1569,7 +1569,7 @@
                                           'Return' => '74',
                                           'ShortName' => 'encode_get_alert_status_req'
                                         },
-                            '118632' => {
+                            '118291' => {
                                           'Header' => 'platform_oem_ibm.h',
                                           'Param' => {
                                                        '0' => {
@@ -6816,38 +6816,7 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_entity_association_pdr_add_from_node_check'
                                        },
-                            '81099' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '78286'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'repo',
-                                                               'type' => '80095'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'entities',
-                                                               'type' => '78711'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'num_entities',
-                                                               'type' => '123'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'is_remote',
-                                                               'type' => '6423'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'terminus_handle',
-                                                               'type' => '5053'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_pdr_add_from_node'
-                                       },
-                            '81595' => {
+                            '81259' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6870,7 +6839,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_pdr_add'
                                        },
-                            '83235' => {
+                            '82899' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6888,7 +6857,7 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_is_current_parent_child'
                                        },
-                            '83324' => {
+                            '82988' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6903,7 +6872,7 @@
                                          'Return' => '168',
                                          'ShortName' => 'pldm_entity_get_num_children'
                                        },
-                            '83539' => {
+                            '83203' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6914,7 +6883,7 @@
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_entity_is_exist_parent'
                                        },
-                            '83694' => {
+                            '83358' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6925,6 +6894,28 @@
                                          'Return' => '77427',
                                          'ShortName' => 'pldm_entity_get_parent'
                                        },
+                            '83513' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'node',
+                                                               'type' => '78286'
+                                                             }
+                                                    },
+                                         'Return' => '6423',
+                                         'ShortName' => 'pldm_entity_is_node_parent'
+                                       },
+                            '83668' => {
+                                         'Header' => 'pdr.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'tree',
+                                                               'type' => '78780'
+                                                             }
+                                                    },
+                                         'Return' => '1',
+                                         'ShortName' => 'pldm_entity_association_tree_destroy'
+                                       },
                             '8379' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -6956,29 +6947,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '83849' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'node',
-                                                               'type' => '78286'
-                                                             }
-                                                    },
-                                         'Return' => '6423',
-                                         'ShortName' => 'pldm_entity_is_node_parent'
-                                       },
-                            '84004' => {
-                                         'Header' => 'pdr.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'tree',
-                                                               'type' => '78780'
-                                                             }
-                                                    },
-                                         'Return' => '1',
-                                         'ShortName' => 'pldm_entity_association_tree_destroy'
-                                       },
-                            '84183' => {
+                            '83847' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -6997,7 +6966,7 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_entity_association_tree_visit'
                                        },
-                            '85145' => {
+                            '84809' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7024,6 +6993,11 @@
                                          'Return' => '78286',
                                          'ShortName' => 'pldm_entity_association_tree_add'
                                        },
+                            '85242' => {
+                                         'Header' => 'pdr.h',
+                                         'Return' => '78780',
+                                         'ShortName' => 'pldm_entity_association_tree_init'
+                                       },
                             '8531' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7059,12 +7033,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_attribute_current_value_by_handle_resp'
                                       },
-                            '85578' => {
-                                         'Header' => 'pdr.h',
-                                         'Return' => '78780',
-                                         'ShortName' => 'pldm_entity_association_tree_init'
-                                       },
-                            '85812' => {
+                            '85476' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7075,7 +7044,7 @@
                                          'Return' => '77427',
                                          'ShortName' => 'pldm_entity_extract'
                                        },
-                            '86607' => {
+                            '86271' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7102,6 +7071,37 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_update_TL_pdr'
                                        },
+                            '86631' => {
+                                         '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' => '86616',
+                                         'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
+                                       },
                             '8693' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7129,38 +7129,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_attribute_current_value_by_handle_req'
                                       },
-                            '86967' => {
-                                         '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' => '86952',
-                                         'ShortName' => 'pldm_pdr_fru_record_set_find_by_rsi'
-                                       },
-                            '87321' => {
+                            '86985' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7196,18 +7165,18 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_pdr_add_fru_record_set_check'
                                        },
-                            '87659' => {
+                            '87318' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'record',
-                                                               'type' => '86952'
+                                                               'type' => '86616'
                                                              }
                                                     },
                                          'Return' => '6423',
                                          'ShortName' => 'pldm_pdr_record_is_remote'
                                        },
-                            '87814' => {
+                            '87473' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7216,13 +7185,13 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'record',
-                                                               'type' => '86952'
+                                                               'type' => '86616'
                                                              }
                                                     },
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_handle'
                                        },
-                            '88027' => {
+                            '87686' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7233,7 +7202,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_repo_size'
                                        },
-                            '88158' => {
+                            '87817' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7244,7 +7213,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'pldm_pdr_get_record_count'
                                        },
-                            '88289' => {
+                            '87948' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7257,7 +7226,7 @@
                                                              },
                                                       '2' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '86952'
+                                                               'type' => '86616'
                                                              },
                                                       '3' => {
                                                                'name' => 'data',
@@ -7273,10 +7242,10 @@
                                                     '3' => 'rcx',
                                                     '4' => 'r8'
                                                   },
-                                         'Return' => '86952',
+                                         'Return' => '86616',
                                          'ShortName' => 'pldm_pdr_find_record_by_type'
                                        },
-                            '88460' => {
+                            '88119' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7285,7 +7254,7 @@
                                                              },
                                                       '1' => {
                                                                'name' => 'curr_record',
-                                                               'type' => '86952'
+                                                               'type' => '86616'
                                                              },
                                                       '2' => {
                                                                'name' => 'data',
@@ -7300,10 +7269,10 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '86952',
+                                         'Return' => '86616',
                                          'ShortName' => 'pldm_pdr_get_next_record'
                                        },
-                            '88627' => {
+                            '88286' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7327,10 +7296,10 @@
                                                                'type' => '2087'
                                                              }
                                                     },
-                                         'Return' => '86952',
+                                         'Return' => '86616',
                                          'ShortName' => 'pldm_pdr_find_record'
                                        },
-                            '88795' => {
+                            '88454' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7341,12 +7310,12 @@
                                          'Return' => '1',
                                          'ShortName' => 'pldm_pdr_destroy'
                                        },
-                            '88950' => {
+                            '88609' => {
                                          'Header' => 'pdr.h',
                                          'Return' => '80095',
                                          'ShortName' => 'pldm_pdr_init'
                                        },
-                            '89022' => {
+                            '88681' => {
                                          'Header' => 'pdr.h',
                                          'Param' => {
                                                       '0' => {
@@ -7412,7 +7381,7 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_resp'
                                       },
-                            '90443' => {
+                            '90102' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7423,7 +7392,7 @@
                                          'Return' => '180',
                                          'ShortName' => 'dec2bcd32'
                                        },
-                            '90572' => {
+                            '90231' => {
                                          'Header' => 'utils.h',
                                          'Param' => {
                                                       '0' => {
@@ -7434,6 +7403,43 @@
                                          'Return' => '180',
                                          'ShortName' => 'bcd2dec32'
                                        },
+                            '90632' => {
+                                         'Header' => 'utils.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'version',
+                                                               'type' => '3344'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'buffer',
+                                                               'type' => '11614'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'buffer_size',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Reg' => {
+                                                    '0' => 'rdi'
+                                                  },
+                                         'Return' => '12557',
+                                         'ShortName' => 'ver2str'
+                                       },
+                            '90760' => {
+                                         'Header' => 'utils.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'data',
+                                                               'type' => '1434'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'size',
+                                                               'type' => '123'
+                                                             }
+                                                    },
+                                         'Return' => '168',
+                                         'ShortName' => 'crc8'
+                                       },
                             '9094' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7465,62 +7471,44 @@
                                         'Return' => '74',
                                         'ShortName' => 'decode_get_bios_table_req'
                                       },
-                            '90973' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'version',
-                                                               'type' => '3344'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'buffer',
-                                                               'type' => '11614'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'buffer_size',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Reg' => {
-                                                    '0' => 'rdi'
-                                                  },
-                                         'Return' => '12557',
-                                         'ShortName' => 'ver2str'
-                                       },
-                            '91101' => {
-                                         'Header' => 'utils.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'data',
-                                                               'type' => '1434'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'size',
-                                                               'type' => '123'
-                                                             }
-                                                    },
-                                         'Return' => '168',
-                                         'ShortName' => 'crc8'
-                                       },
-                            '92359' => {
+                            '92018' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92582'
+                                                               'type' => '92241'
                                                              },
                                                       '1' => {
                                                                'name' => 'tid',
-                                                               'type' => '91681'
+                                                               'type' => '91340'
                                                              },
                                                       '2' => {
                                                                'name' => 'iid',
-                                                               'type' => '91693'
+                                                               'type' => '91352'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_id_free'
                                        },
+                            '92246' => {
+                                         'Header' => 'instance-id.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'ctx',
+                                                               'type' => '92241'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'tid',
+                                                               'type' => '91340'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'iid',
+                                                               'type' => '92667'
+                                                             }
+                                                    },
+                                         'Return' => '74',
+                                         'ShortName' => 'pldm_instance_id_alloc'
+                                       },
                             '9241' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7548,53 +7536,34 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_req'
                                       },
-                            '92587' => {
+                            '92672' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '92582'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'tid',
-                                                               'type' => '91681'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'iid',
-                                                               'type' => '93008'
-                                                             }
-                                                    },
-                                         'Return' => '74',
-                                         'ShortName' => 'pldm_instance_id_alloc'
-                                       },
-                            '93013' => {
-                                         'Header' => 'instance-id.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'ctx',
-                                                               'type' => '92582'
+                                                               'type' => '92241'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_destroy'
                                        },
-                            '93098' => {
+                            '92757' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93184'
+                                                               'type' => '92843'
                                                              }
                                                     },
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init_default'
                                        },
-                            '93189' => {
+                            '92848' => {
                                          'Header' => 'instance-id.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ctx',
-                                                               'type' => '93184'
+                                                               'type' => '92843'
                                                              },
                                                       '1' => {
                                                                'name' => 'dbpath',
@@ -7604,12 +7573,12 @@
                                          'Return' => '74',
                                          'ShortName' => 'pldm_instance_db_init'
                                        },
-                            '94362' => {
+                            '94021' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93700'
+                                                               'type' => '93359'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7624,9 +7593,40 @@
                                                                'type' => '123'
                                                              }
                                                     },
-                                         'Return' => '93809',
+                                         'Return' => '93468',
                                          'ShortName' => 'pldm_send'
                                        },
+                            '94440' => {
+                                         'Header' => 'pldm.h',
+                                         'Param' => {
+                                                      '0' => {
+                                                               'name' => 'eid',
+                                                               'type' => '93359'
+                                                             },
+                                                      '1' => {
+                                                               'name' => 'mctp_fd',
+                                                               'type' => '74'
+                                                             },
+                                                      '2' => {
+                                                               'name' => 'pldm_req_msg',
+                                                               'type' => '6245'
+                                                             },
+                                                      '3' => {
+                                                               'name' => 'req_msg_len',
+                                                               'type' => '123'
+                                                             },
+                                                      '4' => {
+                                                               'name' => 'pldm_resp_msg',
+                                                               'type' => '69879'
+                                                             },
+                                                      '5' => {
+                                                               'name' => 'resp_msg_len',
+                                                               'type' => '9084'
+                                                             }
+                                                    },
+                                         'Return' => '93468',
+                                         'ShortName' => 'pldm_send_recv'
+                                       },
                             '9464' => {
                                         'Header' => 'bios.h',
                                         'Param' => {
@@ -7663,43 +7663,12 @@
                                         'Return' => '74',
                                         'ShortName' => 'encode_get_bios_table_resp'
                                       },
-                            '94781' => {
+                            '94923' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93700'
-                                                             },
-                                                      '1' => {
-                                                               'name' => 'mctp_fd',
-                                                               'type' => '74'
-                                                             },
-                                                      '2' => {
-                                                               'name' => 'pldm_req_msg',
-                                                               'type' => '6245'
-                                                             },
-                                                      '3' => {
-                                                               'name' => 'req_msg_len',
-                                                               'type' => '123'
-                                                             },
-                                                      '4' => {
-                                                               'name' => 'pldm_resp_msg',
-                                                               'type' => '69879'
-                                                             },
-                                                      '5' => {
-                                                               'name' => 'resp_msg_len',
-                                                               'type' => '9084'
-                                                             }
-                                                    },
-                                         'Return' => '93809',
-                                         'ShortName' => 'pldm_send_recv'
-                                       },
-                            '95264' => {
-                                         'Header' => 'pldm.h',
-                                         'Param' => {
-                                                      '0' => {
-                                                               'name' => 'eid',
-                                                               'type' => '93700'
+                                                               'type' => '93359'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7718,15 +7687,15 @@
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '93809',
+                                         'Return' => '93468',
                                          'ShortName' => 'pldm_recv'
                                        },
-                            '95490' => {
+                            '95149' => {
                                          'Header' => 'pldm.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'eid',
-                                                               'type' => '93700'
+                                                               'type' => '93359'
                                                              },
                                                       '1' => {
                                                                'name' => 'mctp_fd',
@@ -7741,12 +7710,12 @@
                                                                'type' => '9084'
                                                              }
                                                     },
-                                         'Return' => '93809',
+                                         'Return' => '93468',
                                          'ShortName' => 'pldm_recv_any'
                                        },
-                            '95935' => {
+                            '95594' => {
                                          'Header' => 'pldm.h',
-                                         'Return' => '93809',
+                                         'Return' => '93468',
                                          'ShortName' => 'pldm_open'
                                        },
                             '9755' => {
@@ -8056,7 +8025,6 @@
                                                  'pldm_bios_table_string_find_by_handle' => 1,
                                                  'pldm_bios_table_string_find_by_string' => 1,
                                                  'pldm_entity_association_pdr_add' => 1,
-                                                 'pldm_entity_association_pdr_add_from_node' => 1,
                                                  'pldm_entity_association_pdr_add_from_node_check' => 1,
                                                  'pldm_entity_association_pdr_extract' => 1,
                                                  'pldm_entity_association_tree_add' => 1,
@@ -10062,7 +10030,7 @@
                                      },
                           '77483' => {
                                        'Header' => undef,
-                                       'Line' => '429',
+                                       'Line' => '433',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'root',
@@ -10091,7 +10059,7 @@
                                      },
                           '77543' => {
                                        'Header' => undef,
-                                       'Line' => '434',
+                                       'Line' => '438',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'entity',
@@ -10219,18 +10187,18 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
+                          '86616' => {
+                                       'BaseType' => '77281',
+                                       'Name' => 'pldm_pdr_record const*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
                           '869' => {
                                      'BaseType' => '830',
                                      'Name' => 'struct pldm_msg const',
                                      'Size' => '4',
                                      'Type' => 'Const'
                                    },
-                          '86952' => {
-                                       'BaseType' => '77281',
-                                       'Name' => 'pldm_pdr_record const*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
                           '874' => {
                                      'BaseType' => '168',
                                      'Name' => 'uint8_t[1]',
@@ -10277,7 +10245,7 @@
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '91681' => {
+                          '91340' => {
                                        'BaseType' => '168',
                                        'Header' => 'base.h',
                                        'Line' => '14',
@@ -10285,7 +10253,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '91693' => {
+                          '91352' => {
                                        'BaseType' => '168',
                                        'Header' => 'instance-id.h',
                                        'Line' => '11',
@@ -10293,14 +10261,14 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '92073' => {
+                          '91732' => {
                                        'Header' => undef,
                                        'Line' => '18',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'prev',
                                                             'offset' => '0',
-                                                            'type' => '91693'
+                                                            'type' => '91352'
                                                           },
                                                    '1' => {
                                                             'name' => 'allocations',
@@ -10313,14 +10281,14 @@
                                        'Size' => '8',
                                        'Type' => 'Struct'
                                      },
-                          '92112' => {
+                          '91771' => {
                                        'Header' => undef,
                                        'Line' => '23',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'state',
                                                             'offset' => '0',
-                                                            'type' => '92154'
+                                                            'type' => '91813'
                                                           },
                                                    '1' => {
                                                             'name' => 'lock_db_fd',
@@ -10333,31 +10301,31 @@
                                        'Size' => '2052',
                                        'Type' => 'Struct'
                                      },
-                          '92154' => {
-                                       'BaseType' => '92073',
+                          '91813' => {
+                                       'BaseType' => '91732',
                                        'Name' => 'struct pldm_tid_state[256]',
                                        'Size' => '2048',
                                        'Type' => 'Array'
                                      },
-                          '92582' => {
-                                       'BaseType' => '92112',
+                          '92241' => {
+                                       'BaseType' => '91771',
                                        'Name' => 'struct pldm_instance_db*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93008' => {
-                                       'BaseType' => '91693',
+                          '92667' => {
+                                       'BaseType' => '91352',
                                        'Name' => 'pldm_instance_id_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93184' => {
-                                       'BaseType' => '92582',
+                          '92843' => {
+                                       'BaseType' => '92241',
                                        'Name' => 'struct pldm_instance_db**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '93700' => {
+                          '93359' => {
                                        'BaseType' => '168',
                                        'Header' => 'pldm.h',
                                        'Line' => '12',
@@ -10365,7 +10333,7 @@
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '93712' => {
+                          '93371' => {
                                        'Header' => 'pldm.h',
                                        'Line' => '14',
                                        'Memb' => {
@@ -10426,8 +10394,8 @@
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '93809' => {
-                                       'BaseType' => '93712',
+                          '93468' => {
+                                       'BaseType' => '93371',
                                        'Header' => 'pldm.h',
                                        'Line' => '28',
                                        'Name' => 'pldm_requester_rc_t',
diff --git a/include/libpldm/pdr.h b/include/libpldm/pdr.h
index ebad973..d9e2553 100644
--- a/include/libpldm/pdr.h
+++ b/include/libpldm/pdr.h
@@ -451,17 +451,6 @@
 					  pldm_pdr *repo, bool is_remote,
 					  uint16_t terminus_handle);
 
-/** @brief Add entity association pdr from node
- *
- *  @param[in] node - opaque pointer acting as a handle to an entity node
- *  @param[in] repo - PDR repo where entity association records should be added
- *  @param[in] is_remote  - if true, then the PDR is not from this terminus
- *  @param[in] terminus_handle - terminus handle of the terminus
- */
-void pldm_entity_association_pdr_add_from_node(
-	pldm_entity_node *node, pldm_pdr *repo, pldm_entity **entities,
-	size_t num_entities, bool is_remote, uint16_t terminus_handle);
-
 /** @brief Add entity association pdr from node, or return an error
  *
  *  @param[in] node - opaque pointer acting as a handle to an entity node
diff --git a/src/pdr.c b/src/pdr.c
index 46e2da0..4f7a3e3 100644
--- a/src/pdr.c
+++ b/src/pdr.c
@@ -932,17 +932,6 @@
 					  terminus_handle, 0);
 }
 
-LIBPLDM_ABI_DEPRECATED
-void pldm_entity_association_pdr_add_from_node(
-	pldm_entity_node *node, pldm_pdr *repo, pldm_entity **entities,
-	size_t num_entities, bool is_remote, uint16_t terminus_handle)
-{
-	int rc = pldm_entity_association_pdr_add_from_node_check(
-		node, repo, entities, num_entities, is_remote, terminus_handle);
-	(void)rc;
-	assert(!rc);
-}
-
 LIBPLDM_ABI_STABLE
 int pldm_entity_association_pdr_add_from_node_check(
 	pldm_entity_node *node, pldm_pdr *repo, pldm_entity **entities,