@rough-minister-58256 I found a simple fix for dependees in v2, instead of using address_mapper.scan_build_files, we can use address_mapper.scan_addresses which is already implemented.