diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 96d217b..53037ab 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -15,37 +15,42 @@ model Role {
   id        String @id @default(cuid())
   name      String @unique
   userRoles UserRole[]
+
+  @@map("roles")
 }
 
 model UserRole {
-  id      String    @id @default(cuid())
-  user    AuthUser  @relation(fields: [userId], references: [id])
-  userId  String
-  role    Role      @relation(fields: [roleId], references: [id])
-  roleId  String
+  id          String    @id @default(cuid())
+  user        AuthUser  @relation(fields: [user_id], references: [id])
+  user_id      String
+  role        Role      @relation(fields: [role_id], references: [id])
+  role_id      String
+  created_at  DateTime  @default(now()) @db.Timestamp(6)
+  updated_at  DateTime  @updatedAt  @db.Timestamp(6)
 
-  @@unique([userId, roleId])
-  @@index([userId])
-  @@index([roleId])
+  @@unique([user_id, role_id])
+  @@index([user_id])
+  @@index([role_id])
+  @@map("user_roles")
 }
 
 model AuthUser {
-    id            String        @id @default(cuid())
-    username      String        @unique
-    email         String?       @unique
-    firstName     String?
-    lastName      String?
-    roles         UserRole[]
-    verified      Boolean       @default(false)
-    receiveEmail  Boolean       @default(false)
-    token         String?       @unique
-    collection    Collection?
-    wishlist      Wishlist[]
-    theme         String        @default("system")
-    createdAt     DateTime      @default(now()) @db.Timestamp(6)
-    updatedAt     DateTime      @updatedAt @db.Timestamp(6)
-    auth_session  AuthSession[]
-    auth_key      AuthKey[]
+  id            String        @id @default(cuid())
+  username      String        @unique
+  email         String?       @unique
+  firstName     String?
+  lastName      String?
+  roles         UserRole[]
+  verified      Boolean       @default(false)
+  receiveEmail  Boolean       @default(false)
+  token         String?       @unique
+  collection    Collection?
+  wishlist      Wishlist[]
+  theme         String        @default("system")
+  created_at    DateTime      @default(now()) @db.Timestamp(6)
+  updated_at    DateTime      @updatedAt @db.Timestamp(6)
+  auth_session  AuthSession[]
+  auth_key      AuthKey[]
 
   @@map("auth_user")
 }
