diff --git a/README.md b/README.md
index 6d35523..21058f0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Fastapi-SQLA
 
 [![codecov](https://codecov.io/gh/dialoguemd/fastapi-sqla/branch/master/graph/badge.svg?token=BQHLryClIn)](https://codecov.io/gh/dialoguemd/fastapi-sqla)
-[![CircleCI](https://circleci.com/gh/dialoguemd/fastapi-sqla.svg?style=svg&circle-token=998482f269270ee521aa54f2accbee2e22943743)](https://circleci.com/gh/dialoguemd/fastapi-sqla)
+[![CircleCI](https://dl.circleci.com/status-badge/img/gh/dialoguemd/fastapi-sqla/tree/master.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/dialoguemd/fastapi-sqla/tree/master)
 ![PyPI](https://img.shields.io/pypi/v/fastapi-sqla)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-brightgreen.svg)](https://conventionalcommits.org)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
diff --git a/fastapi_sqla/sqla.py b/fastapi_sqla/sqla.py
index b466bd6..17733a1 100644
--- a/fastapi_sqla/sqla.py
+++ b/fastapi_sqla/sqla.py
@@ -23,10 +23,12 @@
 from fastapi_sqla import aws_aurora_support, aws_rds_iam_support
 
 try:
-    from sqlalchemy.orm import declarative_base
+    from sqlalchemy.orm import DeclarativeBase
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
 
+    DeclarativeBase = declarative_base()  # type: ignore
+
 
 logger = structlog.get_logger(__name__)
 
@@ -67,7 +69,7 @@ def startup():
     logger.info("startup", engine=engine)
 
 
-class Base(declarative_base(cls=DeferredReflection)):  # type: ignore
+class Base(DeclarativeBase, DeferredReflection):
     __abstract__ = True