diff --git a/Core.Cerberos.BFF.Api/Controllers/AuthenticationController.cs b/Core.Cerberos.BFF.Api/Controllers/AuthenticationController.cs
index 0bec018..1afd0c3 100644
--- a/Core.Cerberos.BFF.Api/Controllers/AuthenticationController.cs
+++ b/Core.Cerberos.BFF.Api/Controllers/AuthenticationController.cs
@@ -52,11 +52,11 @@ namespace Core.Cerberos.BFF.Api.Controllers
 
                 if (tokenAdapter is not null && tokenAdapter.User is not null)
                 {
-                    tokenAdapter.User.Token = tokenService.GenerateAccessToken(tokenAdapter);
+                    var (token, modules) = tokenService.GenerateAccessToken(tokenAdapter);
 
                     await Handle(() => cerberosServiceClient.LoginUserService(new LoginUserRequest { Email = email }, cancellationToken)).ConfigureAwait(false);
 
-                    return Ok(tokenAdapter.User);
+                    return Ok(new { token, modules });
                 }
                 else
                 {
diff --git a/Core.Cerberos.BFF.Api/Core.Cerberos.BFF.Api.csproj b/Core.Cerberos.BFF.Api/Core.Cerberos.BFF.Api.csproj
index 9bef2d4..5bda6a9 100644
--- a/Core.Cerberos.BFF.Api/Core.Cerberos.BFF.Api.csproj
+++ b/Core.Cerberos.BFF.Api/Core.Cerberos.BFF.Api.csproj
@@ -7,10 +7,6 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Core.Cerberos.Adapters" Version="0.3.0-alpha0042" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Core.Cerberos.External\Core.Cerberos.External.csproj" />
   </ItemGroup>
diff --git a/Core.Cerberos.External/Core.Cerberos.External.csproj b/Core.Cerberos.External/Core.Cerberos.External.csproj
index 387eeac..7a830a5 100644
--- a/Core.Cerberos.External/Core.Cerberos.External.csproj
+++ b/Core.Cerberos.External/Core.Cerberos.External.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Core.Cerberos.Adapters" Version="0.3.0-alpha0042" />
+    <PackageReference Include="Cerberos.Building.Blocks" Version="0.0.3" />
     <PackageReference Include="Lib.Architecture.BuildingBlocks" Version="0.9.0-alpha0001" />
     <PackageReference Include="Refit" Version="8.0.0" />
   </ItemGroup>