diff --git a/src/Linna/Authorization/PermissionExtendedMapperInterface.php b/src/Linna/Authorization/PermissionExtendedMapperInterface.php
index 2715841..9feb796 100644
--- a/src/Linna/Authorization/PermissionExtendedMapperInterface.php
+++ b/src/Linna/Authorization/PermissionExtendedMapperInterface.php
@@ -12,14 +12,14 @@
 
 namespace Linna\Authorization;
 
-use Linna\DataMapper\FetchByNameInterface;
-use Linna\DataMapper\MapperInterface;
+//use Linna\DataMapper\FetchByNameInterface;
+//use Linna\DataMapper\MapperInterface;
 
 /**
  * Permission Extended Mapper Interface.
  *
  * <p>Contain methods required from concrete permission mapper.</p>
  */
-interface PermissionExtendedMapperInterface extends MapperInterface, FetchByNameInterface, FetchByUserInterface, FetchByRoleInterface
+interface PermissionExtendedMapperInterface extends PermissionMapperInterface
 {
 }
diff --git a/src/Linna/Authorization/RoleExtendedMapperInterface.php b/src/Linna/Authorization/RoleExtendedMapperInterface.php
index 6c03f77..09a9525 100644
--- a/src/Linna/Authorization/RoleExtendedMapperInterface.php
+++ b/src/Linna/Authorization/RoleExtendedMapperInterface.php
@@ -14,16 +14,17 @@
 
 use Linna\Authorization\User;
 use Linna\Authorization\Permission;
-use Linna\Authorization\RoleExtendedExtended;
-use Linna\DataMapper\MapperInterface;
-use Linna\DataMapper\FetchByNameInterface;
+use Linna\Authorization\RoleExtended;
+
+//use Linna\DataMapper\MapperInterface;
+//use Linna\DataMapper\FetchByNameInterface;
 
 /**
  * Role Extended Mapper Interface.
  *
  * Contain methods required from concrete RoleExtended Mapper.
  */
-interface RoleExtendedMapperInterface extends MapperInterface, FetchByNameInterface, FetchByPermissionInterface, FetchByUserInterface
+interface RoleExtendedMapperInterface extends RoleMapperInterface
 {
     /**
      * Grant a permission at role.
diff --git a/src/Linna/Authorization/UserExtendedMapperInterface.php b/src/Linna/Authorization/UserExtendedMapperInterface.php
index c5c234f..2431f8d 100644
--- a/src/Linna/Authorization/UserExtendedMapperInterface.php
+++ b/src/Linna/Authorization/UserExtendedMapperInterface.php
@@ -15,15 +15,16 @@
 use Linna\Authorization\UserExtended;
 use Linna\Authorization\Permission;
 use Linna\Authorization\Role;
-use Linna\DataMapper\MapperInterface;
-use Linna\DataMapper\FetchByNameInterface;
+
+//use Linna\DataMapper\MapperInterface;
+//use Linna\DataMapper\FetchByNameInterface;
 
 /**
  * User Mapper Interface.
  *
  * Contains methods required from concrete User Mapper.
  */
-interface UserExtendedMapperInterface extends MapperInterface, FetchByNameInterface, FetchByPermissionInterface, FetchByRoleInterface
+interface UserExtendedMapperInterface extends UserMapperInterface
 {
     /**
      * Grant a permission to an user.