diff --git a/base_external_dbsource_mssql/__manifest__.py b/base_external_dbsource_mssql/__manifest__.py
index 83b2e5ef..21ca3883 100644
--- a/base_external_dbsource_mssql/__manifest__.py
+++ b/base_external_dbsource_mssql/__manifest__.py
@@ -3,13 +3,14 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl).
 {
     "name": "External Database Source - MSSQL",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Tools",
     "author": "Daniel Reis, " "LasLabs, " "Odoo Community Association (OCA)",
+    "maintainers": ["anddago78"],
     "website": "https://github.com/OCA/server-backend",
     "license": "LGPL-3",
     "depends": ["base_external_dbsource_sqlite"],
-    "external_dependencies": {"python": ["pymssql<=2.2.5"]},
+    "external_dependencies": {"python": ["pymssql<=2.2.5", "sqlalchemy"]},
     "demo": ["demo/base_external_dbsource.xml"],
     "installable": True,
 }
diff --git a/base_external_dbsource_mssql/models/base_external_dbsource.py b/base_external_dbsource_mssql/models/base_external_dbsource.py
index b79c066f..31fe9076 100644
--- a/base_external_dbsource_mssql/models/base_external_dbsource.py
+++ b/base_external_dbsource_mssql/models/base_external_dbsource.py
@@ -4,12 +4,7 @@
 
 import pymssql
 
-from odoo import models
-
-from odoo.addons.base_external_dbsource.models import base_external_dbsource
-
-CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS
-CONNECTORS.append(("mssql", "Microsoft SQL Server"))
+from odoo import fields, models
 
 assert pymssql
 
@@ -19,6 +14,9 @@ class BaseExternalDbsource(models.Model):
 
     _inherit = "base.external.dbsource"
 
+    connector = fields.Selection(
+        selection_add=[("mssql", "Microsoft SQL Server")], ondelete={"mssql": "cascade"}
+    )
     PWD_STRING_MSSQL = "Password=%s;"
 
     def connection_close_mssql(self, connection):
diff --git a/base_external_dbsource_mssql/readme/CONTRIBUTORS.rst b/base_external_dbsource_mssql/readme/CONTRIBUTORS.rst
index 0d2405cf..f2635f46 100644
--- a/base_external_dbsource_mssql/readme/CONTRIBUTORS.rst
+++ b/base_external_dbsource_mssql/readme/CONTRIBUTORS.rst
@@ -4,3 +4,4 @@
 * Dave Lasley <dave@laslabs.com>
 * `Tecnativa <https://www.tecnativa.com>`_:
     * Sergio Teruel
+* Andrea Cattalani (`Moduon <https://www.moduon.team/>`__)
diff --git a/base_external_dbsource_mssql/tests/test_base_external_dbsource.py b/base_external_dbsource_mssql/tests/test_base_external_dbsource.py
index 884b84d1..144e05cf 100644
--- a/base_external_dbsource_mssql/tests/test_base_external_dbsource.py
+++ b/base_external_dbsource_mssql/tests/test_base_external_dbsource.py
@@ -1,6 +1,6 @@
 # Copyright 2016 LasLabs Inc.
 
-import mock
+from unittest import mock
 
 from odoo.tests import common
 
diff --git a/requirements.txt b/requirements.txt
index 867daed4..88328f65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 # generated from manifests external_dependencies
+pymssql<=2.2.5
 sqlalchemy
diff --git a/setup/base_external_dbsource_mssql/odoo/addons/base_external_dbsource_mssql b/setup/base_external_dbsource_mssql/odoo/addons/base_external_dbsource_mssql
new file mode 120000
index 00000000..9a9b864e
--- /dev/null
+++ b/setup/base_external_dbsource_mssql/odoo/addons/base_external_dbsource_mssql
@@ -0,0 +1 @@
+../../../../base_external_dbsource_mssql
\ No newline at end of file
diff --git a/setup/base_external_dbsource_mssql/setup.py b/setup/base_external_dbsource_mssql/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/base_external_dbsource_mssql/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)