diff --git a/Server/Configurations/MapperInitializer.cs b/Server/Configurations/MapperInitializer.cs
index e4bc08a..652cc65 100644
--- a/Server/Configurations/MapperInitializer.cs
+++ b/Server/Configurations/MapperInitializer.cs
@@ -1,4 +1,3 @@
-using System.Dynamic;
 using AutoMapper;
 using Server.Models;
 using SharedModels.DataTransferObjects;
@@ -86,4 +85,4 @@ public class MapperInitializer : Profile
         CreateMap<RouteAddressDetails, RouteAddressDetailsInVehicleEnrollmentDto>().ReverseMap();
         CreateMap<RouteAddressDetails, CreateRouteAddressDetailsInVehicleEnrollmentDto>().ReverseMap();
     }
-}
\ No newline at end of file
+}
diff --git a/Server/Constants/Authorization.cs b/Server/Constants/Authorization.cs
deleted file mode 100644
index 75021d6..0000000
--- a/Server/Constants/Authorization.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Server.Constants;
-
-public class Authorization
-{
-    public enum Roles
-    {
-        Admin,
-        User
-    }
-
-    public const string DefaultUsername = "user";
-    public const string DefaultEmail = "user@email.com";
-    public const string DefaultPassword = "125ASgl^%@lsdgjk!@#%^12eas";
-    public const Roles DefaultRole = Roles.User;
-}
\ No newline at end of file
diff --git a/Server/Constants/Identity.cs b/Server/Constants/Identity.cs
new file mode 100644
index 0000000..a13f66e
--- /dev/null
+++ b/Server/Constants/Identity.cs
@@ -0,0 +1,17 @@
+namespace Server.Constants;
+
+public class Identity
+{
+    public enum Roles
+    {
+        User,
+        Driver,
+        Company,
+        Administrator
+    }
+
+    public const string DefaultUsername = "admin";
+    public const string DefaultEmail = "admin@subdomain.domain";
+    public const string DefaultPassword = "123qwe!@#QWE";
+    public const Roles DefaultRole = Roles.Administrator;
+}
diff --git a/Server/Controllers/AuthenticationController.cs b/Server/Controllers/AuthenticationController.cs
index 5e7e26a..e71a788 100644
--- a/Server/Controllers/AuthenticationController.cs
+++ b/Server/Controllers/AuthenticationController.cs
@@ -72,7 +72,7 @@ public class AuthenticationController : ControllerBase
         return Ok(authResponse);
     }
     
-    [Authorize(AuthenticationSchemes = "Bearer")]
+    [Authorize]
     [HttpPost("revoke-session")]
     public async Task<IActionResult> RevokeToken()
     {
diff --git a/Server/Controllers/CityController.cs b/Server/Controllers/CityController.cs
index 0fb24fc..e49f975 100644
--- a/Server/Controllers/CityController.cs
+++ b/Server/Controllers/CityController.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Server.Services;
@@ -6,6 +7,7 @@ using SharedModels.QueryParameters.Objects;
 
 namespace Server.Controllers;
 
+[Authorize]
 [Route("api/cities")]
 [ApiController]
 public class CityController : ControllerBase
@@ -17,6 +19,7 @@ public class CityController : ControllerBase
         _cityManagementService = cityManagementService;
     }
 
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpPost]
     public async Task<IActionResult> AddCity(CreateCityDto city)
     {
@@ -30,6 +33,7 @@ public class CityController : ControllerBase
         return CreatedAtAction(nameof(GetCity), new {id = result.city.Id}, result.city);
     }
 
+    [Authorize(Policy = "CompanyAccess")]
     [HttpGet]
     public async Task<IActionResult> GetCities([FromQuery] CityParameters parameters)
     {
@@ -45,6 +49,7 @@ public class CityController : ControllerBase
         return Ok(result.cities);
     }
     
