diff --git a/Module.php b/Module.php
index 4a5a57a..d439408 100644
--- a/Module.php
+++ b/Module.php
@@ -13,11 +13,6 @@ public function onBootstrap($e)
         $sm      = $app->getServiceManager();
         $options = $sm->get('zfcuser_module_options');
 
-        // Add the default entity driver only if specified in configuration
-        if ($options->getEnableDefaultEntities()) {
-            $chain = $sm->get('doctrine.driver.odm_default');
-            $chain->addDriver(new XmlDriver(__DIR__ . '/config/xml'), 'ZfcUserDoctrineMongoODM\Document');
-        }
     }
 
     public function getAutoloaderConfig()
diff --git a/composer.json b/composer.json
index 6727aad..ffa1aa8 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "zf-commons/zfc-user": "0.*",
-        "doctrine/doctrine-mongo-odm-module": "~0.9.1"
+        "zf-commons/zfc-user": "3.*",
+        "doctrine/doctrine-mongo-odm-module": "^1.0"
     },
     "minimum-stability": "dev",
     "extra": {
diff --git a/config/xml/ZfcUserDoctrineMongoODM.Document.UserMappedSuperClass.dcm.xml b/config/xml/ZfcUserDoctrineMongoODM.Document.UserMappedSuperClass.dcm.xml
index 26a847a..7e3d7d3 100644
--- a/config/xml/ZfcUserDoctrineMongoODM.Document.UserMappedSuperClass.dcm.xml
+++ b/config/xml/ZfcUserDoctrineMongoODM.Document.UserMappedSuperClass.dcm.xml
@@ -10,9 +10,9 @@
         
         <field fieldName="username" type="string" unique="true" nullable="true" />
         <field fieldName="email" type="string" unique="true" length="100" />
-        <field fieldName="display_name" type="string" length="50" nullable="true" />
+        <field fieldName="displayName" type="string" length="50" nullable="true" />
         <field fieldName="password" type="string" length="128" />
 
     </mapped-superclass>
 
-</doctrine-mongo-mapping>
\ No newline at end of file
+</doctrine-mongo-mapping>
diff --git a/src/ZfcUserDoctrineMongoODM/Mapper/UserMongoDB.php b/src/ZfcUserDoctrineMongoODM/Mapper/UserMongoDB.php
index c901be5..cd321b7 100644
--- a/src/ZfcUserDoctrineMongoODM/Mapper/UserMongoDB.php
+++ b/src/ZfcUserDoctrineMongoODM/Mapper/UserMongoDB.php
@@ -71,19 +71,17 @@ public function persist($document)
         $dm->flush();
     }
     
-    public function insert($document, $tableName = null, HydratorInterface $hydrator = null)
+    public function insert(\ZfcUser\Entity\UserInterface $user)
     {
-        $this->dm->persist($document);
+        $this->dm->persist($user);
         $this->dm->flush();
     }
 
-    public function update($document, $where = null, $tableName = null, HydratorInterface $hydrator = null)
+    public function update(\ZfcUser\Entity\UserInterface $user)
     {
-        if (!$where) {
-            $where = 'id = ' . $document->getId();
-        }
+       
 
-        $this->dm->persist($document);
+        $this->dm->persist($user);
         $this->dm->flush();
     }
 }