Make bridging more efficient