diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
deleted file mode 100644
index 08cd53d..0000000
--- a/Setup/InstallSchema.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * A Magento 2 module named Experius/EmailCatcher
- * Copyright (C) 2019 Experius
- *
- * This file included in Experius/EmailCatcher is licensed under OSL 3.0
- *
- * http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- * Please see LICENSE.txt for the full text of the OSL 3.0 license
- */
-
-namespace Experius\EmailCatcher\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\InstallSchemaInterface;
-
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public function install(
-        SchemaSetupInterface $setup,
-        ModuleContextInterface $context
-    ) {
-        $installer = $setup;
-        $installer->startSetup();
-        $table_experius_emailcatcher = $setup->getConnection()->newTable($setup->getTable('experius_emailcatcher'));
-        $table_experius_emailcatcher->addColumn(
-            'emailcatcher_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true, 'unsigned' => true,],
-            'Entity ID'
-        );
-        $table_experius_emailcatcher->addColumn(
-            'to',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            [],
-            'To Email Address'
-        );
-        $table_experius_emailcatcher->addColumn(
-            'from',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            [],
-            'From Email Address'
-        );
-        $table_experius_emailcatcher->addColumn(
-            'subject',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            [],
-            'Subject'
-        );
-        $table_experius_emailcatcher->addColumn(
-            'body',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            [],
-            'Email Body'
-        );
-        $table_experius_emailcatcher->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-            null,
-            [],
-            'Created At'
-        );
-        $table_experius_emailcatcher->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Store Id'
-        );
-        $setup->getConnection()->createTable($table_experius_emailcatcher);
-        $setup->endSetup();
-    }
-}
diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
deleted file mode 100644
index 75eb677..0000000
--- a/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * A Magento 2 module named Experius/EmailCatcher
- * Copyright (C) 2019 Experius
- *
- * This file included in Experius/EmailCatcher is licensed under OSL 3.0
- *
- * http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- * Please see LICENSE.txt for the full text of the OSL 3.0 license
- */
-namespace Experius\EmailCatcher\Setup;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public function upgrade(
-        SchemaSetupInterface $setup,
-        ModuleContextInterface $context
-    ) {
-        if (version_compare($context->getVersion(), "1.0.1", "<")) {
-            $connection = $setup->getConnection();
-            if (!$connection->tableColumnExists($setup->getTable('experius_emailcatcher'), 'recipient')) {
-                $connection->changeColumn(
-                    $setup->getTable('experius_emailcatcher'),
-                    'to',
-                    'recipient',
-                    ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT]
-                );
-            }
-            if (!$connection->tableColumnExists($setup->getTable('experius_emailcatcher'), 'sender')) {
-                $connection->changeColumn(
-                    $setup->getTable('experius_emailcatcher'),
-                    'from',
-                    'sender',
-                    ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT]
-                );
-            }
-        }
-        if (version_compare($context->getVersion(), "1.0.2", "<")) {
-            $connection = $setup->getConnection();
-            if (!$connection->tableColumnExists($setup->getTable('experius_emailcatcher'), 'template_identifier')) {
-                $connection->addColumn(
-                    $setup->getTable('experius_emailcatcher'),
-                    'template_identifier',
-                    [
-                        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                        'nullable' => true,
-                        'comment' => 'Email Template Identifier'
-                    ]
-                );
-            }
-        }
-    }
-}
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
index 420a84b..dba46b4 100644
--- a/etc/db_schema.xml
+++ b/etc/db_schema.xml
@@ -1,16 +1,22 @@
 <?xml version="1.0"?>
-<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-  <table name="experius_emailcatcher" resource="default" engine="innodb" comment="experius_emailcatcher">
-    <column xsi:type="int" name="emailcatcher_id" padding="10" unsigned="true" nullable="false" identity="true" comment="Entity ID"/>
-    <column xsi:type="text" name="recipient" nullable="true" comment="To Email Address"/>
-    <column xsi:type="text" name="sender" nullable="true" comment="From Email Address"/>
-    <column xsi:type="text" name="subject" nullable="true" comment="Subject"/>
-    <column xsi:type="text" name="body" nullable="true" comment="Email Body"/>
-    <column xsi:type="text" name="template_identifier" nullable="true" comment="Email Template Identifier"/>
-    <column xsi:type="datetime" name="created_at" on_update="false" nullable="true" comment="Created At"/>
-    <column xsi:type="int" name="store_id" padding="11" unsigned="false" nullable="true" identity="false" comment="Store Id"/>
-    <constraint xsi:type="primary" referenceId="PRIMARY">
-      <column name="emailcatcher_id"/>
-    </constraint>
-  </table>
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="experius_emailcatcher" resource="default" engine="innodb" comment="experius_emailcatcher">
+        <column xsi:type="int" name="emailcatcher_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="text" name="recipient" nullable="true" comment="To Email Address"/>
+        <column xsi:type="text" name="sender" nullable="true" comment="From Email Address"/>
+        <column xsi:type="text" name="subject" nullable="true" comment="Subject"/>
+        <column xsi:type="text" name="body" nullable="true" comment="Email Body"/>
+        <column xsi:type="text" name="template_identifier" nullable="true" comment="Email Template Identifier"/>
+        <column xsi:type="datetime" name="created_at" on_update="false" nullable="true" comment="Created At"/>
+        <column xsi:type="int" name="store_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Store Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="emailcatcher_id"/>
+            <column name="emailcatcher_id"/>
+        </constraint>
+        <column xsi:type="text" name="to" nullable="true" comment="To Email Address"/>
+        <column xsi:type="text" name="from" nullable="true" comment="From Email Address"/>
+    </table>
 </schema>
diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
new file mode 100644
index 0000000..47a11b6
--- /dev/null
+++ b/etc/db_schema_whitelist.json
@@ -0,0 +1,19 @@
+{
+    "experius_emailcatcher": {
+        "column": {
+            "emailcatcher_id": true,
+            "recipient": true,
+            "sender": true,
+            "subject": true,
+            "body": true,
+            "template_identifier": true,
+            "created_at": true,
+            "store_id": true,
+            "to": true,
+            "from": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file