diff --git a/Birdmap.API/Birdmap.API.csproj b/Birdmap.API/Birdmap.API.csproj
index 192db05..b48be96 100644
--- a/Birdmap.API/Birdmap.API.csproj
+++ b/Birdmap.API/Birdmap.API.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <IsPackable>false</IsPackable>
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
+    <AssemblyName>Birdmap.API</AssemblyName>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -20,9 +21,9 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="10.1.1" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.9">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -32,10 +33,11 @@
     </PackageReference>
     <PackageReference Include="MQTTnet" Version="3.0.13" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="3.0.13" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NLog" Version="4.7.5" />
     <PackageReference Include="NLog.Web" Version="4.9.3" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.3" />
-    <PackageReference Include="NSwag.AspNetCore" Version="13.8.2" />
+    <PackageReference Include="NSwag.AspNetCore" Version="13.9.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Birdmap.API/ClientApp/src/components/devices/Devices.jsx b/Birdmap.API/ClientApp/src/components/devices/Devices.jsx
new file mode 100644
index 0000000..a9876a2
--- /dev/null
+++ b/Birdmap.API/ClientApp/src/components/devices/Devices.jsx
@@ -0,0 +1,5 @@
+import React, { Component } from 'react'
+
+export default class Devices extends React.Component {
+
+}
\ No newline at end of file
diff --git a/Birdmap.API/DTOs/AuthenticateRequest.cs b/Birdmap.API/DTOs/AuthenticateRequest.cs
index 515c0df..2d3a184 100644
--- a/Birdmap.API/DTOs/AuthenticateRequest.cs
+++ b/Birdmap.API/DTOs/AuthenticateRequest.cs
@@ -2,7 +2,7 @@
 
 namespace Birdmap.Models
 {
-    public class AuthenticateRequest
+    public record AuthenticateRequest
     {
         [Required(AllowEmptyStrings = false, ErrorMessage = "Username is required.")]
         public string Username { get; set; }
diff --git a/Birdmap.API/DTOs/AuthenticateResponse.cs b/Birdmap.API/DTOs/AuthenticateResponse.cs
index a475791..d7f236e 100644
--- a/Birdmap.API/DTOs/AuthenticateResponse.cs
+++ b/Birdmap.API/DTOs/AuthenticateResponse.cs
@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Birdmap.API.DTOs
 {
-    public class AuthenticateResponse
+    public record AuthenticateResponse
     {
         [JsonProperty("user_name")]
         public string Username { get; set; }
diff --git a/Birdmap.API/DTOs/RegisterRequest.cs b/Birdmap.API/DTOs/RegisterRequest.cs
index a6c42d5..67edac2 100644
--- a/Birdmap.API/DTOs/RegisterRequest.cs
+++ b/Birdmap.API/DTOs/RegisterRequest.cs
@@ -2,7 +2,7 @@
 
 namespace Birdmap.API.DTOs
 {
-    public class RegisterRequest
+    public record RegisterRequest
     {
         [Required(AllowEmptyStrings = false, ErrorMessage = "Username is required.")]
         public string Username { get; set; }
diff --git a/Birdmap.API/DTOs/ServiceInfo.cs b/Birdmap.API/DTOs/ServiceInfo.cs
index 2150eaf..97139bf 100644
--- a/Birdmap.API/DTOs/ServiceInfo.cs
+++ b/Birdmap.API/DTOs/ServiceInfo.cs
@@ -2,7 +2,7 @@
 
 namespace Birdmap.API.DTOs
 {
-    public class ServiceInfo
+    public record ServiceInfo
     {
         public ServiceRequest Service { get; set; }
         public HttpStatusCode StatusCode { get; set; }
diff --git a/Birdmap.API/DTOs/ServiceRequest.cs b/Birdmap.API/DTOs/ServiceRequest.cs
index ca99642..e48d7a1 100644
--- a/Birdmap.API/DTOs/ServiceRequest.cs
+++ b/Birdmap.API/DTOs/ServiceRequest.cs
@@ -1,6 +1,6 @@
 namespace Birdmap.API.DTOs
 {
-    public class ServiceRequest
+    public record ServiceRequest
     {
         public int Id { get; set; }
         public string Name { get; set; }
diff --git a/Birdmap.BLL/Birdmap.BLL.csproj b/Birdmap.BLL/Birdmap.BLL.csproj
index 32cb887..c604365 100644
--- a/Birdmap.BLL/Birdmap.BLL.csproj
+++ b/Birdmap.BLL/Birdmap.BLL.csproj
@@ -1,9 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Birdmap.Common\Birdmap.Common.csproj" />
     <ProjectReference Include="..\Birdmap.DAL\Birdmap.DAL.csproj" />
diff --git a/Birdmap.BLL/Services/LiveDeviceService.cs b/Birdmap.BLL/Services/LiveDeviceService.cs
index eb423c3..e902146 100644
--- a/Birdmap.BLL/Services/LiveDeviceService.cs
+++ b/Birdmap.BLL/Services/LiveDeviceService.cs
@@ -9,6 +9,7 @@
 #pragma warning disable 472 // Disable "CS0472 The result of the expression is always 'false' since a value of type 'Int32' is never equal to 'null' of type 'Int32?'
 #pragma warning disable 1573 // Disable "CS1573 Parameter '...' has no matching param tag in the XML comment for ...
 #pragma warning disable 1591 // Disable "CS1591 Missing XML comment for publicly visible type or member ..."
+#pragma warning disable 8073 // Disable "CS8073 The result of the expression is always 'false' since a value of type '...' is never equal to 'null' of type '...?'"
 
 namespace Birdmap.BLL.Services
 {
@@ -895,6 +896,7 @@ namespace Birdmap.BLL.Services
     }
 }
 
+#pragma warning restore 8703
 #pragma warning restore 1591
 #pragma warning restore 1573
 #pragma warning restore 472
diff --git a/Birdmap.BLL/Services/LiveInputService.cs b/Birdmap.BLL/Services/LiveInputService.cs
index d231010..15e7e1d 100644
--- a/Birdmap.BLL/Services/LiveInputService.cs
+++ b/Birdmap.BLL/Services/LiveInputService.cs
@@ -9,6 +9,7 @@
 #pragma warning disable 472 // Disable "CS0472 The result of the expression is always 'false' since a value of type 'Int32' is never equal to 'null' of type 'Int32?'
 #pragma warning disable 1573 // Disable "CS1573 Parameter '...' has no matching param tag in the XML comment for ...
 #pragma warning disable 1591 // Disable "CS1591 Missing XML comment for publicly visible type or member ..."
+#pragma warning disable 8073 // Disable "CS8073 The result of the expression is always 'false' since a value of type '...' is never equal to 'null' of type '...?'"
 
 namespace Birdmap.BLL.Services
 {
@@ -470,6 +471,7 @@ namespace Birdmap.BLL.Services
 
 }
 
+#pragma warning restore 8703
 #pragma warning restore 1591
 #pragma warning restore 1573
 #pragma warning restore 472
diff --git a/Birdmap.Common/Birdmap.Common.csproj b/Birdmap.Common/Birdmap.Common.csproj
index cb63190..f208d30 100644
--- a/Birdmap.Common/Birdmap.Common.csproj
+++ b/Birdmap.Common/Birdmap.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/Birdmap.DAL/Birdmap.DAL.csproj b/Birdmap.DAL/Birdmap.DAL.csproj
index 9e084dd..a5985e6 100644
--- a/Birdmap.DAL/Birdmap.DAL.csproj
+++ b/Birdmap.DAL/Birdmap.DAL.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Birdmap.DAL/Entities/Service.cs b/Birdmap.DAL/Entities/Service.cs
index 64db462..ae0f5d4 100644
--- a/Birdmap.DAL/Entities/Service.cs
+++ b/Birdmap.DAL/Entities/Service.cs
@@ -2,7 +2,7 @@
 
 namespace Birdmap.DAL.Entities
 {
-    public class Service
+    public record Service
     {
         public int Id { get; set; }
         public string Name { get; set; }
diff --git a/Birdmap.DAL/Entities/User.cs b/Birdmap.DAL/Entities/User.cs
index d49a778..1b26776 100644
--- a/Birdmap.DAL/Entities/User.cs
+++ b/Birdmap.DAL/Entities/User.cs
@@ -6,7 +6,7 @@
         Admin,
     }
 
-    public class User
+    public record User
     {
         public int Id { get; set; }
         public string Name { get; set; }
diff --git a/MQTTnet.TestApp.WinForm/MQTTnet.TestApp.WinForm.csproj b/MQTTnet.TestApp.WinForm/MQTTnet.TestApp.WinForm.csproj
index 07ec309..a893d44 100644
--- a/MQTTnet.TestApp.WinForm/MQTTnet.TestApp.WinForm.csproj
+++ b/MQTTnet.TestApp.WinForm/MQTTnet.TestApp.WinForm.csproj
@@ -1,18 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
+	  <OutputType>WinExe</OutputType>
+	  <TargetFramework>net5.0-windows</TargetFramework>
+	  <UseWindowsForms>true</UseWindowsForms>
+	  <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+
+	  <RootNamespace>MQTTnet.TestApp.WinForm</RootNamespace>
+	  <AssemblyName>MQTTnet.TestApp.WinForm</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersionTask" Version="5.3.3">
+    <PackageReference Include="GitVersionTask" Version="5.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MQTTnet" Version="3.0.11" />
-    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.11" />
+    <PackageReference Include="MQTTnet" Version="3.0.13" />
+    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.13" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>