diff --git a/composer.json b/composer.json
index b637d03..b58bd0f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "zf-commons/zfc-user-doctrine-orm",
+    "name": "lexxur/zfc-user-doctrine-orm",
     "description": "Doctrine2 ORM storage adapter for ZfcUser.",
     "type": "library",
     "license": "BSD-3-Clause",
@@ -11,20 +11,15 @@
     "homepage": "https://github.com/ZF-Commons/ZfcUserDoctrineORM",
     "authors": [
         {
-            "name": "Evan Coury",
-            "email": "me@evancoury.com",
-            "homepage": "http://blog.evan.pro/"
-        },
-        {
-            "name": "Kyle Spraggs",
-            "email": "theman@spiffyjr.me",
-            "homepage": "http://www.spiffyjr.me/"
+            "name": "Andrey Oprokidnev",
+            "email": "oprokidnev@gmail.com",
+            "homepage": "http://oprokidnev.ru/"
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": "^7.1",
         "zf-commons/zfc-user": "*",
-        "doctrine/doctrine-orm-module": "~1.0"
+        "doctrine/doctrine-orm-module": "~1.0 || dev-master"
     },
     "autoload": {
         "psr-0": {
@@ -33,5 +28,10 @@
         "classmap": [
             "./"
         ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1.x-dev"
+        }
     }
 }
diff --git a/src/ZfcUserDoctrineORM/Mapper/User.php b/src/ZfcUserDoctrineORM/Mapper/User.php
index 5def5f3..04ae46e 100644
--- a/src/ZfcUserDoctrineORM/Mapper/User.php
+++ b/src/ZfcUserDoctrineORM/Mapper/User.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use ZfcUser\Mapper\User as ZfcUserMapper;
 use ZfcUserDoctrineORM\Options\ModuleOptions;
-use Zend\Stdlib\Hydrator\HydratorInterface;
+use Zend\Hydrator\HydratorInterface;
 
 class User extends ZfcUserMapper
 {
@@ -46,12 +46,12 @@ public function findById($id)
         return $er->find($id);
     }
 
-    public function insert($entity, $tableName = null, HydratorInterface $hydrator = null)
+    public function insert(\ZfcUser\Entity\UserInterface $entity, $tableName = null, HydratorInterface $hydrator = null)
     {
         return $this->persist($entity);
     }
 
-    public function update($entity, $where = null, $tableName = null, HydratorInterface $hydrator = null)
+    public function update(\ZfcUser\Entity\UserInterface $entity, $where = null, $tableName = null, HydratorInterface $hydrator = null)
     {
         return $this->persist($entity);
     }