+    [Authorize(Policy = "CompanyAccess")]
     [HttpGet("{id}")]
     public async Task<IActionResult> GetCity(int id, [FromQuery] string? fields)
     {
@@ -58,6 +63,7 @@ public class CityController : ControllerBase
         return Ok(result.city);
     }
 
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpPut("{id}")]
     public async Task<IActionResult> UpdateCountry(int id, UpdateCityDto city)
     {
@@ -76,6 +82,7 @@ public class CityController : ControllerBase
         return Ok(result.city);
     }
     
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpDelete("{id}")]
     public async Task<IActionResult> DeleteCountry(int id)
     {
diff --git a/Server/Controllers/CompanyController.cs b/Server/Controllers/CompanyController.cs
index a01e0a7..4120705 100644
--- a/Server/Controllers/CompanyController.cs
+++ b/Server/Controllers/CompanyController.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Server.Services;
@@ -6,6 +7,7 @@ using SharedModels.QueryParameters.Objects;
 
 namespace Server.Controllers;
 
+[Authorize]
 [Route("api/companies")]
 [ApiController]
 public class CompanyController : ControllerBase
@@ -17,6 +19,7 @@ public class CompanyController : ControllerBase
         _companyManagementService = companyManagementService;
     }
 
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpPost]
     public async Task<IActionResult> AddCompany(CreateCompanyDto company)
     {
@@ -30,6 +33,7 @@ public class CompanyController : ControllerBase
         return CreatedAtAction(nameof(GetCompany), new {id = result.company.Id}, result.company);
     }
 
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpGet]
     public async Task<IActionResult> GetCompanies([FromQuery] CompanyParameters parameters)
     {
@@ -45,6 +49,7 @@ public class CompanyController : ControllerBase
         return Ok(result.companies);
     }
     
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpGet("{id}")]
     public async Task<IActionResult> GetCompany(int id, [FromQuery] string? fields)
     {
@@ -58,6 +63,7 @@ public class CompanyController : ControllerBase
         return Ok(result.company);
     }
 
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpPut("{id}")]
     public async Task<IActionResult> UpdateCompany(int id, UpdateCompanyDto company)
     {
@@ -71,6 +77,7 @@ public class CompanyController : ControllerBase
         return Ok(result.company);
     }
     
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpDelete("{id}")]
     public async Task<IActionResult> DeleteCompany(int id)
     {
diff --git a/Server/Controllers/CountryController.cs b/Server/Controllers/CountryController.cs
index d4d353b..1e977f4 100644
--- a/Server/Controllers/CountryController.cs
+++ b/Server/Controllers/CountryController.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Server.Services;
@@ -6,6 +7,7 @@ using SharedModels.QueryParameters.Objects;
 
 namespace Server.Controllers;
 
+[Authorize]
 [Route("api/countries")]
 [ApiController]
 public class CountryController : ControllerBase
@@ -17,6 +19,7 @@ public class CountryController : ControllerBase
         _countryManagementService = countryManagementService;
     }
 
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpPost]
     public async Task<IActionResult> AddCountry(CreateCountryDto country)
     {
@@ -30,6 +33,7 @@ public class CountryController : ControllerBase
         return CreatedAtAction(nameof(GetCountry), new {id = result.country.Id}, result.country);
     }
 
+    [Authorize(Policy = "CompanyAccess")]
     [HttpGet]
     public async Task<IActionResult> GetCountries([FromQuery] CountryParameters parameters)
     {
@@ -45,6 +49,7 @@ public class CountryController : ControllerBase
         return Ok(result.countries);
     }
     
+    [Authorize(Policy = "CompanyAccess")]
     [HttpGet("{id}")]
     public async Task<IActionResult> GetCountry(int id, [FromQuery] string? fields)
     {
@@ -58,6 +63,7 @@ public class CountryController : ControllerBase
         return Ok(result.country);
     }
 
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpPut("{id}")]
     public async Task<IActionResult> UpdateCountry(int id, UpdateCountryDto country)
     {
@@ -71,6 +77,7 @@ public class CountryController : ControllerBase
         return Ok(result.country);
     }
     
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpDelete("{id}")]
     public async Task<IActionResult> DeleteCountry(int id)
     {
@@ -83,4 +90,4 @@ public class CountryController : ControllerBase
     
         return NoContent();
     }
