diff --git a/src/app/app.cc b/src/app/app.cc
index acfd8437e..745f0e73f 100644
--- a/src/app/app.cc
+++ b/src/app/app.cc
@@ -205,7 +205,7 @@ didFailToContinueUserActivityWithType: (NSString*) userActivityType
 
   self.app->windowManager.configure(windowManagerOptions);
 
-  auto defaultWindow = self.app->windowManager.createDefaultWindow(WindowOptions {
+  auto defaultWindow = self.app->windowManager.createDefaultWindow(Window::Options {
      .shouldExitApplicationOnClose = true
     });
 
@@ -218,7 +218,7 @@ didFailToContinueUserActivityWithType: (NSString*) userActivityType
     self.app->userConfig["webview_service_worker_mode"] != "hybrid" &&
     self.app->userConfig["permissions_allow_service_worker"] != "false"
   ) {
-    auto serviceWorkerWindowOptions = WindowOptions {};
+    auto serviceWorkerWindowOptions = Window::Options {};
     auto serviceWorkerUserConfig = self.app->userConfig;
     const auto screen = defaultWindow->getScreenSize();
 
@@ -1063,7 +1063,7 @@ extern "C" {
       app->windowManager.configure(windowManagerOptions);
 
       app->dispatch([=]() {
-        auto defaultWindow = app->windowManager.createDefaultWindow(WindowOptions {
+        auto defaultWindow = app->windowManager.createDefaultWindow(Window::Options {
           .shouldExitApplicationOnClose = true
         });
 
@@ -1074,7 +1074,7 @@ extern "C" {
           app->userConfig["permissions_allow_service_worker"] != "false"
         ) {
           if (app->windowManager.getWindowStatus(SOCKET_RUNTIME_SERVICE_WORKER_CONTAINER_WINDOW_INDEX) == WindowManager::WINDOW_NONE) {
-            auto serviceWorkerWindowOptions = WindowOptions {};
+            auto serviceWorkerWindowOptions = Window::Options {};
             auto serviceWorkerUserConfig = app->userConfig;
             auto screen = defaultWindow->getScreenSize();
 
diff --git a/src/app/app.hh b/src/app/app.hh
index f501f8a9e..a956ae035 100644
--- a/src/app/app.hh
+++ b/src/app/app.hh
@@ -123,12 +123,6 @@ namespace SSC {
       void dispatch (Function<void()>);
       String getcwd ();
       bool hasRuntimePermission (const String& permission) const;
-
-      /*
-    #if SOCKET_RUNTIME_PLATFORM_ANDROID
-      bool isAndroidPermissionAllowed (const String& permission);
-    #endif
-    */
   };
 }
 #endif
diff --git a/src/cli/cli.cc b/src/cli/cli.cc
index fd1ffbd11..694680ab1 100644
--- a/src/cli/cli.cc
+++ b/src/cli/cli.cc
@@ -1692,22 +1692,23 @@ void run (const String& targetPlatform, Map& settings, const Paths& paths, const
   exit(1);
 }
 
-struct Option {
+struct CommandLineOption {
   std::vector<String> aliases;
   bool isOptional;
   bool shouldHaveValue;
 };
-using Options = std::vector<Option>;
+
+using CommandLineOptions = Vector<CommandLineOption>;
 
 struct optionsAndEnv {
   Map optionsWithValue;
   std::unordered_set<String> optionsWithoutValue;
-  std::vector<String> envs;
+  Vector<String> envs;
 };
 
 optionsAndEnv parseCommandLineOptions (
   const std::span<const char*>& options,
-  const Options& availableOptions,
+  const CommandLineOptions& availableOptions,
   const String& subcommand
 ) {
   optionsAndEnv result;
@@ -1755,7 +1756,7 @@ optionsAndEnv parseCommandLineOptions (
     }
 
     // find option
-    Option recognizedOption;
+    CommandLineOption recognizedOption;
     bool found = false;
     for (const auto option : availableOptions) {
       for (const auto alias : option.aliases) {
@@ -1988,7 +1989,7 @@ int main (const int argc, const char* argv[]) {
 
   auto createSubcommand = [&](
     const String& subcommand,
-    const Options& availableOptions,
+    const CommandLineOptions& availableOptions,
     const bool& needsConfig,
     std::function<void(Map, std::unordered_set<String>)> subcommandHandler
   ) -> void {
@@ -2187,7 +2188,7 @@ int main (const int argc, const char* argv[]) {
 
   // first flag indicating whether option is optional
   // second flag indicating whether option should be followed by a value
-  Options initOptions = {
+  CommandLineOptions initOptions = {
     { { "--config", "-C" }, true, false },
     { { "--name", "-n" }, true, true }
   };
@@ -2246,7 +2247,7 @@ int main (const int argc, const char* argv[]) {
 
   // first flag indicating whether option is optional
   // second flag indicating whether option should be followed by a value
-  Options listDevicesOptions = {
+  CommandLineOptions listDevicesOptions = {
     { { "--platform" }, false, true },
     { { "--ecid" }, true, false },
     { { "--udid" }, true, false },
@@ -2352,7 +2353,7 @@ int main (const int argc, const char* argv[]) {
 
   // first flag indicating whether option is optional
   // second flag indicating whether option should be followed by a value
-  Options installAppOptions = {
+  CommandLineOptions installAppOptions = {
     { { "--debug", "-D" }, true, false },
     { { "--device" }, true, true },
     { { "--platform" }, true, true },
@@ -2571,7 +2572,7 @@ int main (const int argc, const char* argv[]) {
 
   // first flag indicating whether option is optional
   // second flag indicating whether option should be followed by a value
-  Options printBuildDirOptions = {
+  CommandLineOptions printBuildDirOptions = {
     { { "--platform" }, true, true }, { { "--root" }, true, false}
   };
 
@@ -2592,7 +2593,7 @@ int main (const int argc, const char* argv[]) {
 
   // first flag indicating whether option is optional
   // second flag indicating whether option should be followed by a value
-  Options runOptions = {
+  CommandLineOptions runOptions = {
     { { "--platform" }, true, true },
     { { "--prod", "-P" }, true, false },
     { { "--test", "-t" }, true, true },
@@ -2604,7 +2605,7 @@ int main (const int argc, const char* argv[]) {
     { { "--host"}, true, true }
   };
 
-  Options buildOptions = {
+  CommandLineOptions buildOptions = {
     { { "--quiet", "-q" }, true, false },
     { { "--only-build", "-o" }, true, false },
     { { "--run", "-r" }, true, false },
@@ -7125,7 +7126,7 @@ int main (const int argc, const char* argv[]) {
 
   // first flag indicating whether option is optional
   // second flag indicating whether option should be followed by a value
-  Options setupOptions = {
+  CommandLineOptions setupOptions = {
     { { "--platform" }, true, true },
     { { "--yes", "-y" }, true, false },
     { { "--quiet", "-q" }, true, false },
diff --git a/src/core/core.cc b/src/core/core.cc
index e9cfe7454..b03091b2d 100644
--- a/src/core/core.cc
+++ b/src/core/core.cc
@@ -387,17 +387,21 @@ namespace SSC {
       static constexpr auto resolution = RELEASE_STRONG_REFERENCE_SHARED_POINTER_BUFFERS_RESOLUTION;
       Lock lock(core->mutex);
       for (int i = 0; i < core->sharedPointerBuffers.size(); ++i) {
-        auto& entry = core->sharedPointerBuffers[i];
+        auto entry = &core->sharedPointerBuffers[i];
+        if (entry == nullptr) {
+          continue;
+        }
+
         // expired
-        if (entry.ttl <= resolution) {
-          entry.pointer = nullptr;
-          entry.ttl = 0;
+        if (entry->ttl <= resolution) {
+          entry->pointer = nullptr;
+          entry->ttl = 0;
           if (i == core->sharedPointerBuffers.size() - 1) {
             core->sharedPointerBuffers.pop_back();
             break;
           }
         } else {
-          entry.ttl = entry.ttl - resolution;
+          entry->ttl = entry->ttl - resolution;
         }
       }
 
diff --git a/src/core/core.hh b/src/core/core.hh
index 43bc0ffde..8219b14eb 100644
--- a/src/core/core.hh
+++ b/src/core/core.hh
@@ -15,9 +15,10 @@
 #include "ip.hh"
 #include "json.hh"
 #include "module.hh"
-#include "socket.hh"
+#include "options.hh"
 #include "post.hh"
 #include "resource.hh"
+#include "socket.hh"
 #include "unique_client.hh"
 #include "url.hh"
 #include "version.hh"
diff --git a/src/core/options.hh b/src/core/options.hh
new file mode 100644
index 000000000..37bf17ee8
--- /dev/null
+++ b/src/core/options.hh
@@ -0,0 +1,14 @@
+#ifndef SOCKET_RUNTIME_CORE_OPTIONS_H
+#define SOCKET_RUNTIME_CORE_OPTIONS_H
+
+#include "../platform/types.hh"
+
+namespace SSC {
+  struct Options {
+    template <typename T> const T& as () const {
+      static_assert(std::is_base_of<Options, T>::value);
+      return *reinterpret_cast<const T*>(this);
+    }
+  };
+}
+#endif
diff --git a/src/desktop/extension/linux.cc b/src/desktop/extension/linux.cc
index b75f78e68..49640fe16 100644
--- a/src/desktop/extension/linux.cc
+++ b/src/desktop/extension/linux.cc
@@ -28,7 +28,8 @@ extern "C" {
 
     if (bridge == nullptr) {
       g_object_ref(context);
-      bridge = std::make_shared<IPC::Bridge>(app->core, app->userConfig);
+      auto options = IPC::Bridge::Options(app->userConfig);
+      bridge = std::make_shared<IPC::Bridge>(app->core, options);
       bridge->evaluateJavaScriptFunction = [context] (const auto source) {
         auto _ = jsc_context_evaluate(context, source.c_str(), source.size());
       };
diff --git a/src/desktop/main.cc b/src/desktop/main.cc
index 0dbadc179..961fe95f3 100644
--- a/src/desktop/main.cc
+++ b/src/desktop/main.cc
@@ -1075,7 +1075,7 @@ MAIN {
     auto isMinimizable = getProperty("window_minimizable");
     auto isClosable = getProperty("window_closable");
 
-    auto defaultWindow = app.windowManager.createDefaultWindow(WindowOptions {
+    auto defaultWindow = app.windowManager.createDefaultWindow(Window::Options {
       .minimizable = (isMinimizable == "" || isMinimizable == "true") ? true : false,
       .maximizable = (isMaximizable == "" || isMaximizable == "true") ? true : false,
       .resizable = getProperty("window_resizable") == "false" ? false : true,
@@ -1093,7 +1093,7 @@ MAIN {
       userConfig["webview_service_worker_mode"] != "hybrid" &&
       userConfig["permissions_allow_service_worker"] != "false"
     ) {
-      auto serviceWorkerWindowOptions = WindowOptions {};
+      auto serviceWorkerWindowOptions = Window::Options {};
       auto serviceWorkerUserConfig = userConfig;
       auto screen = defaultWindow->getScreenSize();
 
diff --git a/src/ipc/bridge.cc b/src/ipc/bridge.cc
index 2e372be81..ced88d0d6 100644
--- a/src/ipc/bridge.cc
+++ b/src/ipc/bridge.cc
@@ -154,10 +154,18 @@ export default module)S";
     }
   }
 #endif
-
-  Bridge::Bridge (SharedPointer<Core> core, Map userConfig)
-    : core(core),
-      userConfig(userConfig),
+  Bridge::Options::Options (
+    const Map& userConfig,
+    const Preload::Options& preload
+  ) : userConfig(userConfig),
+      preload(preload)
+  {}
+
+  Bridge::Bridge (
+    SharedPointer<Core> core,
+    const Options& options
+  ) : core(core),
+      userConfig(options.userConfig),
       router(this),
       navigator(this),
       schemeHandlers(this)
@@ -644,7 +652,7 @@ export default module)S";
               if (resource.mimeType() != "text/html") {
                 response.send(resource);
               } else {
-                const auto html = this->preload.insertIntoHTML(resource.str(), {
+                const auto html = this->client.preload.insertIntoHTML(resource.str(), {
                   .protocolHandlerSchemes = this->navigator.serviceWorker.protocols.getSchemes()
                 });
 
diff --git a/src/ipc/bridge.hh b/src/ipc/bridge.hh
index e6ce05677..a4d395fd8 100644
--- a/src/ipc/bridge.hh
+++ b/src/ipc/bridge.hh
@@ -2,6 +2,7 @@
 #define SOCKET_RUNTIME_IPC_BRIDGE_H
 
 #include "../core/core.hh"
+#include "../core/options.hh"
 #include "../core/webview.hh"
 
 #include "client.hh"
@@ -18,6 +19,15 @@ namespace SSC::IPC {
       using DispatchCallback = Function<void()>;
       using DispatchFunction = Function<void(DispatchCallback)>;
 
+      struct Options : public SSC::Options {
+        Map userConfig = {};
+        Preload::Options preload;
+        Options (
+          const Map& userConfig = {},
+          const Preload::Options& preload = {}
+        );
+      };
+
       static Vector<Bridge*> getInstances();
 
       const CoreNetworkStatus::Observer networkStatusObserver;
@@ -31,24 +41,23 @@ namespace SSC::IPC {
       DispatchFunction dispatchFunction = nullptr;
 
       Bluetooth bluetooth;
+      Client client = {};
+      Map userConfig;
       Navigator navigator;
-      SchemeHandlers schemeHandlers;
-      Preload preload;
       Router router;
-      Map userConfig;
+      SchemeHandlers schemeHandlers;
 
       SharedPointer<Core> core = nullptr;
-      Client client = {};
       uint64_t id = 0;
 
     #if SOCKET_RUNTIME_PLATFORM_ANDROID
       bool isAndroidEmulator = false;
     #endif
 
+      Bridge (SharedPointer<Core>core, const Options& options);
       Bridge () = delete;
       Bridge (const Bridge&) = delete;
       Bridge (Bridge&&) = delete;
-      Bridge (SharedPointer<Core>core, Map userConfig);
       ~Bridge ();
 
       Bridge& operator = (const Bridge&) = delete;
diff --git a/src/ipc/client.hh b/src/ipc/client.hh
index 5a3ac9695..6db3f1b66 100644
--- a/src/ipc/client.hh
+++ b/src/ipc/client.hh
@@ -6,7 +6,8 @@
 
 namespace SSC::IPC {
   struct Client : public UniqueClient {
-    using ID = Client::ID;
+    using ID = UniqueClient::ID;
+    ID id = 0;
     IPC::Preload preload = {};
   };
 }
diff --git a/src/ipc/preload.cc b/src/ipc/preload.cc
index 12ab4e8da..b8e2d1a02 100644
--- a/src/ipc/preload.cc
+++ b/src/ipc/preload.cc
@@ -35,7 +35,13 @@ namespace SSC::IPC {
     R"HTML(</script>)HTML"
   );
 
-  Preload::Preload (const PreloadOptions& options)
+  const Preload Preload::compile (const Options& options) {
+    auto preload = Preload(options);
+    preload.compile();
+    return preload;
+  }
+
+  Preload::Preload (const Options& options)
     : options(options)
   {
     this->configure();
@@ -48,7 +54,7 @@ namespace SSC::IPC {
     this->configure(this->options);
   }
 
-  void Preload::configure (const PreloadOptions& options) {
+  void Preload::configure (const Options& options) {
     this->options = options;
     this->headers = options.headers;
     this->metadata = options.metadata;
@@ -236,7 +242,7 @@ namespace SSC::IPC {
         )JAVASCRIPT",
         Map {
           {"id", std::to_string(rand64())},
-          {"clientId", std::to_string(this->options.clientId)}
+          {"clientId", std::to_string(this->options.client.id)}
         }
       )));
 
@@ -663,10 +669,4 @@ namespace SSC::IPC {
 
     return output;
   }
-
-  const Preload createPreload (const PreloadOptions& options) {
-    auto preload = Preload(options);
-    preload.compile();
-    return preload;
-  }
 }
diff --git a/src/ipc/preload.hh b/src/ipc/preload.hh
index f788fb9a1..74a85362e 100644
--- a/src/ipc/preload.hh
+++ b/src/ipc/preload.hh
@@ -2,125 +2,163 @@
 #define SOCKET_RUNTIME_IPC_PRELOAD_H
 
 #include "../platform/platform.hh"
+#include "../core/unique_client.hh"
+#include "../core/options.hh"
 #include "../core/headers.hh"
 #include "../core/config.hh"
 
 namespace SSC::IPC {
   /**
-   * `PreloadFeatures` is a container for a variety of ways of configuring the
-   * compiler features for the compiled preload that is "injeced" into HTML
-   * documents.
+   * `Preload` is a container for state to compile a "preload script" attached
+   * to an IPC bridge that is injected into HTML documents loaded into a WebView
    */
-  struct PreloadFeatures {
-    /**
-     * If `true`, the feature enables global CommonJS values such as `module`,
-     * `exports`, `require`, `__filename`, and `__dirname`.
-     */
-    bool useGlobalCommonJS = true;
+  class Preload {
+    String compiled = "";
+    public:
+
+      /**
+      * `Options` is an input container for configuring `Preload` metadata,
+      * headers, environment variable values, preload compiler features, and more.
+      */
+      struct Options : SSC::Options {
+        /**
+         * `Features` is a container for a variety of ways of configuring the
+         * compiler features for the compiled preload that is "injeced" into HTML
+         * documents.
+         */
+        struct Features {
+          /**
+           * If `true`, the feature enables global CommonJS values such as `module`,
+           * `exports`, `require`, `__filename`, and `__dirname`.
+           */
+          bool useGlobalCommonJS = true;
+
+          /**
+           * If `true`, the feature enables global Node.js values like
+           * `process` and `global`.
+           */
+          bool useGlobalNodeJS = true;
+
+          /**
+           * If `true`, the feature enables the automatic import of a "test script"
+           * that is specified with the `--test <path_relative_to_resources>` command
+           * line argument. This is useful for running tests
+           */
+          bool useTestScript = false;
+
+          /**
+           * If `true`, the feature enables the compiled preload to use HTML markup
+           * such as `<script>` and `<meta>` tags for injecting JavaScript, metadata
+           * and HTTP headers. If this feature is `false`, then the preload compiler
+           * will not include metadata or HTTP headers in `<meta>` tags nor will the
+           * JavaScript compiled in the preload be "wrapped" by a `<script>` tag.
+           */
+          bool useHTMLMarkup = true;
+
+          /**
+           * If `true`, the feature enables the preload compiler to use ESM import
+           * syntax instead of "dynamic" import for importing the "internal init"
+           * module or running a "user script"
+           */
+          bool useESM = true;
+
+          /**
+           * If `true`, the feature enables the preload compiler to use include the
+           * a global `__args` object available on `globalThis`.
+           */
+          bool useGlobalArgs = true;
+        };
+
+      bool headless = false;
+      bool debug = false;
+
+      Features features;
+
+      UniqueClient client;
+      int index = 0;
+
+      Headers headers = {}; // depends on 'features.useHTMLMarkup'
+      Map metadata; // depends on 'features.useHTMLMarkup'
+      Map env;
+      Map userConfig;
+      Vector<String> argv;
+
+      String userScript = "";
+
+      // only use if you know what you are doing
+      String RUNTIME_PRIMORDIAL_OVERRIDES = "";
+    };
+
+    struct InsertIntoHTMLOptions : public Options {
+      Vector<String> protocolHandlerSchemes;
+    };
 
     /**
-     * If `true`, the feature enables global Node.js values like
-     * `process` and `global`.
+     * Creates and compiles preload from given options.
      */
-    bool useGlobalNodeJS = true;
+    static const Preload compile (const Options& options);
 
     /**
-     * If `true`, the feature enables the automatic import of a "test script"
-     * that is specified with the `--test <path_relative_to_resources>` command
-     * line argument. This is useful for running tests
+     * The options used to configure this preload.
      */
-    bool useTestScript = false;
+    Options options;
 
     /**
-     * If `true`, the feature enables the compiled preload to use HTML markup
-     * such as `<script>` and `<meta>` tags for injecting JavaScript, metadata
-     * and HTTP headers. If this feature is `false`, then the preload compiler
-     * will not include metadata or HTTP headers in `<meta>` tags nor will the
-     * JavaScript compiled in the preload be "wrapped" by a `<script>` tag.
+     * The current preload buffer, prior to compilation.
      */
-    bool useHTMLMarkup = true;
+    Vector<String> buffer;
 
     /**
-     * If `true`, the feature enables the preload compiler to use ESM import
-     * syntax instead of "dynamic" import for importing the "internal init"
-     * module or running a "user script"
+     * A mapping of key-value HTTP headers to be injected as HTML `<meta>`
+     * tags into the preload output.
+     * This depends on the 'useHTMLMarkup' feature.
      */
-    bool useESM = true;
+    Headers headers = {};
 
     /**
-     * If `true`, the feature enables the preload compiler to use include the
-     * a global `__args` object available on `globalThis`.
+     * A mapping of key-value metadata to be injected as HTML `<meta>` tags
+     * into the preload output.
+     * This depends on the 'useHTMLMarkup' feature.
      */
-    bool useGlobalArgs = true;
-  };
+    Map metadata;
 
-  /**
-   * `PreloadOptions` is an input container for configuring `Preload` metadata,
-   * headers, environment variable values, preload compiler features, and more.
-   */
-  struct PreloadOptions {
-    bool headless = false;
-    bool debug = false;
-
-    PreloadFeatures features;
-
-    uint64_t clientId = 0;
-    int index = 0;
-
-    Headers headers = {}; // depends on 'features.useHTMLMarkup'
-    Map metadata; // depends on 'features.useHTMLMarkup'
-    Map env;
-    Map userConfig;
-    Vector<String> argv;
+    Preload () = default;
+    Preload (const Options& options);
 
-    String userScript = "";
+    /**
+     * Appends source to the preload, prior to compilation.
+     */
+    Preload& append (const String& source);
 
-    // only use if you know what you are doing
-    String RUNTIME_PRIMORDIAL_OVERRIDES = "";
-  };
+    /**
+     * Configures the preload from default options.
+     */
+    void configure ();
 
-  /**
-   * `Preload` is a container for state to compile a "preload script" attached
-   * to an IPC bridge that is injected into HTML documents loaded into a WebView
-   */
-  class Preload {
-    String compiled = "";
-    public:
-      struct InsertIntoHTMLOptions {
-        Vector<String> protocolHandlerSchemes;
-      };
+    /**
+     * Configures the preload from given options.
+     */
+    void configure (const Options& options);
 
-      PreloadOptions options;
-      Vector<String> buffer;
+    /**
+     * Compiles the preload and returns a reference to the
+     * compiled string.
+     */
+    const String& compile ();
 
-      /**
-       * A mapping of key-value HTTP headers to be injected as HTML `<meta>`
-       * tags into the preload output.
-       * This depends on the 'useHTMLMarkup' feature.
-       */
-      Headers headers = {};
+    /**
+     * Get a reference to the currently compiled preload string
+     */
+    const String& str () const;
 
-      /**
-       * A mapping of key-value metadata to be injected as HTML `<meta>` tags
-       * into the preload output.
-       * This depends on the 'useHTMLMarkup' feature.
-       */
-      Map metadata;
-
-      Preload () = default;
-      Preload (const PreloadOptions& options);
-      Preload& append (const String& source);
-
-      void configure ();
-      void configure (const PreloadOptions& options);
-      const String& compile ();
-      const String& str () const;
-      const String insertIntoHTML (
-        const String& html,
-        const InsertIntoHTMLOptions& options
-      ) const;
+    /**
+     * Inserts and returns compiled preload into an HTML string with
+     * insert options
+     */
+    const String insertIntoHTML (
+      const String& html,
+      const InsertIntoHTMLOptions& options
+    ) const;
   };
-
-  const Preload createPreload (const PreloadOptions& options);
 }
 #endif
diff --git a/src/ipc/routes.cc b/src/ipc/routes.cc
index c17f743b9..f4c0832ac 100644
--- a/src/ipc/routes.cc
+++ b/src/ipc/routes.cc
@@ -3099,7 +3099,7 @@ static void mapIPCRoutes (Router *router) {
 
       const auto window = app->windowManager.getWindow(0);
       const auto screen = window->getScreenSize();
-      auto options = WindowOptions {};
+      auto options = Window::Options {};
 
       options.shouldExitApplicationOnClose = message.get("shouldExitApplicationOnClose") == "true" ? true : false;
       options.headless = app->userConfig["build_headless"] == "true";
diff --git a/src/ipc/scheme_handlers.hh b/src/ipc/scheme_handlers.hh
index 694e40a34..a82e318ef 100644
--- a/src/ipc/scheme_handlers.hh
+++ b/src/ipc/scheme_handlers.hh
@@ -114,7 +114,7 @@ namespace SSC::IPC {
           SharedPointer<Request> build ();
         };
 
-        uint64_t id = rand64();
+        Client::ID id = rand64();
         String scheme = "";
         String method = "GET";
         String hostname = "";
diff --git a/src/platform/types.hh b/src/platform/types.hh
index f2104ba61..f50c23174 100644
--- a/src/platform/types.hh
+++ b/src/platform/types.hh
@@ -12,6 +12,7 @@
 #include <sstream>
 #include <string>
 #include <thread>
+#include <type_traits>
 #include <vector>
 
 #if defined(__APPLE__)
diff --git a/src/serviceworker/container.cc b/src/serviceworker/container.cc
index e8b2907b1..8f9ef0a59 100644
--- a/src/serviceworker/container.cc
+++ b/src/serviceworker/container.cc
@@ -385,10 +385,7 @@ namespace SSC {
             {"message", "Callback 'id' given in parameters does not have a 'FetchRequest'"}
           }});
         }
-      } while (0);
 
-      do {
-        Lock lock(this->mutex);
         callback = this->fetchCallbacks.at(id);
         request = this->fetchRequests.at(id);
       } while (0);
@@ -430,10 +427,10 @@ namespace SSC {
           (html.find("<script") != String::npos || html.find("<SCRIPT") != String::npos)
         )
       ) {
-        auto preloadOptions = this->bridge->preload.options;
+        auto preloadOptions = request.client.preload.options;
         preloadOptions.metadata["runtime-frame-source"] = "serviceworker";
 
-        auto preload = IPC::createPreload(preloadOptions);
+        auto preload = IPC::Preload::compile(preloadOptions);
         auto begin = String("<meta name=\"begin-runtime-preload\">");
         auto end = String("<meta name=\"end-runtime-preload\">");
         auto x = html.find(begin);
diff --git a/src/window/android.cc b/src/window/android.cc
index 271cfdb15..f3e41f6c9 100644
--- a/src/window/android.cc
+++ b/src/window/android.cc
@@ -6,10 +6,10 @@
 using namespace SSC;
 
 namespace SSC {
-  Window::Window (SharedPointer<Core> core, const WindowOptions& options)
+  Window::Window (SharedPointer<Core> core, const Window::Options& options)
     : options(options),
       core(core),
-      bridge(core, options.userConfig),
+      bridge(core, options.as<IPC::Bridge::Options>()),
       hotkey(this),
       dialog(this)
   {
@@ -28,7 +28,7 @@ namespace SSC {
     };
 
     this->bridge.preload = IPC::createPreload({
-      .clientId = this->bridge.id,
+      .client = this->bridge.client,
       .index = options.index,
       .userScript = options.userScript
     });
diff --git a/src/window/apple.mm b/src/window/apple.mm
index 540ee91c7..a79bf9f6e 100644
--- a/src/window/apple.mm
+++ b/src/window/apple.mm
@@ -171,7 +171,7 @@ - (void) scrollViewDidScroll: (UIScrollView*) scrollView {
 @end
 
 namespace SSC {
-  Window::Window (SharedPointer<Core> core, const WindowOptions& options)
+  Window::Window (SharedPointer<Core> core, const Window::Options& options)
     : core(core),
       options(options),
       bridge(core, options.userConfig),
diff --git a/src/window/linux.cc b/src/window/linux.cc
index 51500a989..e05fa1a38 100644
--- a/src/window/linux.cc
+++ b/src/window/linux.cc
@@ -109,10 +109,13 @@ namespace SSC {
     isInitialized = true;
   }
 
-  Window::Window (SharedPointer<Core> core, const WindowOptions& options)
+  Window::Window (SharedPointer<Core> core, const Window::Options& options)
     : core(core),
       options(options),
-      bridge(core, options.userConfig),
+      bridge(core, IPC::Bridge::Options {
+        options.userConfig,
+        options.as<IPC::Preload::Options>()
+      }),
       hotkey(this),
       dialog(this)
   {
@@ -234,8 +237,8 @@ namespace SSC {
       this->eval(source);
     };
 
-    this->bridge.preload = IPC::createPreload({
-      .clientId = this->bridge.id,
+    this->bridge.client.preload = IPC::Preload::compile({
+      .client = this->bridge.client,
       .index = options.index,
       .userScript = options.userScript
     });
diff --git a/src/window/manager.cc b/src/window/manager.cc
index 7bca57b6a..6224084d4 100644
--- a/src/window/manager.cc
+++ b/src/window/manager.cc
@@ -77,19 +77,19 @@ namespace SSC {
   }
 
   SharedPointer<WindowManager::ManagedWindow> WindowManager::WindowManager::getOrCreateWindow (int index) {
-    return this->getOrCreateWindow(index, WindowOptions {});
+    return this->getOrCreateWindow(index, Window::Options {});
   }
 
   SharedPointer<WindowManager::ManagedWindow> WindowManager::WindowManager::getOrCreateWindow (
     int index,
-    const WindowOptions& options
+    const Window::Options& options
   ) {
     if (this->destroyed || index < 0 || index >= this->windows.size()) {
       return nullptr;
     }
 
     if (this->getWindowStatus(index) == WindowStatus::WINDOW_NONE) {
-      WindowOptions optionsCopy = options;
+      Window::Options optionsCopy = options;
       optionsCopy.index = index;
       return this->createWindow(optionsCopy);
     }
@@ -135,7 +135,7 @@ namespace SSC {
   }
 
   SharedPointer<WindowManager::ManagedWindow> WindowManager::createWindow (
-    const WindowOptions& options
+    const Window::Options& options
   ) {
     Lock lock(this->mutex);
 
@@ -172,7 +172,7 @@ namespace SSC {
       ? Window::getSizeInPixels(this->options.defaultMaxHeight, screen.height)
       : options.maxHeight;
 
-    WindowOptions windowOptions = {
+    Window::Options windowOptions = {
       .minimizable = options.minimizable,
       .maximizable = options.maximizable,
       .resizable = options.resizable,
@@ -245,9 +245,9 @@ namespace SSC {
     return this->windows.at(options.index);
   }
 
-  SharedPointer<WindowManager::ManagedWindow> WindowManager::createDefaultWindow (const WindowOptions& options) {
+  SharedPointer<WindowManager::ManagedWindow> WindowManager::createDefaultWindow (const Window::Options& options) {
     static const auto devHost = SSC::getDevHost();
-    auto windowOptions = WindowOptions {
+    auto windowOptions = Window::Options {
       .minimizable = options.minimizable,
       .maximizable = options.maximizable,
       .resizable = options.resizable,
@@ -306,7 +306,7 @@ namespace SSC {
   WindowManager::ManagedWindow::ManagedWindow (
     WindowManager &manager,
     SharedPointer<Core> core,
-    const WindowOptions& options
+    const Window::Options& options
   ) : index(options.index),
       Window(core, options),
       manager(manager)
diff --git a/src/window/options.hh b/src/window/options.hh
deleted file mode 100644
index 8f5b1d349..000000000
--- a/src/window/options.hh
+++ /dev/null
@@ -1,162 +0,0 @@
-#ifndef SOCKET_RUNTIME_WINDOW_OPTIONS_H
-#define SOCKET_RUNTIME_WINDOW_OPTIONS_H
-
-#include "../core/config.hh"
-#include "../ipc/preload.hh"
-
-namespace SSC {
-  /**
-   * `WindowOptions` is an extended `IPC::PreloadOptions` container for
-   * configuring a new `Window`.
-   */
-  struct WindowOptions : public IPC::PreloadOptions {
-    /**
-     * If `true`, the window can be minimized.
-     * This option value is only supported on desktop.
-     */
-    bool minimizable = true;
-
-    /**
-     * If `true`, the window can be maximized.
-     * This option value is only supported on desktop.
-     */
-    bool maximizable = true;
-
-    /**
-     * If `true`, the window can be resized.
-     * This option value is only supported on desktop.
-     */
-    bool resizable = true;
-
-    /**
-     * If `true`, the window can be closed.
-     * This option value is only supported on desktop.
-     */
-    bool closable = true;
-
-    /**
-     * If `true`, the window can be "frameless".
-     * This option value is only supported on desktop.
-     */
-    bool frameless = false;
-
-    /**
-     * If `true`, the window is considered a "utility" window.
-     * This option value is only supported on desktop.
-     */
-    bool utility = false;
-
-    /**
-     * If `true`, the window, when the window is "closed", it can
-     * exit the application.
-     * This option value is only supported on desktop.
-     */
-    bool shouldExitApplicationOnClose = false;
-
-    /**
-     * The maximum height in screen pixels the window can be.
-     */
-    float maxHeight = 0.0;
-
-    /**
-     * The minimum height in screen pixels the window can be.
-     */
-    float minHeight = 0.0;
-
-    /**
-     * The absolute height in screen pixels the window can be.
-     */
-    float height = 0.0;
-
-    /**
-     * The maximum width in screen pixels the window can be.
-     */
-    float maxWidth = 0.0;
-
-    /**
-     * The minimum width in screen pixels the window can be.
-     */
-    float minWidth = 0.0;
-
-    /**
-     * The absolute width in screen pixels the window can be.
-     */
-    float width = 0.0;
-
-    /**
-     * The window border/corner radius.
-     * This option value is only supported on macOS.
-     */
-    float radius = 0.0;
-
-    /**
-     * Thw window frame margin.
-     * This option value is only supported on macOS.
-     */
-    float margin = 0.0;
-
-    /**
-     * A string (split on ':') provides two float values which will
-     * set the window's aspect ratio.
-     * This option value is only supported on desktop.
-     */
-    String aspectRatio = "";
-
-    /**
-     * A string that describes a style for the window title bar.
-     * Valid values are:
-     *   - hidden
-     *   - hiddenInset
-     * This option value is only supported on macOS and Windows.
-     */
-    String titlebarStyle = "";
-
-    /**
-     * A string value (split on 'x') in the form of `XxY` where
-     *   - `X` is the value in screen pixels offset from the left of the
-     *         window frame
-     *   - `Y` is the value in screen pixels offset from the top of the
-     *         window frame
-     * The values control the offset of the "close", "minimize", and "maximize"
-     * button controls for a window.
-     * This option value is only supported on macOS.
-     */
-    String windowControlOffsets = "";
-
-    /**
-     * A string value in the form of `rgba(r, g, b, a)` where
-     *   - `r` is the "red" channel value, an integer between `0` and `255`
-     *   - `g` is the "green" channel value, an integer between `0` and `255`
-     *   - `b` is the "blue" channel value, an integer between `0` and `255`
-     *   - `a` is the "alpha" channel value, a float between `0` and `1`
-     * The values represent the background color of a window when the platform
-     * system theme is in "light mode". This also be the "default" theme.
-     */
-    String backgroundColorLight = "";
-
-    /**
-     * A string value in the form of `rgba(r, g, b, a)` where
-     *   - `r` is the "red" channel value, an integer between `0` and `255`
-     *   - `g` is the "green" channel value, an integer between `0` and `255`
-     *   - `b` is the "blue" channel value, an integer between `0` and `255`
-     *   - `a` is the "alpha" channel value, a float between `0` and `1`
-     * The values represent the background color of a window when the platform
-     * system theme is in "dark mode".
-     */
-    String backgroundColorDark = "";
-
-    /**
-     * A callback function that is called when a "script message" is received
-     * from the WebVew.
-     */
-    MessageCallback onMessage = [](const String) {};
-
-    /**
-     * A callback function that is called when the window wants to exit the
-     * application. This function is called _only_ when the
-     * `shouldExitApplicationOnClose` option is `true`.
-     */
-    ExitCallback onExit = nullptr;
-  };
-}
-#endif
diff --git a/src/window/win.cc b/src/window/win.cc
index ec7c3dd72..43cb0b9fc 100644
--- a/src/window/win.cc
+++ b/src/window/win.cc
@@ -602,7 +602,7 @@ namespace SSC {
     };
   };
 
-  Window::Window (App& app, WindowOptions opts)
+  Window::Window (App& app, Window::Options opts)
     : app(app),
       opts(opts),
       hotkey(this)
diff --git a/src/window/window.hh b/src/window/window.hh
index 4dcbe813a..d1aa86a4e 100644
--- a/src/window/window.hh
+++ b/src/window/window.hh
@@ -11,7 +11,6 @@
 
 #include "dialog.hh"
 #include "hotkey.hh"
-#include "options.hh"
 
 #ifndef SOCKET_RUNTIME_MAX_WINDOWS
 #define SOCKET_RUNTIME_MAX_WINDOWS 32
@@ -102,10 +101,164 @@ namespace SSC {
         int height = 0;
       };
 
+      /**
+       * `Window::Options` is an extended `IPC::Preload::Options` container for
+       * configuring a new `Window`.
+       */
+      struct Options : public IPC::Preload::Options {
+        /**
+         * If `true`, the window can be minimized.
+         * This option value is only supported on desktop.
+         */
+        bool minimizable = true;
+
+        /**
+         * If `true`, the window can be maximized.
+         * This option value is only supported on desktop.
+         */
+        bool maximizable = true;
+
+        /**
+         * If `true`, the window can be resized.
+         * This option value is only supported on desktop.
+         */
+        bool resizable = true;
+
+        /**
+         * If `true`, the window can be closed.
+         * This option value is only supported on desktop.
+         */
+        bool closable = true;
+
+        /**
+         * If `true`, the window can be "frameless".
+         * This option value is only supported on desktop.
+         */
+        bool frameless = false;
+
+        /**
+         * If `true`, the window is considered a "utility" window.
+         * This option value is only supported on desktop.
+         */
+        bool utility = false;
+
+        /**
+         * If `true`, the window, when the window is "closed", it can
+         * exit the application.
+         * This option value is only supported on desktop.
+         */
+        bool shouldExitApplicationOnClose = false;
+
+        /**
+         * The maximum height in screen pixels the window can be.
+         */
+        float maxHeight = 0.0;
+
+        /**
+         * The minimum height in screen pixels the window can be.
+         */
+        float minHeight = 0.0;
+
+        /**
+         * The absolute height in screen pixels the window can be.
+         */
+        float height = 0.0;
+
+        /**
+         * The maximum width in screen pixels the window can be.
+         */
+        float maxWidth = 0.0;
+
+        /**
+         * The minimum width in screen pixels the window can be.
+         */
+        float minWidth = 0.0;
+
+        /**
+         * The absolute width in screen pixels the window can be.
+         */
+        float width = 0.0;
+
+        /**
+         * The window border/corner radius.
+         * This option value is only supported on macOS.
+         */
+        float radius = 0.0;
+
+        /**
+         * Thw window frame margin.
+         * This option value is only supported on macOS.
+         */
+        float margin = 0.0;
+
+        /**
+         * A string (split on ':') provides two float values which will
+         * set the window's aspect ratio.
+         * This option value is only supported on desktop.
+         */
+        String aspectRatio = "";
+
+        /**
+         * A string that describes a style for the window title bar.
+         * Valid values are:
+         *   - hidden
+         *   - hiddenInset
+         * This option value is only supported on macOS and Windows.
+         */
+        String titlebarStyle = "";
+
+        /**
+         * A string value (split on 'x') in the form of `XxY` where
+         *   - `X` is the value in screen pixels offset from the left of the
+         *         window frame
+         *   - `Y` is the value in screen pixels offset from the top of the
+         *         window frame
+         * The values control the offset of the "close", "minimize", and "maximize"
+         * button controls for a window.
+         * This option value is only supported on macOS.
+         */
+        String windowControlOffsets = "";
+
+        /**
+         * A string value in the form of `rgba(r, g, b, a)` where
+         *   - `r` is the "red" channel value, an integer between `0` and `255`
+         *   - `g` is the "green" channel value, an integer between `0` and `255`
+         *   - `b` is the "blue" channel value, an integer between `0` and `255`
+         *   - `a` is the "alpha" channel value, a float between `0` and `1`
+         * The values represent the background color of a window when the platform
+         * system theme is in "light mode". This also be the "default" theme.
+         */
+        String backgroundColorLight = "";
+
+        /**
+         * A string value in the form of `rgba(r, g, b, a)` where
+         *   - `r` is the "red" channel value, an integer between `0` and `255`
+         *   - `g` is the "green" channel value, an integer between `0` and `255`
+         *   - `b` is the "blue" channel value, an integer between `0` and `255`
+         *   - `a` is the "alpha" channel value, a float between `0` and `1`
+         * The values represent the background color of a window when the platform
+         * system theme is in "dark mode".
+         */
+        String backgroundColorDark = "";
+
+        /**
+         * A callback function that is called when a "script message" is received
+         * from the WebVew.
+         */
+        MessageCallback onMessage = [](const String) {};
+
+        /**
+         * A callback function that is called when the window wants to exit the
+         * application. This function is called _only_ when the
+         * `shouldExitApplicationOnClose` option is `true`.
+         */
+        ExitCallback onExit = nullptr;
+      };
+
       /**
        * The options used to create this window.
        */
-      const WindowOptions options;
+      const Window::Options options;
 
       /**
        * The "hot key" context for this window.
@@ -246,7 +399,7 @@ namespace SSC {
       jobject androidWindowRef;
     #endif
 
-      Window (SharedPointer<Core> core, const WindowOptions&);
+      Window (SharedPointer<Core> core, const Window::Options&);
       ~Window ();
 
       static ScreenSize getScreenSize ();
@@ -314,7 +467,7 @@ namespace SSC {
       }
   };
 
-  struct WindowManagerOptions : WindowOptions {
+  struct WindowManagerOptions : Window::Options {
     String defaultHeight = "0";
     String defaultWidth = "0";
     String defaultMinWidth = "0";
@@ -357,7 +510,7 @@ namespace SSC {
           ManagedWindow (
             WindowManager &manager,
             SharedPointer<Core> core,
-            const WindowOptions& options
+            const Window::Options& options
           );
 
           ~ManagedWindow ();
@@ -390,13 +543,13 @@ namespace SSC {
       SharedPointer<ManagedWindow> getWindowForBridge (const IPC::Bridge* bridge);
       SharedPointer<ManagedWindow> getWindowForWebView (WebView* webview);;
       SharedPointer<ManagedWindow> getOrCreateWindow (int index);
-      SharedPointer<ManagedWindow> getOrCreateWindow (int index, const WindowOptions& options);
+      SharedPointer<ManagedWindow> getOrCreateWindow (int index, const Window::Options& options);
       WindowStatus getWindowStatus (int index);
 
       void destroyWindow (int index);
 
-      SharedPointer<ManagedWindow> createWindow (const WindowOptions& options);
-      SharedPointer<ManagedWindow> createDefaultWindow (const WindowOptions& options);
+      SharedPointer<ManagedWindow> createWindow (const Window::Options& options);
+      SharedPointer<ManagedWindow> createDefaultWindow (const Window::Options& options);
 
       JSON::Array json (const Vector<int>& indices);
   };