1 files changed, 12 insertions, 5 deletions

diff --git a/src/mailman_pgp/model/base.py b/src/mailman_pgp/model/base.py
index 0a87a53..2ccc7e5 100644
--- a/src/mailman_pgp/model/base.py
+++ b/src/mailman_pgp/model/base.py
@@ -18,11 +18,18 @@
 """"""
 
 from public import public
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.declarative import as_declarative
 
+from mailman_pgp.database import query
 
-Base = declarative_base()
-public(Base=Base)
 
-from mailman_pgp.model.address import EncryptedAddress # noqa
-from mailman_pgp.model.list import EncryptedMailingList # noqa
+@public
+@as_declarative()
+class Base:
+
+    def query(self):
+        return query(self.__class__)
+
+
+from mailman_pgp.model.address import PGPAddress # noqa
+from mailman_pgp.model.list import PGPMailingList # noqa