-}
+}
\ No newline at end of file
diff --git a/Server/Controllers/StateController.cs b/Server/Controllers/StateController.cs
index c624589..7d63b47 100644
--- a/Server/Controllers/StateController.cs
+++ b/Server/Controllers/StateController.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Server.Services;
@@ -6,6 +7,7 @@ using SharedModels.QueryParameters.Objects;
 
 namespace Server.Controllers;
 
+[Authorize]
 [Route("api/states")] 
 [ApiController] 
 public class StateController : ControllerBase 
@@ -17,6 +19,7 @@ public class StateController : ControllerBase
         _stateManagementService = stateManagementService;
     }
 
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpPost]
     public async Task<IActionResult> AddState(CreateStateDto state)
     {
@@ -30,6 +33,7 @@ public class StateController : ControllerBase
         return CreatedAtAction(nameof(GetState), new {id = result.state.Id}, result.state);
     }
 
+    [Authorize(Policy = "CompanyAccess")]
     [HttpGet]
     public async Task<IActionResult> GetStates([FromQuery] StateParameters parameters)
     {
@@ -45,6 +49,7 @@ public class StateController : ControllerBase
         return Ok(result.states);
     }
     
+    [Authorize(Policy = "CompanyAccess")]
     [HttpGet("{id}")]
     public async Task<IActionResult> GetState(int id, [FromQuery] string? fields)
     {
@@ -58,6 +63,7 @@ public class StateController : ControllerBase
         return Ok(result.state);
     }
 
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpPut("{id}")]
     public async Task<IActionResult> UpdateState(int id, UpdateStateDto state)
     {
@@ -76,6 +82,7 @@ public class StateController : ControllerBase
         return Ok(result.state);
     }
     
