diff --git a/framework/bigcommerce/api/endpoints/cart/index.ts b/framework/bigcommerce/api/endpoints/cart/index.ts
index c96fe9761..ae2414d70 100644
--- a/framework/bigcommerce/api/endpoints/cart/index.ts
+++ b/framework/bigcommerce/api/endpoints/cart/index.ts
@@ -1,4 +1,5 @@
-import type { GetAPISchema } from '@commerce/api'
+import { GetAPISchema, createEndpoint } from '@commerce/api'
+import cartEndpoint from '@commerce/api/endpoints/cart'
 import type { CartSchema } from '../../../types/cart'
 import type { BigcommerceAPI } from '../..'
 import getCart from './get-cart'
@@ -10,4 +11,16 @@ export type CartAPI = GetAPISchema<BigcommerceAPI, CartSchema>
 
 export type CartEndpoint = CartAPI['endpoint']
 
-export const handlers = { getCart, addItem, updateItem, removeItem }
+export const handlers: CartEndpoint['handlers'] = {
+  getCart,
+  addItem,
+  updateItem,
+  removeItem,
+}
+
+const cartApi = createEndpoint<CartAPI>({
+  handler: cartEndpoint,
+  handlers,
+})
+
+export default cartApi
diff --git a/framework/bigcommerce/api/endpoints/customer/index.ts b/framework/bigcommerce/api/endpoints/customer/index.ts
index cbc70fa80..cb0f6787a 100644
--- a/framework/bigcommerce/api/endpoints/customer/index.ts
+++ b/framework/bigcommerce/api/endpoints/customer/index.ts
@@ -1,4 +1,5 @@
-import type { GetAPISchema } from '@commerce/api'
+import { GetAPISchema, createEndpoint } from '@commerce/api'
+import customerEndpoint from '@commerce/api/endpoints/customer'
 import type { CustomerSchema } from '../../../types/customer'
 import type { BigcommerceAPI } from '../..'
 import getLoggedInCustomer from './get-logged-in-customer'
@@ -7,4 +8,11 @@ export type CustomerAPI = GetAPISchema<BigcommerceAPI, CustomerSchema>
 
 export type CustomerEndpoint = CustomerAPI['endpoint']
 
-export const handlers = { getLoggedInCustomer }
+export const handlers: CustomerEndpoint['handlers'] = { getLoggedInCustomer }
+
+const customerApi = createEndpoint<CustomerAPI>({
+  handler: customerEndpoint,
+  handlers,
+})
+
+export default customerApi
diff --git a/framework/bigcommerce/api/endpoints/login/index.ts b/framework/bigcommerce/api/endpoints/login/index.ts
index 5bd6e469c..2b454c7c2 100644
--- a/framework/bigcommerce/api/endpoints/login/index.ts
+++ b/framework/bigcommerce/api/endpoints/login/index.ts
@@ -1,4 +1,5 @@
-import type { GetAPISchema } from '@commerce/api'
+import { GetAPISchema, createEndpoint } from '@commerce/api'
+import loginEndpoint from '@commerce/api/endpoints/login'
 import type { LoginSchema } from '../../../types/login'
 import type { BigcommerceAPI } from '../..'
 import login from './login'
@@ -7,4 +8,11 @@ export type LoginAPI = GetAPISchema<BigcommerceAPI, LoginSchema>
 
 export type LoginEndpoint = LoginAPI['endpoint']
 
-export const handlers = { login }
+export const handlers: LoginEndpoint['handlers'] = { login }
+
+const loginApi = createEndpoint<LoginAPI>({
+  handler: loginEndpoint,
+  handlers,
+})
+
+export default loginApi
diff --git a/framework/bigcommerce/api/endpoints/logout/index.ts b/framework/bigcommerce/api/endpoints/logout/index.ts
index d70bcb0c3..0dbb23bab 100644
--- a/framework/bigcommerce/api/endpoints/logout/index.ts
+++ b/framework/bigcommerce/api/endpoints/logout/index.ts
@@ -1,4 +1,5 @@
-import type { GetAPISchema } from '@commerce/api'
+import { GetAPISchema, createEndpoint } from '@commerce/api'
+import logoutEndpoint from '@commerce/api/endpoints/logout'
 import type { LogoutSchema } from '../../../types/logout'
 import type { BigcommerceAPI } from '../..'
 import logout from './logout'
@@ -7,4 +8,11 @@ export type LogoutAPI = GetAPISchema<BigcommerceAPI, LogoutSchema>
 
 export type LogoutEndpoint = LogoutAPI['endpoint']
 
