To support API changes in both to be aligned with the issue/PR in BAP itself: https://github.com/BinaryAnalysisPlatform/bap/pull/820