+    [Authorize(Policy = "AdministratorAccess")]
     [HttpDelete("{id}")]
     public async Task<IActionResult> DeleteState(int id)
     {
diff --git a/Server/Data/ApplicationDbContext.cs b/Server/Data/ApplicationDbContext.cs
index 003c09b..9aa37e6 100644
--- a/Server/Data/ApplicationDbContext.cs
+++ b/Server/Data/ApplicationDbContext.cs
@@ -10,6 +10,7 @@ public class ApplicationDbContext : IdentityDbContext<User>
     public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
         : base(options)
     {
+        Database.EnsureCreated();
     }
     
     public DbSet<Company> Companies { get; set; } = null!;
@@ -26,4 +27,4 @@ public class ApplicationDbContext : IdentityDbContext<User>
     public DbSet<TicketGroup> TicketGroups { get; set; } = null!;
     public DbSet<Ticket> Tickets { get; set; } = null!;
     public DbSet<Review> Reviews { get; set; } = null!;
-}
\ No newline at end of file
+}
diff --git a/Server/Data/ApplicationDbContextSeed.cs b/Server/Data/ApplicationDbContextSeed.cs
deleted file mode 100644
index 3ce011b..0000000
--- a/Server/Data/ApplicationDbContextSeed.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Microsoft.AspNetCore.Identity;
-using Server.Constants;
-using Server.Models;
-
-namespace Server.Data;
-
-public class ApplicationDbContextSeed
-{
-    public static async Task SeedEssentialsAsync(UserManager<User> userManager,
-        RoleManager<IdentityRole> roleManager)
-    {
-        //Seed Roles
-        await roleManager.CreateAsync(new IdentityRole(Authorization.Roles.Admin.ToString()));
-        await roleManager.CreateAsync(new IdentityRole(Authorization.Roles.User.ToString()));
-        
-        //Seed Default User
-        var defaultUser = new User
-        {
-            UserName = Authorization.DefaultUsername,
-            Email = Authorization.DefaultEmail,
-            EmailConfirmed = true,
-            PhoneNumberConfirmed = true
-        };
-        
-        if (userManager.Users.All(u => u.Id != defaultUser.Id))
-        {
-            await userManager.CreateAsync(defaultUser, Authorization.DefaultPassword);
-            await userManager.AddToRoleAsync(defaultUser, Authorization.DefaultRole.ToString());
-        }
-    }
-}
\ No newline at end of file
diff --git a/Server/Data/SeedData.cs b/Server/Data/SeedData.cs
new file mode 100644
index 0000000..9350b28
--- /dev/null
+++ b/Server/Data/SeedData.cs
@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Identity;
+using Server.Models;
+
+namespace Server.Data;
+
+public class SeedData
+{
+    public static async Task Initialize(IServiceProvider serviceProvider)
+    {
+        var userManager = (UserManager<User>)serviceProvider.GetService(typeof(UserManager<User>))!;
+        var roleManager = (RoleManager<IdentityRole>)serviceProvider.GetService(typeof(RoleManager<IdentityRole>))!;
+
+        //Seed Roles
+         foreach (var role in Enum.GetValues(typeof(Constants.Identity.Roles)))
+        {
+            await roleManager.CreateAsync(new IdentityRole(role.ToString()));
+        }
+        
+        //Seed Default User
+        var defaultUser = new User
+        {
+            UserName = Constants.Identity.DefaultUsername,
+            Email = Constants.Identity.DefaultEmail,
+            EmailConfirmed = true
+        };
+        
+        if (userManager.Users.All(u => u.Id != defaultUser.Id))
+        {
+            await userManager.CreateAsync(defaultUser, Constants.Identity.DefaultPassword);
+            await userManager.AddToRoleAsync(defaultUser, Constants.Identity.DefaultRole.ToString());
+        }
+    }
+}
diff --git a/Server/Models/Address.cs b/Server/Models/Address.cs
index a6c6135..97d6d36 100644
--- a/Server/Models/Address.cs
+++ b/Server/Models/Address.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using SharedModels.DataTransferObjects;
 
 namespace Server.Models;
 
@@ -31,4 +30,4 @@ public class Address
         
         return $"{City.GetFullName()}, {Name}";
     }
-}
\ No newline at end of file
+}
diff --git a/Server/Models/City.cs b/Server/Models/City.cs
index 72cd52a..cc35a7f 100644
--- a/Server/Models/City.cs
+++ b/Server/Models/City.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using SharedModels.DataTransferObjects;
 
 namespace Server.Models;
 
@@ -29,4 +28,4 @@ public class City
         
         return $"{State.GetFullName()}, {Name}";
     }
-}
\ No newline at end of file
+}
diff --git a/Server/Models/Country.cs b/Server/Models/Country.cs
index 6f1f93e..e86a307 100644
--- a/Server/Models/Country.cs
+++ b/Server/Models/Country.cs
@@ -1,6 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SharedModels.DataTransferObjects;
 
 namespace Server.Models;
 
@@ -18,4 +16,4 @@ public class Country
     {
         return $"{Name}";
     }
-}
\ No newline at end of file
+}
diff --git a/Server/Models/Route.cs b/Server/Models/Route.cs
index 8134fcf..141c088 100644
--- a/Server/Models/Route.cs
+++ b/Server/Models/Route.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using SharedModels.DataTransferObjects;
 
 namespace Server.Models;
 
@@ -12,4 +11,4 @@ public class Route
 
     public virtual IList<RouteAddress> RouteAddresses { get; set; } = null!;
     public virtual IList<VehicleEnrollment> VehicleEnrollments { get; set; } = null!;
-}
\ No newline at end of file
+}
diff --git a/Server/Models/State.cs b/Server/Models/State.cs
index 44f6408..b91d770 100644
--- a/Server/Models/State.cs
+++ b/Server/Models/State.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using SharedModels.DataTransferObjects;
 
 namespace Server.Models;
 
