diff --git a/src/index.tsx b/src/index.tsx
index 81f0895..edcbfe0 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -6,13 +6,7 @@ import type { CustomRender } from './interface';
 
 const defaultBlackList: string[] = [
   'ConfigProvider',
-  'Drawer',
   'Grid',
-  'Modal',
-  'Popconfirm',
-  'Popover',
-  'Tooltip',
-  'Tour',
 ];
 
 const ComponentCustomizeRender: Record<
@@ -33,6 +27,40 @@ const ComponentCustomizeRender: Record<
   Menu: (Menu) => <Menu items={[]} />,
   QRCode: (QRCode) => <QRCode value="https://ant.design" />,
   Tree: (Tree) => <Tree treeData={[]} />,
+  Tag: (Tag) => (
+    <>
+      <Tag color="blue">Tag</Tag>
+      <Tag color="success">Tag</Tag>
+    </>
+  ),
+  Badge: (Badge: any) => (
+    <>
+      <Badge />
+      <Badge.Ribbon />
+    </>
+  ),
+  Space: (Space: any) => (
+    <>
+      <Space />
+      <Space.Compact>
+        <antd.Button />
+      </Space.Compact>
+    </>
+  ),
+  Modal: (Modal: any) => (
+    <>
+      <Modal />
+      <Modal._InternalPanelDoNotUseOrYouWillBeFired />
+    </>
+  ),
+  message: (message: any) => {
+    const { _InternalPanelDoNotUseOrYouWillBeFired: PurePanel } = message;
+    return <PurePanel />;
+  },
+  notification: (notification: any) => {
+    const { _InternalPanelDoNotUseOrYouWillBeFired: PurePanel } = notification;
+    return <PurePanel />;
+  },
 };
 
 interface NodeProps {
@@ -48,7 +76,7 @@ const defaultNode = ({ excludes = [], includes }: NodeProps) => {
       {components
         .filter(
           (name) =>
-            ![...defaultBlackList, ...excludes].includes(name) && name[0] === name[0].toUpperCase(),
+            ![...defaultBlackList, ...excludes].includes(name) && (name[0] === name[0].toUpperCase() || ['notification', 'message'].includes(name)),
         )
         .map((compName) => {
           const Comp = antd[compName];
diff --git a/tests/index.test.tsx b/tests/index.test.tsx
index 2e4960b..ec06760 100644
--- a/tests/index.test.tsx
+++ b/tests/index.test.tsx
@@ -69,6 +69,8 @@ describe('Static-Style-Extract', () => {
       excludes: ['Card']
     });
     expect(cssText).toContain('.ant-btn');
+    expect(cssText).toContain('.ant-notification');
+    expect(cssText).toContain('.ant-message');
     expect(cssText).not.toContain('.ant-card');
   })
 });