diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c3addd3f..1689594b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1261,6 +1261,24 @@ importers:
       styled-components: 5.3.6_react@18.2.0
       zustand: 4.1.2_react@18.2.0
 
+  server/test/demo/openapi-client:
+    specifiers:
+      axios: ^0.26.0
+      express: ^4.17.2
+      openid-client: ^5.1.5
+    dependencies:
+      axios: 0.26.1
+      express: 4.18.2
+      openid-client: 5.3.2
+
+  server/test/demo/openapi-client-simple:
+    specifiers:
+      axios: ^0.26.0
+      express: ^4.17.2
+    dependencies:
+      axios: 0.26.1
+      express: 4.18.2
+
   website:
     specifiers:
       '@docusaurus/core': 2.1.0
@@ -15385,6 +15403,14 @@ packages:
       - debug
     dev: false
 
+  /axios/0.26.1:
+    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
+    dependencies:
+      follow-redirects: 1.15.2
+    transitivePeerDependencies:
+      - debug
+    dev: false
+
   /axios/0.27.2:
     resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
@@ -25019,6 +25045,10 @@ packages:
       '@sideway/formula': 3.0.0
       '@sideway/pinpoint': 2.0.0
 
+  /jose/4.11.2:
+    resolution: {integrity: sha512-njj0VL2TsIxCtgzhO+9RRobBvws4oYyCM8TpvoUQwl/MbIM3NFJRR9+e6x0sS5xXaP1t6OCBkaBME98OV9zU5A==}
+    dev: false
+
   /jose/4.9.0:
     resolution: {integrity: sha512-RgaqEOZLkVO+ViN3KkN44XJt9g7+wMveUv59sVLaTxONcUPc8ZpfqOCeLphVBZyih2dgkvZ0Ap1CNcokvY7Uyw==}
     dev: false
@@ -28507,6 +28537,15 @@ packages:
     resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==}
     hasBin: true
 
+  /openid-client/5.3.2:
+    resolution: {integrity: sha512-nXXt+cna0XHOw+WqjMZOmuXw/YZEMwfWD2lD7tCsFtsBjMQGVXA+NZABA3upYBET1suhIsmfd7GnxG4jCAnvYQ==}
+    dependencies:
+      jose: 4.11.2
+      lru-cache: 6.0.0
+      object-hash: 2.2.0
+      oidc-token-hash: 5.0.1
+    dev: false
+
   /opn/4.0.2:
     resolution: {integrity: sha512-iPBWbPP4OEOzR1xfhpGLDh+ypKBOygunZhM9jBtA7FS5sKjEiMZw0EFb82hnDOmTZX90ZWLoZKUza4cVt8MexA==}
     engines: {node: '>=0.10.0'}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 93e84d31..44391e47 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -9,4 +9,5 @@ packages:
   - 'server/admin-next'
   - 'server/packages/**'
   - 'server/plugins/**'
+  - 'server/test/demo/**'
   - 'website'
diff --git a/server/mixins/__tests__/socketio.spec.ts b/server/mixins/__tests__/socketio.spec.ts
index 6a5eebba..c8165d7f 100644
--- a/server/mixins/__tests__/socketio.spec.ts
+++ b/server/mixins/__tests__/socketio.spec.ts
@@ -1,8 +1,7 @@
 import { TcSocketIOService } from '../socketio.mixin';
 import { io } from 'socket.io-client';
-import ApiGateway from 'moleculer-web';
 import { createTestUserToken } from '../../test/utils';
-import { UserJWTPayload, TcBroker } from 'tailchat-server-sdk';
+import { UserJWTPayload, TcBroker, ApiGatewayMixin } from 'tailchat-server-sdk';
 
 require('dotenv').config();
 
@@ -46,7 +45,7 @@ describe('Testing "socketio.mixin"', () => {
   const service = broker.createService({
     name: 'test',
     mixins: [
-      ApiGateway,
+      ApiGatewayMixin,
       TcSocketIOService({
         async userAuth(token): Promise<UserJWTPayload> {
           return {
diff --git a/server/models/base.ts b/server/models/base.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/server/tsconfig.json b/server/tsconfig.json
index e58c05bd..cf554b2c 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -15,5 +15,5 @@
     "outDir": "dist"
   },
   "include": ["./**/*"],
-  "exclude": ["node_modules/**/*", "dist", "plugins/**/web/**", "packages/sdk/**", "admin/**"]
+  "exclude": ["node_modules/**/*", "dist", "plugins/**/web/**", "packages/sdk/**", "admin/**", "admin-next/**"]
 }