@@ -26,4 +25,4 @@ public class State
         
         return $"{Country.GetFullName()}, {Name}";
     }
-}
\ No newline at end of file
+}
diff --git a/Server/Program.cs b/Server/Program.cs
index 326d054..e2d53cb 100644
--- a/Server/Program.cs
+++ b/Server/Program.cs
@@ -8,12 +8,12 @@ using Microsoft.OpenApi.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Server.Configurations;
+using Server.Constants;
 using Server.Data;
 using Server.Helpers;
 using Server.Models;
 using Server.Services;
 using SharedModels.DataTransferObjects;
-using Route = Server.Models.Route;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -52,21 +52,21 @@ builder.Services.AddSwaggerGen(options => {
     });
 });
 
-var corsPolicyName = "defaultCorsPolicy";
 builder.Services.AddCors(options => {
-    options.AddPolicy(corsPolicyName,
-        policy => policy.WithOrigins("http://localhost:4200").AllowCredentials()
-            .AllowAnyHeader().AllowAnyMethod());
+    options.AddDefaultPolicy(policy => policy.AllowAnyOrigin()
+        .AllowAnyHeader().AllowAnyMethod());
 });
 
+builder.Services.AddIdentityCore<User>(options => {
+    options.User.RequireUniqueEmail = true;
+    options.Password.RequiredLength = 7;
+    options.User.AllowedUserNameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567889-_.";
+}).AddRoles<IdentityRole>().AddEntityFrameworkStores<ApplicationDbContext>();
+
 // Configuration from AppSettings
 builder.Services.Configure<Jwt>(builder.Configuration.GetSection("Jwt"));
 // Adding Authentication - JWT
-builder.Services.AddAuthentication(options => {
-        options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-        options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-        options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
-    })
+builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
     .AddJwtBearer(options => {
         // options.RequireHttpsMetadata = false;
         // options.SaveToken = false;
@@ -76,22 +76,30 @@ builder.Services.AddAuthentication(options => {
             ValidateAudience = false,
             ValidateIssuer = false,
             ValidateLifetime = true,
-            ClockSkew = TimeSpan.Zero,
             ValidIssuer = builder.Configuration["Jwt:Issuer"],
             ValidAudience = builder.Configuration["Jwt:Audience"],
             IssuerSigningKey = new SymmetricSecurityKey(
                 Encoding.UTF8.GetBytes(builder.Configuration["Jwt:Key"]))
         };
     });
-builder.Services.AddAuthorization();
+
+builder.Services.AddAuthorization(options => {
+    // options.FallbackPolicy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build();
+ 
+    // Policies for accessing endpoints on a top level based on user role
+    options.AddPolicy(Identity.Roles.User + "Access", policy => 
+        policy.RequireRole(Identity.Roles.User.ToString()));
+    options.AddPolicy(Identity.Roles.Driver + "Access", policy => 
+        policy.RequireRole(Identity.Roles.Driver.ToString(), Identity.Roles.Company.ToString(),
+            Identity.Roles.Administrator.ToString()));
+    options.AddPolicy(Identity.Roles.Company + "Access", policy => 
+        policy.RequireRole(Identity.Roles.Company.ToString(), Identity.Roles.Administrator.ToString()));
+    options.AddPolicy(Identity.Roles.Administrator + "Access", policy => 
+        policy.RequireRole(Identity.Roles.Administrator.ToString()));
+});
 
 builder.Services.AddAutoMapper(typeof(MapperInitializer));
 
-builder.Services.AddIdentity<User, IdentityRole>(options => {
-    options.User.RequireUniqueEmail = true;
-    options.Password.RequiredLength = 8;
-    options.User.AllowedUserNameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.";
-}).AddEntityFrameworkStores<ApplicationDbContext>();
 builder.Services.AddScoped<IAuthenticationService, AuthenticationService>();
 
 builder.Services.AddScoped<ICountryManagementService, CountryManagementService>();
@@ -141,6 +149,11 @@ builder.Services.AddDbContext<ApplicationDbContext>(options =>
 
 var app = builder.Build();
 
+// Data seeding
+using var scope = app.Services.CreateScope();
+var services = scope.ServiceProvider;
+await SeedData.Initialize(services);
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
@@ -148,19 +161,15 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
+/*
 app.UseHttpsRedirection();
-
-// Data seeding
-// using var scope = app.Services.CreateScope();
-// var userManager = (UserManager<User>)scope.ServiceProvider.GetService(typeof(UserManager<User>))!;
-// var roleManager = (RoleManager<IdentityRole>)scope.ServiceProvider.GetService(typeof(RoleManager<IdentityRole>))!;
-// await ApplicationDbContextSeed.SeedEssentialsAsync(userManager, roleManager);
-
-app.MapControllers();
-
-app.UseCors(corsPolicyName);
+*/
 
 app.UseAuthentication();
 app.UseAuthorization();
 
+app.UseCors();
+
+app.MapControllers();
+
 app.Run();
\ No newline at end of file
diff --git a/Server/Server.csproj b/Server/Server.csproj
index 8da995d..d752f26 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.9" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.14" />
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.9" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
diff --git a/Server/Services/AuthenticationService.cs b/Server/Services/AuthenticationService.cs
index 11f0b9c..e380f39 100644
--- a/Server/Services/AuthenticationService.cs
+++ b/Server/Services/AuthenticationService.cs
@@ -7,7 +7,6 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using Server.Configurations;
-using Server.Constants;
 using Server.Models;
 using SharedModels.Requests;
 using SharedModels.Responses;
@@ -45,7 +44,7 @@ public class AuthenticationService : IAuthenticationService
             return (false, $"{result.Errors?.First().Description}");
         }
         
-        await _userManager.AddToRoleAsync(user, Authorization.DefaultRole.ToString());
+        await _userManager.AddToRoleAsync(user, Constants.Identity.DefaultRole.ToString());
         return (true, $"User registered with email {user.Email}.");
     }
 
