diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 3c512398f..a62419d0d 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   build:
-    name: build-${{ matrix.browser }}-${{ matrix.mode }}-${{ matrix.os }}
+    name: ${{ matrix.browser }}-${{ matrix.mode }}-${{ matrix.os }}-${{ matrix.protocol }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -28,33 +28,31 @@ jobs:
           - os: ubuntu-latest
             browser: CHROME
             mode: headless
+            protocol: cdp
           - os: ubuntu-latest
             browser: CHROME
             mode: headful
+            protocol: cdp
           - os: ubuntu-latest
             browser: CHROME
             mode: headless-shell
-          - os: ubuntu-latest
-            browser: FIREFOX
-            mode: headless
-          - os: ubuntu-latest
-            browser: FIREFOX
-            mode: headful
+            protocol: cdp
           - os: windows-latest
             browser: CHROME
             mode: headless
+            protocol: cdp
           - os: windows-latest
             browser: CHROME
             mode: headful
+            protocol: cdp
           - os: windows-latest
             browser: CHROME
             mode: headless-shell
-          - os: windows-latest
+            protocol: cdp
+          - os: ubuntu-latest
             browser: FIREFOX
             mode: headless
-          - os: windows-latest
-            browser: FIREFOX
-            mode: headful
+            protocol: webdriverbidi
     steps:
     - uses: actions/checkout@v3
     - name: Setup .NET Core
@@ -82,7 +80,7 @@ jobs:
         New-SelfSignedCertificate -Subject "localhost" -FriendlyName "Puppeteer" -CertStoreLocation "cert:\CurrentUser\My"
         Get-ChildItem -Path cert:\CurrentUSer\my | where { $_.friendlyname -eq "Puppeteer" } | Export-Certificate -FilePath $env:GITHUB_WORKSPACE\lib\PuppeteerSharp.TestServer\testCert.cer
     - name: Check formatting
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.browser == 'CHROME' && matrix.mode == 'headless' }}
+      if: ${{ matrix.os == 'ubuntu-latest' && matrix.browser == 'CHROME' && matrix.mode == 'headless' && matrix.protocol == 'cdp' }}
       run: dotnet format ./lib/PuppeteerSharp.sln --verify-no-changes --exclude-diagnostics CA1865
     - name: Build
       working-directory: lib
@@ -95,6 +93,7 @@ jobs:
       env:
         BROWSER: ${{ matrix.browser }}
         HEADLESS_MODE: ${{ matrix.mode }}
+        PROTOCOL: ${{ matrix.protocol }}
       run: |
           Xvfb :1 -screen 5 1024x768x8 &
           export DISPLAY=:1.5
@@ -105,6 +104,7 @@ jobs:
       env:
         BROWSER: ${{ matrix.browser }}
         HEADLESS_MODE: ${{ matrix.mode }}
+        PROTOCOL: ${{ matrix.protocol }}
       run: |
         cd .\lib\PuppeteerSharp.Tests
         dotnet test -s test.runsettings --blame-hang-timeout 300000
diff --git a/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs b/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs
index 6b4d1363f..c8bc6d49c 100644
--- a/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs
+++ b/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs
@@ -21,9 +21,10 @@ public class PuppeteerTestAttribute : NUnitAttribute, IApplyToTest
     {
         private static TestExpectation[] _localExpectations;
         private static TestExpectation[] _upstreamExpectations;
+
         public static readonly bool IsChrome = Environment.GetEnvironmentVariable("BROWSER") != "FIREFOX";
-        // TODO: Change implementation when we implement Webdriver Bidi
-        public static readonly bool IsCdp = true;
+        public static readonly bool IsCdp = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROTOCOL")) || Environment.GetEnvironmentVariable("PROTOCOL")!.Equals("cdp");
+
         public static readonly HeadlessMode Headless =
             string.IsNullOrEmpty(Environment.GetEnvironmentVariable("HEADLESS_MODE")) ?
             (System.Diagnostics.Debugger.IsAttached ? HeadlessMode.False : HeadlessMode.True) :
diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
index 51c349d4c..1c26431ec 100644
--- a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
+++ b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
@@ -85,7 +85,7 @@
   },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[accessibility.spec] *",
+    "testIdPattern": "[browser.spec] *",
     "platforms": [
       "darwin",
       "linux",
@@ -100,7 +100,7 @@
   },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[ariaqueryhandler.spec] *",
+    "testIdPattern": "[navigation.spec] *should navigate to about:blank*",
     "platforms": [
       "darwin",
       "linux",
@@ -115,7 +115,7 @@
   },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[autofill.spec] *",
+    "testIdPattern": "[navigation.spec] navigation Page.waitForNavigation*",
     "platforms": [
       "darwin",
       "linux",
@@ -130,7 +130,7 @@
   },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[browser.spec] *",
+    "testIdPattern": "[navigation.spec] *should work with anchor navigation*",
     "platforms": [
       "darwin",
       "linux",
@@ -145,7 +145,7 @@
   },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[browsercontext.spec] *",
+    "testIdPattern": "[navigation.spec] * should fail when main resources failed to load",
     "platforms": [
       "darwin",
       "linux",
@@ -160,7 +160,7 @@
   },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[cdp] *",
+    "testIdPattern": "[navigation.spec] navigation Frame.goto*",
     "platforms": [
       "darwin",
       "linux",
@@ -175,7 +175,7 @@
   },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[chromiumonly.spec] *",
+    "testIdPattern": "[navigation.spec] navigation Page.reload*",
     "platforms": [
       "darwin",
       "linux",
@@ -190,7 +190,307 @@
   },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[click.spec] *",
+    "testIdPattern": "[navigation.spec] *should fail when navigating and show the url at the error message*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should work with self requesting page*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should work when reload causes history API in beforeunload*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should work when navigating to valid url*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should work when navigating to 404*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should wait for network idle to succeed navigation*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should return last response in redirect chain*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should not throw an error for a 404 response with an empty body*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should navigate to page with iframe and networkidle0*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should navigate to empty page with networkidle2*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should navigate to empty page with networkidle0*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should navigate to empty page with domcontentloaded*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should not throw an error for a 500 response with an empty body*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should return response when page changes its URL after load*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *SSL*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *should fail*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] navigation Page.goBack *",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] *timeout*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[navigation.spec] navigation Frame.waitForNavigation*",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[ariaqueryhandler.spec] *",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[chromiumonly.spec] *",
     "platforms": [
       "darwin",
       "linux",
@@ -595,7 +895,7 @@
   },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[navigation.spec] *",
+    "testIdPattern": "[click.spec] *",
     "platforms": [
       "darwin",
       "linux",
@@ -847,5 +1147,110 @@
     "expectations": [
       "FAIL"
     ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[ChromeLauncher.test.ts] *",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[NetworkManager.test.ts] *",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[DeviceRequestPrompt.test.ts] *",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[launcher.spec] PuppeteerSharp *",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[puppeteer-sharp.spec.ts] PuppeteerSharp *",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[elementhandle.spec] PuppeteerSharp *",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
+  },
+  {
+    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
+    "testIdPattern": "[prerender.spec] *",
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "webDriverBiDi"
+    ],
+    "expectations": [
+      "FAIL"
+    ]
   }
 ]
diff --git a/lib/PuppeteerSharp.Tests/BrowserContextTests/BrowserContextTests.cs b/lib/PuppeteerSharp.Tests/BrowserContextTests/BrowserContextTests.cs
index 8cc7bd047..12664db51 100644
--- a/lib/PuppeteerSharp.Tests/BrowserContextTests/BrowserContextTests.cs
+++ b/lib/PuppeteerSharp.Tests/BrowserContextTests/BrowserContextTests.cs
@@ -138,7 +138,8 @@ public async Task ShouldWorkAcrossSessions()
 
             var remoteBrowser = await Puppeteer.ConnectAsync(new ConnectOptions
             {
-                BrowserWSEndpoint = Browser.WebSocketEndpoint
+                BrowserWSEndpoint = Browser.WebSocketEndpoint,
+                Protocol = ((Browser)Browser).Protocol,
             });
             var contexts = remoteBrowser.BrowserContexts();
             Assert.That(contexts, Has.Length.EqualTo(2));
