Add a bit more bridging support