-export const handlers = { logout }
+export const handlers: LogoutEndpoint['handlers'] = { logout }
+
+const logoutApi = createEndpoint<LogoutAPI>({
+  handler: logoutEndpoint,
+  handlers,
+})
+
+export default logoutApi
diff --git a/framework/bigcommerce/api/endpoints/signup/index.ts b/framework/bigcommerce/api/endpoints/signup/index.ts
index 2efdff641..6ce8be271 100644
--- a/framework/bigcommerce/api/endpoints/signup/index.ts
+++ b/framework/bigcommerce/api/endpoints/signup/index.ts
@@ -1,4 +1,5 @@
-import type { GetAPISchema } from '@commerce/api'
+import { GetAPISchema, createEndpoint } from '@commerce/api'
+import signupEndpoint from '@commerce/api/endpoints/signup'
 import type { SignupSchema } from '../../../types/signup'
 import type { BigcommerceAPI } from '../..'
 import signup from './signup'
@@ -7,4 +8,11 @@ export type SignupAPI = GetAPISchema<BigcommerceAPI, SignupSchema>
 
 export type SignupEndpoint = SignupAPI['endpoint']
 
-export const handlers = { signup }
+export const handlers: SignupEndpoint['handlers'] = { signup }
+
+const singupApi = createEndpoint<SignupAPI>({
+  handler: signupEndpoint,
+  handlers,
+})
+
+export default singupApi
diff --git a/framework/bigcommerce/api/endpoints/wishlist/index.ts b/framework/bigcommerce/api/endpoints/wishlist/index.ts
index 605c53472..31af234ce 100644
--- a/framework/bigcommerce/api/endpoints/wishlist/index.ts
+++ b/framework/bigcommerce/api/endpoints/wishlist/index.ts
@@ -1,5 +1,5 @@
 import { GetAPISchema, createEndpoint } from '@commerce/api'
-import wishlist from '@commerce/api/endpoints/wishlist'
+import wishlistEndpoint from '@commerce/api/endpoints/wishlist'
 import type { WishlistSchema } from '../../../types/wishlist'
 import type { BigcommerceAPI } from '../..'
 import getWishlist from './get-wishlist'
@@ -16,9 +16,9 @@ export const handlers: WishlistEndpoint['handlers'] = {
   removeItem,
 }
 
