Updated BridgeSupport internal format