diff --git a/src/api/api.include.ts b/src/api/api.include.ts
deleted file mode 100644
index e6021f9..0000000
--- a/src/api/api.include.ts
+++ /dev/null
@@ -1 +0,0 @@
-import { TribufuApiBase } from "./api.base";
diff --git a/src/api/api.nswag b/src/api/api.nswag
index 25e9158..9898232 100644
--- a/src/api/api.nswag
+++ b/src/api/api.nswag
@@ -4,7 +4,7 @@
     "documentGenerator": {
         "fromDocument": {
             "json": "",
-            "url": "http://localhost:5000/v1/openapi.json",
+            "url": "https://api.tribufu.com/v1/openapi.json",
             "output": null,
             "newLineBehavior": "Auto"
         }
@@ -48,7 +48,7 @@
             "useLeafType": false,
             "classTypes": [],
             "extendedClasses": [],
-            "extensionCode": "api.include.ts",
+            "extensionCode": "include.ts",
             "generateDefaultValues": true,
             "excludedTypeNames": [],
             "excludedParameterNames": [],
@@ -67,7 +67,7 @@
             "templateDirectory": null,
             "serviceHost": null,
             "serviceSchemes": null,
-            "output": "api.generated.ts",
+            "output": "generated.ts",
             "newLineBehavior": "LF"
         }
     }
diff --git a/src/api/api.base.ts b/src/api/base.ts
similarity index 94%
rename from src/api/api.base.ts
rename to src/api/base.ts
index 6535641..730eb4c 100644
--- a/src/api/api.base.ts
+++ b/src/api/base.ts
@@ -92,12 +92,10 @@ export abstract class TribufuApiBase {
      * @returns
      */
     protected transformOptions(options: RequestInit) {
-        if (this.apiKey) {
-            options.headers = {
-                ...options.headers,
-                ...this.getHeaders(),
-            };
-        }
+        options.headers = {
+            ...options.headers,
+            ...this.getHeaders(),
+        };
 
         return Promise.resolve(options);
     }
diff --git a/src/api/api.generated.ts b/src/api/generated.ts
similarity index 99%
rename from src/api/api.generated.ts
rename to src/api/generated.ts
index 1317b22..23ff7ca 100644
--- a/src/api/api.generated.ts
+++ b/src/api/generated.ts
@@ -8,7 +8,7 @@
 /* eslint-disable */
 // ReSharper disable InconsistentNaming
 
-import { TribufuApiBase } from "./api.base";
+import { TribufuApiBase } from "./base";
 
 export class TribufuApiGenerated extends TribufuApiBase {
     private http: { fetch(url: RequestInfo, init?: RequestInit): Promise<Response> };
diff --git a/src/api/include.ts b/src/api/include.ts
new file mode 100644
index 0000000..041f835
--- /dev/null
+++ b/src/api/include.ts
@@ -0,0 +1 @@
+import { TribufuApiBase } from "./base";
diff --git a/src/api/index.ts b/src/api/index.ts
index c18a582..57186c9 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 import { TRIBUFU_API_URL } from "..";
-import { TribufuApiBase } from "./api.base";
-import { TribufuApiGenerated } from "./api.generated";
+import { TribufuApiBase } from "./base";
+import { TribufuApiGenerated } from "./generated";
 import { TribufuApiOptions } from "../options";
 
 /**
@@ -98,8 +98,6 @@ export class TribufuApi extends TribufuApiGenerated {
         }
 
         const baseUrl = process.env[`TRIBUFU_API_URL`] || null;
-        return TribufuApiBase.debugEnabled() && baseUrl
-            ? baseUrl
-            : TRIBUFU_API_URL;
+        return TribufuApiBase.debugEnabled() && baseUrl ? baseUrl : TRIBUFU_API_URL;
     }
 }
diff --git a/src/index.ts b/src/index.ts
index 6f5ea9c..03fc263 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -22,9 +22,9 @@ export {
     TribufuApiSingleton,
 };
 
-export * from "./api/api.base";
-export * from "./api/api.generated";
-export * from "./api/api.include";
+export * from "./api/base";
+export * from "./api/generated";
+export * from "./api/include";
 export * from "./api/index";
 export * from "./api/singletion";
 export * from "./http/headers";