-const wishlistEndpoint = createEndpoint({
-  handler: wishlist as WishlistAPI['endpoint']['handler'],
+const wishlistApi = createEndpoint<WishlistAPI>({
+  handler: wishlistEndpoint,
   handlers,
 })
 
-export default wishlistEndpoint
+export default wishlistApi
diff --git a/framework/bigcommerce/api/index.ts b/framework/bigcommerce/api/index.ts
index 345715384..9eeea5b49 100644
--- a/framework/bigcommerce/api/index.ts
+++ b/framework/bigcommerce/api/index.ts
@@ -4,7 +4,6 @@ import {
   CommerceAPI,
   CommerceAPIConfig,
   getCommerceApi as commerceApi,
-  getEndpoint,
 } from '@commerce/api'
 import fetchGraphqlApi from './utils/fetch-graphql-api'
 import fetchStoreApi from './utils/fetch-store-api'
diff --git a/framework/commerce/api/endpoints/cart.ts b/framework/commerce/api/endpoints/cart.ts
index e5a05dbd6..ca39e7da3 100644
--- a/framework/commerce/api/endpoints/cart.ts
+++ b/framework/commerce/api/endpoints/cart.ts
@@ -5,7 +5,7 @@ import type { GetAPISchema } from '..'
 
 const cartEndpoint: GetAPISchema<
   any,
-  CartSchema
+  CartSchema<any>
 >['endpoint']['handler'] = async (ctx) => {
   const { req, res, handlers, config } = ctx
 
diff --git a/framework/commerce/api/endpoints/customer.ts b/framework/commerce/api/endpoints/customer.ts
index cf4699d2a..6372c494f 100644
--- a/framework/commerce/api/endpoints/customer.ts
+++ b/framework/commerce/api/endpoints/customer.ts
@@ -5,7 +5,7 @@ import type { GetAPISchema } from '..'
 
 const customerEndpoint: GetAPISchema<
   any,
-  CustomerSchema
+  CustomerSchema<any>
 >['endpoint']['handler'] = async (ctx) => {
   const { req, res, handlers } = ctx
 
diff --git a/framework/commerce/api/endpoints/login.ts b/framework/commerce/api/endpoints/login.ts
index 946df0d2c..bc071b751 100644
--- a/framework/commerce/api/endpoints/login.ts
+++ b/framework/commerce/api/endpoints/login.ts
@@ -5,7 +5,7 @@ import type { GetAPISchema } from '..'
 
 const loginEndpoint: GetAPISchema<
   any,
-  LoginSchema
+  LoginSchema<any>
 >['endpoint']['handler'] = async (ctx) => {
   const { req, res, handlers } = ctx
 
diff --git a/framework/commerce/api/endpoints/wishlist.ts b/framework/commerce/api/endpoints/wishlist.ts
index 688fcd5da..233ac5294 100644
--- a/framework/commerce/api/endpoints/wishlist.ts
+++ b/framework/commerce/api/endpoints/wishlist.ts
@@ -5,7 +5,7 @@ import type { GetAPISchema } from '..'
 
 const wishlistEndpoint: GetAPISchema<
   any,
-  WishlistSchema
+  WishlistSchema<any>
 >['endpoint']['handler'] = async (ctx) => {
   const { req, res, handlers, config } = ctx
 
diff --git a/pages/api/cart.ts b/pages/api/cart.ts
index e05ddc2f2..642891107 100644
--- a/pages/api/cart.ts
+++ b/pages/api/cart.ts
@@ -1,8 +1,4 @@
-import cart from '@commerce/api/endpoints/cart'
-import { CartAPI, handlers } from '@framework/api/endpoints/cart'
+import cartApi from '@framework/api/endpoints/cart'
 import commerce from '@lib/api/commerce'
 
-export default commerce.endpoint({
-  handler: cart as CartAPI['endpoint']['handler'],
-  handlers,
-})
+export default cartApi(commerce)
diff --git a/pages/api/customer.ts b/pages/api/customer.ts
index 85a0c893e..0c86e76e5 100644
--- a/pages/api/customer.ts
+++ b/pages/api/customer.ts
@@ -1,8 +1,4 @@
-import customer from '@commerce/api/endpoints/customer'
-import { CustomerAPI, handlers } from '@framework/api/endpoints/customer'
+import customerApi from '@framework/api/endpoints/customer'
 import commerce from '@lib/api/commerce'
 
-export default commerce.endpoint({
-  handler: customer as CustomerAPI['endpoint']['handler'],
-  handlers,
-})
+export default customerApi(commerce)
diff --git a/pages/api/login.ts b/pages/api/login.ts
index 982944654..9d0b6ae57 100644
--- a/pages/api/login.ts
+++ b/pages/api/login.ts
@@ -1,8 +1,4 @@
-import login from '@commerce/api/endpoints/login'
-import { LoginAPI, handlers } from '@framework/api/endpoints/login'
+import loginApi from '@framework/api/endpoints/login'
 import commerce from '@lib/api/commerce'
 
-export default commerce.endpoint({
-  handler: login as LoginAPI['endpoint']['handler'],
-  handlers,
-})
+export default loginApi(commerce)
diff --git a/pages/api/logout.ts b/pages/api/logout.ts
index 012ef2b0d..0cf0fc4d2 100644
--- a/pages/api/logout.ts
+++ b/pages/api/logout.ts
@@ -1,8 +1,4 @@
-import logout from '@commerce/api/endpoints/logout'
-import { LogoutAPI, handlers } from '@framework/api/endpoints/logout'
+import logoutApi from '@framework/api/endpoints/logout'
 import commerce from '@lib/api/commerce'
 
-export default commerce.endpoint({
-  handler: logout as LogoutAPI['endpoint']['handler'],
-  handlers,
-})
+export default logoutApi(commerce)
diff --git a/pages/api/signup.ts b/pages/api/signup.ts
index 8b069d0ab..e19d67ee8 100644
--- a/pages/api/signup.ts
+++ b/pages/api/signup.ts
@@ -1,8 +1,4 @@
-import signup from '@commerce/api/endpoints/signup'
-import { SignupAPI, handlers } from '@framework/api/endpoints/signup'
+import singupApi from '@framework/api/endpoints/signup'
 import commerce from '@lib/api/commerce'
 
-export default commerce.endpoint({
-  handler: signup as SignupAPI['endpoint']['handler'],
-  handlers,
-})
+export default singupApi(commerce)
diff --git a/pages/api/wishlist.ts b/pages/api/wishlist.ts
index 2f14bec5c..3b9681209 100644
--- a/pages/api/wishlist.ts
+++ b/pages/api/wishlist.ts
@@ -1,4 +1,4 @@
-import wishlistEndpoint from '@framework/api/endpoints/wishlist'
+import wishlistApi from '@framework/api/endpoints/wishlist'
 import commerce from '@lib/api/commerce'
 
-export default wishlistEndpoint(commerce)
+export default wishlistApi(commerce)