Broke BridgeSupport apart into two different parts.