diff --git a/DeepDrftManager/Components/Pages/Cms/Index.razor b/DeepDrftManager/Components/Pages/Cms/Index.razor
index dae54cd..f3283ef 100644
--- a/DeepDrftManager/Components/Pages/Cms/Index.razor
+++ b/DeepDrftManager/Components/Pages/Cms/Index.razor
@@ -1,7 +1,5 @@
 @page "/cms"
 @rendermode InteractiveServer
-@using AuthBlocksWeb.HierarchicalAuthorize
-@using AuthBlocksModels.SystemDefinitions
 @attribute [HierarchicalRoleAuthorize([SystemRoleConstants.Admin])]
 
 <PageTitle>DeepDrft CMS</PageTitle>
diff --git a/DeepDrftManager/Components/Pages/Index.razor b/DeepDrftManager/Components/Pages/Index.razor
index ed10f52..78e98ef 100644
--- a/DeepDrftManager/Components/Pages/Index.razor
+++ b/DeepDrftManager/Components/Pages/Index.razor
@@ -1,7 +1,6 @@
 @page "/"
 @rendermode InteractiveServer
-@using AuthBlocksWeb.HierarchicalAuthorize
-@attribute [HierarchicalRoleAuthorize("Admin")]
+@attribute [HierarchicalRoleAuthorize([SystemRoleConstants.Admin])]
 @inject NavigationManager NavigationManager
 
 @code {
diff --git a/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor b/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
index da10b7d..3884fb5 100644
--- a/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
@@ -1,12 +1,10 @@
 @page "/cms/tracks/{Id:int}"
-@using AuthBlocksWeb.HierarchicalAuthorize
-@using AuthBlocksWeb.Services
 @using System.Net.Http.Headers
 @using System.Net.Http.Json
-@attribute [HierarchicalRoleAuthorize("Admin")]
+@attribute [HierarchicalRoleAuthorize([SystemRoleConstants.Admin])]
 @inject ITrackService TrackService
 @inject IHttpClientFactory HttpClientFactory
-@inject ITokenService TokenService
+@inject IAuthSession AuthSession
 @inject ISnackbar Snackbar
 @inject IDialogService DialogService
 @inject NavigationManager Nav
@@ -203,7 +201,7 @@
 
     private async Task AttachBearerAsync(HttpClient http)
     {
-        var token = await TokenService.GetAccessTokenAsync();
+        var token = await AuthSession.GetValidTokenAsync();
         if (!string.IsNullOrEmpty(token))
         {
             http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
diff --git a/DeepDrftManager/Components/Pages/Tracks/TrackList.razor b/DeepDrftManager/Components/Pages/Tracks/TrackList.razor
index a20b7e7..1762f2d 100644
--- a/DeepDrftManager/Components/Pages/Tracks/TrackList.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/TrackList.razor
@@ -1,11 +1,10 @@
 @page "/cms/tracks"
 @using System.Net
 @using System.Net.Http.Headers
-@using AuthBlocksWeb.HierarchicalAuthorize
-@attribute [HierarchicalRoleAuthorize("Admin")]
+@attribute [HierarchicalRoleAuthorize([SystemRoleConstants.Admin])]
 @inject ITrackService TrackService
 @inject IHttpClientFactory HttpClientFactory
-@inject AuthBlocksWeb.Services.ITokenService TokenService
+@inject IAuthSession AuthSession
 @inject IDialogService DialogService
 @inject ISnackbar Snackbar
 @inject ILogger<TrackList> Logger
@@ -115,7 +114,7 @@
         try
         {
             var client = HttpClientFactory.CreateClient("DeepDrft.API");
-            var token = await TokenService.GetAccessTokenAsync();
+            var token = await AuthSession.GetValidTokenAsync();
             if (!string.IsNullOrEmpty(token))
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             var response = await client.DeleteAsync($"api/cms/track/{track.Id}");
diff --git a/DeepDrftManager/Components/Pages/Tracks/TrackNew.razor b/DeepDrftManager/Components/Pages/Tracks/TrackNew.razor
index 085e554..5ca1140 100644
--- a/DeepDrftManager/Components/Pages/Tracks/TrackNew.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/TrackNew.razor
@@ -1,7 +1,6 @@
 @page "/cms/tracks/new"
 @using System.Net.Http.Headers
-@using AuthBlocksWeb.HierarchicalAuthorize
-@attribute [HierarchicalRoleAuthorize("Admin")]
+@attribute [HierarchicalRoleAuthorize([SystemRoleConstants.Admin])]
 
 @inject IHttpClientFactory HttpClientFactory
 @inject NavigationManager Navigation
diff --git a/DeepDrftManager/Components/Shared/DeleteTrackDialog.razor b/DeepDrftManager/Components/Shared/DeleteTrackDialog.razor
index 367ba81..65bae87 100644
--- a/DeepDrftManager/Components/Shared/DeleteTrackDialog.razor
+++ b/DeepDrftManager/Components/Shared/DeleteTrackDialog.razor
@@ -2,7 +2,7 @@
 @using System.Net.Http.Headers
 @using Microsoft.AspNetCore.Components
 @inject IHttpClientFactory HttpClientFactory
-@inject AuthBlocksWeb.Services.ITokenService TokenService
+@inject IAuthSession AuthSession
 
 <MudDialog>
     <DialogContent>
@@ -51,7 +51,7 @@
         try
         {
             var client = HttpClientFactory.CreateClient("DeepDrft.API");
-            var token = await TokenService.GetAccessTokenAsync();
+            var token = await AuthSession.GetValidTokenAsync();
             if (!string.IsNullOrEmpty(token))
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             var response = await client.DeleteAsync($"api/cms/track/{TrackId}");
diff --git a/DeepDrftManager/Components/_Imports.razor b/DeepDrftManager/Components/_Imports.razor
index d3c559c..cd6df25 100644
--- a/DeepDrftManager/Components/_Imports.razor
+++ b/DeepDrftManager/Components/_Imports.razor
@@ -14,3 +14,6 @@
 @using DeepDrftModels.Entities
 @using DeepDrftData
 @using Models.Common
+@using AuthBlocksModels.SystemDefinitions
+@using AuthBlocksWeb.HierarchicalAuthorize
+@using AuthBlocksWeb.Services
diff --git a/DeepDrftManager/DeepDrftManager.csproj b/DeepDrftManager/DeepDrftManager.csproj
index ae9d350..22d11d4 100644
--- a/DeepDrftManager/DeepDrftManager.csproj
+++ b/DeepDrftManager/DeepDrftManager.csproj
@@ -12,8 +12,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
     <PackageReference Include="MudBlazor" Version="8.15.0" />
-    <PackageReference Include="Cerebellum.AuthBlocks" Version="10.3.32" />
-    <PackageReference Include="Cerebellum.AuthBlocks.Web" Version="10.3.32" />
+    <PackageReference Include="Cerebellum.AuthBlocks" Version="10.3.33" />
+    <PackageReference Include="Cerebellum.AuthBlocks.Web" Version="10.3.33" />
   </ItemGroup>
 
   <ItemGroup>