diff --git a/Resources/config/doctrine/AccessToken.mongodb.xml b/Resources/config/doctrine/AccessToken.mongodb.xml
new file mode 100644
index 00000000..214d7fe0
--- /dev/null
+++ b/Resources/config/doctrine/AccessToken.mongodb.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping"
+                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
+                        http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
+
+    <mapped-superclass name="FOS\OAuthServerBundle\Document\AccessToken">
+        <field name="token" fieldName="token" type="string" />
+        <field name="expiresAt" fieldName="expiresAt" type="int" nullable="true" />
+        <field name="scope" fieldName="scope" type="string" nullable="true" />
+    </mapped-superclass>
+</doctrine-mongo-mapping>
\ No newline at end of file
diff --git a/Resources/config/doctrine/AuthCode.mongodb.xml b/Resources/config/doctrine/AuthCode.mongodb.xml
new file mode 100644
index 00000000..ce1e88d9
--- /dev/null
+++ b/Resources/config/doctrine/AuthCode.mongodb.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping"
+                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
+                        http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
+
+    <mapped-superclass name="FOS\OAuthServerBundle\Document\AuthCode">
+        <field name="token" fieldName="token" type="string" />
+        <field name="redirectUri" fieldName="redirectUri" type="text" />
+        <field name="expiresAt" fieldName="expiresAt" type="int" nullable="true" />
+        <field name="scope" fieldName="scope" type="string" nullable="true" />
+    </mapped-superclass>
+</doctrine-mongo-mapping>
\ No newline at end of file
diff --git a/Resources/config/doctrine/Client.mongodb.xml b/Resources/config/doctrine/Client.mongodb.xml
new file mode 100644
index 00000000..179a2ffa
--- /dev/null
+++ b/Resources/config/doctrine/Client.mongodb.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping"
+                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
+                        http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
+
+    <mapped-superclass name="FOS\OAuthServerBundle\Document\Client">
+        <field name="randomId" fieldName="randomId" type="string" />
+        <field name="redirectUris" fieldName="redirectUris" type="hash" />
+        <field name="secret" fieldName="secret" type="string" />
+        <field name="allowedGrantTypes" fieldName="allowedGrantTypes" type="hash" />
+    </mapped-superclass>
+</doctrine-mongo-mapping>
\ No newline at end of file
diff --git a/Resources/config/odm.xml b/Resources/config/odm.xml
index f83677fb..808809fb 100644
--- a/Resources/config/odm.xml
+++ b/Resources/config/odm.xml
@@ -7,6 +7,7 @@
     <parameters>
         <parameter key="fos_oauth_server.model.client.manager.class">FOS\OAuthServerBundle\Document\ClientManager</parameter>
         <parameter key="fos_oauth_server.model.access.token.manager.class">FOS\OAuthServerBundle\Document\AccessTokenManager</parameter>
+        <parameter key="fos_oauth_server.model.auth.code.manager.class">FOS\OAuthServerBundle\Document\AuthCodeManager</parameter>
     </parameters>
 
     <services>
@@ -19,5 +20,10 @@
             <argument type="service" id="doctrine.odm.mongodb.document_manager" />
             <argument>%fos_oauth_server.model.access.token.class%</argument>
         </service>
+
+        <service id="fos_oauth_server.auth.code.manager.default" class="%fos_oauth_server.model.auth.code.manager.class%">
+            <argument type="service" id="doctrine.odm.mongodb.document_manager" />
+            <argument>%fos_oauth_server.model.auth.code.class%</argument>
+        </service>
     </services>
 </container>