diff --git a/packages/better-auth/src/api/routes/email-verification.ts b/packages/better-auth/src/api/routes/email-verification.ts
index ed5b71d487..76f31ab130 100644
--- a/packages/better-auth/src/api/routes/email-verification.ts
+++ b/packages/better-auth/src/api/routes/email-verification.ts
@@ -174,6 +174,7 @@ export const verifyEmail = createAuthEndpoint(
 									properties: {
 										user: {
 											type: "object",
+											ref: "#/components/schemas/User",
 										},
 										status: {
 											type: "boolean",
diff --git a/packages/better-auth/src/api/routes/session.ts b/packages/better-auth/src/api/routes/session.ts
index 7f995ce936..f092887028 100644
--- a/packages/better-auth/src/api/routes/session.ts
+++ b/packages/better-auth/src/api/routes/session.ts
@@ -66,17 +66,7 @@ export const getSession = <Option extends BetterAuthOptions>() =>
 										properties: {
 											session: {
 												type: "object",
-												properties: {
-													token: {
-														type: "string",
-													},
-													userId: {
-														type: "string",
-													},
-													expiresAt: {
-														type: "string",
-													},
-												},
+												$ref: "#/components/schemas/Session",
 											},
 											user: {
 												type: "object",
diff --git a/packages/better-auth/src/api/routes/sign-in.ts b/packages/better-auth/src/api/routes/sign-in.ts
index 36601d01a1..5835f40fb2 100644
--- a/packages/better-auth/src/api/routes/sign-in.ts
+++ b/packages/better-auth/src/api/routes/sign-in.ts
@@ -144,11 +144,12 @@ export const signInSocial = createAuthEndpoint(
 								schema: {
 									type: "object",
 									properties: {
-										session: {
+										token: {
 											type: "string",
 										},
 										user: {
 											type: "object",
+											ref: "#/components/schemas/User",
 										},
 										url: {
 											type: "string",
@@ -157,7 +158,7 @@ export const signInSocial = createAuthEndpoint(
 											type: "boolean",
 										},
 									},
-									required: ["session", "user", "url", "redirect"],
+									required: ["redirect"],
 								},
 							},
 						},
@@ -329,8 +330,12 @@ export const signInEmail = createAuthEndpoint(
 								schema: {
 									type: "object",
 									properties: {
+										token: {
+											type: "string",
+										},
 										user: {
 											type: "object",
+											ref: "#/components/schemas/User",
 										},
 										url: {
 											type: "string",
@@ -339,7 +344,7 @@ export const signInEmail = createAuthEndpoint(
 											type: "boolean",
 										},
 									},
-									required: ["session", "user", "url", "redirect"],
+									required: ["token", "user", "redirect"],
 								},
 							},
 						},
diff --git a/packages/better-auth/src/api/routes/update-user.ts b/packages/better-auth/src/api/routes/update-user.ts
index ff6a27db53..bdcee6bd99 100644
--- a/packages/better-auth/src/api/routes/update-user.ts
+++ b/packages/better-auth/src/api/routes/update-user.ts
@@ -61,6 +61,7 @@ export const updateUser = <O extends BetterAuthOptions>() =>
 										properties: {
 											user: {
 												type: "object",
+												ref: "#/components/schemas/User",
 											},
 										},
 									},
@@ -547,6 +548,7 @@ export const changeEmail = createAuthEndpoint(
 									properties: {
 										user: {
 											type: "object",
+											ref: "#/components/schemas/User",
 										},
 										status: {
 											type: "boolean",