diff --git a/packages/core/src/blitzkit/api/base.ts b/packages/core/src/blitzkit/api/base.ts
index 5b7460efb..49173042d 100644
--- a/packages/core/src/blitzkit/api/base.ts
+++ b/packages/core/src/blitzkit/api/base.ts
@@ -1,3 +1,23 @@
+import {
+  CamouflageDefinitions,
+  ConsumableDefinitions,
+  EquipmentDefinitions,
+  GameDefinitions,
+  MapDefinitions,
+  ModelDefinitions,
+  ProvisionDefinitions,
+  SkillDefinitions,
+  TankDefinitions,
+} from "@blitzkit/core";
+
 export abstract class BlitzKitAPI {
-  // abstract game(): Promise<GameDefinitions>;
+  abstract skillDefinitions(): Promise<SkillDefinitions>;
+  abstract provisionDefinitions(): Promise<ProvisionDefinitions>;
+  abstract consumableDefinitions(): Promise<ConsumableDefinitions>;
+  abstract equipmentDefinitions(): Promise<EquipmentDefinitions>;
+  abstract mapDefinitions(): Promise<MapDefinitions>;
+  abstract modelDefinitions(): Promise<ModelDefinitions>;
+  abstract camouflageDefinitions(): Promise<CamouflageDefinitions>;
+  abstract tankDefinitions(): Promise<TankDefinitions>;
+  abstract gameDefinitions(): Promise<GameDefinitions>;
 }
diff --git a/packages/core/src/blitzkit/api/server.ts b/packages/core/src/blitzkit/api/server.ts
index bc0e3bdfd..11b7aa2ed 100644
--- a/packages/core/src/blitzkit/api/server.ts
+++ b/packages/core/src/blitzkit/api/server.ts
@@ -526,7 +526,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
             ({ type }) => this.blitzkitCrewTypeToBlitz[type] === crewKey,
           );
           if (index === -1) {
-            if (crewKey === "#text") return;
+            if (crewKey === "#text") continue;
             entry = {
               type: this.blitzCrewTypeToBlitzkit[crewKey as BlitzCrewType],
               count: 0,
@@ -866,7 +866,7 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
         }
 
         for (const unlocks of totalUnlocks) {
-          if (unlocks === undefined) return;
+          if (unlocks === undefined) continue;
 
           for (const key in unlocks) {
             const value = unlocks[key as keyof BlitzModuleType];
@@ -1082,7 +1082,8 @@ export class ServerBlitzKitAPI extends BlitzKitAPI {
             ({ type }) => this.blitzkitCrewTypeToBlitz[type] === crewKey,
           );
           if (index === -1) {
-            if (crewKey === "#text") return;
+            if (crewKey === "#text") continue;
+
             entry = {
               type: this.blitzCrewTypeToBlitzkit[crewKey as BlitzCrewType],
               count: 0,
diff --git a/packages/website/astro.config.ts b/packages/website/astro.config.ts
index 07c0b288d..89243fbbf 100644
--- a/packages/website/astro.config.ts
+++ b/packages/website/astro.config.ts
@@ -12,7 +12,7 @@ import { tools } from "./src/constants/tools";
 
 const POSSIBLE_TARGETS = ["app", "web"];
 
-const target = process.env.PUBLIC_TARGET ;
+const target = process.env.PUBLIC_TARGET;
 
 if (!target || !POSSIBLE_TARGETS.includes(target)) {
   throw new Error("Invalid target");
@@ -21,7 +21,11 @@ if (!target || !POSSIBLE_TARGETS.includes(target)) {
 export default defineConfig({
   devToolbar: { enabled: false },
 
-  vite: { server: { allowedHosts: [] } },
+  vite: {
+    server: { allowedHosts: [] },
+    esbuild: { target: "es2022" },
+  },
+
   output: target === "web" ? "static" : "server",
   site: "https://blitzkit.app",
   outDir: "../../dist/website",
@@ -50,15 +54,15 @@ export default defineConfig({
           return {
             name: strings.website.tools[stringId].name,
             name_localized: wrapper(
-              (strings) => strings.website.tools[stringId].name
+              (strings) => strings.website.tools[stringId].name,
             ),
             description: strings.website.tools[stringId].description,
             description_localized: wrapper(
-              (strings) => strings.website.tools[stringId].description
+              (strings) => strings.website.tools[stringId].description,
             ),
             short_name: strings.website.tools[stringId].name,
             short_name_localized: wrapper(
-              (strings) => strings.website.tools[stringId].name
+              (strings) => strings.website.tools[stringId].name,
             ),
             url: `/${tool.id}`,
             icon: `public/assets/images/tools/${tool.id}.webp`,
@@ -68,7 +72,7 @@ export default defineConfig({
       manifest: {
         description: strings.website.home.seo_description,
         description_localized: wrapper(
-          (strings) => strings.website.home.seo_description
+          (strings) => strings.website.home.seo_description,
         ),
 
         dir: "ltr",
diff --git a/packages/website/src/components/Footer.astro b/packages/website/src/components/Footer.astro
index 7db12917e..ec9e7c750 100644
--- a/packages/website/src/components/Footer.astro
+++ b/packages/website/src/components/Footer.astro
@@ -11,7 +11,7 @@ export interface Props {
   locale: string;
 }
 
-const gameDefinitions = await api.game();
+const gameDefinitions = await api.gameDefinitions();
 const PUBLIC_ASSET_BRANCH = assertSecret(import.meta.env.PUBLIC_BRANCH);
 const { locale } = Astro.props;
 const strings = getStrings(locale);