@@ -212,4 +211,4 @@ public class AuthenticationService : IAuthenticationService
             ExpiryDateTime = DateTime.UtcNow.AddDays(_jwt.RefreshTokenValidityInDays)
         };
     }
-}
\ No newline at end of file
+}
diff --git a/Server/Services/IAuthenticationService.cs b/Server/Services/IAuthenticationService.cs
index fc8d3e3..65a1786 100644
--- a/Server/Services/IAuthenticationService.cs
+++ b/Server/Services/IAuthenticationService.cs
@@ -1,4 +1,3 @@
-using Server.Models;
 using SharedModels.Requests;
 using SharedModels.Responses;
 
@@ -13,4 +12,4 @@ public interface IAuthenticationService
     Task<(bool succeeded, AuthenticationResponse authResponse, string? refreshToken)> RenewRefreshTokenAsync(string? token);
 
     Task<bool> RevokeRefreshToken(string? token);
-}
\ No newline at end of file
+}
diff --git a/Server/Services/ICompanyManagementService.cs b/Server/Services/ICompanyManagementService.cs
index 5020592..191bab7 100644
--- a/Server/Services/ICompanyManagementService.cs
+++ b/Server/Services/ICompanyManagementService.cs
@@ -1,6 +1,5 @@
 using System.Dynamic;
 using Microsoft.AspNetCore.Mvc;
-using Server.Models;
 using SharedModels.DataTransferObjects;
 using SharedModels.QueryParameters;
 using SharedModels.QueryParameters.Objects;
@@ -16,4 +15,4 @@ public interface ICompanyManagementService
     Task<(bool isSucceed, IActionResult? actionResult, CompanyDto company)> UpdateCompany(UpdateCompanyDto updateCompanyDto);
     Task<(bool isSucceed, IActionResult? actionResult)> DeleteCompany(int id);
     Task<bool> IsCompanyExists(int id);
