Further optimize reachability topology builder