diff --git a/lib/Controllers/DefaultController.php b/lib/Controllers/DefaultController.php
index 4b13d2e..5bfe5b9 100644
--- a/lib/Controllers/DefaultController.php
+++ b/lib/Controllers/DefaultController.php
@@ -13,8 +13,8 @@ use InvalidArgumentException;
 use KTXC\Http\Response\JsonResponse;
 use KTXC\Http\Response\Response;
 use KTXC\Http\Response\StreamedNdJsonResponse;
-use KTXC\SessionIdentity;
-use KTXC\SessionTenant;
+use KTXC\Context\IdentityContextInterface;
+use KTXC\Context\TenantContextInterface;
 use KTXF\Controller\ControllerAbstract;
 use KTXF\Json\JsonSerializable;
 use KTXF\Resource\Identifier\CollectionIdentifier;
@@ -51,8 +51,8 @@ class DefaultController extends ControllerAbstract {
     private const ERR_TARGET_ENTITY = 'Invalid parameter: target must be provider:service:collection:entity';
 
     public function __construct(
-        private readonly SessionTenant $tenantIdentity,
-        private readonly SessionIdentity $userIdentity,
+        private readonly TenantContextInterface $tenantContext,
+        private readonly IdentityContextInterface $identityContext,
         private readonly Manager $manager,
         private readonly LoggerInterface $logger
     ) {}
@@ -80,8 +80,8 @@ class DefaultController extends ControllerAbstract {
     ): Response {
 
         // authorize request
-        $tenantId = $this->tenantIdentity->identifier();
-        $userId = $this->userIdentity->identifier();
+        $tenantId = $this->tenantContext->identifier();
+        $userId = $this->identityContext->identifier();
 
         try {
 
diff --git a/lib/Controllers/TransferController.php b/lib/Controllers/TransferController.php
index cfd42dd..fa9a3f0 100644
--- a/lib/Controllers/TransferController.php
+++ b/lib/Controllers/TransferController.php
@@ -12,8 +12,8 @@ namespace KTXM\DocumentsManager\Controllers;
 use KTXC\Http\Response\JsonResponse;
 use KTXC\Http\Response\Response;
 use KTXC\Http\Response\StreamedResponse;
-use KTXC\SessionIdentity;
-use KTXC\SessionTenant;
+use KTXC\Context\IdentityContextInterface;
+use KTXC\Context\TenantContextInterface;
 use KTXF\Controller\ControllerAbstract;
 use KTXF\Documents\Collection\CollectionBaseInterface;
 use KTXF\Documents\Entity\EntityBaseInterface;
@@ -39,8 +39,8 @@ use Throwable;
 class TransferController extends ControllerAbstract
 {
     public function __construct(
-        private readonly SessionTenant $tenantIdentity,
-        private readonly SessionIdentity $userIdentity,
+        private readonly TenantContextInterface $tenantContext,
+        private readonly IdentityContextInterface $identityContext,
         private readonly Manager $manager,
         private readonly LoggerInterface $logger
     ) {}
@@ -56,8 +56,8 @@ class TransferController extends ControllerAbstract
         methods: ['GET']
     )]
     public function downloadEntity(string $provider, string $service, string $collection, string $identifier): Response {
-        $tenantId = $this->tenantIdentity->identifier();
-        $userId = $this->userIdentity->identifier();
+        $tenantId = $this->tenantContext->identifier();
+        $userId = $this->identityContext->identifier();
 
         try {
             $target = new EntityIdentifier($provider, $service, $collection, $identifier);
@@ -135,8 +135,8 @@ class TransferController extends ControllerAbstract
         methods: ['GET']
     )]
     public function downloadArchive(string $provider, string $service, array $ids = [], ?string $collection = null, string $name = 'download'): Response {
-        $tenantId = $this->tenantIdentity->identifier();
-        $userId = $this->userIdentity->identifier();
+        $tenantId = $this->tenantContext->identifier();
+        $userId = $this->identityContext->identifier();
 
         if (empty($ids)) {
             return new JsonResponse([
@@ -221,8 +221,8 @@ class TransferController extends ControllerAbstract
         methods: ['GET']
     )]
     public function downloadCollection(string $provider, string $service, string $identifier): Response {
-        $tenantId = $this->tenantIdentity->identifier();
-        $userId = $this->userIdentity->identifier();
+        $tenantId = $this->tenantContext->identifier();
+        $userId = $this->identityContext->identifier();
 
         try {
             // Fetch collection metadata