diff --git a/lib/PuppeteerSharp.Tests/BrowserTests/IsConnectedTests.cs b/lib/PuppeteerSharp.Tests/BrowserTests/IsConnectedTests.cs
index 6aa9c73af..b45bf94db 100644
--- a/lib/PuppeteerSharp.Tests/BrowserTests/IsConnectedTests.cs
+++ b/lib/PuppeteerSharp.Tests/BrowserTests/IsConnectedTests.cs
@@ -6,16 +6,13 @@ namespace PuppeteerSharp.Tests.BrowserTests
 {
     public class IsConnectedTests : PuppeteerBrowserBaseTest
     {
-        public IsConnectedTests() : base()
-        {
-        }
-
         [Test, Retry(2), PuppeteerTest("browser.spec", "Browser.isConnected", "should set the browser connected state")]
         public async Task ShouldSetTheBrowserConnectedState()
         {
             var newBrowser = await Puppeteer.ConnectAsync(new ConnectOptions
             {
-                BrowserWSEndpoint = Browser.WebSocketEndpoint
+                BrowserWSEndpoint = Browser.WebSocketEndpoint,
+                Protocol = ((Browser)Browser).Protocol,
             });
             Assert.That(newBrowser.IsConnected, Is.True);
             newBrowser.Disconnect();
diff --git a/lib/PuppeteerSharp.Tests/BrowserTests/ProcessTests.cs b/lib/PuppeteerSharp.Tests/BrowserTests/ProcessTests.cs
index 16c16d7ad..0c7c25cee 100644
--- a/lib/PuppeteerSharp.Tests/BrowserTests/ProcessTests.cs
+++ b/lib/PuppeteerSharp.Tests/BrowserTests/ProcessTests.cs
@@ -6,8 +6,6 @@ namespace PuppeteerSharp.Tests.BrowserTests
 {
     public class ProcessTests : PuppeteerBrowserBaseTest
     {
-        public ProcessTests() : base() { }
-
         [Test, Retry(2), PuppeteerTest("browser.spec", "Browser.process", "should return child_process instance")]
         public void ShouldReturnProcessInstance()
         {
@@ -20,8 +18,14 @@ public async Task ShouldNotReturnChildProcessForRemoteBrowser()
         {
             var browserWSEndpoint = Browser.WebSocketEndpoint;
             var remoteBrowser = await Puppeteer.ConnectAsync(
-                new ConnectOptions { BrowserWSEndpoint = browserWSEndpoint }, TestConstants.LoggerFactory);
+                new ConnectOptions
+                {
+                    BrowserWSEndpoint = browserWSEndpoint,
+                    Protocol = ((Browser)Browser).Protocol,
+                },
+                TestConstants.LoggerFactory);
             Assert.That(remoteBrowser.Process, Is.Null);
+
             remoteBrowser.Disconnect();
         }
     }
diff --git a/lib/PuppeteerSharp.Tests/CookiesTests/SetCookiesTests.cs b/lib/PuppeteerSharp.Tests/CookiesTests/SetCookiesTests.cs
index c7fa517fa..578739e3d 100644
--- a/lib/PuppeteerSharp.Tests/CookiesTests/SetCookiesTests.cs
+++ b/lib/PuppeteerSharp.Tests/CookiesTests/SetCookiesTests.cs
@@ -7,10 +7,6 @@ namespace PuppeteerSharp.Tests.CookiesTests
 {
     public class SetCookiesTests : PuppeteerPageBaseTest
     {
-        public SetCookiesTests() : base()
-        {
-        }
-
         [Test, Retry(2), PuppeteerTest("cookies.spec", "Cookie specs Page.setCookie", "should work")]
         public async Task ShouldWork()
         {
diff --git a/lib/PuppeteerSharp.Tests/ElementHandleTests/ContentFrameTests.cs b/lib/PuppeteerSharp.Tests/ElementHandleTests/ContentFrameTests.cs
index 9fc36a2c6..26002f913 100644
--- a/lib/PuppeteerSharp.Tests/ElementHandleTests/ContentFrameTests.cs
+++ b/lib/PuppeteerSharp.Tests/ElementHandleTests/ContentFrameTests.cs
@@ -24,7 +24,7 @@ public async Task ShouldWork()
             Assert.That(frame, Is.EqualTo(Page.FirstChildFrame()));
         }
 
-        [Test]
+        [Test, Retry(2), PuppeteerTest("elementhandle.spec", "PuppeteerSharp", "should work headful")]
         public async Task ShouldWorkHeadful()
         {
             await using var Browser = await Puppeteer.LaunchAsync(_headfulOptions);
diff --git a/lib/PuppeteerSharp.Tests/LauncherTests/BrowserCloseTests.cs b/lib/PuppeteerSharp.Tests/LauncherTests/BrowserCloseTests.cs
index 2b77b0922..0a2b363d9 100644
--- a/lib/PuppeteerSharp.Tests/LauncherTests/BrowserCloseTests.cs
+++ b/lib/PuppeteerSharp.Tests/LauncherTests/BrowserCloseTests.cs
@@ -11,7 +11,12 @@ public class BrowserCloseTests : PuppeteerBrowserBaseTest
         public async Task ShouldTerminateNetworkWaiters()
         {
             await using var browser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions());
-            await using var remote = await Puppeteer.ConnectAsync(new ConnectOptions { BrowserWSEndpoint = browser.WebSocketEndpoint });
+            await using var remote = await Puppeteer.ConnectAsync(new ConnectOptions
+            {
+                BrowserWSEndpoint = browser.WebSocketEndpoint,
+                Protocol = ((Browser)browser).Protocol,
+            });
+
             var newPage = await remote.NewPageAsync();
             var requestTask = newPage.WaitForRequestAsync(TestConstants.EmptyPage);
             var responseTask = newPage.WaitForResponseAsync(TestConstants.EmptyPage);
@@ -27,7 +32,7 @@ public async Task ShouldTerminateNetworkWaiters()
             Assert.That(exception.Message, Does.Not.Contain("Timeout"));
         }
 
-        [Test]
+        [Test, Retry(2), PuppeteerTest("launcher.spec", "PuppeteerSharp", "delete temp user data dir when disposing browser")]
         public async Task DeleteTempUserDataDirWhenDisposingBrowser()
         {
             var options = TestConstants.DefaultBrowserOptions();
diff --git a/lib/PuppeteerSharp.Tests/LauncherTests/BrowserDisconnectTests.cs b/lib/PuppeteerSharp.Tests/LauncherTests/BrowserDisconnectTests.cs
index e27d5d43a..b5ed6a0ec 100644
--- a/lib/PuppeteerSharp.Tests/LauncherTests/BrowserDisconnectTests.cs
+++ b/lib/PuppeteerSharp.Tests/LauncherTests/BrowserDisconnectTests.cs
@@ -15,7 +15,8 @@ public async Task ShouldRejectNavigationWhenBrowserCloses()
             await using var browser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions());
             var remote = await Puppeteer.ConnectAsync(new ConnectOptions
             {
-                BrowserWSEndpoint = browser.WebSocketEndpoint
+                BrowserWSEndpoint = browser.WebSocketEndpoint,
+                Protocol = ((Browser)Browser).Protocol,
             });
             var page = await remote.NewPageAsync();
             var navigationTask = page.GoToAsync(TestConstants.ServerUrl + "/one-style.html", new NavigationOptions
@@ -41,7 +42,8 @@ public async Task ShouldRejectWaitForSelectorWhenBrowserCloses()
             await using var browser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions());
             var remote = await Puppeteer.ConnectAsync(new ConnectOptions
             {
-                BrowserWSEndpoint = browser.WebSocketEndpoint
+                BrowserWSEndpoint = browser.WebSocketEndpoint,
+                Protocol = ((Browser)browser).Protocol,
             });
             var page = await remote.NewPageAsync();
             var watchdog = page.WaitForSelectorAsync("div", new WaitForSelectorOptions { Timeout = 60000 });
diff --git a/lib/PuppeteerSharp.Tests/LauncherTests/BrowserEventsDisconnectedTests.cs b/lib/PuppeteerSharp.Tests/LauncherTests/BrowserEventsDisconnectedTests.cs
index 6ef713baa..961771c6b 100644
--- a/lib/PuppeteerSharp.Tests/LauncherTests/BrowserEventsDisconnectedTests.cs
+++ b/lib/PuppeteerSharp.Tests/LauncherTests/BrowserEventsDisconnectedTests.cs
@@ -14,7 +14,11 @@ public BrowserEventsDisconnectedTests() : base()
         public async Task ShouldEmittedWhenBrowserGetsClosedDisconnectedOrUnderlyingWebsocketGetsClosed()
         {
             var originalBrowser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions(), TestConstants.LoggerFactory);
-            var connectOptions = new ConnectOptions { BrowserWSEndpoint = originalBrowser.WebSocketEndpoint };
+            var connectOptions = new ConnectOptions
+            {
+                BrowserWSEndpoint = originalBrowser.WebSocketEndpoint,
+                Protocol = ((Browser)Browser).Protocol,
+            };
             var remoteBrowser1 = await Puppeteer.ConnectAsync(connectOptions, TestConstants.LoggerFactory);
             var remoteBrowser2 = await Puppeteer.ConnectAsync(connectOptions, TestConstants.LoggerFactory);
 
diff --git a/lib/PuppeteerSharp.Tests/LauncherTests/PuppeteerConnectTests.cs b/lib/PuppeteerSharp.Tests/LauncherTests/PuppeteerConnectTests.cs
index 4ee159efa..977a1741c 100644
--- a/lib/PuppeteerSharp.Tests/LauncherTests/PuppeteerConnectTests.cs
+++ b/lib/PuppeteerSharp.Tests/LauncherTests/PuppeteerConnectTests.cs
@@ -15,7 +15,8 @@ public async Task ShouldBeAbleToConnectMultipleTimesToSameBrowser()
         {
             var options = new ConnectOptions()
             {
-                BrowserWSEndpoint = Browser.WebSocketEndpoint
+                BrowserWSEndpoint = Browser.WebSocketEndpoint,
+                Protocol = ((Browser)Browser).Protocol,
             };
             var browser = await Puppeteer.ConnectAsync(options, TestConstants.LoggerFactory);
             await using (var page = await browser.NewPageAsync())
@@ -54,7 +55,8 @@ public async Task ShouldSupportAcceptInsecureCertsOption()
             await using var browser = await Puppeteer.ConnectAsync(new ConnectOptions
             {
                 BrowserWSEndpoint = originalBrowser.WebSocketEndpoint,
-                AcceptInsecureCerts = true
+                AcceptInsecureCerts = true,
+                Protocol = ((Browser)Browser).Protocol,
             });
             await using var page = await browser.NewPageAsync();
             var requestTask = HttpsServer.WaitForRequest(
@@ -87,6 +89,7 @@ public async Task ShouldSupportTargetFilter()
             {
                 BrowserWSEndpoint = browser.WebSocketEndpoint,
                 TargetFilter = target => !target.Url.Contains("should-be-ignored"),
+                Protocol = ((Browser)browser).Protocol,
             }, TestConstants.LoggerFactory);
 
             var pages = await remoteBrowser.PagesAsync();
@@ -129,7 +132,8 @@ public async Task ShouldBeAbleToReconnectToADisconnectedBrowser()
         {
             var options = new ConnectOptions()
             {
-                BrowserWSEndpoint = Browser.WebSocketEndpoint
+                BrowserWSEndpoint = Browser.WebSocketEndpoint,
+                Protocol = ((Browser)Browser).Protocol,
             };
 
             var url = TestConstants.ServerUrl + "/frames/nested-frames.html";
@@ -154,7 +158,8 @@ public async Task ShouldBeAbleToConnectToTheSamePageSimultaneously()
             var browserOne = await Puppeteer.LaunchAsync(new LaunchOptions());
             var browserTwo = await Puppeteer.ConnectAsync(new ConnectOptions
             {
-                BrowserWSEndpoint = browserOne.WebSocketEndpoint
+                BrowserWSEndpoint = browserOne.WebSocketEndpoint,
+                Protocol = ((Browser)browserOne).Protocol,
             });
             var tcs = new TaskCompletionSource<IPage>();
             async void TargetCreated(object sender, TargetChangedArgs e)
@@ -185,7 +190,8 @@ public async Task ShouldBeAbleToReconnect()
 
             var browserTwo = await Puppeteer.ConnectAsync(new ConnectOptions
             {
-                BrowserWSEndpoint = browserWSEndpoint
+                BrowserWSEndpoint = browserWSEndpoint,
+                Protocol = ((Browser)browserOne).Protocol,
             });
 
             var pages = await browserTwo.PagesAsync();
diff --git a/lib/PuppeteerSharp.Tests/LauncherTests/PuppeteerLaunchTests.cs b/lib/PuppeteerSharp.Tests/LauncherTests/PuppeteerLaunchTests.cs
index 65332b3a8..ab9cb4ac5 100644
--- a/lib/PuppeteerSharp.Tests/LauncherTests/PuppeteerLaunchTests.cs
+++ b/lib/PuppeteerSharp.Tests/LauncherTests/PuppeteerLaunchTests.cs
@@ -14,7 +14,7 @@ namespace PuppeteerSharp.Tests.LauncherTests
 {
     public class PuppeteerLaunchTests : PuppeteerBaseTest
     {
-        [Test, Retry(2)]
+        [Test, Retry(2), PuppeteerTest("launcher.spec", "PuppeteerSharp", "should work in real life")]
         public async Task ShouldWorkInRealLife()
         {
             var options = TestConstants.DefaultBrowserOptions();
@@ -187,6 +187,7 @@ public void ShouldReturnTheDefaultArguments()
 
         [TestCase(false)]
         [TestCase(true)]
+        [PuppeteerTest("launcher.spec", "PuppeteerSharp", "chrome should be closed")]
         public async Task ChromeShouldBeClosed(bool useDisposeAsync)
         {
             var options = TestConstants.DefaultBrowserOptions();
@@ -339,7 +340,7 @@ public async Task ShouldTakeFullPageScreenshotsWhenDefaultViewportIsNull()
             Assert.That(await page.ScreenshotDataAsync(new ScreenshotOptions { FullPage = true }), Is.Not.Empty);
         }
 
-        [Test, Retry(2)]
+        [Test, Retry(2), PuppeteerTest("launcher.spec", "PuppeteerSharp", "should support custom websocket")]
         public async Task ShouldSupportCustomWebSocket()
         {
             var options = TestConstants.DefaultBrowserOptions();
@@ -356,7 +357,7 @@ public async Task ShouldSupportCustomWebSocket()
             }
         }
 
-        [Test, Retry(2)]
+        [Test, Retry(2), PuppeteerTest("launcher.spec", "Launcher specs Browser.close", "should support custom transport")]
         public async Task ShouldSupportCustomTransport()
         {
             var customTransportCreated = false;
diff --git a/lib/PuppeteerSharp.Tests/NavigationTests/PageWaitForNavigationTests.cs b/lib/PuppeteerSharp.Tests/NavigationTests/PageWaitForNavigationTests.cs
index ad6532cf5..a8c90d616 100644
--- a/lib/PuppeteerSharp.Tests/NavigationTests/PageWaitForNavigationTests.cs
+++ b/lib/PuppeteerSharp.Tests/NavigationTests/PageWaitForNavigationTests.cs
@@ -26,7 +26,7 @@ await Task.WhenAll(
             Assert.That(response.Url, Does.Contain("grid.html"));
         }
 
-        [Test, Retry(2), PuppeteerTest("navigation.spec", "Page.waitForNavigation", "should work with both domcontentloaded and load")]
+        [Test, Retry(2), PuppeteerTest("navigation.spec", "navigation Page.waitForNavigation", "should work with both domcontentloaded and load")]
         public async Task ShouldWorkWithBothDomcontentloadedAndLoad()
         {
             var responseCompleted = new TaskCompletionSource<bool>();
diff --git a/lib/PuppeteerSharp.Tests/PageTests/CloseTests.cs b/lib/PuppeteerSharp.Tests/PageTests/CloseTests.cs
index c3d6aac7b..bf1223a36 100644
--- a/lib/PuppeteerSharp.Tests/PageTests/CloseTests.cs
+++ b/lib/PuppeteerSharp.Tests/PageTests/CloseTests.cs
@@ -128,7 +128,7 @@ public async Task ShouldTerminateNetworkWaiters()
             Assert.That(exception.Message, Does.Not.Contain("Timeout"));
         }
 
-        [Test, Retry(2)]
+        [Test, Retry(2), PuppeteerTest("page.spec", "Page Page.close PuppeteerSharp", "should close when connection breaks prematurely")]
         public async Task ShouldCloseWhenConnectionBreaksPrematurely()
         {
             Browser.Disconnect();
diff --git a/lib/PuppeteerSharp.Tests/PageTests/GetContentTests.cs b/lib/PuppeteerSharp.Tests/PageTests/GetContentTests.cs
index d989e2815..fed1051a9 100644
--- a/lib/PuppeteerSharp.Tests/PageTests/GetContentTests.cs
+++ b/lib/PuppeteerSharp.Tests/PageTests/GetContentTests.cs
@@ -8,7 +8,7 @@ namespace PuppeteerSharp.Tests.PageTests
     public class GetContentTests : PuppeteerPageBaseTest
     {
 
-        [Test, Retry(2)]
+        [Test, Retry(2), PuppeteerTest("puppeteer-sharp.spec.ts", "PuppeteerSharp", "should work with lone surrogate")]
         public async Task ShouldWorkWithLoneSurrogate()
         {
             await Page.GoToAsync(TestConstants.ServerUrl + "/lone-surrogate.html");
diff --git a/lib/PuppeteerSharp.Tests/TestConstants.cs b/lib/PuppeteerSharp.Tests/TestConstants.cs
index 9f5d5e011..bfe01bebb 100644
--- a/lib/PuppeteerSharp.Tests/TestConstants.cs
+++ b/lib/PuppeteerSharp.Tests/TestConstants.cs
@@ -22,7 +22,6 @@ public static class TestConstants
         public static readonly string EmptyPage = $"{ServerUrl}/empty.html";
         public static readonly string CrossProcessUrl = ServerIpUrl;
         public static readonly bool IsChrome = PuppeteerTestAttribute.IsChrome;
-
         public static readonly DeviceDescriptor IPhone = Puppeteer.Devices[DeviceDescriptorName.IPhone6];
         public static readonly DeviceDescriptor IPhone6Landscape = Puppeteer.Devices[DeviceDescriptorName.IPhone6Landscape];
 
@@ -46,6 +45,7 @@ public static class TestConstants
             EnqueueAsyncMessages = Convert.ToBoolean(Environment.GetEnvironmentVariable("ENQUEUE_ASYNC_MESSAGES") ?? "false"),
             Timeout = 0,
             LogProcess = true,
+            Protocol = PuppeteerTestAttribute.IsCdp ? ProtocolType.Cdp : ProtocolType.WebdriverBiDi,
 #if NETCOREAPP
             EnqueueTransportMessages = false
 #else
diff --git a/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForFunctionTests.cs b/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForFunctionTests.cs
index 7c39acb5a..e2d57aef6 100644
--- a/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForFunctionTests.cs
+++ b/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForFunctionTests.cs
@@ -29,7 +29,7 @@ public FrameWaitForFunctionTests() : base()
 
         public void Dispose()
         {
-            _pollerInterceptor.Dispose();
+            _pollerInterceptor?.Dispose();
         }
 
         [Test, Retry(2), PuppeteerTest("waittask.spec", "waittask specs Frame.waitForFunction", "should work when resolved right before execution context disposal")]
diff --git a/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForSelectorTests.cs b/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForSelectorTests.cs
index 2e6c78158..a18a6ac73 100644
--- a/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForSelectorTests.cs
+++ b/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForSelectorTests.cs
@@ -32,7 +32,7 @@ public FrameWaitForSelectorTests()
 
         public void Dispose()
         {
-            _pollerInterceptor.Dispose();
+            _pollerInterceptor?.Dispose();
         }
 
         [Test, Retry(2), PuppeteerTest("waittask.spec", "waittask specs Frame.waitForSelector", "should immediately resolve promise if node exists")]
diff --git a/lib/PuppeteerSharp/Bidi/BidiBrowser.cs b/lib/PuppeteerSharp/Bidi/BidiBrowser.cs
new file mode 100644
index 000000000..c2c62bd62
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiBrowser.cs
@@ -0,0 +1,193 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using PuppeteerSharp.Bidi.Core;
+using PuppeteerSharp.Helpers;
+using WebDriverBiDi;
+using WebDriverBiDi.Session;
+
+namespace PuppeteerSharp.Bidi;
+
+/// <summary>
+/// Represents a browser connected using the Bidi protocol.
+/// </summary>
+public class BidiBrowser : Browser
+{
+    private readonly LaunchOptions _options;
+    private readonly ConcurrentSet<BidiBrowserContext> _browserContexts = [];
+    private readonly ILogger<BidiBrowser> _logger;
+    private readonly BidiBrowserTarget _target;
+
+    private BidiBrowser(Core.Browser browserCore, LaunchOptions options, ILoggerFactory loggerFactory)
+    {
+        _target = new BidiBrowserTarget(this);
+        _options = options;
+        BrowserCore = browserCore;
+        _logger = loggerFactory.CreateLogger<BidiBrowser>();
+    }
+
+    /// <inheritdoc />
+    public override bool IsClosed { get; }
+
+    internal static string[] SubscribeModules { get; } =
+    [
+        "browsingContext",
+        "network",
+        "log",
+        "script",
+    ];
+
+    internal static string[] SubscribeCdpEvents { get; } =
+    [
+        "cdp.Debugger.scriptParsed",
+        "cdp.CSS.styleSheetAdded",
+        "cdp.Runtime.executionContextsCleared",
+        "cdp.Tracing.tracingComplete",
+        "cdp.Network.requestWillBeSent",
+        "cdp.Debugger.scriptParsed",
+        "cdp.Page.screencastFrame",
+    ];
+
+    internal BiDiDriver Driver => BrowserCore.Session.Driver;
+
+    internal Core.Browser BrowserCore { get; }
+
+    internal override ProtocolType Protocol => ProtocolType.WebdriverBiDi;
+
+    // TODO: Implement
+    internal bool CdpSupported => false;
+
+    internal string BrowserVersion => BrowserCore.Session.Info.Capabilities.BrowserVersion;
+
+    internal string BrowserName => BrowserCore.Session.Info.Capabilities.BrowserName;
+
+    /// <inheritdoc />
+    public override Task<string> GetVersionAsync() => Task.FromResult($"{BrowserName}/{BrowserVersion}");
+
+    /// <inheritdoc />
+    public override Task<string> GetUserAgentAsync() => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override void Disconnect() => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override async Task CloseAsync()
+    {
+        try
+        {
+            await BrowserCore.CloseAsync().ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to close connection");
+        }
+        finally
+        {
+            await Driver.StopAsync().ConfigureAwait(false);
+        }
+    }
+
+    /// <inheritdoc />
+    public override Task<IPage> NewPageAsync() => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override ITarget[] Targets()
+        =>
+        [
+            _target,
+            .. _browserContexts.SelectMany(context => context.Targets()).ToArray()
+        ];
+
+    /// <inheritdoc />
+    public override async Task<IBrowserContext> CreateBrowserContextAsync(BrowserContextOptions options = null)
+    {
+        var userContext = await BrowserCore.CreateUserContextAsync().ConfigureAwait(false);
+        return CreateBrowserContext(userContext);
+    }
+
+    /// <inheritdoc />
+    public override IBrowserContext[] BrowserContexts() => throw new NotImplementedException();
+
+    [SuppressMessage(
+        "Reliability",
+        "CA2000:Dispose objects before losing scope",
+        Justification = "We return the session, the browser needs to dispose the session")]
+    internal static async Task<BidiBrowser> CreateAsync(
+        BiDiDriver driver,
+        LaunchOptions options,
+        ILoggerFactory loggerFactory)
+    {
+        var session = await Session.FromAsync(
+            driver,
+            new NewCommandParameters
+            {
+                Capabilities = new CapabilitiesRequest()
+                {
+                    AlwaysMatch = new CapabilityRequest()
+                    {
+                        AcceptInsecureCertificates = options.AcceptInsecureCerts,
+                        AdditionalCapabilities = { ["webSocketUrl"] = true, },
+                    },
+                },
+            },
+            loggerFactory).ConfigureAwait(false);
+
+        await session.SubscribeAsync(
+            session.Info.Capabilities.BrowserName.ToLowerInvariant().Contains("firefox")
+                ? SubscribeModules
+                : [.. SubscribeModules, .. SubscribeCdpEvents]).ConfigureAwait(false);
+
+        var browser = new BidiBrowser(session.Browser, options, loggerFactory);
+        browser.InitializeAsync();
+        return browser;
+    }
+
+    private void InitializeAsync()
+    {
+        // Initializing existing contexts.
+        foreach (var userContext in BrowserCore.UserContexts)
+        {
+            CreateBrowserContext(userContext);
+        }
+    }
+
+    private BidiBrowserContext CreateBrowserContext(UserContext userContext)
+    {
+        var browserContext = BidiBrowserContext.From(
+            this,
+            userContext,
+            new BidiBrowserContextOptions() { DefaultViewport = _options.DefaultViewport, });
+
+        _browserContexts.Add(browserContext);
+
+        browserContext.TargetCreated += (sender, args) => OnTargetCreated(args);
+        browserContext.TargetDestroyed += (sender, args) => OnTargetDestroyed(args);
+
+        return browserContext;
+    }
+}
+
diff --git a/lib/PuppeteerSharp/Bidi/BidiBrowserContext.cs b/lib/PuppeteerSharp/Bidi/BidiBrowserContext.cs
new file mode 100644
index 000000000..67a78b7bc
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiBrowserContext.cs
@@ -0,0 +1,217 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using PuppeteerSharp.Bidi.Core;
+using PuppeteerSharp.Helpers;
+
+namespace PuppeteerSharp.Bidi;
+
+/// <inheritdoc />
+public class BidiBrowserContext : BrowserContext
+{
+    private readonly ConcurrentDictionary<BrowsingContext, BidiPage> _pages = [];
+    private readonly ConcurrentDictionary<BidiPage, BidiPageTargetInfo> _targets = new();
+
+    private BidiBrowserContext(BidiBrowser browser, UserContext userContext, BidiBrowserContextOptions options)
+    {
+        UserContext = userContext;
+        Browser = browser;
+        DefaultViewport = options.DefaultViewport;
+    }
+
+    internal ViewPortOptions DefaultViewport { get; set; }
+
+    internal TaskQueue ScreenshotTaskQueue => Browser.ScreenshotTaskQueue;
+
+    internal UserContext UserContext { get; }
+
+    /// <inheritdoc />
+    public override Task OverridePermissionsAsync(string origin, IEnumerable<OverridePermission> permissions) => throw new System.NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task ClearPermissionOverridesAsync() => throw new System.NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<IPage[]> PagesAsync() => throw new System.NotImplementedException();
+
+    /// <inheritdoc />
+    public override async Task<IPage> NewPageAsync()
+    {
+        var context = await UserContext.CreateBrowserContextAsync(WebDriverBiDi.BrowsingContext.CreateType.Tab).ConfigureAwait(false);
+
+        if (!_pages.TryGetValue(context, out var page))
+        {
+            throw new PuppeteerException("Page is not found");
+        }
+
+        if (DefaultViewport != null)
+        {
+            try
+            {
+                await page.SetViewportAsync(DefaultViewport).ConfigureAwait(false);
+            }
+            catch
+            {
+                // No support for setViewport in Firefox.
+            }
+        }
+
+        return page;
+    }
+
+    /// <inheritdoc />
+    public override Task CloseAsync() => throw new System.NotImplementedException();
+
+    /// <inheritdoc />
+    public override ITarget[] Targets()
+        => _targets.SelectMany(target =>
+            (ITarget[])[
+                target.Value.BidiPageTarget,
+                .. target.Value.FrameTargets.Values.ToArray(),
+                .. target.Value.WorkerTargets.Values.ToArray(),
+            ]).ToArray();
+
+    internal static BidiBrowserContext From(
+        BidiBrowser browser,
+        UserContext userContext,
+        BidiBrowserContextOptions options)
+    {
+        var context = new BidiBrowserContext(browser, userContext, options);
+        context.Initialize();
+        return context;
+    }
+
+    private void Initialize()
+    {
+        // Create targets for existing browsing contexts.
+        foreach (var browsingContext in UserContext.BrowsingContexts)
+        {
+            CreatePage(browsingContext);
+        }
+
+        UserContext.BrowsingContextCreated += (sender, args) =>
+        {
+            var browsingContext = args.BrowsingContext;
+            var page = CreatePage(browsingContext);
+
+            // We need to wait for the DOMContentLoaded as the
+            // browsingContext still may be navigating from the about:blank
+            browsingContext.DomContentLoaded += (o, eventArgs) =>
+            {
+                if (browsingContext.OriginalOpener == null)
+                {
+                    return;
+                }
+
+                foreach (var context in UserContext.BrowsingContexts)
+                {
+                    if (context.Id != browsingContext.OriginalOpener)
+                    {
+                        continue;
+                    }
+
+                    if (_pages.TryGetValue(context, out var originalOpenerPage))
+                    {
+                        originalOpenerPage.OnPopup(page);
+                    }
+                }
+            };
+        };
+    }
+
+    private BidiPage CreatePage(BrowsingContext browsingContext)
+    {
+        var page = BidiPage.From(this, browsingContext);
+        _pages.AddOrUpdate(browsingContext, page, (_, _) => page);
+
+        var pageTarget = new BidiPageTarget(page);
+        var targetInfo = new BidiPageTargetInfo { BidiPageTarget = pageTarget };
+        _targets.TryAdd(page, targetInfo);
+
+        page.FrameAttached += (_, e) =>
+        {
+            var bidiFrame = (BidiFrame)e.Frame;
+            var frameTarget = new BidiFrameTarget(bidiFrame);
+            targetInfo.FrameTargets.TryAdd(bidiFrame, frameTarget);
+        };
+
+        page.FrameNavigated += (_, e) =>
+        {
+            var bidiFrame = (BidiFrame)e.Frame;
+            OnTargetChanged(new TargetChangedArgs(
+                targetInfo.FrameTargets.TryGetValue(bidiFrame, out var frameTarget)
+                    ? frameTarget
+                    : pageTarget));
+        };
+
+        page.FrameDetached += (_, e) =>
+        {
+            var bidiFrame = (BidiFrame)e.Frame;
+            if (targetInfo.FrameTargets.TryRemove(bidiFrame, out var frameTarget))
+            {
+                OnTargetDestroyed(new TargetChangedArgs(frameTarget));
+            }
+        };
+
+        page.WorkerCreated += (_, e) =>
+        {
+            var bidiWorker = (BidiWebWorker)e.Worker;
+            var workerTarget = new BidiWorkerTarget(bidiWorker);
+            targetInfo.WorkerTargets.TryAdd(bidiWorker, workerTarget);
+        };
+
+        page.WorkerDestroyed += (_, e) =>
+        {
+            var bidiWorker = (BidiWebWorker)e.Worker;
+            if (targetInfo.WorkerTargets.TryRemove(bidiWorker, out var workerTarget))
+            {
+                OnTargetDestroyed(new TargetChangedArgs(workerTarget));
+            }
+        };
+
+        page.Close += (_, _) =>
+        {
+            if (_targets.TryRemove(page, out _))
+            {
+                OnTargetDestroyed(new TargetChangedArgs(pageTarget));
+            }
+        };
+
+        OnTargetCreated(new TargetChangedArgs(pageTarget));
+        return page;
+    }
+
+    private class BidiPageTargetInfo
+    {
+        public BidiPageTarget BidiPageTarget { get; set; }
+
+        public ConcurrentDictionary<BidiFrame, BidiFrameTarget> FrameTargets { get; set; } = new();
+
+        public ConcurrentDictionary<BidiWebWorker, BidiWorkerTarget> WorkerTargets { get; set; } = new();
+    }
+}
+
+
diff --git a/lib/PuppeteerSharp/Bidi/BidiBrowserContextOptions.cs b/lib/PuppeteerSharp/Bidi/BidiBrowserContextOptions.cs
new file mode 100644
index 000000000..59900a772
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiBrowserContextOptions.cs
@@ -0,0 +1,30 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using WebDriverBiDi.BrowsingContext;
+
+namespace PuppeteerSharp.Bidi;
+
+internal class BidiBrowserContextOptions
+{
+    public ViewPortOptions DefaultViewport { get; set; }
+}
diff --git a/lib/PuppeteerSharp/Bidi/BidiBrowserTarget.cs b/lib/PuppeteerSharp/Bidi/BidiBrowserTarget.cs
new file mode 100644
index 000000000..b05fc82b2
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiBrowserTarget.cs
@@ -0,0 +1,42 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System.Threading.Tasks;
+
+namespace PuppeteerSharp.Bidi;
+
+internal class BidiBrowserTarget(BidiBrowser bidiBrowser) : Target
+{
+    public override string Url { get; }
+
+    public override TargetType Type { get; }
+
+    public override ITarget Opener { get; }
+
+    internal override BrowserContext BrowserContext { get; }
+
+    internal override Browser Browser => bidiBrowser;
+
+    public override Task<IPage> AsPageAsync() => throw new System.NotImplementedException();
+
+    public override Task<ICDPSession> CreateCDPSessionAsync() => throw new System.NotImplementedException();
+}
diff --git a/lib/PuppeteerSharp/Bidi/BidiCdpSession.cs b/lib/PuppeteerSharp/Bidi/BidiCdpSession.cs
new file mode 100644
index 000000000..61b3e9a1e
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiCdpSession.cs
@@ -0,0 +1,85 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace PuppeteerSharp.Bidi;
+
+/// <inheritdoc />
+public class BidiCdpSession : ICDPSession
+{
+    // I don't like the idea of having this static field. But this is the original implementation.
+    private static readonly ConcurrentDictionary<string, BidiCdpSession> _sessions = new();
+
+    /// <inheritdoc />
+    public event EventHandler<MessageEventArgs> MessageReceived;
+
+    /// <inheritdoc />
+    public event EventHandler Disconnected;
+
+    /// <inheritdoc />
+    public event EventHandler<SessionEventArgs> SessionAttached;
+
+    /// <inheritdoc />
+    public event EventHandler<SessionEventArgs> SessionDetached;
+
+    /// <inheritdoc />
+    public ILoggerFactory LoggerFactory { get; }
+
+    /// <inheritdoc />
+    public string Id { get; }
+
+    /// <inheritdoc />
+    public string CloseReason { get; }
+
+    internal static IEnumerable<BidiCdpSession> Sessions => _sessions.Values;
+
+    internal BidiFrame Frame { get; set; }
+
+    /// <inheritdoc />
+    public Task<T> SendAsync<T>(string method, object args = null, CommandOptions options = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public Task<JsonElement?> SendAsync(string method, object args = null, bool waitForCallback = true, CommandOptions options = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public Task DetachAsync() => throw new NotImplementedException();
+
+    internal void OnClose()
+    {
+        throw new NotImplementedException();
+    }
+
+    internal virtual void OnSessionAttached(SessionEventArgs e) => SessionAttached?.Invoke(this, e);
+
+    internal virtual void OnSessionDetached(SessionEventArgs e) => SessionDetached?.Invoke(this, e);
+
+    internal virtual void OnDisconnected() => Disconnected?.Invoke(this, EventArgs.Empty);
+
+    internal virtual void OnMessageReceived(MessageEventArgs e) => MessageReceived?.Invoke(this, e);
+}
diff --git a/lib/PuppeteerSharp/Bidi/BidiFrame.cs b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
new file mode 100644
index 000000000..10df07299
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
@@ -0,0 +1,229 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using PuppeteerSharp.Bidi.Core;
+
+namespace PuppeteerSharp.Bidi;
+
+/// <inheritdoc />
+public class BidiFrame : Frame
+{
+    private readonly ConcurrentDictionary<BrowsingContext, BidiFrame> _frames = new();
+
+    internal BidiFrame(BidiPage parentPage, BidiFrame parentFrame, BrowsingContext browsingContext)
+    {
+        ParentPage = parentPage;
+        ParentFrame = parentFrame;
+        BrowsingContext = browsingContext;
+    }
+
+    /// <inheritdoc />
+    public override IReadOnlyCollection<IFrame> ChildFrames { get; }
+
+    /// <inheritdoc/>
+    public override string Url => BrowsingContext.Url;
+
+    /// <inheritdoc />
+    public override IPage Page => BidiPage;
+
+    /// <inheritdoc />
+    public override CDPSession Client { get; protected set; }
+
+    internal BidiPage BidiPage
+    {
+        get
+        {
+            var frame = this;
+            while (frame?.ParentPage == null)
+            {
+                frame = frame.ParentFrame as BidiFrame;
+            }
+
+            return frame.ParentPage;
+        }
+    }
+
+    internal BrowsingContext BrowsingContext { get; }
+
+    internal BidiPage ParentPage { get; }
+
+    internal override Frame ParentFrame { get; }
+
+    internal TimeoutSettings TimeoutSettings => BidiPage.TimeoutSettings;
+
+    /// <inheritdoc />
+    public override Task<IElementHandle> AddStyleTagAsync(AddTagOptions options) => throw new System.NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<IElementHandle> AddScriptTagAsync(AddTagOptions options) => throw new System.NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetContentAsync(string html, NavigationOptions options = null) => throw new System.NotImplementedException();
+
+    /// <inheritdoc />
+    public override async Task<IResponse> GoToAsync(string url, NavigationOptions options)
+    {
+        var waitForNavigationTask = WaitForNavigationAsync(options);
+        var navigationTask = NavigateAsync(url);
+
+        try
+        {
+            await Task.WhenAll(waitForNavigationTask, navigationTask).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            throw RewriteNavigationError(ex, url, options?.Timeout ?? TimeoutSettings.NavigationTimeout);
+        }
+
+        return waitForNavigationTask.Result;
+    }
+
+    /// <inheritdoc />
+    public override Task<IResponse> WaitForNavigationAsync(NavigationOptions options = null)
+    {
+        // TODO: This logic is missing tons of things.
+        var navigationTcs = new TaskCompletionSource<IResponse>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        // TODO: Async void is not safe. Refactor code.
+        BrowsingContext.Navigation += (sender, args) =>
+        {
+            args.Navigation.RequestCreated += async (o, eventArgs) =>
+            {
+                try
+                {
+                    var httpRequest = await BidiHttpRequest.Requests.GetItemAsync(args.Navigation.Request)
+                        .ConfigureAwait(false);
+
+                    if (httpRequest.Response != null)
+                    {
+                        navigationTcs.TrySetResult(httpRequest.Response);
+                        return;
+                    }
+
+                    args.Navigation.Request.Success += (o, eventArgs) =>
+                    {
+                        navigationTcs.TrySetResult(httpRequest.Response);
+                    };
+                }
+                catch (Exception ex)
+                {
+                    navigationTcs.TrySetException(ex);
+                }
+            };
+        };
+
+        return navigationTcs.Task;
+    }
+
+    internal static BidiFrame From(BidiPage parentPage, BidiFrame parentFrame, BrowsingContext browsingContext)
+    {
+        parentFrame = new BidiFrame(parentPage, parentFrame, browsingContext);
+        parentFrame.Initialize();
+        return parentFrame;
+    }
+
+    /// <inheritdoc />
+    protected internal override DeviceRequestPromptManager GetDeviceRequestPromptManager() => throw new System.NotImplementedException();
+
+    private PuppeteerException RewriteNavigationError(Exception ex, string url, int timeoutSettingsNavigationTimeout)
+    {
+        return ex is TimeoutException
+            ? new NavigationException($"Navigation timeout of {timeoutSettingsNavigationTimeout} ms exceeded", url)
+            : new PuppeteerException("Navigation failed: " + ex.Message, ex);
+    }
+
+    private async Task NavigateAsync(string url)
+    {
+        // Some implementations currently only report errors when the
+        // readiness=interactive.
+        //
+        // Related: https://bugzilla.mozilla.org/show_bug.cgi?id=1846601
+        try
+        {
+            await BrowsingContext.NavigateAsync(url, WebDriverBiDi.BrowsingContext.ReadinessState.Interactive).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            if (ex.Message.Contains("net::ERR_HTTP_RESPONSE_CODE_FAILURE"))
+            {
+                return;
+            }
+
+            throw new PuppeteerException("Failed to navigate to " + url, ex);
+        }
+    }
+
+    private void Initialize()
+    {
+        foreach (var browsingContext in BrowsingContext.Children)
+        {
+            CreateFrameTarget(browsingContext);
+        }
+
+        BrowsingContext.Closed += (sender, args) =>
+        {
+            foreach (var session in BidiCdpSession.Sessions)
+            {
+                if (session.Frame == this)
+                {
+                    session.OnClose();
+                }
+            }
+
+            ((BidiPage)Page).OnFrameDetached(new FrameEventArgs(this));
+        };
+
+        BrowsingContext.Request += (sender, args) =>
+        {
+            var httpRequest = BidiHttpRequest.From(args.Request, this);
+
+            args.Request.Success += (o, eventArgs) =>
+            {
+                ((BidiPage)Page).OnRequestFinished(new RequestEventArgs(httpRequest));
+            };
+
+            args.Request.Error += (o, eventArgs) =>
+            {
+                ((BidiPage)Page).OnRequestFailed(new RequestEventArgs(httpRequest));
+            };
+
+            _ = httpRequest.FinalizeInterceptionsAsync();
+        };
+    }
+
+    private void CreateFrameTarget(BrowsingContext browsingContext)
+    {
+        var frame = BidiFrame.From(null, this, browsingContext);
+        _frames.TryAdd(browsingContext, frame);
+        ((BidiPage)Page).OnFrameAttached(new FrameEventArgs(frame));
+
+        browsingContext.Closed += (sender, args) =>
+        {
+            _frames.TryRemove(browsingContext, out var _);
+        };
+    }
+}
+
diff --git a/lib/PuppeteerSharp/Bidi/BidiFrameTarget.cs b/lib/PuppeteerSharp/Bidi/BidiFrameTarget.cs
new file mode 100644
index 000000000..adf4bd4d9
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiFrameTarget.cs
@@ -0,0 +1,50 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Threading.Tasks;
+
+namespace PuppeteerSharp.Bidi;
+
+internal class BidiFrameTarget : Target
+{
+    private readonly BidiFrame _frame;
+
+    internal BidiFrameTarget(BidiFrame frame)
+    {
+        _frame = frame;
+    }
+
+    public override string Url => _frame.Url;
+
+    public override TargetType Type { get; }
+
+    public override ITarget Opener { get; }
+
+    internal override BrowserContext BrowserContext { get; }
+
+    internal override Browser Browser { get; }
+
+    public override Task<IPage> AsPageAsync() => throw new NotImplementedException();
+
+    public override Task<ICDPSession> CreateCDPSessionAsync() => throw new NotImplementedException();
+}
diff --git a/lib/PuppeteerSharp/Bidi/BidiHttpRequest.cs b/lib/PuppeteerSharp/Bidi/BidiHttpRequest.cs
new file mode 100644
index 000000000..9df5dd8f1
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiHttpRequest.cs
@@ -0,0 +1,150 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using PuppeteerSharp.Bidi.Core;
+using PuppeteerSharp.Helpers;
+
+namespace PuppeteerSharp.Bidi;
+
+/// <inheritdoc />
+public class BidiHttpRequest : Request<BidiHttpResponse>
+{
+    private readonly Request _request;
+    private readonly BidiRequestInterception _interception = new();
+
+    private BidiHttpRequest(Request request, BidiFrame frame, BidiHttpRequest redirect)
+    {
+        _request = request;
+        Frame = frame;
+        RedirectChainList = new List<IRequest>();
+        Requests.AddItem(request, this);
+    }
+
+    // TODO: I don't like having this static field at all. This will cause memory leaks for sure.
+    // We need to move this to a place where we can control its lifecycle.
+    internal static AsyncDictionaryHelper<Request, BidiHttpRequest> Requests { get; } = new("Request {0} not found");
+
+    internal override Payload ContinueRequestOverrides { get; }
+
+    internal override ResponseData ResponseForRequest { get; }
+
+    internal override RequestAbortErrorCode AbortErrorReason { get; }
+
+    internal BidiPage BidiPage => (BidiPage)Frame.Page;
+
+    internal ConcurrentDictionary<string, string> ExtraHttpHeaders => BidiPage.ExtraHttpHeaders;
+
+    internal ConcurrentDictionary<string, string> UserAgentHeaders => BidiPage.UserAgentHeaders;
+
+    internal bool HasInternalHeaderOverwrite => ExtraHttpHeaders.Values.Count != 0 || UserAgentHeaders.Values.Count != 0;
+
+    /// <inheritdoc />
+    public override Task ContinueAsync(Payload payloadOverrides = null, int? priority = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task RespondAsync(ResponseData response, int? priority = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task AbortAsync(RequestAbortErrorCode errorCode = RequestAbortErrorCode.Failed, int? priority = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<string> FetchPostDataAsync() => throw new NotImplementedException();
+
+    internal static BidiHttpRequest From(Request bidiRequest, BidiFrame frame, BidiHttpRequest redirect = null)
+    {
+        var request = new BidiHttpRequest(bidiRequest, frame, redirect);
+        request.Initialize();
+        return request;
+    }
+
+    internal override Task FinalizeInterceptionsAsync()
+    {
+        // TODO: Implement this
+        return Task.CompletedTask;
+    }
+
+    internal override void EnqueueInterceptionAction(Func<IRequest, Task> pendingHandler) => throw new NotImplementedException();
+
+    private void Initialize()
+    {
+        _request.Redirect += (sender, e) =>
+        {
+            var request = e.Request;
+            var httpRequest = From(request, Frame as BidiFrame, this);
+            RedirectChainList.Add(this);
+
+            request.Success += (sender, e) =>
+            {
+                BidiPage.OnRequestFinished(new RequestEventArgs(httpRequest));
+            };
+
+            request.Success += (sender, e) =>
+            {
+                BidiPage.OnRequestFinished(new RequestEventArgs(httpRequest));
+            };
+
+            request.Error += (o, args) =>
+            {
+                BidiPage.OnRequestFailed(new RequestEventArgs(httpRequest));
+            };
+
+            _ = httpRequest.FinalizeInterceptionsAsync();
+        };
+
+        _request.Success += (sender, e) =>
+        {
+            Response = BidiHttpResponse.From(e.Response, this, BidiPage.BidiBrowser.CdpSupported);
+            BidiPage.OnRequest(this);
+        };
+
+        _request.Success += (sender, args) =>
+        {
+            Response = BidiHttpResponse.From(args.Response, this, BidiPage.BidiBrowser.CdpSupported);
+        };
+
+        _request.Authenticate += HandleAuthentication;
+
+        BidiPage.OnRequest(this);
+
+        if (HasInternalHeaderOverwrite)
+        {
+            _interception.Handlers.Add(async () =>
+            {
+                await ContinueAsync(
+                new Payload()
+                {
+                    Headers = Headers,
+                },
+                0).ConfigureAwait(false);
+            });
+        }
+    }
+
+    private void HandleAuthentication(object sender, EventArgs e)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/lib/PuppeteerSharp/Bidi/BidiHttpResponse.cs b/lib/PuppeteerSharp/Bidi/BidiHttpResponse.cs
new file mode 100644
index 000000000..37ebdff89
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiHttpResponse.cs
@@ -0,0 +1,62 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System.Threading.Tasks;
+
+namespace PuppeteerSharp.Bidi;
+
+/// <inheritdoc />
+public class BidiHttpResponse : Response<BidiHttpRequest>
+{
+    private readonly WebDriverBiDi.Network.ResponseData _data;
+    private readonly BidiHttpRequest _request;
+
+    private BidiHttpResponse(WebDriverBiDi.Network.ResponseData data, BidiHttpRequest request, bool cdpSupported)
+    {
+        _data = data;
+        _request = request;
+    }
+
+    /// <inheritdoc />
+    public override bool FromCache { get; }
+
+    /// <inheritdoc />
+    public override ValueTask<byte[]> BufferAsync() => throw new System.NotImplementedException();
+
+    internal static BidiHttpResponse From(WebDriverBiDi.Network.ResponseData data, BidiHttpRequest request, bool cdpSupported)
+    {
+        var response = new BidiHttpResponse(data, request, cdpSupported);
+        response.Initialize();
+        return response;
+    }
+
+    private void Initialize()
+    {
+        if (_data.FromCache)
+        {
+            _request.FromMemoryCache = true;
+            ((Page)_request.Frame.Page).OnRequestServedFromCache(new RequestEventArgs(_request));
+        }
+
+        _request.BidiPage.OnResponse(new ResponseCreatedEventArgs(this));
+    }
+}
diff --git a/lib/PuppeteerSharp/Bidi/BidiPage.cs b/lib/PuppeteerSharp/Bidi/BidiPage.cs
new file mode 100644
index 000000000..448409227
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiPage.cs
@@ -0,0 +1,220 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using PuppeteerSharp.Bidi.Core;
+using PuppeteerSharp.Helpers;
+using PuppeteerSharp.Media;
+
+namespace PuppeteerSharp.Bidi;
+
+/// <inheritdoc />
+public class BidiPage : Page
+{
+    internal BidiPage(BidiBrowserContext browserContext, BrowsingContext browsingContext) : base(browserContext.ScreenshotTaskQueue)
+    {
+        BrowserContext = browserContext;
+        BidiMainFrame = BidiFrame.From(this, null, browsingContext);
+    }
+
+    /// <inheritdoc />
+    public override IBrowserContext BrowserContext { get; }
+
+    /// <inheritdoc />
+    public override CDPSession Client { get; }
+
+    /// <inheritdoc />
+    public override Target Target { get; }
+
+    /// <inheritdoc />
+    public override IFrame[] Frames { get; }
+
+    /// <inheritdoc />
+    public override WebWorker[] Workers { get; }
+
+    /// <inheritdoc />
+    public override bool IsJavaScriptEnabled { get; }
+
+    /// <inheritdoc/>
+    public override IFrame MainFrame => BidiMainFrame;
+
+    internal BidiBrowser BidiBrowser => (BidiBrowser)BrowserContext.Browser;
+
+    internal BidiFrame BidiMainFrame { get; set; }
+
+    internal ConcurrentDictionary<string, string> ExtraHttpHeaders { get; set; } = new();
+
+    internal ConcurrentDictionary<string, string> UserAgentHeaders { get; set; } = new();
+
+    /// <inheritdoc />
+    protected override Browser Browser { get; }
+
+    /// <inheritdoc />
+    public override Task SetExtraHttpHeadersAsync(Dictionary<string, string> headers) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task AuthenticateAsync(Credentials credentials) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task BringToFrontAsync() => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task EmulateVisionDeficiencyAsync(VisionDeficiency type) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task EmulateTimezoneAsync(string timezoneId) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task EmulateIdleStateAsync(EmulateIdleOverrides idleOverrides = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task EmulateCPUThrottlingAsync(decimal? factor = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<IResponse> ReloadAsync(NavigationOptions options) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task WaitForNetworkIdleAsync(WaitForNetworkIdleOptions options = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<IRequest> WaitForRequestAsync(Func<IRequest, bool> predicate, WaitForOptions options = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<IResponse> WaitForResponseAsync(Func<IResponse, Task<bool>> predicate, WaitForOptions options = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<FileChooser> WaitForFileChooserAsync(WaitForOptions options = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<IResponse> GoBackAsync(NavigationOptions options = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<IResponse> GoForwardAsync(NavigationOptions options = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetBurstModeOffAsync() => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<IFrame> WaitForFrameAsync(Func<IFrame, bool> predicate, WaitForOptions options = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetGeolocationAsync(GeolocationOption options) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetJavaScriptEnabledAsync(bool enabled) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetBypassCSPAsync(bool enabled) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetCacheEnabledAsync(bool enabled = true) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task EmulateMediaTypeAsync(MediaType type) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task EmulateMediaFeaturesAsync(IEnumerable<MediaFeatureValue> features) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetUserAgentAsync(string userAgent, UserAgentMetadata userAgentData = null) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetViewportAsync(ViewPortOptions viewport) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetCookieAsync(params CookieParam[] cookies) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override async Task CloseAsync(PageCloseOptions options = null)
+    {
+        try
+        {
+            await BidiMainFrame.BrowsingContext.CloseAsync(options?.RunBeforeUnload).ConfigureAwait(false);
+        }
+        catch (Exception)
+        {
+            return;
+        }
+    }
+
+    /// <inheritdoc />
+    public override Task DeleteCookieAsync(params CookieParam[] cookies) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetDragInterceptionAsync(bool enabled) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<Dictionary<string, decimal>> MetricsAsync() => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<NewDocumentScriptEvaluation> EvaluateFunctionOnNewDocumentAsync(string pageFunction, params object[] args) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task RemoveExposedFunctionAsync(string name) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task RemoveScriptToEvaluateOnNewDocumentAsync(string identifier) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetBypassServiceWorkerAsync(bool bypass) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<NewDocumentScriptEvaluation> EvaluateExpressionOnNewDocumentAsync(string expression) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<IJSHandle> QueryObjectsAsync(IJSHandle prototypeHandle) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetRequestInterceptionAsync(bool value) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task SetOfflineModeAsync(bool value) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task EmulateNetworkConditionsAsync(NetworkConditions networkConditions) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    public override Task<CookieParam[]> GetCookiesAsync(params string[] urls) => throw new NotImplementedException();
+
+    internal static BidiPage From(BidiBrowserContext browserContext, BrowsingContext browsingContext)
+    {
+        var page = new BidiPage(browserContext, browsingContext);
+        page.Initialize();
+        return page;
+    }
+
+    /// <inheritdoc />
+    protected override Task<byte[]> PdfInternalAsync(string file, PdfOptions options) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    protected override Task<string> PerformScreenshotAsync(ScreenshotType type, ScreenshotOptions options) => throw new NotImplementedException();
+
+    /// <inheritdoc />
+    protected override Task ExposeFunctionAsync(string name, Delegate puppeteerFunction) => throw new NotImplementedException();
+
+    private void Initialize()
+    {
+    }
+}
diff --git a/lib/PuppeteerSharp/Bidi/BidiPageTarget.cs b/lib/PuppeteerSharp/Bidi/BidiPageTarget.cs
new file mode 100644
index 000000000..eee826e56
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiPageTarget.cs
@@ -0,0 +1,51 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Threading.Tasks;
+
+namespace PuppeteerSharp.Bidi;
+
+internal class BidiPageTarget(BidiPage page) : Target
+{
+    public override string Url => page.Url;
+
+    public override TargetType Type => TargetType.Page;
+
+    public override ITarget Opener => throw new InvalidOperationException();
+
+    internal override Browser Browser { get; }
+
+    internal override BrowserContext BrowserContext => BidiBrowserContext;
+
+    internal BidiBrowserContext BidiBrowserContext { get; }
+
+    public override Task<IPage> PageAsync() => Task.FromResult<IPage>(page);
+
+    public override Task<IPage> AsPageAsync()
+#pragma warning disable CA2000
+        => Task.FromResult(BidiPage.From(BidiBrowserContext, page.BidiMainFrame.BrowsingContext) as IPage);
+#pragma warning restore CA2000
+
+    public override Task<ICDPSession> CreateCDPSessionAsync()
+        => page.CreateCDPSessionAsync();
+}
diff --git a/lib/PuppeteerSharp/Bidi/BidiWebWorker.cs b/lib/PuppeteerSharp/Bidi/BidiWebWorker.cs
new file mode 100644
index 000000000..fb95302d5
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiWebWorker.cs
@@ -0,0 +1,38 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System.Threading.Tasks;
+
+namespace PuppeteerSharp.Bidi;
+
+internal class BidiWebWorker : WebWorker
+{
+    public BidiWebWorker(string url) : base(url)
+    {
+    }
+
+    public override CDPSession Client { get; }
+
+    internal override IsolatedWorld World { get; }
+
+    public override Task CloseAsync() => throw new System.NotImplementedException();
+}
diff --git a/lib/PuppeteerSharp/Bidi/BidiWorkerTarget.cs b/lib/PuppeteerSharp/Bidi/BidiWorkerTarget.cs
new file mode 100644
index 000000000..1e9be4398
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiWorkerTarget.cs
@@ -0,0 +1,48 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Threading.Tasks;
+
+namespace PuppeteerSharp.Bidi;
+
+internal class BidiWorkerTarget : Target
+{
+    public BidiWorkerTarget(BidiWebWorker bidiWorker)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override string Url { get; }
+
+    public override TargetType Type { get; }
+
+    public override ITarget Opener { get; }
+
+    internal override BrowserContext BrowserContext { get; }
+
+    internal override Browser Browser { get; }
+
+    public override Task<IPage> AsPageAsync() => throw new NotImplementedException();
+
+    public override Task<ICDPSession> CreateCDPSessionAsync() => throw new NotImplementedException();
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/BidiBrowsingContextEventArgs.cs b/lib/PuppeteerSharp/Bidi/Core/BidiBrowsingContextEventArgs.cs
new file mode 100644
index 000000000..73aac7cdb
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/BidiBrowsingContextEventArgs.cs
@@ -0,0 +1,33 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class BidiBrowsingContextEventArgs
+{
+    public BidiBrowsingContextEventArgs(BrowsingContext browsingContext)
+    {
+        BrowsingContext = browsingContext;
+    }
+
+    public BrowsingContext BrowsingContext { get; }
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/BidiRequestInterception.cs b/lib/PuppeteerSharp/Bidi/Core/BidiRequestInterception.cs
new file mode 100644
index 000000000..23dfd5225
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/BidiRequestInterception.cs
@@ -0,0 +1,33 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class BidiRequestInterception
+{
+    public List<Func<Task>> Handlers { get; } = new();
+}
+
diff --git a/lib/PuppeteerSharp/Bidi/Core/Browser.cs b/lib/PuppeteerSharp/Bidi/Core/Browser.cs
new file mode 100644
index 000000000..739cca12f
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/Browser.cs
@@ -0,0 +1,198 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using PuppeteerSharp.Helpers;
+using WebDriverBiDi.Browser;
+using WebDriverBiDi.BrowsingContext;
+using WebDriverBiDi.Protocol;
+using WebDriverBiDi.Script;
+using CloseCommandParameters = WebDriverBiDi.Browser.CloseCommandParameters;
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal sealed class Browser(Session session) : IDisposable
+{
+    private readonly ConcurrentDictionary<string, UserContext> _userContexts = new();
+    private bool _disposed;
+    private string _reason;
+
+    public event EventHandler<ClosedEventArgs> Closed;
+
+    public event EventHandler<ClosedEventArgs> Disconnected;
+
+    public Session Session { get; } = session;
+
+    public bool IsClosed { get; set; }
+
+    public string Reason { get; set; }
+
+    internal ICollection<UserContext> UserContexts => _userContexts.Values;
+
+    public static async Task<Browser> From(Session session)
+    {
+        var browser = new Browser(session);
+        await browser.InitializeAsync().ConfigureAwait(false);
+        return browser;
+    }
+
+    public async Task CloseAsync()
+    {
+        try
+        {
+            await Session.Driver.Browser.CloseAsync(new CloseCommandParameters()).ConfigureAwait(false);
+        }
+        finally
+        {
+            Dispose("Browser already closed.", true);
+        }
+    }
+
+    public void Dispose()
+    {
+        if (!_disposed)
+        {
+            return;
+        }
+
+        _disposed = true;
+        _reason ??= "Browser was disconnected, probably because the session ended.";
+
+        if (IsClosed)
+        {
+            Closed?.Invoke(this, new ClosedEventArgs(_reason));
+        }
+
+        Disconnected?.Invoke(this, new ClosedEventArgs(_reason));
+
+        Session?.Dispose();
+    }
+
+    public async Task<UserContext> CreateUserContextAsync()
+    {
+        var result = await Session.Driver.Browser.CreateUserContextAsync(new CreateUserContextCommandParameters()).ConfigureAwait(false);
+        return CreateUserContext(result.UserContextId);
+    }
+
+    private void Dispose(string reason)
+    {
+        _reason = reason;
+        IsClosed = true;
+        Dispose();
+    }
+
+    private void Dispose(bool disposing)
+    {
+        Dispose();
+    }
+
+    private async Task InitializeAsync()
+    {
+        Session.Ended += OnSessionEnded;
+        Session.Driver.OnEventReceived.AddObserver(OnEventReceived);
+
+        await SyncUserContextsAsync().ConfigureAwait(false);
+        await SyncBrowsingContextsAsync().ConfigureAwait(false);
+    }
+
+    private Task SyncBrowsingContextsAsync()
+    {
+        // In case contexts are created or destroyed during `getTree`, we use this
+        // set to detect them.
+        var contextIds = new ConcurrentSet<string>();
+
+        Session.Driver.BrowsingContext.OnContextCreated.AddObserver(info =>
+        {
+            contextIds.Add(info.BrowsingContextId);
+        });
+        var tree = Session.Driver.BrowsingContext.GetTreeAsync(new GetTreeCommandParameters());
+        var contexts = tree.Result.ContextTree;
+
+        // Simulating events so contexts are created naturally.
+        foreach (var info in contexts)
+        {
+            if (!contextIds.Contains(info.BrowsingContextId))
+            {
+                Session.OnBrowsingContextContextCreated(new BrowsingContextEventArgs(info));
+            }
+
+            foreach (var child in info.Children)
+            {
+                contexts.Add(child);
+            }
+        }
+
+        return Task.CompletedTask;
+    }
+
+    private async Task SyncUserContextsAsync()
+    {
+        var result = await Session.Driver.Browser.GetUserContextsAsync(new GetUserContextsCommandParameters()).ConfigureAwait(false);
+
+        foreach (var context in result.UserContexts)
+        {
+            CreateUserContext(context.UserContextId);
+        }
+    }
+
+    private UserContext CreateUserContext(string id)
+    {
+        var userContext = UserContext.Create(this, id);
+        _userContexts.TryAdd(userContext.Id, userContext);
+        userContext.Closed += (sender, args) => _userContexts.TryRemove(userContext.Id, out _);
+
+        return userContext;
+    }
+
+    private void OnEventReceived(EventReceivedEventArgs e)
+    {
+        switch (e.EventName)
+        {
+            case "script.realmCreated":
+                var realInfo = e.EventData as RealmInfo;
+
+                if (realInfo.Type != RealmType.SharedWorker)
+                {
+                    return;
+                }
+
+                break;
+            default:
+                return;
+        }
+    }
+
+    private void OnSessionEnded(object sender, SessionEndArgs e)
+    {
+        Dispose(e.Reason);
+    }
+
+    private void Dispose(string reason = null, bool closed = false)
+    {
+        Reason = reason;
+        IsClosed = closed;
+        Dispose(true);
+    }
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/BrowserContextNavigationEventArgs.cs b/lib/PuppeteerSharp/Bidi/Core/BrowserContextNavigationEventArgs.cs
new file mode 100644
index 000000000..630912798
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/BrowserContextNavigationEventArgs.cs
@@ -0,0 +1,33 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class BrowserContextNavigationEventArgs
+{
+    public BrowserContextNavigationEventArgs(Navigation navigation)
+    {
+        Navigation = navigation;
+    }
+
+    public Navigation Navigation { get; }
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs b/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs
new file mode 100644
index 000000000..a59421791
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs
@@ -0,0 +1,248 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using WebDriverBiDi.BrowsingContext;
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class BrowsingContext : IDisposable
+{
+    private readonly ConcurrentDictionary<string, BrowsingContext> _children = new();
+    private readonly ConcurrentDictionary<string, Request> _requests = new();
+    private string _reason;
+    private Navigation _navigation;
+
+    private BrowsingContext(UserContext userContext, BrowsingContext parent, string id, string url, string originalOpener)
+    {
+        UserContext = userContext;
+        Parent = parent;
+        Id = id;
+        Url = url;
+        OriginalOpener = originalOpener;
+    }
+
+    public event EventHandler<ClosedEventArgs> Closed;
+
+    public event EventHandler DomContentLoaded;
+
+    public event EventHandler Load;
+
+    public event EventHandler<BidiBrowsingContextEventArgs> BrowsingContextCreated;
+
+    public event EventHandler<RequestEventArgs> Request;
+
+    public event EventHandler<BrowserContextNavigationEventArgs> Navigation;
+
+    public UserContext UserContext { get; }
+
+    public string Id { get; }
+
+    public string Url { get; private set; }
+
+    public Session Session => UserContext.Browser.Session;
+
+    public IEnumerable<BrowsingContext> Children => _children.Values;
+
+    internal string OriginalOpener { get; }
+
+    internal BrowsingContext Top
+    {
+        get
+        {
+            var context = this;
+
+            while (context.Parent != null)
+            {
+                context = context.Parent;
+            }
+
+            return context;
+        }
+    }
+
+    private BrowsingContext Parent { get; }
+
+    public static BrowsingContext From(UserContext userContext, BrowsingContext parent, string id, string url, string originalOpener)
+    {
+        var context = new BrowsingContext(userContext, parent, id, url, originalOpener);
+        context.Initialize();
+        return context;
+    }
+
+    public void Dispose()
+    {
+        _reason ??= "Browser was disconnected, probably because the session ended.";
+        OnClosed(_reason);
+        foreach (var context in _children.Values)
+        {
+            context.Dispose("Parent browsing context was disposed");
+        }
+    }
+
+    public async Task CloseAsync(bool? promptUnload)
+    {
+        foreach (var context in _children.Values)
+        {
+            await context.CloseAsync(promptUnload).ConfigureAwait(false);
+        }
+
+        await Session.Driver.BrowsingContext.CloseAsync(new CloseCommandParameters(Id)
+        {
+            PromptUnload = promptUnload,
+        }).ConfigureAwait(false);
+    }
+
+    internal async Task NavigateAsync(string url, ReadinessState wait)
+    {
+        await Session.Driver.BrowsingContext.NavigateAsync(new NavigateCommandParameters(Id, url)
+        {
+            Wait = wait,
+        }).ConfigureAwait(false);
+    }
+
+    protected virtual void OnBrowsingContextCreated(BidiBrowsingContextEventArgs e) => BrowsingContextCreated?.Invoke(this, e);
+
+    private void Initialize()
+    {
+        UserContext.Closed += (sender, args) => Dispose("User context was closed");
+
+        Session.BrowsingContextContextCreated += (sender, args) =>
+        {
+            if (args.Parent != Id)
+            {
+                return;
+            }
+
+            var browsingContext = From(UserContext, this, args.UserContextId, args.Url, args.OriginalOpener);
+
+            _children.TryAdd(args.UserContextId, browsingContext);
+
+            browsingContext.Closed += (sender, args) =>
+            {
+                _children.TryRemove(browsingContext.Id, out _);
+            };
+
+            OnBrowsingContextCreated(new BidiBrowsingContextEventArgs(browsingContext));
+        };
+
+        Session.BrowsingContextContextDestroyed += (sender, args) =>
+        {
+            if (args.UserContextId != Id)
+            {
+                return;
+            }
+
+            Dispose("Browsing context already closed.");
+        };
+
+        Session.BrowsingContextDomContentLoaded += (sender, args) =>
+        {
+            if (args.BrowsingContextId != Id)
+            {
+                return;
+            }
+
+            Url = args.Url;
+            OnDomContentLoaded();
+        };
+
+        Session.BrowsingContextLoad += (sender, args) =>
+        {
+            if (args.BrowsingContextId != Id)
+            {
+                return;
+            }
+
+            Url = args.Url;
+            OnLoad();
+        };
+
+        Session.BrowsingcontextNavigationStarted += (sender, args) =>
+        {
+            if (args.BrowsingContextId != Id)
+            {
+                return;
+            }
+
+            foreach (var entry in _requests)
+            {
+                if (entry.Value.IsDisposed)
+                {
+                    _requests.TryRemove(entry.Key, out _);
+                }
+            }
+
+            if (_navigation is { IsDisposed: false })
+            {
+                return;
+            }
+
+            _navigation = Core.Navigation.From(this);
+
+            _navigation.Fragment += UpdateUrlFromEvent;
+            _navigation.Aborted += UpdateUrlFromEvent;
+            _navigation.Failed += UpdateUrlFromEvent;
+
+            OnNavigation(new BrowserContextNavigationEventArgs(_navigation));
+        };
+
+        Session.NetworkBeforeRequestSent += (sender, args) =>
+        {
+            if (args.BrowsingContextId != Id)
+            {
+                return;
+            }
+
+            if (_requests.ContainsKey(args.Request.RequestId))
+            {
+                return;
+            }
+
+            var request = Core.Request.From(this, args);
+            _requests.TryAdd(args.Request.RequestId, request);
+            Request?.Invoke(this, new RequestEventArgs(request));
+        };
+    }
+
+    private void OnNavigation(BrowserContextNavigationEventArgs args) => Navigation?.Invoke(this, args);
+
+    private void UpdateUrlFromEvent(object sender, NavigationEventArgs e)
+    {
+        Url = e.Url;
+    }
+
+    private void OnLoad() => Load?.Invoke(this, EventArgs.Empty);
+
+    private void OnDomContentLoaded() => DomContentLoaded?.Invoke(this, EventArgs.Empty);
+
+    private void Dispose(string reason)
+    {
+        _reason = reason;
+        Dispose();
+    }
+
+    private void OnClosed(string reason) => Closed?.Invoke(this, new ClosedEventArgs(reason));
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/ClosedEventArgs.cs b/lib/PuppeteerSharp/Bidi/Core/ClosedEventArgs.cs
new file mode 100644
index 000000000..321b3f9c3
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/ClosedEventArgs.cs
@@ -0,0 +1,28 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class ClosedEventArgs(string reason)
+{
+    public string Reason { get; } = reason;
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/ErrorEventArgs.cs b/lib/PuppeteerSharp/Bidi/Core/ErrorEventArgs.cs
new file mode 100644
index 000000000..b923643c5
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/ErrorEventArgs.cs
@@ -0,0 +1,28 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class ErrorEventArgs(string error)
+{
+    public string Error { get; } = error;
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/Navigation.cs b/lib/PuppeteerSharp/Bidi/Core/Navigation.cs
new file mode 100644
index 000000000..3087a1a17
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/Navigation.cs
@@ -0,0 +1,146 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using WebDriverBiDi.BrowsingContext;
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class Navigation
+{
+    private readonly BrowsingContext _browsingContext;
+    private Navigation _navigation;
+    private string _id;
+
+    private Navigation(BrowsingContext browsingContext)
+    {
+        _browsingContext = browsingContext;
+    }
+
+    public event EventHandler<NavigationEventArgs> Failed;
+
+    public event EventHandler<NavigationEventArgs> Fragment;
+
+    public event EventHandler<NavigationEventArgs> Aborted;
+
+    public event EventHandler<RequestEventArgs> RequestCreated;
+
+    public Request Request { get; private set; }
+
+    public Session Session => _browsingContext.UserContext.Browser.Session;
+
+    public bool IsDisposed { get; private set; }
+
+    public static Navigation From(BrowsingContext context)
+    {
+        var navigation = new Navigation(context);
+        navigation.Initialize();
+        return navigation;
+    }
+
+    public void Dispose()
+    {
+        IsDisposed = true;
+    }
+
+    protected virtual void OnFailed(NavigationEventArgs e) => Failed?.Invoke(this, e);
+
+    private void Initialize()
+    {
+        _browsingContext.Closed += (sender, args) =>
+        {
+            OnFailed(new NavigationEventArgs(_browsingContext.Url));
+        };
+
+        _browsingContext.Request += (sender, args) =>
+        {
+            if (args.Request.Navigation == null || !Matches(args.Request.Navigation))
+            {
+                return;
+            }
+
+            Request = args.Request;
+            OnRequestCreated(Request);
+            Request.Redirect += (sender, args) => Request = args.Request;
+        };
+
+        Session.BrowsingcontextNavigationStarted += (sender, args) =>
+        {
+            if (args.BrowsingContextId != _browsingContext.Id || _navigation != null)
+            {
+                return;
+            }
+
+            _navigation = Navigation.From(_browsingContext);
+        };
+
+        Session.BrowsingContextDomContentLoaded += OnSessionPageLoaded;
+        Session.BrowsingContextLoad += OnSessionPageLoaded;
+
+        Session.BrowsingContextFragmentNavigated += (sender, args) => HandleNavigation(args, () => OnFragment(new NavigationEventArgs(args.Url)));
+        Session.BrowsingContextNavigationFailed += (sender, args) => HandleNavigation(args, () => OnFailed(new NavigationEventArgs(args.Url)));
+        Session.BrowsingContextNavigationAborted += (sender, args) => HandleNavigation(args, () => OnAborted(new NavigationEventArgs(args.Url)));
+    }
+
+    private void HandleNavigation(WebDriverBiDi.BrowsingContext.NavigationEventArgs args, Action action)
+    {
+        if (args.BrowsingContextId != _browsingContext.Id || !Matches(args.NavigationId))
+        {
+            return;
+        }
+
+        action();
+        Dispose();
+    }
+
+    private void OnFragment(NavigationEventArgs args) => Fragment?.Invoke(this, args);
+
+    private void OnAborted(NavigationEventArgs args) => Aborted?.Invoke(this, args);
+
+    private void OnSessionPageLoaded(object sender, WebDriverBiDi.BrowsingContext.NavigationEventArgs e)
+    {
+        if (e.BrowsingContextId != _browsingContext.Id || e.NavigationId == null || !Matches(e.NavigationId))
+        {
+            return;
+        }
+
+        Dispose();
+    }
+
+    private void OnRequestCreated(Request request) => RequestCreated?.Invoke(this, new RequestEventArgs(request));
+
+    private bool Matches(string navigation)
+    {
+        if (_navigation is { IsDisposed: false })
+        {
+            return false;
+        }
+
+        if (_id == null)
+        {
+            _id = navigation;
+            return true;
+        }
+
+        return _id == navigation;
+    }
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/NavigationEventArgs.cs b/lib/PuppeteerSharp/Bidi/Core/NavigationEventArgs.cs
new file mode 100644
index 000000000..003bff11b
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/NavigationEventArgs.cs
@@ -0,0 +1,32 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class NavigationEventArgs(string url)
+{
+    public string Url { get; set; } = url;
+
+    public DateTime Timestamp { get; set; } = DateTime.Now;
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/Request.cs b/lib/PuppeteerSharp/Bidi/Core/Request.cs
new file mode 100644
index 000000000..75fa229e5
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/Request.cs
@@ -0,0 +1,148 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using WebDriverBiDi.Network;
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class Request : IDisposable
+{
+    private readonly BrowsingContext _browsingContext;
+    private readonly BeforeRequestSentEventArgs _eventArgs;
+    private string _error;
+    private Request _redirect;
+    private WebDriverBiDi.Network.ResponseData _response;
+
+    private Request(BrowsingContext browsingContext, BeforeRequestSentEventArgs args)
+    {
+        _browsingContext = browsingContext;
+        _eventArgs = args;
+        Timings = args.Request.Timings;
+    }
+
+    public event EventHandler<RequestEventArgs> Redirect;
+
+    public event EventHandler<ErrorEventArgs> Error;
+
+    public event EventHandler Authenticate;
+
+    internal event EventHandler<ResponseEventArgs> Success;
+
+    public bool IsDisposed { get; set; }
+
+    public string Navigation => _eventArgs.NavigationId;
+
+    public string Id => _eventArgs.Request.RequestId;
+
+    public Session Session => _browsingContext.UserContext.Browser.Session;
+
+    public FetchTimingInfo Timings { get; private set; }
+
+    public static Request From(BrowsingContext browsingContext, BeforeRequestSentEventArgs args)
+    {
+        var request = new Request(browsingContext, args);
+        request.Initialize();
+        return request;
+    }
+
+    public void Dispose()
+    {
+        IsDisposed = true;
+    }
+
+    private void Initialize()
+    {
+        _browsingContext.Closed += (sender, args) =>
+        {
+            _error = args.Reason;
+            OnError(_error);
+            Dispose();
+        };
+
+        Session.NetworkBeforeRequestSent += (sender, args) =>
+        {
+            if (args.BrowsingContextId != _browsingContext.Id ||
+               args.Request.RequestId != Id ||
+               args.RedirectCount != _eventArgs.RedirectCount + 1)
+            {
+                return;
+            }
+
+            _redirect = From(_browsingContext, args);
+            OnRedirect(_redirect);
+            Dispose();
+        };
+
+        Session.NetworkAuthRequired += (sender, args) =>
+        {
+            if (args.BrowsingContextId != _browsingContext.Id || args.Request.RequestId != Id || !args.IsBlocked)
+            {
+                return;
+            }
+
+            OnAuthenticate();
+        };
+
+        Session.NetworkFetchError += (sender, args) =>
+        {
+            if (args.BrowsingContextId != _browsingContext.Id || args.Request.RequestId != Id || args.RedirectCount != _eventArgs.RedirectCount)
+            {
+                return;
+            }
+
+            _error = args.ErrorText;
+            OnError(_error);
+            Dispose();
+        };
+
+        Session.NetworkResponseComplete += (sender, args) =>
+        {
+            if (args.BrowsingContextId != _browsingContext.Id ||
+                args.Request.RequestId != Id ||
+                _eventArgs.RedirectCount != args.RedirectCount)
+            {
+                return;
+            }
+
+            _response = args.Response;
+            Timings = args.Request.Timings;
+            OnSuccess(new ResponseEventArgs(_response));
+
+            // In case this is a redirect.
+            if (_response.Status is >= 300 and < 400)
+            {
+                return;
+            }
+
+            Dispose();
+        };
+    }
+
+    private void OnSuccess(ResponseEventArgs responseEventArgs) => Success?.Invoke(this, responseEventArgs);
+
+    private void OnAuthenticate() => Authenticate?.Invoke(this, EventArgs.Empty);
+
+    private void OnRedirect(Request redirect) => Redirect?.Invoke(this, new RequestEventArgs(redirect));
+
+    private void OnError(string error) => Error?.Invoke(this, new ErrorEventArgs(error));
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/RequestEventArgs.cs b/lib/PuppeteerSharp/Bidi/Core/RequestEventArgs.cs
new file mode 100644
index 000000000..151611fc3
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/RequestEventArgs.cs
@@ -0,0 +1,28 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class RequestEventArgs(Request request)
+{
+    public Request Request { get; } = request;
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/ResponseEventArgs.cs b/lib/PuppeteerSharp/Bidi/Core/ResponseEventArgs.cs
new file mode 100644
index 000000000..88d9d4008
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/ResponseEventArgs.cs
@@ -0,0 +1,28 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class ResponseEventArgs(WebDriverBiDi.Network.ResponseData response)
+{
+    public WebDriverBiDi.Network.ResponseData Response { get; } = response;
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/Session.cs b/lib/PuppeteerSharp/Bidi/Core/Session.cs
new file mode 100644
index 000000000..4f43f6d52
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/Session.cs
@@ -0,0 +1,130 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using WebDriverBiDi;
+using WebDriverBiDi.BrowsingContext;
+using WebDriverBiDi.Network;
+using WebDriverBiDi.Session;
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class Session(BiDiDriver driver, NewCommandResult info) : IDisposable
+{
+    public event EventHandler<SessionEndArgs> Ended;
+
+    public event EventHandler<BrowsingContextEventArgs> BrowsingContextContextCreated;
+
+    public event EventHandler<BrowsingContextEventArgs> BrowsingContextContextDestroyed;
+
+    public event EventHandler<WebDriverBiDi.BrowsingContext.NavigationEventArgs> BrowsingcontextNavigationStarted;
+
+    public event EventHandler<WebDriverBiDi.BrowsingContext.NavigationEventArgs> BrowsingContextLoad;
+
+    public event EventHandler<WebDriverBiDi.BrowsingContext.NavigationEventArgs> BrowsingContextDomContentLoaded;
+
+    public event EventHandler<WebDriverBiDi.BrowsingContext.NavigationEventArgs> BrowsingContextNavigationAborted;
+
+    public event EventHandler<WebDriverBiDi.BrowsingContext.NavigationEventArgs> BrowsingContextNavigationFailed;
+
+    public event EventHandler<WebDriverBiDi.BrowsingContext.NavigationEventArgs> BrowsingContextFragmentNavigated;
+
+    public event EventHandler<BeforeRequestSentEventArgs> NetworkBeforeRequestSent;
+
+    public event EventHandler<AuthRequiredEventArgs> NetworkAuthRequired;
+
+    public event EventHandler<FetchErrorEventArgs> NetworkFetchError;
+
+    public event EventHandler<ResponseCompletedEventArgs> NetworkResponseComplete;
+
+    public BiDiDriver Driver { get; } = driver;
+
+    public NewCommandResult Info { get; } = info;
+
+    public Browser Browser { get; private set; }
+
+    public static async Task<Session> FromAsync(BiDiDriver driver, NewCommandParameters capabilities, ILoggerFactory loggerFactory)
+    {
+        var result = await driver.Session.NewSessionAsync(capabilities).ConfigureAwait(false);
+        var session = new Session(driver, result);
+        await session.InitializeAsync().ConfigureAwait(false);
+        return session;
+    }
+
+    public void Dispose()
+    {
+    }
+
+    public async Task SubscribeAsync(string[] events, string[] contexts = null)
+    {
+        var args = new SubscribeCommandParameters();
+        args.Events.AddRange(events);
+        args.Contexts.AddRange(contexts ?? []);
+        await Driver.Session.SubscribeAsync(args).ConfigureAwait(false);
+    }
+
+    internal virtual void OnEnded(SessionEndArgs e) => Ended?.Invoke(this, e);
+
+    internal virtual void OnBrowsingContextContextCreated(BrowsingContextEventArgs e) => BrowsingContextContextCreated?.Invoke(this, e);
+
+    private async Task InitializeAsync()
+    {
+        Browser = await Browser.From(this).ConfigureAwait(false);
+        Driver.BrowsingContext.OnContextCreated.AddObserver(OnBrowsingContextContextCreated);
+        Driver.BrowsingContext.OnContextDestroyed.AddObserver(OnBrowsingContextContextDestroyed);
+        Driver.BrowsingContext.OnDomContentLoaded.AddObserver(OnBrowsingContextDomContentLoaded);
+        Driver.BrowsingContext.OnLoad.AddObserver(OnBrowsingContextLoad);
+        Driver.BrowsingContext.OnNavigationStarted.AddObserver(OnBrowsingContextNavigationStarted);
+        Driver.BrowsingContext.OnFragmentNavigated.AddObserver(OnBrowsingContextFragmentNavigated);
+        Driver.BrowsingContext.OnNavigationFailed.AddObserver(OnBrowsingContextNavigationFailed);
+        Driver.BrowsingContext.OnNavigationAborted.AddObserver(OnBrowsingContextNavigationAborted);
+        Driver.Network.OnBeforeRequestSent.AddObserver(OnBeforeRequestSent);
+        Driver.Network.OnAuthRequired.AddObserver(OnNetworkAuthRequired);
+        Driver.Network.OnFetchError.AddObserver(OnNetworkFetchError);
+        Driver.Network.OnResponseCompleted.AddObserver(OnNetworkResponseCompleted);
+    }
+
+    private void OnNetworkResponseCompleted(ResponseCompletedEventArgs obj) => NetworkResponseComplete?.Invoke(this, obj);
+
+    private void OnNetworkFetchError(FetchErrorEventArgs obj) => NetworkFetchError?.Invoke(this, obj);
+
+    private void OnNetworkAuthRequired(AuthRequiredEventArgs obj) => NetworkAuthRequired?.Invoke(this, obj);
+
+    private void OnBeforeRequestSent(BeforeRequestSentEventArgs obj) => NetworkBeforeRequestSent?.Invoke(this, obj);
+
+    private void OnBrowsingContextNavigationAborted(WebDriverBiDi.BrowsingContext.NavigationEventArgs obj) => BrowsingContextNavigationAborted?.Invoke(this, obj);
+
+    private void OnBrowsingContextNavigationFailed(WebDriverBiDi.BrowsingContext.NavigationEventArgs obj) => BrowsingContextNavigationFailed?.Invoke(this, obj);
+
+    private void OnBrowsingContextFragmentNavigated(WebDriverBiDi.BrowsingContext.NavigationEventArgs obj) => BrowsingContextFragmentNavigated?.Invoke(this, obj);
+
+    private void OnBrowsingContextNavigationStarted(WebDriverBiDi.BrowsingContext.NavigationEventArgs obj) => BrowsingcontextNavigationStarted?.Invoke(this, obj);
+
+    private void OnBrowsingContextLoad(WebDriverBiDi.BrowsingContext.NavigationEventArgs arg) => BrowsingContextLoad?.Invoke(this, arg);
+
+    private void OnBrowsingContextDomContentLoaded(WebDriverBiDi.BrowsingContext.NavigationEventArgs obj) => BrowsingContextDomContentLoaded?.Invoke(this, obj);
+
+    private void OnBrowsingContextContextDestroyed(BrowsingContextEventArgs obj) => BrowsingContextContextDestroyed?.Invoke(this, obj);
+}
diff --git a/lib/PuppeteerSharp/Bidi/Core/SessionEndArgs.cs b/lib/PuppeteerSharp/Bidi/Core/SessionEndArgs.cs
new file mode 100644
index 000000000..a97d750c8
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/SessionEndArgs.cs
@@ -0,0 +1,29 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal record SessionEndArgs
+{
+    public string Reason { get; set; }
+}
+
diff --git a/lib/PuppeteerSharp/Bidi/Core/UserContext.cs b/lib/PuppeteerSharp/Bidi/Core/UserContext.cs
new file mode 100644
index 000000000..0debf81ad
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/Core/UserContext.cs
@@ -0,0 +1,137 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using WebDriverBiDi.BrowsingContext;
+
+namespace PuppeteerSharp.Bidi.Core;
+
+internal class UserContext : IDisposable
+{
+    private readonly ConcurrentDictionary<string, BrowsingContext> _browsingContexts = new();
+    private string _reason;
+
+    private UserContext(Browser browser, string id)
+    {
+        Browser = browser;
+        Id = id;
+    }
+
+    public event EventHandler<ClosedEventArgs> Closed;
+
+    public event EventHandler<BidiBrowsingContextEventArgs> BrowsingContextCreated;
+
+    public IEnumerable<BrowsingContext> BrowsingContexts => _browsingContexts.Values;
+
+    public Browser Browser { get; }
+
+    public Session Session => Browser.Session;
+
+    public bool IsDisposed { get; set; }
+
+    public string Id { get; }
+
+    public static UserContext Create(Browser browser, string id)
+    {
+        var context = new UserContext(browser, id);
+        context.Initialize();
+        return context;
+    }
+
+    public void Dispose()
+    {
+        if (IsDisposed)
+        {
+            return;
+        }
+
+        IsDisposed = true;
+        _reason ??= "User context already closed, probably because the browser disconnected/closed.";
+        OnClosed();
+        Browser.Dispose();
+        Session.Dispose();
+        GC.SuppressFinalize(this);
+    }
+
+    public async Task<BrowsingContext> CreateBrowserContextAsync(CreateType contextType)
+    {
+        var createParams = new CreateCommandParameters(contextType) { UserContextId = Id };
+        var result = await Session.Driver.BrowsingContext.CreateAsync(createParams).ConfigureAwait(false);
+
+        _browsingContexts.TryGetValue(result.BrowsingContextId, out var browsingContext);
+
+        if (browsingContext is null)
+        {
+            throw new PuppeteerException(
+                "The WebDriver BiDi implementation is failing to create a browsing context correctly.");
+        }
+
+        return browsingContext;
+    }
+
+    private void Initialize()
+    {
+        Browser.Closed += (sender, args) => Dispose("User context was closed");
+        Browser.Disconnected += (sender, args) => Dispose("User context was disconnected");
+
+        Browser.Session.BrowsingContextContextCreated += OnBrowsingContextContextCreated;
+    }
+
+    private void OnBrowsingContextContextCreated(object sender, BrowsingContextEventArgs info)
+    {
+        if (info.Parent != null)
+        {
+            return;
+        }
+
+        if (info.UserContextId != Id)
+        {
+            return;
+        }
+
+        var browsingContext = BrowsingContext.From(
+            this,
+            null,
+            info.BrowsingContextId,
+            info.Url,
+            info.OriginalOpener);
+
+        _browsingContexts.TryAdd(browsingContext.Id, browsingContext);
+
+        browsingContext.Closed += (sender, args) => _browsingContexts.TryRemove(browsingContext.Id, out _);
+
+        OnBrowsingContext(browsingContext);
+    }
+
+    private void OnBrowsingContext(BrowsingContext browsingContext) => BrowsingContextCreated?.Invoke(this, new BidiBrowsingContextEventArgs(browsingContext));
+
+    private void Dispose(string reason)
+    {
+        _reason = reason;
+        Dispose();
+    }
+
+    private void OnClosed() => Closed?.Invoke(this, new ClosedEventArgs(_reason));
+}
diff --git a/lib/PuppeteerSharp/Browser.cs b/lib/PuppeteerSharp/Browser.cs
index 00cee6e55..c59a19f54 100644
--- a/lib/PuppeteerSharp/Browser.cs
+++ b/lib/PuppeteerSharp/Browser.cs
@@ -3,13 +3,17 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using PuppeteerSharp.Bidi;
 using PuppeteerSharp.Cdp;
 using PuppeteerSharp.Helpers;
 
 namespace PuppeteerSharp
 {
+    // We won't change the name just because WebDriver has a namespace with the same name.
+#pragma warning disable CA1724
     /// <inheritdoc/>
     public abstract class Browser : IBrowser
+#pragma warning disable CA1724
     {
         /// <inheritdoc/>
         public event EventHandler Closed;
@@ -63,6 +67,8 @@ public abstract class Browser : IBrowser
 
         internal Func<Target, bool> IsPageTargetFunc { get; init; }
 
+        internal abstract ProtocolType Protocol { get; }
+
         /// <inheritdoc/>
         public abstract Task<IPage> NewPageAsync();
 
@@ -171,7 +177,8 @@ public void Dispose()
         public async ValueTask DisposeAsync()
         {
             // On disposal, the browser doesn't get closed. It gets disconnected.
-            if (Launcher == null)
+            // TODO: See a better way to handle this instead of checking for BidiBrowser.
+            if (Launcher == null && this is not BidiBrowser)
             {
                 Disconnect();
             }
diff --git a/lib/PuppeteerSharp/BrowserContext.cs b/lib/PuppeteerSharp/BrowserContext.cs
index 0073afc87..e1587e261 100644
--- a/lib/PuppeteerSharp/BrowserContext.cs
+++ b/lib/PuppeteerSharp/BrowserContext.cs
@@ -68,11 +68,11 @@ public async ValueTask DisposeAsync()
             GC.SuppressFinalize(this);
         }
 
-        internal void OnTargetCreated(Browser browser, TargetChangedArgs args) => TargetCreated?.Invoke(browser, args);
+        internal void OnTargetCreated(TargetChangedArgs args) => TargetCreated?.Invoke(this, args);
 
-        internal void OnTargetDestroyed(Browser browser, TargetChangedArgs args) => TargetDestroyed?.Invoke(browser, args);
+        internal void OnTargetDestroyed(TargetChangedArgs args) => TargetDestroyed?.Invoke(this, args);
 
-        internal void OnTargetChanged(Browser browser, TargetChangedArgs args) => TargetChanged?.Invoke(browser, args);
+        internal void OnTargetChanged(TargetChangedArgs args) => TargetChanged?.Invoke(this, args);
 
         /// <summary>
         /// Closes the browser context. All the targets that belong to the browser context will be closed.
diff --git a/lib/PuppeteerSharp/BrowserData/Firefox.cs b/lib/PuppeteerSharp/BrowserData/Firefox.cs
index 94681a862..12c55816f 100644
--- a/lib/PuppeteerSharp/BrowserData/Firefox.cs
+++ b/lib/PuppeteerSharp/BrowserData/Firefox.cs
@@ -17,11 +17,11 @@ public static class Firefox
         /// <summary>
         /// Default firefox build.
         /// </summary>
-        public const string DefaultBuildId = "128.0b5";
+        public const string DefaultBuildId = "stable_131.0.3";
 
         private static readonly Dictionary<string, string> _cachedBuildIds = [];
 
-        internal static Task<string> GetDefaultBuildIdAsync() => ResolveBuildIdAsync(FirefoxChannel.Nightly);
+        internal static Task<string> GetDefaultBuildIdAsync() => Task.FromResult(DefaultBuildId);
 
         internal static string ResolveDownloadUrl(Platform platform, string buildId, string baseUrl)
         {
diff --git a/lib/PuppeteerSharp/CDPSession.cs b/lib/PuppeteerSharp/CDPSession.cs
index cae1723bd..f9cceb11f 100644
--- a/lib/PuppeteerSharp/CDPSession.cs
+++ b/lib/PuppeteerSharp/CDPSession.cs
@@ -38,7 +38,7 @@ public abstract class CDPSession : ICDPSession
 
         internal Connection Connection { get; set; }
 
-        internal Target Target { get; set; }
+        internal CdpTarget Target { get; set; }
 
         internal abstract CDPSession ParentSession { get; }
 
diff --git a/lib/PuppeteerSharp/Cdp/CdpBrowser.cs b/lib/PuppeteerSharp/Cdp/CdpBrowser.cs
index 7ff2861c6..ea65730ac 100644
--- a/lib/PuppeteerSharp/Cdp/CdpBrowser.cs
+++ b/lib/PuppeteerSharp/Cdp/CdpBrowser.cs
@@ -100,6 +100,8 @@ public override bool IsClosed
 
     internal ITargetManager TargetManager { get; }
 
+    internal override ProtocolType Protocol => ProtocolType.Cdp;
+
     /// <inheritdoc/>
     public override Task<IPage> NewPageAsync() => DefaultContext.NewPageAsync();
 
@@ -133,10 +135,10 @@ public override async Task<IBrowserContext> CreateBrowserContextAsync(BrowserCon
             new TargetCreateBrowserContextRequest
             {
                 ProxyServer = options?.ProxyServer ?? string.Empty,
-                ProxyBypassList = string.Join(",", options?.ProxyBypassList ?? Array.Empty<string>()),
+                ProxyBypassList = string.Join(",", options?.ProxyBypassList ?? []),
             }).ConfigureAwait(false);
         var context = new CdpBrowserContext(Connection, this, response.BrowserContextId);
-        _contexts.TryAdd(response.BrowserContextId, (CdpBrowserContext)context);
+        _contexts.TryAdd(response.BrowserContextId, context);
         return context;
     }
 
@@ -210,7 +212,7 @@ internal async Task<IPage> CreatePageInContextAsync(string contextId)
 
         var targetId = (await Connection.SendAsync<TargetCreateTargetResponse>("Target.createTarget", createTargetRequest)
             .ConfigureAwait(false)).TargetId;
-        var target = await WaitForTargetAsync(t => t.TargetId == targetId).ConfigureAwait(false) as Target;
+        var target = await WaitForTargetAsync(t => ((CdpTarget)t).TargetId == targetId).ConfigureAwait(false) as CdpTarget;
         await target!.InitializedTask.ConfigureAwait(false);
         return await target.PageAsync().ConfigureAwait(false);
     }
@@ -362,23 +364,24 @@ private void TargetManager_TargetDiscovered(object sender, TargetChangedArgs e)
 
     private void OnTargetChanged(object sender, TargetChangedArgs e)
     {
-        var args = new TargetChangedArgs { Target = e.Target };
+        var args = new TargetChangedArgs(e.Target);
         OnTargetChanged(args);
-        ((CdpTarget)e.Target).BrowserContext.OnTargetChanged(this, args);
+        ((CdpTarget)e.Target).BrowserContext.OnTargetChanged(args);
     }
 
     private async void OnDetachedFromTargetAsync(object sender, TargetChangedArgs e)
     {
         try
         {
-            e.Target.InitializedTaskWrapper.TrySetResult(InitializationStatus.Aborted);
-            e.Target.CloseTaskWrapper.TrySetResult(true);
+            var target = (CdpTarget)e.Target;
+            target.InitializedTaskWrapper.TrySetResult(InitializationStatus.Aborted);
+            target.CloseTaskWrapper.TrySetResult(true);
 
-            if ((await e.Target.InitializedTask.ConfigureAwait(false)) == InitializationStatus.Success)
+            if ((await target.InitializedTask.ConfigureAwait(false)) == InitializationStatus.Success)
             {
-                var args = new TargetChangedArgs { Target = e.Target };
+                var args = new TargetChangedArgs(e.Target);
                 OnTargetDestroyed(args);
-                e.Target.BrowserContext.OnTargetDestroyed(this, args);
+                e.Target.BrowserContext.OnTargetDestroyed(args);
             }
         }
         catch (Exception ex)
@@ -393,11 +396,12 @@ private async void OnAttachedToTargetAsync(object sender, TargetChangedArgs e)
     {
         try
         {
-            if (await e.Target.InitializedTask.ConfigureAwait(false) == InitializationStatus.Success)
+            var target = (CdpTarget)e.Target;
+            if (await target.InitializedTask.ConfigureAwait(false) == InitializationStatus.Success)
             {
-                var args = new TargetChangedArgs { Target = e.Target };
+                var args = new TargetChangedArgs(e.Target);
                 OnTargetCreated(args);
-                ((CdpTarget)e.Target).BrowserContext.OnTargetCreated(this, args);
+                ((CdpTarget)e.Target).BrowserContext.OnTargetCreated(args);
             }
         }
         catch (Exception ex)
diff --git a/lib/PuppeteerSharp/Cdp/CdpPage.cs b/lib/PuppeteerSharp/Cdp/CdpPage.cs
index af17d8a0c..52dd4fc71 100644
--- a/lib/PuppeteerSharp/Cdp/CdpPage.cs
+++ b/lib/PuppeteerSharp/Cdp/CdpPage.cs
@@ -694,7 +694,7 @@ public override async Task CloseAsync(PageCloseOptions options = null)
         else
         {
             await PrimaryTargetClient.Connection
-                .SendAsync("Target.closeTarget", new TargetCloseTargetRequest { TargetId = Target.TargetId, })
+                .SendAsync("Target.closeTarget", new TargetCloseTargetRequest { TargetId = PrimaryTarget.TargetId, })
                 .ConfigureAwait(false);
 
             // Puppeteer waits for Target.CloseTask. But I found some race condition where IsClose didn't get set to true.
@@ -971,7 +971,7 @@ private void OnAttachedToTarget(object sender, SessionEventArgs e)
     {
         var session = e.Session as CDPSession;
         Debug.Assert(session != null, nameof(session) + " != null");
-        FrameManager.OnAttachedToTarget(new TargetChangedArgs { Target = session.Target });
+        FrameManager.OnAttachedToTarget(session.Target);
 
         if (session.Target.Type == TargetType.Worker)
         {
@@ -1081,7 +1081,7 @@ private async Task OnSecondaryTargetAsync(CDPSession session)
 
     private void OnDetachedFromTarget(object sender, TargetChangedArgs e)
     {
-        var sessionId = e.Target.Session?.Id;
+        var sessionId = ((CdpTarget)e.Target).Session?.Id;
         if (sessionId != null && _workers.TryRemove(sessionId, out var worker))
         {
             OnWorkerDestroyed(worker);
diff --git a/lib/PuppeteerSharp/Cdp/CdpTarget.cs b/lib/PuppeteerSharp/Cdp/CdpTarget.cs
index 9698c78e8..2f557a54c 100644
--- a/lib/PuppeteerSharp/Cdp/CdpTarget.cs
+++ b/lib/PuppeteerSharp/Cdp/CdpTarget.cs
@@ -35,16 +35,61 @@ internal CdpTarget(
         CdpBrowserContext context,
         ITargetManager targetManager,
         Func<bool, Task<CDPSession>> sessionFactory,
-        TaskQueue screenshotTaskQueue) : base(targetInfo, session, context, targetManager, sessionFactory)
+        TaskQueue screenshotTaskQueue)
     {
+        TargetInfo = targetInfo;
+        Session = session;
+        BrowserContext = context;
         ScreenshotTaskQueue = screenshotTaskQueue;
+        TargetManager = targetManager;
+        SessionFactory = sessionFactory;
+
+        if (session != null)
+        {
+            session.Target = this;
+        }
+
         Initialize();
     }
 
+    /// <inheritdoc/>
+    public override string Url => TargetInfo.Url;
+
+    /// <inheritdoc/>
+    public override TargetType Type => TargetInfo.Type;
+
+    /// <summary>
+    /// Gets the target identifier.
+    /// </summary>
+    /// <value>The target identifier.</value>
+    public string TargetId => TargetInfo.TargetId;
+
     /// <inheritdoc/>
     public override ITarget Opener => TargetInfo.OpenerId != null ?
         CdpBrowser.TargetManager.GetAvailableTargets().GetValueOrDefault(TargetInfo.OpenerId) : null;
 
+    internal Task<InitializationStatus> InitializedTask => InitializedTaskWrapper.Task;
+
+    internal TaskCompletionSource<InitializationStatus> InitializedTaskWrapper { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+    internal Task CloseTask => CloseTaskWrapper.Task;
+
+    internal TaskCompletionSource<bool> CloseTaskWrapper { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+    internal Func<bool, Task<CDPSession>> SessionFactory { get; private set; }
+
+    internal ITargetManager TargetManager { get; }
+
+    internal bool IsInitialized { get; set; }
+
+    internal override Browser Browser => BrowserContext.Browser;
+
+    internal override BrowserContext BrowserContext { get; }
+
+    internal TargetInfo TargetInfo { get; set; }
+
+    internal CDPSession Session { get; }
+
     internal CdpBrowser CdpBrowser => Browser as CdpBrowser;
 
     internal TaskQueue ScreenshotTaskQueue { get; }
diff --git a/lib/PuppeteerSharp/Cdp/ChromeTargetManager.cs b/lib/PuppeteerSharp/Cdp/ChromeTargetManager.cs
index 45aec46e4..7825e3b78 100644
--- a/lib/PuppeteerSharp/Cdp/ChromeTargetManager.cs
+++ b/lib/PuppeteerSharp/Cdp/ChromeTargetManager.cs
@@ -235,7 +235,7 @@ private void OnTargetInfoChanged(TargetCreatedResponse e)
             }
         }
 
-        private bool IsPageTargetBecomingPrimary(Target target, TargetInfo newTargetInfo)
+        private bool IsPageTargetBecomingPrimary(CdpTarget target, TargetInfo newTargetInfo)
             => !string.IsNullOrEmpty(target.TargetInfo.Subtype) && string.IsNullOrEmpty(newTargetInfo.Subtype);
 
         private async Task OnAttachedToTargetAsync(object sender, TargetAttachedToTargetResponse e)
diff --git a/lib/PuppeteerSharp/Cdp/Connection.cs b/lib/PuppeteerSharp/Cdp/Connection.cs
index a2f8d061b..2ab7e2d34 100644
--- a/lib/PuppeteerSharp/Cdp/Connection.cs
+++ b/lib/PuppeteerSharp/Cdp/Connection.cs
@@ -268,7 +268,7 @@ private async Task ProcessMessage(MessageReceivedEventArgs e)
             try
             {
                 var response = e.Message;
-                ConnectionResponse obj = null;
+                ConnectionResponse obj;
 
                 if (response.Length > 0 && Delay > 0)
                 {
@@ -340,8 +340,8 @@ private void ProcessIncomingMessage(ConnectionResponse obj)
             }
             else if (obj.Id.HasValue)
             {
-                // If we get the object we are waiting for we return if
-                // if not we add this to the list, sooner or later some one will come for it
+                // If we get the object we are waiting for we return it.
+                // If not we add this to the list, sooner or later someone will come for it
                 if (_callbacks.TryRemove(obj.Id.Value, out var callback))
                 {
                     MessageQueue.Enqueue(callback, obj);
diff --git a/lib/PuppeteerSharp/Cdp/FrameManager.cs b/lib/PuppeteerSharp/Cdp/FrameManager.cs
index 2a2c1ea32..3c0ea710a 100644
--- a/lib/PuppeteerSharp/Cdp/FrameManager.cs
+++ b/lib/PuppeteerSharp/Cdp/FrameManager.cs
@@ -86,18 +86,18 @@ internal ExecutionContext ExecutionContextById(int contextId, CDPSession session
             return context;
         }
 
-        internal void OnAttachedToTarget(TargetChangedArgs e)
+        internal void OnAttachedToTarget(CdpTarget target)
         {
-            if (e.TargetInfo.Type != TargetType.IFrame)
+            if (target.TargetInfo.Type != TargetType.IFrame)
             {
                 return;
             }
 
-            var frame = GetFrame(e.TargetInfo.TargetId);
-            frame?.UpdateClient(e.Target.Session);
+            var frame = GetFrame(target.TargetInfo.TargetId);
+            frame?.UpdateClient(target.Session);
 
-            e.Target.Session.MessageReceived += Client_MessageReceived;
-            _ = InitializeAsync(e.Target.Session);
+            target.Session.MessageReceived += Client_MessageReceived;
+            _ = InitializeAsync(target.Session);
         }
 
         internal ExecutionContext GetExecutionContextById(int contextId, CDPSession session)
diff --git a/lib/PuppeteerSharp/ChromeLauncher.cs b/lib/PuppeteerSharp/ChromeLauncher.cs
index 0ccfe6049..54b24b9a8 100644
--- a/lib/PuppeteerSharp/ChromeLauncher.cs
+++ b/lib/PuppeteerSharp/ChromeLauncher.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
-using PuppeteerSharp.BrowserData;
 using PuppeteerSharp.Helpers;
 
 namespace PuppeteerSharp
@@ -28,9 +26,6 @@ public ChromeLauncher(string executable, LaunchOptions options)
             Process.StartInfo.Arguments = string.Join(" ", chromiumArgs);
         }
 
-        /// <inheritdoc />
-        public override Task<string> GetDefaultBuildIdAsync() => Task.FromResult(Chrome.DefaultBuildId);
-
         /// <inheritdoc />
         public override string ToString() => $"Chromium process; EndPoint={EndPoint}; State={CurrentState}";
 
@@ -63,7 +58,7 @@ internal static string[] GetDefaultArgs(LaunchOptions options)
 
             var chromiumArguments = new List<string>(
             [
-                    "--allow-pre-commit-input",
+                "--allow-pre-commit-input",
                 "--disable-background-networking",
                 "--disable-background-timer-throttling",
                 "--disable-backgrounding-occluded-windows",
diff --git a/lib/PuppeteerSharp/ConnectOptions.cs b/lib/PuppeteerSharp/ConnectOptions.cs
index 0b79a26f8..4bae23220 100644
--- a/lib/PuppeteerSharp/ConnectOptions.cs
+++ b/lib/PuppeteerSharp/ConnectOptions.cs
@@ -82,6 +82,9 @@ public class ConnectOptions : IBrowserOptions, IConnectionOptions
         /// </summary>
         public Action<IBrowser> InitAction { get; set; }
 
+        // TODO: Restore when it's usable
+        internal ProtocolType Protocol { get; set; } = ProtocolType.Cdp;
+
         /// <summary>
         /// Callback to decide if Puppeteer should connect to a given target or not.
         /// </summary>
diff --git a/lib/PuppeteerSharp/FirefoxLauncher.cs b/lib/PuppeteerSharp/FirefoxLauncher.cs
index fa402c109..5fbffec63 100644
--- a/lib/PuppeteerSharp/FirefoxLauncher.cs
+++ b/lib/PuppeteerSharp/FirefoxLauncher.cs
@@ -36,9 +36,6 @@ public FirefoxLauncher(string executable, LaunchOptions options)
             Process.StartInfo.Arguments = string.Join(" ", firefoxArgs);
         }
 
-        /// <inheritdoc />
-        public override Task<string> GetDefaultBuildIdAsync() => Firefox.GetDefaultBuildIdAsync();
-
         /// <inheritdoc />
         public override string ToString() => $"Firefox process; EndPoint={EndPoint}; State={CurrentState}";
 
@@ -81,6 +78,8 @@ internal static string[] GetDefaultArgs(LaunchOptions options)
             return firefoxArguments.ToArray();
         }
 
+        internal Task<string> GetDefaultBuildIdAsync() => Firefox.GetDefaultBuildIdAsync();
+
         internal override void OnExit()
         {
             // If TempUserDataDir is null it means that the user provided their own userDataDir
@@ -154,18 +153,27 @@ private static (List<string> FirefoxArgs, TempDirectory TempUserDataDirectory, s
                 firefoxArguments.Add($"{userDataDir.Quote()}");
             }
 
-            Firefox.CreateProfile(userDataDir, GetPreferences(options.ExtraPrefsFirefox));
+            Firefox.CreateProfile(userDataDir, GetPreferences(options.Protocol, options.ExtraPrefsFirefox));
 
             return (firefoxArguments, tempUserDataDirectory, userDataDir);
         }
 
-        private static Dictionary<string, object> GetPreferences(Dictionary<string, object> optionsExtraPreferencesFirefox)
+        private static Dictionary<string, object> GetPreferences(ProtocolType protocol, Dictionary<string, object> optionsExtraPreferencesFirefox)
         {
             var result = optionsExtraPreferencesFirefox ?? [];
-            result["browser.tabs.closeWindowWithLastTab"] = false;
-            result["network.cookie.cookieBehavior"] = 0;
-            result["fission.bfcacheInParent"] = false;
-            result["remote.active-protocols"] = 2;
+
+            if (protocol == ProtocolType.WebdriverBiDi)
+            {
+                result["remote.active-protocols"] = 1;
+            }
+            else
+            {
+                result["browser.tabs.closeWindowWithLastTab"] = false;
+                result["network.cookie.cookieBehavior"] = 0;
+                result["fission.bfcacheInParent"] = false;
+                result["remote.active-protocols"] = 2;
+            }
+
             result["fission.webContentIsolationStrategy"] = 0;
 
             return result;
diff --git a/lib/PuppeteerSharp/Frame.cs b/lib/PuppeteerSharp/Frame.cs
index 5b3d0e3cb..a8bc3c237 100644
--- a/lib/PuppeteerSharp/Frame.cs
+++ b/lib/PuppeteerSharp/Frame.cs
@@ -32,7 +32,7 @@ public abstract class Frame : IFrame, IEnvironment
         public string Name { get; private set; }
 
         /// <inheritdoc/>
-        public string Url { get; private set; } = string.Empty;
+        public virtual string Url { get; private set; } = string.Empty;
 
         /// <inheritdoc/>
         public bool Detached { get; private set; }
diff --git a/lib/PuppeteerSharp/IBrowserOptions.cs b/lib/PuppeteerSharp/IBrowserOptions.cs
index ce68dda31..68c631308 100644
--- a/lib/PuppeteerSharp/IBrowserOptions.cs
+++ b/lib/PuppeteerSharp/IBrowserOptions.cs
@@ -15,5 +15,11 @@ public interface IBrowserOptions
         /// </summary>
         /// <value>The default Viewport.</value>
         ViewPortOptions DefaultViewport { get; set; }
+        /* Restore when it's usable
+        /// <summary>
+        /// Protocol type.
+        /// </summary>
+        ProtocolType Protocol { get; set; }
+        */
     }
 }
diff --git a/lib/PuppeteerSharp/ITarget.cs b/lib/PuppeteerSharp/ITarget.cs
index 3afb78e9e..c3b1d5322 100644
--- a/lib/PuppeteerSharp/ITarget.cs
+++ b/lib/PuppeteerSharp/ITarget.cs
@@ -26,12 +26,6 @@ public interface ITarget
         /// </remarks>
         ITarget Opener { get; }
 
-        /// <summary>
-        /// Gets the target identifier.
-        /// </summary>
-        /// <value>The target identifier.</value>
-        string TargetId { get; }
-
         /// <summary>
         /// Gets the type. It will be <see cref="PuppeteerSharp.TargetInfo.Type"/>.
         /// Can be `"page"`, `"background_page"`, `"service_worker"`, `"shared_worker"`, `"browser"` or `"other"`.
diff --git a/lib/PuppeteerSharp/LaunchOptions.cs b/lib/PuppeteerSharp/LaunchOptions.cs
index 40baca022..cb3ca14d3 100644
--- a/lib/PuppeteerSharp/LaunchOptions.cs
+++ b/lib/PuppeteerSharp/LaunchOptions.cs
@@ -61,7 +61,7 @@ public bool Headless
         public int Timeout { get; set; } = Puppeteer.DefaultTimeout;
 
         /// <summary>
-        ///  Whether to pipe browser process stdout and stderr into process.stdout and process.stderr. Defaults to false.
+        ///  Whether to pipe browser process stdout and stderr into process stdout and process stderr. Defaults to false.
         /// </summary>
         public bool DumpIO { get; set; }
 
@@ -161,7 +161,7 @@ public string[] IgnoredDefaultArgs
         /// </summary>
         /// <remarks>
         /// It's set to <c>true</c> by default because it's the safest way to send commands to Chromium.
-        /// Setting this to <c>false</c> proved to work in .NET Core but it tends to fail on .NET Framework.
+        /// Setting this to <c>false</c> proved to work in .NET Core, but it tends to fail on .NET Framework.
         /// </remarks>
         public bool EnqueueTransportMessages { get; set; } = true;
 
@@ -195,6 +195,14 @@ public string[] IgnoredDefaultArgs
         /// </summary>
         public Dictionary<string, object> ExtraPrefsFirefox { get; set; }
 
+        /// <summary>
+        /// Wait for the initial page before initializing.
+        /// </summary>
+        public bool WaitForInitialPage { get; set; } = true;
+
+        // Internal until is usable
+        internal ProtocolType Protocol { get; set; }
+
         /// <summary>
         /// Callback to decide if Puppeteer should connect to a given target or not.
         /// </summary>
diff --git a/lib/PuppeteerSharp/Launcher.cs b/lib/PuppeteerSharp/Launcher.cs
index 06bf0fda1..8bbf5b6dd 100644
--- a/lib/PuppeteerSharp/Launcher.cs
+++ b/lib/PuppeteerSharp/Launcher.cs
@@ -1,14 +1,17 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using PuppeteerSharp.Bidi;
 using PuppeteerSharp.BrowserData;
 using PuppeteerSharp.Cdp;
 using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Helpers.Json;
+using WebDriverBiDi;
 
 namespace PuppeteerSharp
 {
@@ -42,6 +45,7 @@ public class Launcher
         /// for a description of the differences between Chromium and Chrome.
         /// <a href="https://chromium.googlesource.com/chromium/src/+/lkcr/docs/chromium_browser_vs_google_chrome.md">This article</a> describes some differences for Linux users.
         /// </remarks>
+        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "The caller is responsible for disposing the returned object.")]
         public async Task<IBrowser> LaunchAsync(LaunchOptions options)
         {
             if (options == null)
@@ -74,33 +78,54 @@ public async Task<IBrowser> LaunchAsync(LaunchOptions options)
 
             try
             {
+                if (options.Protocol == ProtocolType.WebdriverBiDi)
+                {
+                    Process.StateManager.LineOutputExpression = "^WebDriver BiDi listening on (ws:\\/\\/.*)$";
+                }
+
                 await Process.StartAsync().ConfigureAwait(false);
 
                 Connection connection = null;
+                IBrowser browser = null;
+
                 try
                 {
-                    connection = await Connection
-                        .Create(Process.EndPoint, options, _loggerFactory)
-                        .ConfigureAwait(false);
-
-                    var browser = await CdpBrowser
-                        .CreateAsync(
-                            options.Browser,
-                            connection,
-                            [],
-                            options.AcceptInsecureCerts,
-                            options.DefaultViewport,
-                            Process,
-                            options.TargetFilter,
-                            options.IsPageTarget)
-                        .ConfigureAwait(false);
-
-                    await browser.WaitForTargetAsync(t => t.Type == TargetType.Page).ConfigureAwait(false);
+                    if (options.Protocol == ProtocolType.WebdriverBiDi)
+                    {
+                        var driver = new BiDiDriver(TimeSpan.FromMilliseconds(options.ProtocolTimeout));
+                        await driver.StartAsync(Process.EndPoint + "/session").ConfigureAwait(false);
+                        browser = await BidiBrowser.CreateAsync(driver, options, _loggerFactory).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        connection = await Connection
+                            .Create(Process.EndPoint, options, _loggerFactory)
+                            .ConfigureAwait(false);
+
+                        browser = await CdpBrowser
+                            .CreateAsync(
+                                options.Browser,
+                                connection,
+                                [],
+                                options.AcceptInsecureCerts,
+                                options.DefaultViewport,
+                                Process,
+                                options.TargetFilter,
+                                options.IsPageTarget)
+                            .ConfigureAwait(false);
+                    }
+
+                    if (options.WaitForInitialPage)
+                    {
+                        await browser.WaitForTargetAsync(t => t.Type == TargetType.Page).ConfigureAwait(false);
+                    }
+
                     return browser;
                 }
                 catch (Exception ex)
                 {
                     connection?.Dispose();
+                    browser?.Dispose();
                     throw new ProcessException("Failed to create connection", ex);
                 }
             }
diff --git a/lib/PuppeteerSharp/LauncherBase.cs b/lib/PuppeteerSharp/LauncherBase.cs
index cfd368ce0..1f90677c1 100644
--- a/lib/PuppeteerSharp/LauncherBase.cs
+++ b/lib/PuppeteerSharp/LauncherBase.cs
@@ -14,8 +14,6 @@ namespace PuppeteerSharp
     /// </summary>
     public abstract class LauncherBase : IDisposable
     {
-        private readonly StateManager _stateManager;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="LauncherBase"/> class.
         /// </summary>
@@ -23,8 +21,8 @@ public abstract class LauncherBase : IDisposable
         /// <param name="options">Options for launching Base.</param>
         protected LauncherBase(string executable, LaunchOptions options)
         {
-            _stateManager = new StateManager();
-            _stateManager.Starting = new ProcessStartingState(_stateManager);
+            StateManager = new StateManager();
+            StateManager.Starting = new ProcessStartingState(StateManager);
 
             Options = options ?? throw new ArgumentNullException(nameof(options));
 
@@ -67,12 +65,14 @@ protected LauncherBase(string executable, LaunchOptions options)
         /// <summary>
         /// Indicates whether Base process is exiting.
         /// </summary>
-        public bool IsExiting => _stateManager.CurrentState.IsExiting;
+        public bool IsExiting => StateManager.CurrentState.IsExiting;
 
         /// <summary>
         /// Indicates whether Base process has exited.
         /// </summary>
-        public bool HasExited => _stateManager.CurrentState.IsExited;
+        public bool HasExited => StateManager.CurrentState.IsExited;
+
+        internal StateManager StateManager { get; }
 
         internal TaskCompletionSource<bool> ExitCompletionSource { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
 
@@ -85,13 +85,7 @@ protected LauncherBase(string executable, LaunchOptions options)
         /// <summary>
         /// Gets Base process current state.
         /// </summary>
-        internal State CurrentState => _stateManager.CurrentState;
-
-        /// <summary>
-        /// Default build.
-        /// </summary>
-        /// <returns>A tasks that resolves when the build is obtained.</returns>
-        public abstract Task<string> GetDefaultBuildIdAsync();
+        internal State CurrentState => StateManager.CurrentState;
 
         /// <inheritdoc />
         public void Dispose()
@@ -104,7 +98,7 @@ public void Dispose()
         /// Asynchronously starts Base process.
         /// </summary>
         /// <returns>Task which resolves when after start process begins.</returns>
-        public Task StartAsync() => _stateManager.CurrentState.StartAsync(this);
+        public Task StartAsync() => StateManager.CurrentState.StartAsync(this);
 
         /// <summary>
         /// Asynchronously waits for graceful Base process exit within a given timeout period.
@@ -113,14 +107,14 @@ public void Dispose()
         /// <param name="timeout">The maximum waiting time for a graceful process exit.</param>
         /// <returns>Task which resolves when the process is exited or killed.</returns>
         public Task EnsureExitAsync(TimeSpan? timeout) => timeout.HasValue
-            ? _stateManager.CurrentState.ExitAsync(this, timeout.Value)
-            : _stateManager.CurrentState.KillAsync(this);
+            ? StateManager.CurrentState.ExitAsync(this, timeout.Value)
+            : StateManager.CurrentState.KillAsync(this);
 
         /// <summary>
         /// Asynchronously kills Base process.
         /// </summary>
         /// <returns>Task which resolves when the process is killed.</returns>
-        public Task KillAsync() => _stateManager.CurrentState.KillAsync(this);
+        public Task KillAsync() => StateManager.CurrentState.KillAsync(this);
 
         /// <summary>
         /// Waits for Base process exit within a given timeout.
@@ -201,6 +195,6 @@ protected static void SetEnvVariables(IDictionary<string, string> environment, I
         /// Disposes Base process and any temporary user directory.
         /// </summary>
         /// <param name="disposing">Indicates whether disposal was initiated by <see cref="Dispose()"/> operation.</param>
-        protected virtual void Dispose(bool disposing) => _stateManager.CurrentState.Dispose(this);
+        protected virtual void Dispose(bool disposing) => StateManager.CurrentState.Dispose(this);
     }
 }
diff --git a/lib/PuppeteerSharp/Page.cs b/lib/PuppeteerSharp/Page.cs
index eed684d0c..28f50211e 100644
--- a/lib/PuppeteerSharp/Page.cs
+++ b/lib/PuppeteerSharp/Page.cs
@@ -206,7 +206,7 @@ public int DefaultTimeout
         /// <summary>
         /// Timeout settings.
         /// </summary>
-        protected TimeoutSettings TimeoutSettings { get; set; } = new();
+        internal TimeoutSettings TimeoutSettings { get; set; } = new();
 
         /// <summary>
         /// Whether the <see cref="Console"/> event has listeners.
@@ -788,73 +788,47 @@ internal void OnDialog(PageJavascriptDialogOpeningResponse message)
             Dialog?.Invoke(this, new DialogEventArgs(dialog));
         }
 
-        /// <summary>
-        /// Dispose resources.
-        /// </summary>
-        /// <param name="disposing">Indicates whether disposal was initiated by <see cref="Dispose()"/> operation.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            Mouse.Dispose();
-            _ = DisposeAsync();
-        }
-
         /// <summary>
         /// Raises the <see cref="FrameAttached"/> event.
         /// </summary>
         /// <param name="e">Event arguments.</param>
-        protected void OnFrameAttached(FrameEventArgs e) => FrameAttached?.Invoke(this, e);
-
-        /// <summary>
-        /// Raises the <see cref="FrameNavigated"/> event.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        protected void OnFrameNavigated(FrameNavigatedEventArgs e) => FrameNavigated?.Invoke(this, e);
+        internal void OnFrameAttached(FrameEventArgs e) => FrameAttached?.Invoke(this, e);
 
         /// <summary>
         /// Raises the <see cref="FrameDetached"/> event.
         /// </summary>
         /// <param name="e">Event arguments.</param>
-        protected void OnFrameDetached(FrameEventArgs e) => FrameDetached?.Invoke(this, e);
-
-        /// <summary>
-        /// Raises the <see cref="RequestFailed"/> event.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        protected void OnRequestFailed(RequestEventArgs e) => RequestFailed?.Invoke(this, e);
+        internal void OnFrameDetached(FrameEventArgs e) => FrameDetached?.Invoke(this, e);
 
         /// <summary>
         /// Raises the <see cref="RequestFinished"/> event.
         /// </summary>
         /// <param name="e">Event arguments.</param>
-        protected void OnRequestFinished(RequestEventArgs e) => RequestFinished?.Invoke(this, e);
+        internal void OnRequestFinished(RequestEventArgs e) => RequestFinished?.Invoke(this, e);
 
         /// <summary>
-        /// Raises the <see cref="Response"/> event.
+        /// Raises the <see cref="RequestFailed"/> event.
         /// </summary>
         /// <param name="e">Event arguments.</param>
-        protected void OnResponse(ResponseCreatedEventArgs e) => Response?.Invoke(this, e);
+        internal void OnRequestFailed(RequestEventArgs e) => RequestFailed?.Invoke(this, e);
 
         /// <summary>
         /// Raises the <see cref="RequestServedFromCache"/> event.
         /// </summary>
         /// <param name="e">Event arguments.</param>
-        protected void OnRequestServedFromCache(RequestEventArgs e) => RequestServedFromCache?.Invoke(this, e);
+        internal void OnRequestServedFromCache(RequestEventArgs e) => RequestServedFromCache?.Invoke(this, e);
 
         /// <summary>
-        /// Raises the <see cref="DOMContentLoaded"/> event.
-        /// </summary>
-        protected void OnDOMContentLoaded() => DOMContentLoaded?.Invoke(this, EventArgs.Empty);
-
-        /// <summary>
-        /// Raises the <see cref="Load"/> event.
+        /// Raises the <see cref="Response"/> event.
         /// </summary>
-        protected void OnLoad() => Load?.Invoke(this, EventArgs.Empty);
+        /// <param name="e">Event arguments.</param>
+        internal void OnResponse(ResponseCreatedEventArgs e) => Response?.Invoke(this, e);
 
         /// <summary>
         /// Raises the <see cref="Request"/> event.
         /// </summary>
         /// <param name="request">Request object.</param>
-        protected void OnRequest(IRequest request)
+        internal void OnRequest(IRequest request)
         {
             if (request == null)
             {
@@ -870,6 +844,32 @@ protected void OnRequest(IRequest request)
             Request?.Invoke(this, new RequestEventArgs(request));
         }
 
+        /// <summary>
+        /// Dispose resources.
+        /// </summary>
+        /// <param name="disposing">Indicates whether disposal was initiated by <see cref="Dispose()"/> operation.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            Mouse.Dispose();
+            _ = DisposeAsync();
+        }
+
+        /// <summary>
+        /// Raises the <see cref="FrameNavigated"/> event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected void OnFrameNavigated(FrameNavigatedEventArgs e) => FrameNavigated?.Invoke(this, e);
+
+        /// <summary>
+        /// Raises the <see cref="DOMContentLoaded"/> event.
+        /// </summary>
+        protected void OnDOMContentLoaded() => DOMContentLoaded?.Invoke(this, EventArgs.Empty);
+
+        /// <summary>
+        /// Raises the <see cref="Load"/> event.
+        /// </summary>
+        protected void OnLoad() => Load?.Invoke(this, EventArgs.Empty);
+
         /// <summary>
         /// Raises the <see cref="WorkerDestroyed"/> event.
         /// </summary>
diff --git a/lib/PuppeteerSharp/ProtocolType.cs b/lib/PuppeteerSharp/ProtocolType.cs
new file mode 100644
index 000000000..3e8afb781
--- /dev/null
+++ b/lib/PuppeteerSharp/ProtocolType.cs
@@ -0,0 +1,39 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+namespace PuppeteerSharp;
+
+/// <summary>
+/// Protocol used to communicate with the browser.
+/// </summary>
+public enum ProtocolType
+{
+    /// <summary>
+    /// Chrome DevTools Protocol.
+    /// </summary>
+    Cdp = 0,
+
+    /// <summary>
+    /// Webdriver Bidi.
+    /// </summary>
+    WebdriverBiDi,
+}
diff --git a/lib/PuppeteerSharp/PuppeteerSharp.csproj b/lib/PuppeteerSharp/PuppeteerSharp.csproj
index 9f57ce6cc..3e7a5bb7b 100644
--- a/lib/PuppeteerSharp/PuppeteerSharp.csproj
+++ b/lib/PuppeteerSharp/PuppeteerSharp.csproj
@@ -43,6 +43,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="WebDriverBiDi" Version="0.0.9" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
diff --git a/lib/PuppeteerSharp/States/DisposedState.cs b/lib/PuppeteerSharp/States/DisposedState.cs
index cabe79775..c96c08492 100644
--- a/lib/PuppeteerSharp/States/DisposedState.cs
+++ b/lib/PuppeteerSharp/States/DisposedState.cs
@@ -32,7 +32,7 @@ public override Task EnterFromAsync(LauncherBase launcher, State fromState, Time
 
         public override Task StartAsync(LauncherBase p) => throw new ObjectDisposedException(p.ToString());
 
-        public override Task ExitAsync(LauncherBase p, TimeSpan timeout) => throw new ObjectDisposedException(p.ToString());
+        public override Task ExitAsync(LauncherBase launcher, TimeSpan timeout) => throw new ObjectDisposedException(launcher.ToString());
 
         public override Task KillAsync(LauncherBase p) => throw new ObjectDisposedException(p.ToString());
 
diff --git a/lib/PuppeteerSharp/States/ExitedState.cs b/lib/PuppeteerSharp/States/ExitedState.cs
index a303f6ef7..1691ec30e 100644
--- a/lib/PuppeteerSharp/States/ExitedState.cs
+++ b/lib/PuppeteerSharp/States/ExitedState.cs
@@ -22,7 +22,7 @@ public void EnterFrom(LauncherBase launcher, State fromState)
             launcher.OnExit();
         }
 
-        public override Task ExitAsync(LauncherBase p, TimeSpan timeout) => Task.CompletedTask;
+        public override Task ExitAsync(LauncherBase launcher, TimeSpan timeout) => Task.CompletedTask;
 
         public override Task KillAsync(LauncherBase p) => Task.CompletedTask;
 
diff --git a/lib/PuppeteerSharp/States/ExitingState.cs b/lib/PuppeteerSharp/States/ExitingState.cs
index 8d9613476..0c08f0a89 100644
--- a/lib/PuppeteerSharp/States/ExitingState.cs
+++ b/lib/PuppeteerSharp/States/ExitingState.cs
@@ -5,22 +5,20 @@
 
 namespace PuppeteerSharp.States
 {
-    internal class ExitingState : State
+    internal class ExitingState(StateManager stateManager) : State(stateManager)
     {
-        public ExitingState(StateManager stateManager) : base(stateManager)
-        {
-        }
-
         public override Task EnterFromAsync(LauncherBase launcher, State fromState, TimeSpan timeout)
-            => !StateManager.TryEnter(launcher, fromState, this) ? StateManager.CurrentState.ExitAsync(launcher, timeout) : ExitAsync(launcher, timeout);
+            => !StateManager.TryEnter(launcher, fromState, this)
+                ? StateManager.CurrentState.ExitAsync(launcher, timeout)
+                : ExitAsync(launcher, timeout);
 
-        public override async Task ExitAsync(LauncherBase p, TimeSpan timeout)
+        public override async Task ExitAsync(LauncherBase launcher, TimeSpan timeout)
         {
-            var waitForExitTask = WaitForExitAsync(p);
+            var waitForExitTask = WaitForExitAsync(launcher);
             await waitForExitTask.WithTimeout(
                 async () =>
                 {
-                    await StateManager.Killing.EnterFromAsync(p, this, timeout).ConfigureAwait(false);
+                    await StateManager.Killing.EnterFromAsync(launcher, this, timeout).ConfigureAwait(false);
                     await waitForExitTask.ConfigureAwait(false);
                 },
                 timeout,
diff --git a/lib/PuppeteerSharp/States/InitialState.cs b/lib/PuppeteerSharp/States/InitialState.cs
index d34759d8a..29738c8c4 100644
--- a/lib/PuppeteerSharp/States/InitialState.cs
+++ b/lib/PuppeteerSharp/States/InitialState.cs
@@ -3,17 +3,14 @@
 
 namespace PuppeteerSharp.States
 {
-    internal class InitialState : State
+    internal class InitialState(StateManager stateManager) : State(stateManager)
     {
-        public InitialState(StateManager stateManager) : base(stateManager)
-        {
-        }
+        public override Task StartAsync(LauncherBase p)
+            => StateManager.Starting.EnterFromAsync(p, this, TimeSpan.Zero);
 
-        public override Task StartAsync(LauncherBase p) => StateManager.Starting.EnterFromAsync(p, this, TimeSpan.Zero);
-
-        public override Task ExitAsync(LauncherBase p, TimeSpan timeout)
+        public override Task ExitAsync(LauncherBase launcher, TimeSpan timeout)
         {
-            StateManager.Exited.EnterFromAsync(p, this);
+            StateManager.Exited.EnterFromAsync(launcher, this);
             return Task.CompletedTask;
         }
 
@@ -23,11 +20,7 @@ public override Task KillAsync(LauncherBase p)
             return Task.CompletedTask;
         }
 
-        public override Task WaitForExitAsync(LauncherBase p) => Task.FromException(InvalidOperation("wait for exit"));
-
-        private Exception InvalidOperation(string v)
-        {
-            throw new NotImplementedException();
-        }
+        public override Task WaitForExitAsync(LauncherBase p)
+            => Task.FromException(new InvalidOperationException("wait for exit"));
     }
 }
diff --git a/lib/PuppeteerSharp/States/KillingState.cs b/lib/PuppeteerSharp/States/KillingState.cs
index f5fea6b71..dabbe7fe7 100644
--- a/lib/PuppeteerSharp/States/KillingState.cs
+++ b/lib/PuppeteerSharp/States/KillingState.cs
@@ -3,12 +3,8 @@
 
 namespace PuppeteerSharp.States
 {
-    internal class KillingState : State
+    internal class KillingState(StateManager stateManager) : State(stateManager)
     {
-        public KillingState(StateManager stateManager) : base(stateManager)
-        {
-        }
-
         public override async Task EnterFromAsync(LauncherBase launcher, State fromState, TimeSpan timeout)
         {
             if (!StateManager.TryEnter(launcher, fromState, this))
diff --git a/lib/PuppeteerSharp/States/ProcessStartingState.cs b/lib/PuppeteerSharp/States/ProcessStartingState.cs
index 6b9ed179d..603724137 100644
--- a/lib/PuppeteerSharp/States/ProcessStartingState.cs
+++ b/lib/PuppeteerSharp/States/ProcessStartingState.cs
@@ -7,11 +7,9 @@
 
 namespace PuppeteerSharp.States
 {
-    internal class ProcessStartingState : State
+    internal class ProcessStartingState(StateManager stateManager) : State(stateManager)
     {
-        public ProcessStartingState(StateManager stateManager) : base(stateManager)
-        {
-        }
+        public string LineOutputExpression { get; set; } = "^DevTools listening on (ws:\\/\\/.*)";
 
         public override Task EnterFromAsync(LauncherBase launcher, State fromState, TimeSpan timeout)
         {
@@ -27,7 +25,7 @@ public override Task EnterFromAsync(LauncherBase launcher, State fromState, Time
 
         public override Task StartAsync(LauncherBase p) => p.StartCompletionSource.Task;
 
-        public override Task ExitAsync(LauncherBase p, TimeSpan timeout) => StateManager.Exiting.EnterFromAsync(p, this, timeout);
+        public override Task ExitAsync(LauncherBase launcher, TimeSpan timeout) => StateManager.Exiting.EnterFromAsync(launcher, this, timeout);
 
         public override Task KillAsync(LauncherBase p) => StateManager.Killing.EnterFromAsync(p, this);
 
@@ -46,7 +44,7 @@ void OnProcessDataReceivedWhileStarting(object sender, DataReceivedEventArgs e)
                 if (e.Data != null)
                 {
                     output.AppendLine(e.Data);
-                    var match = Regex.Match(e.Data, "^DevTools listening on (ws:\\/\\/.*)");
+                    var match = Regex.Match(e.Data, LineOutputExpression);
                     if (match.Success)
                     {
                         p.StartCompletionSource.TrySetResult(match.Groups[1].Value);
diff --git a/lib/PuppeteerSharp/States/StartedState.cs b/lib/PuppeteerSharp/States/StartedState.cs
index 6c65d901d..ec045a6dc 100644
--- a/lib/PuppeteerSharp/States/StartedState.cs
+++ b/lib/PuppeteerSharp/States/StartedState.cs
@@ -3,12 +3,8 @@
 
 namespace PuppeteerSharp.States
 {
-    internal class StartedState : State
+    internal class StartedState(StateManager stateManager) : State(stateManager)
     {
-        public StartedState(StateManager stateManager) : base(stateManager)
-        {
-        }
-
         public override Task EnterFromAsync(LauncherBase launcher, State fromState, TimeSpan timeout)
         {
             StateManager.TryEnter(launcher, fromState, this);
diff --git a/lib/PuppeteerSharp/States/State.cs b/lib/PuppeteerSharp/States/State.cs
index b7ae7f90e..6770e98a9 100644
--- a/lib/PuppeteerSharp/States/State.cs
+++ b/lib/PuppeteerSharp/States/State.cs
@@ -67,11 +67,12 @@ public State(StateManager stateManager)
 
         public virtual Task EnterFromAsync(LauncherBase launcher, State fromState) => EnterFromAsync(launcher, fromState, TimeSpan.Zero);
 
-        public virtual Task EnterFromAsync(LauncherBase launcher, State fromState, TimeSpan timeout) => Task.FromException(InvalidOperation("enterFrom"));
+        public virtual Task EnterFromAsync(LauncherBase launcher, State fromState, TimeSpan timeout)
+            => Task.FromException(InvalidOperation("enterFrom"));
 
         public virtual Task StartAsync(LauncherBase p) => Task.FromException(InvalidOperation("start"));
 
-        public virtual Task ExitAsync(LauncherBase p, TimeSpan timeout) => Task.FromException(InvalidOperation("exit"));
+        public virtual Task ExitAsync(LauncherBase launcher, TimeSpan timeout) => Task.FromException(InvalidOperation("exit"));
 
         public virtual Task KillAsync(LauncherBase p) => Task.FromException(InvalidOperation("kill"));
 
diff --git a/lib/PuppeteerSharp/States/StateManager.cs b/lib/PuppeteerSharp/States/StateManager.cs
index 7711e53d4..adccc84e9 100644
--- a/lib/PuppeteerSharp/States/StateManager.cs
+++ b/lib/PuppeteerSharp/States/StateManager.cs
@@ -26,7 +26,7 @@ public State CurrentState
 
         internal State Initial { get; set; }
 
-        internal State Starting { get; set; }
+        internal ProcessStartingState Starting { get; set; }
 
         internal StartedState Started { get; set; }
 
@@ -38,6 +38,12 @@ public State CurrentState
 
         internal State Disposed { get; set; }
 
+        internal string LineOutputExpression
+        {
+            get => Starting.LineOutputExpression;
+            set => Starting.LineOutputExpression = value;
+        }
+
         public bool TryEnter(LauncherBase p, State fromState, State toState)
         {
             if (Interlocked.CompareExchange(ref _currentState, toState, fromState) == fromState)
diff --git a/lib/PuppeteerSharp/Target.cs b/lib/PuppeteerSharp/Target.cs
index 0deb26e7d..a04903306 100644
--- a/lib/PuppeteerSharp/Target.cs
+++ b/lib/PuppeteerSharp/Target.cs
@@ -15,39 +15,21 @@ public abstract class Target : ITarget
     {
         private readonly ConcurrentSet<ITarget> _childTargets = [];
 
-        internal Target(
-            TargetInfo targetInfo,
-            CDPSession session,
-            BrowserContext context,
-            ITargetManager targetManager,
-            Func<bool, Task<CDPSession>> sessionFactory)
+        internal Target()
         {
-            Session = session;
-            TargetInfo = targetInfo;
-            SessionFactory = sessionFactory;
-            BrowserContext = context;
-            TargetManager = targetManager;
-
-            if (session != null)
-            {
-                session.Target = this;
-            }
         }
 
         /// <inheritdoc/>
-        public string Url => TargetInfo.Url;
+        public abstract string Url { get; }
 
         /// <inheritdoc/>
-        public virtual TargetType Type => TargetInfo.Type;
-
-        /// <inheritdoc/>
-        public string TargetId => TargetInfo.TargetId;
+        public abstract TargetType Type { get; }
 
         /// <inheritdoc/>
         public abstract ITarget Opener { get; }
 
         /// <inheritdoc/>
-        IBrowser ITarget.Browser => Browser;
+        IBrowser ITarget.Browser { get; }
 
         /// <inheritdoc/>
         IBrowserContext ITarget.BrowserContext => BrowserContext;
@@ -55,27 +37,9 @@ internal Target(
         /// <inheritdoc/>
         IEnumerable<ITarget> ITarget.ChildTargets => _childTargets;
 
-        internal BrowserContext BrowserContext { get; }
-
-        internal Browser Browser => BrowserContext.Browser;
-
-        internal Task<InitializationStatus> InitializedTask => InitializedTaskWrapper.Task;
-
-        internal TaskCompletionSource<InitializationStatus> InitializedTaskWrapper { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
-
-        internal Task CloseTask => CloseTaskWrapper.Task;
-
-        internal TaskCompletionSource<bool> CloseTaskWrapper { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
-
-        internal Func<bool, Task<CDPSession>> SessionFactory { get; private set; }
-
-        internal ITargetManager TargetManager { get; }
-
-        internal bool IsInitialized { get; set; }
-
-        internal CDPSession Session { get; }
+        internal abstract BrowserContext BrowserContext { get; }
 
-        internal TargetInfo TargetInfo { get; set; }
+        internal abstract Browser Browser { get; }
 
         /// <inheritdoc/>
         public virtual Task<IPage> PageAsync() => Task.FromResult<IPage>(null);
diff --git a/lib/PuppeteerSharp/TargetChangedArgs.cs b/lib/PuppeteerSharp/TargetChangedArgs.cs
index 38f72bd93..85cc4eb5a 100644
--- a/lib/PuppeteerSharp/TargetChangedArgs.cs
+++ b/lib/PuppeteerSharp/TargetChangedArgs.cs
@@ -1,3 +1,5 @@
+using PuppeteerSharp.Cdp;
+
 namespace PuppeteerSharp
 {
     /// <summary>
@@ -10,13 +12,22 @@ public class TargetChangedArgs
     {
         private TargetInfo _targetInfo;
 
+        internal TargetChangedArgs()
+        {
+        }
+
+        internal TargetChangedArgs(Target target)
+        {
+            Target = target;
+        }
+
         /// <summary>
         /// Gets the target info.
         /// </summary>
         /// <value>The target info.</value>
         public TargetInfo TargetInfo
         {
-            get => _targetInfo ?? Target.TargetInfo;
+            get => _targetInfo ?? (Target as CdpTarget)?.TargetInfo;
             internal set => _targetInfo = value;
         }