-}
\ No newline at end of file
+}
diff --git a/Server/Services/ICountryManagementService.cs b/Server/Services/ICountryManagementService.cs
index 03d48b9..ae27114 100644
--- a/Server/Services/ICountryManagementService.cs
+++ b/Server/Services/ICountryManagementService.cs
@@ -1,6 +1,5 @@
 using System.Dynamic;
 using Microsoft.AspNetCore.Mvc;
-using Server.Models;
 using SharedModels.DataTransferObjects;
 using SharedModels.QueryParameters;
 using SharedModels.QueryParameters.Objects;
@@ -16,4 +15,4 @@ public interface ICountryManagementService
     Task<(bool isSucceed, IActionResult? actionResult, CountryDto country)> UpdateCountry(UpdateCountryDto updateCountryDto);
     Task<(bool isSucceed, IActionResult? actionResult)> DeleteCountry(int id);
     Task<bool> IsCountryExists(int id);
-}
\ No newline at end of file
+}
diff --git a/Server/Services/IRouteManagementService.cs b/Server/Services/IRouteManagementService.cs
index 1d61320..dd4ddf2 100644
--- a/Server/Services/IRouteManagementService.cs
+++ b/Server/Services/IRouteManagementService.cs
@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc;
 using SharedModels.DataTransferObjects;
 using SharedModels.QueryParameters;
 using SharedModels.QueryParameters.Objects;
-using Route = Server.Models.Route;
 
 namespace Server.Services;
 
@@ -20,4 +19,4 @@ public interface IRouteManagementService
     Task<(bool isSucceed, IActionResult? actionResult, UpdateRouteDto route)> UpdateRoute(UpdateRouteDto updateRouteDto);
     Task<(bool isSucceed, IActionResult? actionResult)> DeleteRoute(int id);
     Task<bool> IsRouteExists(int id);
-}
\ No newline at end of file
+}
diff --git a/Server/Services/IStatisticsService.cs b/Server/Services/IStatisticsService.cs
index 2649aeb..0f2a96a 100644
--- a/Server/Services/IStatisticsService.cs
+++ b/Server/Services/IStatisticsService.cs
@@ -1,6 +1,5 @@
 using System.Dynamic;
 using Microsoft.AspNetCore.Mvc;
-using Server.Models;
 using SharedModels.QueryParameters;
 using SharedModels.QueryParameters.Statistics;
 
@@ -23,4 +22,4 @@ public interface IStatisticsService
     Task<(bool IsSucceed, IActionResult? actionResult, IEnumerable<ExpandoObject> stations, 
             PagingMetadata<ExpandoObject> pagingMetadata)>
         GetPopularStations(PopularAddressesParameters parameters);
-}
\ No newline at end of file
+}
diff --git a/Server/appsettings.Development.json b/Server/appsettings.Development.json
index 8900a52..fec3a7c 100644
--- a/Server/appsettings.Development.json
+++ b/Server/appsettings.Development.json
@@ -12,7 +12,7 @@
     "Key": "Secret which will never be exposed",
     "Audience": "Application URL",
     "Issuer": "Application URL",
-    "ValidityInMinutes": 1,
+    "ValidityInMinutes": 60,
     "RefreshTokenValidityInDays": 10
   }
 }
diff --git a/SharedModels/Requests/RegistrationRequest.cs b/SharedModels/Requests/RegistrationRequest.cs
index 8f37b7b..4eba9a1 100644
--- a/SharedModels/Requests/RegistrationRequest.cs
+++ b/SharedModels/Requests/RegistrationRequest.cs
@@ -12,7 +12,4 @@ public class RegistrationRequest
     [Required(ErrorMessage = "Password is required")]
     [DataType(DataType.Password)]
     public string Password { get; set; } = null!;
-    [DataType(DataType.Password)]
-    [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-    public string ConfirmPassword { get; set; } = null!;
-}
\ No newline at end of file
+}