diff --git a/LANCommander/LANCommander.csproj b/LANCommander/LANCommander.csproj
index 959f468..05532e1 100644
--- a/LANCommander/LANCommander.csproj
+++ b/LANCommander/LANCommander.csproj
@@ -41,6 +41,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.11" />
     <PackageReference Include="MudBlazor" Version="6.1.8" />
     <PackageReference Include="rix0rrr.BeaconLib" Version="1.0.2" />
+    <PackageReference Include="swashbuckle" Version="5.6.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
     <PackageReference Include="YamlDotNet" Version="12.3.1" />
   </ItemGroup>
diff --git a/LANCommander/Program.cs b/LANCommander/Program.cs
index 348b801..bd73b70 100644
--- a/LANCommander/Program.cs
+++ b/LANCommander/Program.cs
@@ -19,8 +19,12 @@ ConfigurationManager configuration = builder.Configuration;
 var connectionString = builder.Configuration.GetConnectionString("DefaultConnection");
 var settings = SettingService.GetSettings();
 
+builder.Services.AddMvc(options => options.EnableEndpointRouting = false);
 builder.Services.AddRazorPages();
-builder.Services.AddServerSideBlazor();
+builder.Services.AddServerSideBlazor().AddCircuitOptions(option =>
+{
+    option.DetailedErrors = true;
+});
 
 builder.WebHost.ConfigureKestrel(options =>
 {
@@ -66,11 +70,14 @@ builder.Services.AddAuthentication(options =>
         };
     });
 
-builder.Services.AddControllersWithViews().AddJsonOptions(x =>
+builder.Services.AddControllers().AddJsonOptions(x =>
 {
     x.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles;
 });
 
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
 builder.Services.AddMudServices(config =>
 {
     config.SnackbarConfiguration.PositionClass = Defaults.Classes.Position.BottomLeft;
@@ -84,6 +91,8 @@ builder.Services.AddMudServices(config =>
     config.SnackbarConfiguration.SnackbarVariant = Variant.Filled;
 });
 
+builder.Services.AddHttpClient();
+
 builder.Services.AddScoped<SettingService>();
 builder.Services.AddScoped<ArchiveService>();
 builder.Services.AddScoped<CategoryService>();
@@ -106,6 +115,8 @@ var app = builder.Build();
 if (app.Environment.IsDevelopment())
 {
     app.UseMigrationsEndPoint();
+    app.UseSwagger();
+    app.UseSwaggerUI();
 }
 else
 {
@@ -122,9 +133,14 @@ app.UseRouting();
 app.UseAuthentication();
 app.UseAuthorization();
 
-app.MapControllers();
-app.MapBlazorHub();
-app.MapFallbackToPage("/_Host");
+app.UseMvcWithDefaultRoute();
+
+app.UseEndpoints(endpoints =>
+{
+    endpoints.MapBlazorHub();
+    endpoints.MapFallbackToPage("/_Host");
+    endpoints.MapControllers();
+});
 
 if (!Directory.Exists("Upload"))
     Directory.CreateDirectory("Upload");