diff --git a/src/Entity/AccessTokenRepository.php b/src/Entity/AccessTokenRepository.php
index 2be87c2d..303bfc3a 100644
--- a/src/Entity/AccessTokenRepository.php
+++ b/src/Entity/AccessTokenRepository.php
@@ -12,6 +12,7 @@
 namespace AuthBucket\Bundle\OAuth2Bundle\Entity;
 
 use AuthBucket\OAuth2\Model\AccessTokenManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * AccessTokenRepository.
@@ -19,6 +20,7 @@
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class AccessTokenRepository extends AbstractEntityRepository implements AccessTokenManagerInterface
+class AccessTokenRepository extends EntityRepository implements AccessTokenManagerInterface
 {
+    use ModelManagerEntityRepository;
 }
diff --git a/src/Entity/AuthorizeRepository.php b/src/Entity/AuthorizeRepository.php
index 8a1b6e6b..d1ecf936 100644
--- a/src/Entity/AuthorizeRepository.php
+++ b/src/Entity/AuthorizeRepository.php
@@ -12,6 +12,7 @@
 namespace AuthBucket\Bundle\OAuth2Bundle\Entity;
 
 use AuthBucket\OAuth2\Model\AuthorizeManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * AuthorizeRepository.
@@ -19,6 +20,7 @@
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class AuthorizeRepository extends AbstractEntityRepository implements AuthorizeManagerInterface
+class AuthorizeRepository extends EntityRepository implements AuthorizeManagerInterface
 {
+    use ModelManagerEntityRepository;
 }
diff --git a/src/Entity/ClientRepository.php b/src/Entity/ClientRepository.php
index 9df65f72..a00eb1e1 100644
--- a/src/Entity/ClientRepository.php
+++ b/src/Entity/ClientRepository.php
@@ -12,6 +12,7 @@
 namespace AuthBucket\Bundle\OAuth2Bundle\Entity;
 
 use AuthBucket\OAuth2\Model\ClientManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * ClientRepository.
@@ -19,6 +20,7 @@
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class ClientRepository extends AbstractEntityRepository implements ClientManagerInterface
+class ClientRepository extends EntityRepository implements ClientManagerInterface
 {
+    use ModelManagerEntityRepository;
 }
diff --git a/src/Entity/CodeRepository.php b/src/Entity/CodeRepository.php
index fb91ebf9..7e0d5b1b 100644
--- a/src/Entity/CodeRepository.php
+++ b/src/Entity/CodeRepository.php
@@ -12,6 +12,7 @@
 namespace AuthBucket\Bundle\OAuth2Bundle\Entity;
 
 use AuthBucket\OAuth2\Model\CodeManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * CodeRepository.
@@ -19,6 +20,7 @@
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class CodeRepository extends AbstractEntityRepository implements CodeManagerInterface
+class CodeRepository extends EntityRepository implements CodeManagerInterface
 {
+    use ModelManagerEntityRepository;
 }
diff --git a/src/Entity/AbstractEntityRepository.php b/src/Entity/ModelManagerEntityRepository.php
similarity index 94%
rename from src/Entity/AbstractEntityRepository.php
rename to src/Entity/ModelManagerEntityRepository.php
index 600a701b..5476220c 100644
--- a/src/Entity/AbstractEntityRepository.php
+++ b/src/Entity/ModelManagerEntityRepository.php
@@ -21,7 +21,7 @@
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class AbstractEntityRepository extends EntityRepository implements ModelManagerInterface
+trait ModelManagerEntityRepository
 {
     public function createModel(ModelInterface $model)
     {
diff --git a/src/Entity/RefreshTokenRepository.php b/src/Entity/RefreshTokenRepository.php
index 186ccb06..4b279b51 100644
--- a/src/Entity/RefreshTokenRepository.php
+++ b/src/Entity/RefreshTokenRepository.php
@@ -12,6 +12,7 @@
 namespace AuthBucket\Bundle\OAuth2Bundle\Entity;
 
 use AuthBucket\OAuth2\Model\RefreshTokenManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * RefreshTokenRepository.
@@ -19,6 +20,7 @@
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class RefreshTokenRepository extends AbstractEntityRepository implements RefreshTokenManagerInterface
+class RefreshTokenRepository extends EntityRepository implements RefreshTokenManagerInterface
 {
+    use ModelManagerEntityRepository;
 }
diff --git a/src/Entity/ScopeRepository.php b/src/Entity/ScopeRepository.php
index e2ca819d..64d89318 100644
--- a/src/Entity/ScopeRepository.php
+++ b/src/Entity/ScopeRepository.php
@@ -12,6 +12,7 @@
 namespace AuthBucket\Bundle\OAuth2Bundle\Entity;
 
 use AuthBucket\OAuth2\Model\ScopeManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * ScopeRepository.
@@ -19,6 +20,7 @@
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class ScopeRepository extends AbstractEntityRepository implements ScopeManagerInterface
+class ScopeRepository extends EntityRepository implements ScopeManagerInterface
 {
+    use ModelManagerEntityRepository;
 }
diff --git a/tests/TestBundle/Entity/UserRepository.php b/tests/TestBundle/Entity/UserRepository.php
index 70a73810..735905a8 100644
--- a/tests/TestBundle/Entity/UserRepository.php
+++ b/tests/TestBundle/Entity/UserRepository.php
@@ -11,7 +11,9 @@
 
 namespace AuthBucket\Bundle\OAuth2Bundle\Tests\TestBundle\Entity;
 
-use AuthBucket\Bundle\OAuth2Bundle\Entity\AbstractEntityRepository;
+use AuthBucket\Bundle\OAuth2Bundle\Entity\ModelManagerEntityRepository;
+use AuthBucket\OAuth2\Model\ModelManagerInterface;
+use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -22,8 +24,10 @@
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class UserRepository extends AbstractEntityRepository implements UserLoaderInterface
+class UserRepository extends EntityRepository implements UserLoaderInterface, ModelManagerInterface
 {
+    use ModelManagerEntityRepository;
+
     public function createUser()
     {
         $class = $this->getClassName();