diff --git a/src/lib/responseBuilders.ts b/src/lib/responseBuilders.ts
index 4bba2a8..105857f 100644
--- a/src/lib/responseBuilders.ts
+++ b/src/lib/responseBuilders.ts
@@ -1,20 +1,12 @@
 import stringify from "json-stable-stringify";
 import objectHash from "object-hash";
+import { guilds, matches, tpMessages } from "~/drizzle/schema";
+import { ExtractDataTypes, GetColumns } from "~/types/db";
 
 export const buildMatches = (
-  matches: {
-    id: number;
-    messageId: number;
-    guildId: number;
-    channelId: number;
-    createrId: number;
-    roleId: number;
-    matchType: string;
-    opponentName: string;
-    utc_ts: Date;
-  }[],
+  queryMatches: ExtractDataTypes<GetColumns<typeof matches>>[],
 ) =>
-  matches.map(
+  queryMatches.map(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     ({ id, guildId, utc_ts, ...match }) => ({
       ...match,
@@ -22,32 +14,12 @@ export const buildMatches = (
     }),
   );
 
-export function buildConfig(guildQuery: {
-  id: number;
-  timezone: string;
-  tpEnabled: boolean;
-  tpChannelId: number | null;
-  tpInterval: number;
-  tpRoles: boolean;
-  isAvailableRoleId: number | null;
-  wantsToBeNotifieRoledId: number | null;
-  tpMessages: {
-    messageId: number | null;
-    day: number;
-    guildId: number;
-  }[];
-  matches: {
-    id: number;
-    messageId: number;
-    guildId: number;
-    channelId: number;
-    createrId: number;
-    roleId: number;
-    matchType: string;
-    opponentName: string;
-    utc_ts: Date;
-  }[];
-}) {
+export function buildConfig(
+  guildQuery: ExtractDataTypes<GetColumns<typeof guilds>> & {
+    tpMessages: ExtractDataTypes<GetColumns<typeof tpMessages>>[];
+    matches: ExtractDataTypes<GetColumns<typeof matches>>[];
+  },
+) {
   const {
     id,
     timezone,
diff --git a/src/types/db.d.ts b/src/types/db.d.ts
new file mode 100644
index 0000000..bb6a905
--- /dev/null
+++ b/src/types/db.d.ts
@@ -0,0 +1,11 @@
+import { PgColumn, PgTableWithColumns } from "drizzle-orm/pg-core";
+
+export type GetColumns<T> =
+  T extends PgTableWithColumns<infer Table> ? Table["columns"] : never;
+
+export type ExtractDataTypes<T> = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [K in keyof T]: T[K] extends PgColumn<infer ColumnConfig, any, any>
+    ? ColumnConfig["data"]
+    : unknown;
+};
diff --git a/src/types/lucia-auth.d.ts b/src/types/lucia-auth.d.ts
index aea0005..880f727 100644
--- a/src/types/lucia-auth.d.ts
+++ b/src/types/lucia-auth.d.ts
@@ -1,6 +1,6 @@
-import { PgColumn, PgTableWithColumns } from "drizzle-orm/pg-core";
 import { users } from "~/drizzle/schema";
 import { lucia } from "~/lib/auth";
+import { ExtractDataTypes, GetColumns } from "./db";
 
 declare module "lucia" {
   // eslint-disable-next-line no-unused-vars
@@ -10,15 +10,6 @@ declare module "lucia" {
   }
 }
 
-type GetColumns<T> =
-  T extends PgTableWithColumns<infer First> ? First["columns"] : never;
-
-type ExtractDataTypes<T> = {
-  [K in keyof T]: T[K] extends PgColumn<infer DataType, never, never>
-    ? DataType["data"]
-    : never;
-};
-
 interface DatabaseUserAttributes
   extends ExtractDataTypes<GetColumns<typeof users>> {
   warst: string;