@@ -86,7 +91,7 @@ model Collection {
 model CollectionItem {
   id String @id @default(cuid())
   collection_id String
-  collection Collection @relation(references: [id], fields: [collection_id])
+  collection Collection @relation(references: [id], fields: [collection_id], onDelete: Cascade)
   game_id String
   game Game @relation(references: [id], fields: [game_id])
   times_played Int
@@ -109,9 +114,11 @@ model Wishlist {
 model WishlistItem {
   id String @id @default(cuid())
   wishlist_id String
-  wishlist Wishlist @relation(references: [id], fields: [wishlist_id])
+  wishlist Wishlist @relation(references: [id], fields: [wishlist_id], onDelete: Cascade)
   game_id String
   game Game @relation(references: [id], fields: [game_id])
+  created_at DateTime @default(now()) @db.Timestamp(6)
+  updated_at DateTime @updatedAt @db.Timestamp(6)
 
   @@index([game_id, wishlist_id])
   @@map("wishlist_items")
@@ -120,23 +127,24 @@ model WishlistItem {
 model Game {
   id            String  @id @default(cuid())
   name          String
+  slug          String
   description   String?
-  yearPublished Int?
-  minPlayers    Int?
-  maxPlayers    Int?
-  minPlaytime   Int?
-  maxPlaytime   Int?
-  minAge        Int?
-  imageUrl      String?
-  thumbUrl      String?
+  year_published Int?
+  min_players    Int?
+  max_players    Int?
+  min_playtime   Int?
+  max_playtime   Int?
+  min_age        Int?
+  image_url      String?
+  thumb_url      String?
   url           String?
-  rulesUrl      String?
-  weightAmount  Float?
-  weightUnits   String?
+  rules_url      String?
+  weight_amount  Float?
+  weight_units   String?
   bggId         String?
   bggUrl        String?
   primary_publisher_id String
-  primaryPublisher Publisher? @relation("PrimaryPublishers", references: [id], fields: [primary_publisher_id])
+  primary_publisher Publisher? @relation("PrimaryPublishers", references: [id], fields: [primary_publisher_id])
   categories    Category[]
   mechanics     Mechanic[]
   designers     Designer[]
@@ -147,8 +155,8 @@ model Game {
   collection_items CollectionItem[]
   wishlist_items WishlistItem[]
   external_id String @unique
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  created_at DateTime @default(now()) @db.Timestamp(6)
+  updated_at DateTime @updatedAt @db.Timestamp(6)
 
   @@index([primary_publisher_id])
   @@map("games")
@@ -159,8 +167,8 @@ model GameName {
   name String
   game_id String
   game Game @relation(references: [id], fields: [game_id])
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  created_at DateTime @default(now()) @db.Timestamp(6)
+  updated_at DateTime @updatedAt @db.Timestamp(6)
 
   @@index([game_id])
   @@map("game_names")
@@ -170,10 +178,10 @@ model Publisher {
   id        String  @id @default(cuid())
   name      String
   games     Game[]
-  primaryPublisher Game[] @relation("PrimaryPublishers")
+  primary_publisher Game[] @relation("PrimaryPublishers")
   external_id String @unique
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  created_at DateTime @default(now()) @db.Timestamp(6)
+  updated_at DateTime @updatedAt @db.Timestamp(6)
   
   @@map("publishers")
 }
@@ -184,8 +192,8 @@ model Category {
   slug      String
   games     Game[]
   external_id String @unique
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  created_at DateTime @default(now()) @db.Timestamp(6)
+  updated_at DateTime @updatedAt @db.Timestamp(6)
 
   @@map("categories")
 }
@@ -195,8 +203,8 @@ model Mechanic {
   name      String
   games     Game[]
   external_id String @unique
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  created_at DateTime @default(now()) @db.Timestamp(6)
+  updated_at DateTime @updatedAt @db.Timestamp(6)
 
   @@map("mechanics")
 }
@@ -206,8 +214,8 @@ model Designer {
   name      String
   games     Game[]
   external_id String @unique
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  created_at DateTime @default(now()) @db.Timestamp(6)
+  updated_at DateTime @updatedAt @db.Timestamp(6)
 
   @@map("designers")
 }
@@ -217,8 +225,8 @@ model Artist {
   name      String
   games     Game[]
   external_id String @unique
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  created_at DateTime @default(now()) @db.Timestamp(6)
+  updated_at DateTime @updatedAt @db.Timestamp(6)
 
   @@map("artists")
 }
@@ -226,12 +234,12 @@ model Artist {
 model Expansion {
   id            String  @id @default(cuid())
   name          String
-  yearPublished Int?
+  year_published Int?
   baseGame      Game?   @relation(fields: [base_game_id], references: [id])
   base_game_id    String?
   external_id String @unique
-  createdAt     DateTime @default(now())
-  updatedAt     DateTime @updatedAt
+  created_at     DateTime @default(now()) @db.Timestamp(6)
+  updated_at     DateTime @updatedAt @db.Timestamp(6)
 
   @@index([base_game_id])
   @@map("expansions")
diff --git a/src/app.d.ts b/src/app.d.ts
index 59ed3b3..0b7dc41 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -1,6 +1,11 @@
 // See https://kit.svelte.dev/docs/types#app
 // for information about these interfaces
 // and what to do when importing types
+
+import type { AuthUser } from '@prisma/client';
+
+type User = Omit<AuthUser, 'id' | 'created_at' | 'updated_at'>;
+
 // src/app.d.ts
 declare global {
 	namespace App {
@@ -33,16 +38,7 @@ declare global {
 declare global {
 	namespace Lucia {
 		type Auth = import('$lib/lucia').Auth;
-		type UserAttributes = {
-			email: string;
-			username: string;
-			firstName: string;
-			lastName: string;
-			role: string;
-			verified: boolean;
-			receiveEmail: boolean;
-			token: string;
-		};
+		type UserAttributes = User;
 	}
 }
 
diff --git a/src/db/roles.ts b/src/db/roles.ts
index 7a3011b..2d10bd9 100644
--- a/src/db/roles.ts
+++ b/src/db/roles.ts
@@ -1,15 +1,15 @@
 import prisma from '$lib/prisma';
 
-export async function add_user_to_role(userId: string, roleName: string) {
+export async function add_user_to_role(user_id: string, role_name: string) {
 	// Find the role by its name
 	const role = await prisma.role.findUnique({
 		where: {
-			name: roleName
+			name: role_name
 		}
 	});
 
 	if (!role) {
-		throw new Error(`Role with name ${roleName} not found`);
+		throw new Error(`Role with name ${role_name} not found`);
 	}
 
 	// Create a UserRole entry linking the user and the role
@@ -17,7 +17,7 @@ export async function add_user_to_role(userId: string, roleName: string) {
 		data: {
 			user: {
 				connect: {
-					id: userId
+					id: user_id
 				}
 			},
 			role: {
diff --git a/src/lib/server/lucia.ts b/src/lib/server/lucia.ts
index 8fe8b80..62f3463 100644
--- a/src/lib/server/lucia.ts
+++ b/src/lib/server/lucia.ts
@@ -11,12 +11,11 @@ export const auth = lucia({
 	middleware: sveltekit(),
 	transformDatabaseUser: (userData) => {
 		return {
-			userId: userData.id,
+			id: userData.id,
 			username: userData.username,
 			email: userData.email,
 			firstName: userData.firstName,
 			lastName: userData.lastName,
-			role: userData.role,
 			verified: userData.verified,
 			receiveEmail: userData.receiveEmail,
 			token: userData.token