diff --git a/demo/nextjs/lib/auth.ts b/demo/nextjs/lib/auth.ts
index f43a39b0..5d03d92d 100644
--- a/demo/nextjs/lib/auth.ts
+++ b/demo/nextjs/lib/auth.ts
@@ -39,11 +39,10 @@ export const auth = betterAuth({
 		},
 	},
 	plugins: [
-		rateLimiter({
-			enabled: true,
-
-			max: 1000,
-		}),
+		// rateLimiter({
+		// 	enabled: true,
+		// 	max: 1000,
+		// }),
 		organization({
 			async sendInvitationEmail(data) {
 				const res = await resend.emails.send({
diff --git a/packages/better-auth/package.json b/packages/better-auth/package.json
index e4a96226..4ac53cbf 100644
--- a/packages/better-auth/package.json
+++ b/packages/better-auth/package.json
@@ -81,7 +81,7 @@
         "@simplewebauthn/browser": "^10.0.0",
         "@simplewebauthn/server": "^10.0.1",
         "arctic": "2.0.0-next.9",
-        "better-call": "0.2.3-beta.3",
+        "better-call": "0.2.3-beta.8",
         "better-sqlite3": "^11.1.2",
         "c12": "^1.11.2",
         "chalk": "^5.3.0",
diff --git a/packages/better-auth/src/api/call.ts b/packages/better-auth/src/api/call.ts
index 3e1e8391..3c7c3808 100644
--- a/packages/better-auth/src/api/call.ts
+++ b/packages/better-auth/src/api/call.ts
@@ -21,8 +21,7 @@ export const createAuthMiddleware = createMiddlewareCreator({
 	use: [
 		optionsMiddleware,
 		/**
-		 * This of for hooks. to tell ts there will a
-		 * return response object
+		 * Only use for post hooks
 		 */
 		createMiddleware(async () => {
 			return {} as {
diff --git a/packages/better-auth/src/api/index.ts b/packages/better-auth/src/api/index.ts
index 828e7192..769b0d83 100644
--- a/packages/better-auth/src/api/index.ts
+++ b/packages/better-auth/src/api/index.ts
@@ -105,25 +105,29 @@ export function getEndpoints<
 	let api: Record<string, any> = {};
 	for (const [key, value] of Object.entries(endpoints)) {
 		api[key] = async (context: any) => {
-			for (const plugin of ctx.options.plugins || []) {
-				if (plugin.hooks?.before) {
-					for (const hook of plugin.hooks.before) {
-						const match = hook.matcher({
-							...context,
-							...value,
-						});
-						if (match) {
-							const hookRes = await hook.handler(context);
-							if (hookRes && "context" in hookRes) {
-								context = {
-									...context,
-									...hookRes.context,
-									...value,
-								};
-							}
-						}
-					}
-				}
+			// for (const plugin of ctx.options.plugins || []) {
+			// 	if (plugin.hooks?.before) {
+			// 		for (const hook of plugin.hooks.before) {
+			// 			const match = hook.matcher({
+			// 				...context,
+			// 				...value,
+			// 			});
+			// 			if (match) {
+			// 				const hookRes = await hook.handler(context);
+			// 				if (hookRes && "context" in hookRes) {
+			// 					context = {
+			// 						...context,
+			// 						...hookRes.context,
+			// 						...value,
+			// 					};
+			// 				}
+			// 			}
+			// 		}
+			// 	}
+			// }
+			if (context.path === "/user/update") {
+				const res = await api[key].options.use[1](context);
+				console.log(res);
 			}
 			/**
 			 * TODO: move this to respond a json response
@@ -187,7 +191,6 @@ export const router = <C extends AuthContext, Option extends BetterAuthOptions>(
 			},
 			...middlewares,
 		],
-
 		onError(e) {
 			if (options.disableLog !== true) {
 				if (e instanceof APIError) {
@@ -196,7 +199,7 @@ export const router = <C extends AuthContext, Option extends BetterAuthOptions>(
 					if (typeof e === "object" && e !== null && "message" in e) {
 						const errorMessage = e.message as string;
 						if (!errorMessage || typeof errorMessage !== "string") {
-							logger.warn(e);
+							logger.error(e);
 							return;
 						}
 						if (errorMessage.includes("no such table")) {
@@ -224,10 +227,10 @@ export const router = <C extends AuthContext, Option extends BetterAuthOptions>(
 								)} to create the tables. There are missing tables in your MySQL database.`,
 							);
 						} else {
-							logger.warn(e);
+							logger.error(e);
 						}
 					} else {
-						logger.warn(e);
+						logger.error(e);
 					}
 				}
 			}
diff --git a/packages/better-auth/src/api/middlewares/index.ts b/packages/better-auth/src/api/middlewares/index.ts
index 1c72ea4e..5016badd 100644
--- a/packages/better-auth/src/api/middlewares/index.ts
+++ b/packages/better-auth/src/api/middlewares/index.ts
@@ -1,2 +1 @@
 export * from "./csrf";
-export * from "./session";
diff --git a/packages/better-auth/src/api/middlewares/session.ts b/packages/better-auth/src/api/middlewares/session.ts
deleted file mode 100644
index ddce1524..00000000
--- a/packages/better-auth/src/api/middlewares/session.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { APIError } from "better-call";
-import { createAuthMiddleware } from "../call";
-import { getSessionFromCtx } from "../routes";
-
-export const sessionMiddleware = createAuthMiddleware(async (ctx) => {
-	const session = await getSessionFromCtx(ctx);
-	if (!session?.session) {
-		throw new APIError("UNAUTHORIZED");
-	}
-	return {
-		session,
-	};
-});
diff --git a/packages/better-auth/src/api/routes/session.ts b/packages/better-auth/src/api/routes/session.ts
index c2f543eb..34a8ede1 100644
--- a/packages/better-auth/src/api/routes/session.ts
+++ b/packages/better-auth/src/api/routes/session.ts
@@ -1,8 +1,7 @@
-import type { Context, InferUse } from "better-call";
-import { createAuthEndpoint } from "../call";
+import { APIError, type Context, type InferUse } from "better-call";
+import { createAuthEndpoint, createAuthMiddleware } from "../call";
 import { getDate } from "../../utils/date";
 import { deleteSessionCookie, setSessionCookie } from "../../utils/cookies";
-import { sessionMiddleware } from "../middlewares/session";
 import type { Session, User } from "../../adapters/schema";
 import { z } from "zod";
 import { getIp } from "../../utils/get-request-ip";
@@ -67,14 +66,18 @@ export const getSession = <Option extends BetterAuthOptions>() =>
 				const cachedSession = sessionCache.get(key);
 				if (cachedSession) {
 					if (cachedSession.expiresAt > Date.now()) {
-						return ctx.json(cachedSession.data);
+						return ctx.json(
+							cachedSession.data as unknown as {
+								session: Prettify<InferSession<Option>>;
+								user: Prettify<InferUser<Option>>;
+							},
+						);
 					}
 					sessionCache.delete(key);
 				}
 
 				const session =
 					await ctx.context.internalAdapter.findSession(sessionCookieToken);
-
 				if (!session || session.session.expiresAt < new Date()) {
 					deleteSessionCookie(ctx);
 					if (session) {
@@ -95,10 +98,15 @@ export const getSession = <Option extends BetterAuthOptions>() =>
 				 * We don't need to update the session if the user doesn't want to be remembered
 				 */
 				if (dontRememberMe) {
-					return ctx.json(session);
+					return ctx.json(
+						session as unknown as {
+							session: Prettify<InferSession<Option>>;
+							user: Prettify<InferUser<Option>>;
+						},
+					);
 				}
-				const expiresIn = ctx.context.session.expiresIn;
-				const updateAge = ctx.context.session.updateAge;
+				const expiresIn = ctx.context.sessionConfig.expiresIn;
+				const updateAge = ctx.context.sessionConfig.updateAge;
 				/**
 				 * Calculate last updated date to throttle write updates to database
 				 * Formula: ({expiry date} - sessionMaxAge) + sessionUpdateAge
@@ -119,7 +127,7 @@ export const getSession = <Option extends BetterAuthOptions>() =>
 						await ctx.context.internalAdapter.updateSession(
 							session.session.id,
 							{
-								expiresAt: getDate(ctx.context.session.expiresIn, true),
+								expiresAt: getDate(ctx.context.sessionConfig.expiresIn, true),
 							},
 						);
 					if (!updatedSession) {
@@ -167,6 +175,16 @@ export const getSessionFromCtx = async (ctx: Context<any, any>) => {
 	return session;
 };
 
+export const sessionMiddleware = createAuthMiddleware(async (ctx) => {
+	const session = await getSessionFromCtx(ctx);
+	if (!session?.session) {
+		throw new APIError("UNAUTHORIZED");
+	}
+	return {
+		session,
+	};
+});
+
 /**
  * user active sessions list
  */
@@ -212,6 +230,13 @@ export const revokeSession = createAuthEndpoint(
 	},
 	async (ctx) => {
 		const id = ctx.body.id;
+		const findSession = await ctx.context.internalAdapter.findSession(id);
+		if (!findSession) {
+			return ctx.json(null, { status: 400 });
+		}
+		if (findSession.session.userId !== ctx.context.session.user.id) {
+			return ctx.json(null, { status: 403 });
+		}
 		try {
 			await ctx.context.internalAdapter.deleteSession(id);
 		} catch (error) {
diff --git a/packages/better-auth/src/api/routes/update-user.ts b/packages/better-auth/src/api/routes/update-user.ts
index e0a5f458..c0f854c4 100644
--- a/packages/better-auth/src/api/routes/update-user.ts
+++ b/packages/better-auth/src/api/routes/update-user.ts
@@ -1,8 +1,9 @@
 import { z } from "zod";
-import { createAuthEndpoint } from "../call";
-import { sessionMiddleware } from "../middlewares/session";
+import { createAuthEndpoint, createAuthMiddleware } from "../call";
 import { alphabet, generateRandomString } from "oslo/crypto";
 import { setSessionCookie } from "../../utils/cookies";
+import { getSessionFromCtx, sessionMiddleware } from "./session";
+import { APIError } from "better-call";
 
 export const updateUser = createAuthEndpoint(
 	"/user/update",
@@ -17,6 +18,9 @@ export const updateUser = createAuthEndpoint(
 	async (ctx) => {
 		const { name, image } = ctx.body;
 		const session = ctx.context.session;
+		if (!image && !name) {
+			return ctx.json(session.user);
+		}
 		const user = await ctx.context.internalAdapter.updateUserByEmail(
 			session.user.email,
 			{
diff --git a/packages/better-auth/src/init.ts b/packages/better-auth/src/init.ts
index 8284b4fd..fae9ab4d 100644
--- a/packages/better-auth/src/init.ts
+++ b/packages/better-auth/src/init.ts
@@ -51,7 +51,7 @@ export const init = (options: BetterAuthOptions) => {
 		},
 		tables,
 		baseURL: baseURL || "",
-		session: {
+		sessionConfig: {
 			updateAge: options.session?.updateAge || 24 * 60 * 60, // 24 hours
 			expiresIn: options.session?.expiresIn || 60 * 60 * 24 * 7, // 7 days
 		},
@@ -83,7 +83,7 @@ export type AuthContext = {
 	internalAdapter: ReturnType<typeof createInternalAdapter>;
 	createAuthCookie: ReturnType<typeof createCookieGetter>;
 	secret: string;
-	session: {
+	sessionConfig: {
 		updateAge: number;
 		expiresIn: number;
 	};
diff --git a/packages/better-auth/src/plugins/organization/call.ts b/packages/better-auth/src/plugins/organization/call.ts
index cb4d42ba..26e3eff9 100644
--- a/packages/better-auth/src/plugins/organization/call.ts
+++ b/packages/better-auth/src/plugins/organization/call.ts
@@ -1,7 +1,7 @@
 import { APIError, type Context, createEndpointCreator } from "better-call";
 import type { Session, User } from "../../adapters/schema";
 import { createAuthMiddleware, optionsMiddleware } from "../../api/call";
-import { sessionMiddleware } from "../../api/middlewares/session";
+import { sessionMiddleware } from "../../api";
 import type { Role, defaultRoles } from "./access";
 import type { OrganizationOptions } from "./organization";
 
diff --git a/packages/better-auth/src/plugins/passkey/index.ts b/packages/better-auth/src/plugins/passkey/index.ts
index 02d3b772..f2aaeca5 100644
--- a/packages/better-auth/src/plugins/passkey/index.ts
+++ b/packages/better-auth/src/plugins/passkey/index.ts
@@ -14,7 +14,7 @@ import { APIError } from "better-call";
 import { alphabet, generateRandomString } from "oslo/crypto";
 import { z } from "zod";
 import { createAuthEndpoint } from "../../api/call";
-import { sessionMiddleware } from "../../api/middlewares/session";
+import { sessionMiddleware } from "../../api";
 import { getSessionFromCtx } from "../../api/routes";
 import type { BetterAuthPlugin } from "../../types/plugins";
 import { setSessionCookie } from "../../utils/cookies";
diff --git a/packages/better-auth/src/plugins/two-factor/backup-codes/index.ts b/packages/better-auth/src/plugins/two-factor/backup-codes/index.ts
index f3cc0a76..697bd8f6 100644
--- a/packages/better-auth/src/plugins/two-factor/backup-codes/index.ts
+++ b/packages/better-auth/src/plugins/two-factor/backup-codes/index.ts
@@ -1,7 +1,7 @@
 import { alphabet, generateRandomString } from "oslo/crypto";
 import { z } from "zod";
 import { createAuthEndpoint } from "../../../api/call";
-import { sessionMiddleware } from "../../../api/middlewares/session";
+import { sessionMiddleware } from "../../../api";
 import { symmetricDecrypt, symmetricEncrypt } from "../../../crypto";
 import { verifyTwoFactorMiddleware } from "../verify-middleware";
 import type { TwoFactorProvider, UserWithTwoFactor } from "../types";
diff --git a/packages/better-auth/src/plugins/two-factor/index.ts b/packages/better-auth/src/plugins/two-factor/index.ts
index a9449c33..6d49ec20 100644
--- a/packages/better-auth/src/plugins/two-factor/index.ts
+++ b/packages/better-auth/src/plugins/two-factor/index.ts
@@ -1,7 +1,7 @@
 import { alphabet, generateRandomString } from "oslo/crypto";
 import { z } from "zod";
 import { createAuthEndpoint, createAuthMiddleware } from "../../api/call";
-import { sessionMiddleware } from "../../api/middlewares/session";
+import { sessionMiddleware } from "../../api";
 import { hs256, symmetricEncrypt } from "../../crypto";
 import type { BetterAuthPlugin } from "../../types/plugins";
 import { backupCode2fa, generateBackupCodes } from "./backup-codes";
diff --git a/packages/better-auth/src/plugins/two-factor/totp/index.ts b/packages/better-auth/src/plugins/two-factor/totp/index.ts
index b69da27a..3cd19be5 100644
--- a/packages/better-auth/src/plugins/two-factor/totp/index.ts
+++ b/packages/better-auth/src/plugins/two-factor/totp/index.ts
@@ -3,7 +3,7 @@ import { TimeSpan } from "oslo";
 import { TOTPController, createTOTPKeyURI } from "oslo/otp";
 import { z } from "zod";
 import { createAuthEndpoint } from "../../../api/call";
-import { sessionMiddleware } from "../../../api/middlewares/session";
+import { sessionMiddleware } from "../../../api";
 import { symmetricDecrypt } from "../../../crypto";
 import type { BackupCodeOptions } from "../backup-codes";
 import { verifyTwoFactorMiddleware } from "../verify-middleware";
diff --git a/packages/better-auth/tsup.config.ts b/packages/better-auth/tsup.config.ts
index a7f6719f..46e7fedf 100644
--- a/packages/better-auth/tsup.config.ts
+++ b/packages/better-auth/tsup.config.ts
@@ -25,6 +25,7 @@ export default defineConfig((env) => {
 		sourcemap: isBuild,
 		format: ["esm"],
 		dts: true,
+		splitting: false,
 		minify: isBuild,
 		minifyWhitespace: isBuild,
 		minifyIdentifiers: isBuild,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 707a2839..f47244c7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -767,8 +767,8 @@ importers:
         specifier: 2.0.0-next.9
         version: 2.0.0-next.9
       better-call:
-        specifier: 0.2.3-beta.3
-        version: 0.2.3-beta.3
+        specifier: 0.2.3-beta.8
+        version: 0.2.3-beta.8
       better-sqlite3:
         specifier: ^11.1.2
         version: 11.3.0
@@ -10102,8 +10102,8 @@ packages:
       typescript: 5.6.2
     dev: false
 
-  /better-call@0.2.3-beta.3:
-    resolution: {integrity: sha512-1W0HB1aJ1adhbkVAi5gBQE/0uhdz+Y1Nrg3I0xZDFQx1R6vocBq7R+bVDrI5eNX+HmbzrXdY6O+Q/CfhhczJcg==}
+  /better-call@0.2.3-beta.8:
+    resolution: {integrity: sha512-cFD9x116voPbe9LSJFPIihY+2zDdhnEiVijQb8YWmXQXdC3PEZ7+lWyptJHBdtmLbao7xPt/JesH96/tm/o3wQ==}
     dependencies:
       '@better-fetch/fetch': 1.1.8
       '@types/set-cookie-parser': 2.4.10