From 2a34a04714d4803fc6fa60ccfc1ef6bc53646f2e Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Mon, 13 Nov 2023 13:06:23 +0100
Subject: [PATCH 01/13] update workflow actions

---
 .github/workflows/stable-release.yml | 8 ++++----
 BeehiveManager.sln                   | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml
index ae43659..a779f9f 100644
--- a/.github/workflows/stable-release.yml
+++ b/.github/workflows/stable-release.yml
@@ -11,13 +11,13 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Docker meta
       id: meta
-      uses: docker/metadata-action@v4
+      uses: docker/metadata-action@v5
       with:
         images: etherna/beehive-manager
         tags: |
@@ -26,7 +26,7 @@ jobs:
           type=semver,pattern=v{{version}}
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
 
     - name: Login to DockerHub
       uses: docker/login-action@v2
@@ -35,7 +35,7 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Build and push
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         push: true
diff --git a/BeehiveManager.sln b/BeehiveManager.sln
index 7607085..3e6a582 100644
--- a/BeehiveManager.sln
+++ b/BeehiveManager.sln
@@ -40,6 +40,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CE10A1ED-2
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Persistence.Tests", "test\BeehiveManager.Persistence.Tests\BeehiveManager.Persistence.Tests.csproj", "{74F4D982-085D-42F4-9E61-C288B25E64CB}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9EEC390E-0D81-4379-A02A-C1A7B55CF431}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\stable-release.yml = .github\workflows\stable-release.yml
+		.github\workflows\unstable-release.yml = .github\workflows\unstable-release.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +85,7 @@ Global
 		{74960F98-A78D-40A5-8CD1-20E05DB4DD35} = {11FCB662-8945-484F-9459-C2C5823045E7}
 		{791D69C2-725F-4E7A-B2F9-30CDC151A0C5} = {2100F089-0589-448E-93E0-45B069DDCE64}
 		{74F4D982-085D-42F4-9E61-C288B25E64CB} = {CE10A1ED-2695-44EC-97F1-CB91FC5412D8}
+		{9EEC390E-0D81-4379-A02A-C1A7B55CF431} = {61C3814F-A839-44D7-8335-0F365D3FFA8C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {67056C24-38A7-45E5-A31A-0CF654008257}

From d3d3eb4caadebb229f894ba51399e7e1ec01474d Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Mon, 13 Nov 2023 13:06:23 +0100
Subject: [PATCH 02/13] update workflow actions

---
 .github/workflows/stable-release.yml   |  8 ++---
 .github/workflows/unstable-release.yml | 48 +++++++++++++-------------
 BeehiveManager.sln                     |  7 ++++
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml
index ae43659..a779f9f 100644
--- a/.github/workflows/stable-release.yml
+++ b/.github/workflows/stable-release.yml
@@ -11,13 +11,13 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Docker meta
       id: meta
-      uses: docker/metadata-action@v4
+      uses: docker/metadata-action@v5
       with:
         images: etherna/beehive-manager
         tags: |
@@ -26,7 +26,7 @@ jobs:
           type=semver,pattern=v{{version}}
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
 
     - name: Login to DockerHub
       uses: docker/login-action@v2
@@ -35,7 +35,7 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Build and push
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         push: true
diff --git a/.github/workflows/unstable-release.yml b/.github/workflows/unstable-release.yml
index 200675e..48d4111 100644
--- a/.github/workflows/unstable-release.yml
+++ b/.github/workflows/unstable-release.yml
@@ -10,32 +10,32 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: etherna/beehive-manager
-        tags: |
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: etherna/beehive-manager
+          tags: |
           type=ref,event=branch
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Build and push
-      uses: docker/build-push-action@v4
-      with:
-        context: .
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/BeehiveManager.sln b/BeehiveManager.sln
index 7607085..3e6a582 100644
--- a/BeehiveManager.sln
+++ b/BeehiveManager.sln
@@ -40,6 +40,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CE10A1ED-2
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Persistence.Tests", "test\BeehiveManager.Persistence.Tests\BeehiveManager.Persistence.Tests.csproj", "{74F4D982-085D-42F4-9E61-C288B25E64CB}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9EEC390E-0D81-4379-A02A-C1A7B55CF431}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\stable-release.yml = .github\workflows\stable-release.yml
+		.github\workflows\unstable-release.yml = .github\workflows\unstable-release.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +85,7 @@ Global
 		{74960F98-A78D-40A5-8CD1-20E05DB4DD35} = {11FCB662-8945-484F-9459-C2C5823045E7}
 		{791D69C2-725F-4E7A-B2F9-30CDC151A0C5} = {2100F089-0589-448E-93E0-45B069DDCE64}
 		{74F4D982-085D-42F4-9E61-C288B25E64CB} = {CE10A1ED-2695-44EC-97F1-CB91FC5412D8}
+		{9EEC390E-0D81-4379-A02A-C1A7B55CF431} = {61C3814F-A839-44D7-8335-0F365D3FFA8C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {67056C24-38A7-45E5-A31A-0CF654008257}

From ff9f787b5f7248174eea8eebc3e4c486c2aed559 Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Fri, 8 Mar 2024 19:32:59 +0100
Subject: [PATCH 03/13] update dependencies

---
 BeehiveManager.sln.DotSettings                            | 3 ++-
 src/BeehiveManager.Domain/BeehiveManager.Domain.csproj    | 2 +-
 .../BeehiveManager.Services.csproj                        | 4 ++--
 .../Utilities/BeeNodeLiveManager.cs                       | 4 ++--
 src/BeehiveManager/BeehiveManager.csproj                  | 4 ++--
 .../BeehiveManager.Persistence.Tests.csproj               | 8 ++++----
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/BeehiveManager.sln.DotSettings b/BeehiveManager.sln.DotSettings
index 2be8dbb..10fdf13 100644
--- a/BeehiveManager.sln.DotSettings
+++ b/BeehiveManager.sln.DotSettings
@@ -11,4 +11,5 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-  limitations under the License.</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+  limitations under the License.</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
index 4259f0a..4f9a53c 100644
--- a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
+++ b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="Etherna.DomainEvents" Version="1.4.0" />
     <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.101" />
-    <PackageReference Include="Nethereum.Web3" Version="4.14.0" />
+    <PackageReference Include="Nethereum.Web3" Version="4.19.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BeehiveManager.Services/BeehiveManager.Services.csproj b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
index 2c8946b..a381bd1 100644
--- a/src/BeehiveManager.Services/BeehiveManager.Services.csproj
+++ b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
@@ -13,10 +13,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bee.Net" Version="0.2.0-alpha.216" />
+    <PackageReference Include="Bee.Net" Version="0.2.0-alpha.218" />
     <PackageReference Include="Etherna.DomainEvents.AspNetCore" Version="1.4.0" />
     <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.101" />
-    <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.17.1" />
+    <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.19.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 
diff --git a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
index fe6e8dd..78040db 100644
--- a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
+++ b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
@@ -141,7 +141,7 @@ public void StopHealthHeartbeat() =>
                 case BeeNodeSelectionMode.RoundRobin:
                     BeeNodeLiveInstance? selectedNode = null;
 
-                    if (!lastSelectedNodesRoundRobin.ContainsKey(selectionContext)) //take first node if never selected once in this context
+                    if (!lastSelectedNodesRoundRobin.TryGetValue(selectionContext, out BeeNodeLiveInstance? lastNode)) //take first node if never selected once in this context
                     {
                         selectedNode = await beeNodeInstances.Values
                             .Where(async instance => instance.Status.IsAlive && await isValidPredicate(instance))
@@ -151,7 +151,7 @@ public void StopHealthHeartbeat() =>
                     {
                         var lastSelectedNodeWithIndexList = beeNodeInstances.Values
                             .Select((node, index) => new { index, node })
-                            .Where(g => g.node == lastSelectedNodesRoundRobin[selectionContext])
+                            .Where(g => g.node == lastNode)
                             .ToList();
 
                         if (lastSelectedNodeWithIndexList.Any()) //if prev node still exists
diff --git a/src/BeehiveManager/BeehiveManager.csproj b/src/BeehiveManager/BeehiveManager.csproj
index 3016609..05104b7 100644
--- a/src/BeehiveManager/BeehiveManager.csproj
+++ b/src/BeehiveManager/BeehiveManager.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EthernaACR" Version="0.3.9" />
+    <PackageReference Include="EthernaACR" Version="0.3.10" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
     <PackageReference Include="MongODM" Version="0.24.0-alpha.101" />
     <PackageReference Include="MongODM.AspNetCore.UI" Version="0.24.0-alpha.101" />
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
diff --git a/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj b/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
index 5f9c9ae..9f08905 100644
--- a/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
+++ b/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
@@ -15,10 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From c7a4b85cc90f2bd9f0aa52beafaad94203586ecb Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Fri, 8 Mar 2024 19:34:48 +0100
Subject: [PATCH 04/13] update github workflows

---
 .github/workflows/stable-release.yml   | 54 +++++++++++++-------------
 .github/workflows/unstable-release.yml |  6 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml
index a779f9f..997bcbf 100644
--- a/.github/workflows/stable-release.yml
+++ b/.github/workflows/stable-release.yml
@@ -10,34 +10,34 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: etherna/beehive-manager
-        tags: |
-          type=semver,pattern=v{{major}}
-          type=semver,pattern=v{{major}}.{{minor}}
-          type=semver,pattern=v{{version}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: etherna/beehive-manager
+          tags: |
+            type=semver,pattern=v{{major}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{version}}
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Build and push
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/unstable-release.yml b/.github/workflows/unstable-release.yml
index 48d4111..ac005f7 100644
--- a/.github/workflows/unstable-release.yml
+++ b/.github/workflows/unstable-release.yml
@@ -3,7 +3,7 @@ name: Unstable release on Docker Hub
 on:
   push:
     branches:
-    - dev
+      - dev
 
 jobs:
   build:
@@ -21,13 +21,13 @@ jobs:
         with:
           images: etherna/beehive-manager
           tags: |
-          type=ref,event=branch
+            type=ref,event=branch
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

From 38bb43f8d1cacf679fbf3747ed08c44856814af6 Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Fri, 8 Mar 2024 19:42:03 +0100
Subject: [PATCH 05/13] update license header spacing

---
 BeehiveManager.sln.DotSettings                | 20 +++++++++----------
 .../Events/SetBeeNodeAddressesEvent.cs        | 20 +++++++++----------
 .../IBeehiveDbContext.cs                      | 20 +++++++++----------
 src/BeehiveManager.Domain/Models/BeeNode.cs   | 20 +++++++++----------
 .../Models/EntityModelBase.cs                 | 20 +++++++++----------
 src/BeehiveManager.Domain/Models/ModelBase.cs | 20 +++++++++----------
 .../Properties/AssemblyInfo.cs                | 20 +++++++++----------
 .../BeehiveDbContext.cs                       | 20 +++++++++----------
 .../IEventDispatcherDbContext.cs              | 20 +++++++++----------
 .../ModelMaps/BeeNodeMap.cs                   | 20 +++++++++----------
 .../ModelMaps/ModelBaseMap.cs                 | 20 +++++++++----------
 .../Properties/AssemblyInfo.cs                | 20 +++++++++----------
 .../Repositories/DomainRepository.cs          | 20 +++++++++----------
 .../Domain/BeeNodeService.cs                  | 20 +++++++++----------
 .../Domain/IBeeNodeService.cs                 | 20 +++++++++----------
 ...nBeeNodeCreatedThenAddNodeStatusHandler.cs | 20 +++++++++----------
 ...eNodeDeletedThenRemoveNodeStatusHandler.cs | 20 +++++++++----------
 .../Extensions/IEnumerableExtensions.cs       | 20 +++++++++----------
 .../Extensions/LoggerExtensions.cs            | 20 +++++++++----------
 .../Properties/AssemblyInfo.cs                | 20 +++++++++----------
 .../ServiceCollectionExtensions.cs            | 20 +++++++++----------
 .../CashoutAllNodesChequesSettings.cs         | 20 +++++++++----------
 .../NodesAddressMaintainerSettings.cs         | 20 +++++++++----------
 .../NodesChequebookMaintainerSettings.cs      | 20 +++++++++----------
 .../Tasks/CashoutAllNodesChequesTask.cs       | 20 +++++++++----------
 .../Tasks/ICashoutAllNodesChequesTask.cs      | 20 +++++++++----------
 .../Tasks/INodesAddressMaintainerTask.cs      | 20 +++++++++----------
 .../Tasks/INodesChequebookMaintainerTask.cs   | 20 +++++++++----------
 .../Tasks/IPinContentInNodeTask.cs            | 20 +++++++++----------
 .../Tasks/NodesAddressMaintainerTask.cs       | 20 +++++++++----------
 .../Tasks/NodesChequebookMaintainerTask.cs    | 20 +++++++++----------
 .../Tasks/PinContentInNodeTask.cs             | 20 +++++++++----------
 src/BeehiveManager.Services/Tasks/Queues.cs   | 20 +++++++++----------
 .../Utilities/BeeNodeLiveManager.cs           | 20 +++++++++----------
 .../Utilities/IBeeNodeLiveManager.cs          | 20 +++++++++----------
 .../Utilities/Models/BeeNodeAddresses.cs      | 20 +++++++++----------
 .../Utilities/Models/BeeNodeLiveInstance.cs   | 20 +++++++++----------
 .../Utilities/Models/BeeNodeSelectionMode.cs  | 20 +++++++++----------
 .../Utilities/Models/BeeNodeStatus.cs         | 20 +++++++++----------
 .../Utilities/Models/ChainState.cs            | 20 +++++++++----------
 .../Areas/Api/ApiHostingStartup.cs            | 20 +++++++++----------
 .../Areas/Api/Controllers/ChainController.cs  | 20 +++++++++----------
 .../Controllers/EtherAddressesController.cs   | 20 +++++++++----------
 .../Api/Controllers/LoadBalancerController.cs | 20 +++++++++----------
 .../Areas/Api/Controllers/NodesController.cs  | 20 +++++++++----------
 .../Api/Controllers/PinningController.cs      | 20 +++++++++----------
 .../Api/Controllers/PostageController.cs      | 20 +++++++++----------
 .../Areas/Api/DtoModels/BeeNodeDto.cs         | 20 +++++++++----------
 .../Areas/Api/DtoModels/BeeNodeStatusDto.cs   | 20 +++++++++----------
 .../Areas/Api/DtoModels/ChainStateDto.cs      | 20 +++++++++----------
 .../Areas/Api/DtoModels/EtherAddressDto.cs    | 20 +++++++++----------
 .../Areas/Api/DtoModels/PinnedResourceDto.cs  | 20 +++++++++----------
 .../Areas/Api/DtoModels/PostageBatchDto.cs    | 20 +++++++++----------
 .../Areas/Api/DtoModels/PostageBatchRefDto.cs | 20 +++++++++----------
 .../Areas/Api/InputModels/BeeNodeInput.cs     | 20 +++++++++----------
 .../Api/InputModels/UpdateNodeConfigInput.cs  | 20 +++++++++----------
 .../Api/Services/ChainControllerService.cs    | 20 +++++++++----------
 .../Api/Services/IChainControllerService.cs   | 20 +++++++++----------
 .../ILoadBalancerControllerService.cs         | 20 +++++++++----------
 .../Api/Services/INodesControllerService.cs   | 20 +++++++++----------
 .../Api/Services/IPinningControllerService.cs | 20 +++++++++----------
 .../Api/Services/IPostageControllerService.cs | 20 +++++++++----------
 .../Services/LoadBalancerControllerService.cs | 20 +++++++++----------
 .../Api/Services/NodesControllerService.cs    | 20 +++++++++----------
 .../Api/Services/PinningControllerService.cs  | 20 +++++++++----------
 .../Api/Services/PostageControllerService.cs  | 20 +++++++++----------
 .../SimpleExceptionFilterAttribute.cs         | 20 +++++++++----------
 .../SwarmResourceValidationAttribute.cs       | 20 +++++++++----------
 src/BeehiveManager/Configs/CommonConsts.cs    | 20 +++++++++----------
 .../Configs/Hangfire/AllowAllFilter.cs        | 20 +++++++++----------
 .../Configs/MongODM/AllowAllFilter.cs         | 20 +++++++++----------
 .../Swagger/ConfigureSwaggerOptions.cs        | 20 +++++++++----------
 .../Configs/Swagger/SwaggerDefaultValues.cs   | 20 +++++++++----------
 .../Configs/SystemStore/XmlRepository.cs      | 20 +++++++++----------
 .../ServiceConfigurationException.cs          | 20 +++++++++----------
 .../ApplicationBuilderExtensions.cs           | 20 +++++++++----------
 .../DataProtectionBuilderExtensions.cs        | 20 +++++++++----------
 src/BeehiveManager/Pages/Index.cshtml.cs      | 20 +++++++++----------
 src/BeehiveManager/Program.cs                 | 20 +++++++++----------
 src/BeehiveManager/Properties/AssemblyInfo.cs | 20 +++++++++----------
 .../Properties/GlobalSuppressions.cs          | 20 +++++++++----------
 src/BeehiveManager/Settings/SeedDbSettings.cs | 20 +++++++++----------
 .../Helpers/DbContextMockHelper.cs            | 20 +++++++++----------
 .../Helpers/DeserializationTestElement.cs     | 20 +++++++++----------
 .../BeehiveDbContextDeserializationTest.cs    | 20 +++++++++----------
 .../Properties/AssemblyInfo.cs                | 20 +++++++++----------
 86 files changed, 860 insertions(+), 860 deletions(-)

diff --git a/BeehiveManager.sln.DotSettings b/BeehiveManager.sln.DotSettings
index 10fdf13..8f4a067 100644
--- a/BeehiveManager.sln.DotSettings
+++ b/BeehiveManager.sln.DotSettings
@@ -1,15 +1,15 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">  Copyright 2021-present Etherna SA
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright 2021-present Etherna SA
 
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.</s:String>
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs b/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs
index 6a62b00..5349713 100644
--- a/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs
+++ b/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.DomainEvents;
diff --git a/src/BeehiveManager.Domain/IBeehiveDbContext.cs b/src/BeehiveManager.Domain/IBeehiveDbContext.cs
index d4896eb..3719f79 100644
--- a/src/BeehiveManager.Domain/IBeehiveDbContext.cs
+++ b/src/BeehiveManager.Domain/IBeehiveDbContext.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.DomainEvents;
diff --git a/src/BeehiveManager.Domain/Models/BeeNode.cs b/src/BeehiveManager.Domain/Models/BeeNode.cs
index 2ab6be7..5c7add7 100644
--- a/src/BeehiveManager.Domain/Models/BeeNode.cs
+++ b/src/BeehiveManager.Domain/Models/BeeNode.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 
diff --git a/src/BeehiveManager.Domain/Models/EntityModelBase.cs b/src/BeehiveManager.Domain/Models/EntityModelBase.cs
index 7cd8e69..cb6b90d 100644
--- a/src/BeehiveManager.Domain/Models/EntityModelBase.cs
+++ b/src/BeehiveManager.Domain/Models/EntityModelBase.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.DomainEvents;
 using Etherna.MongODM.Core.Domain.Models;
diff --git a/src/BeehiveManager.Domain/Models/ModelBase.cs b/src/BeehiveManager.Domain/Models/ModelBase.cs
index 7a1556e..273adf1 100644
--- a/src/BeehiveManager.Domain/Models/ModelBase.cs
+++ b/src/BeehiveManager.Domain/Models/ModelBase.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.MongODM.Core.Domain.Models;
 using System.Collections.Generic;
diff --git a/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs b/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs
index 8c95e13..e4e2051 100644
--- a/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs
+++ b/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 using System.Runtime.CompilerServices;
diff --git a/src/BeehiveManager.Persistence/BeehiveDbContext.cs b/src/BeehiveManager.Persistence/BeehiveDbContext.cs
index 08aba28..8cad874 100644
--- a/src/BeehiveManager.Persistence/BeehiveDbContext.cs
+++ b/src/BeehiveManager.Persistence/BeehiveDbContext.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain;
 using Etherna.BeehiveManager.Domain.Models;
diff --git a/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs b/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs
index 6b3d048..2008698 100644
--- a/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs
+++ b/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.DomainEvents;
 using Etherna.MongODM.Core;
diff --git a/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs b/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
index bf2c4b4..85856cc 100644
--- a/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
+++ b/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.MongoDB.Bson;
diff --git a/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs b/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs
index cb8bda9..bef29c0 100644
--- a/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs
+++ b/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.MongoDB.Bson;
diff --git a/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs b/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs
index 0bb23d3..0d5e509 100644
--- a/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs
+++ b/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 
diff --git a/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs b/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
index 28b98cd..2b56f92 100644
--- a/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
+++ b/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.DomainEvents;
diff --git a/src/BeehiveManager.Services/Domain/BeeNodeService.cs b/src/BeehiveManager.Services/Domain/BeeNodeService.cs
index 04c9a97..566b276 100644
--- a/src/BeehiveManager.Services/Domain/BeeNodeService.cs
+++ b/src/BeehiveManager.Services/Domain/BeeNodeService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain;
 using Etherna.BeehiveManager.Domain.Models;
diff --git a/src/BeehiveManager.Services/Domain/IBeeNodeService.cs b/src/BeehiveManager.Services/Domain/IBeeNodeService.cs
index dea974c..6b7b58d 100644
--- a/src/BeehiveManager.Services/Domain/IBeeNodeService.cs
+++ b/src/BeehiveManager.Services/Domain/IBeeNodeService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs
index 688c514..15d0d7b 100644
--- a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs
+++ b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeehiveManager.Services.Utilities;
diff --git a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs
index 60815da..128b9ff 100644
--- a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs
+++ b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeehiveManager.Services.Utilities;
diff --git a/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs b/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs
index c7bf12a..e6ae62d 100644
--- a/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs
+++ b/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 using System.Collections.Generic;
diff --git a/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs b/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
index 43beb62..d387ede 100644
--- a/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
+++ b/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Microsoft.Extensions.Logging;
 using System;
diff --git a/src/BeehiveManager.Services/Properties/AssemblyInfo.cs b/src/BeehiveManager.Services/Properties/AssemblyInfo.cs
index 0bb23d3..0d5e509 100644
--- a/src/BeehiveManager.Services/Properties/AssemblyInfo.cs
+++ b/src/BeehiveManager.Services/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 
diff --git a/src/BeehiveManager.Services/ServiceCollectionExtensions.cs b/src/BeehiveManager.Services/ServiceCollectionExtensions.cs
index 3465dc1..12c4c79 100644
--- a/src/BeehiveManager.Services/ServiceCollectionExtensions.cs
+++ b/src/BeehiveManager.Services/ServiceCollectionExtensions.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Services.Domain;
 using Etherna.BeehiveManager.Services.Tasks;
diff --git a/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs b/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs
index d80bf66..28c7be0 100644
--- a/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs
+++ b/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 namespace Etherna.BeehiveManager.Services.Settings
 {
diff --git a/src/BeehiveManager.Services/Settings/NodesAddressMaintainerSettings.cs b/src/BeehiveManager.Services/Settings/NodesAddressMaintainerSettings.cs
index 5e118ca..9d57c3c 100644
--- a/src/BeehiveManager.Services/Settings/NodesAddressMaintainerSettings.cs
+++ b/src/BeehiveManager.Services/Settings/NodesAddressMaintainerSettings.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 namespace Etherna.BeehiveManager.Services.Settings
 {
diff --git a/src/BeehiveManager.Services/Settings/NodesChequebookMaintainerSettings.cs b/src/BeehiveManager.Services/Settings/NodesChequebookMaintainerSettings.cs
index 664f099..3f578be 100644
--- a/src/BeehiveManager.Services/Settings/NodesChequebookMaintainerSettings.cs
+++ b/src/BeehiveManager.Services/Settings/NodesChequebookMaintainerSettings.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 namespace Etherna.BeehiveManager.Services.Settings
 {
diff --git a/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs b/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
index f45b83a..6cc0545 100644
--- a/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
+++ b/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Services.Extensions;
 using Etherna.BeehiveManager.Services.Settings;
diff --git a/src/BeehiveManager.Services/Tasks/ICashoutAllNodesChequesTask.cs b/src/BeehiveManager.Services/Tasks/ICashoutAllNodesChequesTask.cs
index 1d2789d..c42e241 100644
--- a/src/BeehiveManager.Services/Tasks/ICashoutAllNodesChequesTask.cs
+++ b/src/BeehiveManager.Services/Tasks/ICashoutAllNodesChequesTask.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Hangfire;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/Tasks/INodesAddressMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/INodesAddressMaintainerTask.cs
index 78c5e7e..19bbd45 100644
--- a/src/BeehiveManager.Services/Tasks/INodesAddressMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/INodesAddressMaintainerTask.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Hangfire;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/Tasks/INodesChequebookMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/INodesChequebookMaintainerTask.cs
index a9ef4ef..a29ce69 100644
--- a/src/BeehiveManager.Services/Tasks/INodesChequebookMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/INodesChequebookMaintainerTask.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Hangfire;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/Tasks/IPinContentInNodeTask.cs b/src/BeehiveManager.Services/Tasks/IPinContentInNodeTask.cs
index 1d9e370..4baa1d6 100644
--- a/src/BeehiveManager.Services/Tasks/IPinContentInNodeTask.cs
+++ b/src/BeehiveManager.Services/Tasks/IPinContentInNodeTask.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Hangfire;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs
index 55467af..025cc49 100644
--- a/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Services.Extensions;
 using Etherna.BeehiveManager.Services.Settings;
diff --git a/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
index a752b70..79ec52f 100644
--- a/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Services.Extensions;
 using Etherna.BeehiveManager.Services.Settings;
diff --git a/src/BeehiveManager.Services/Tasks/PinContentInNodeTask.cs b/src/BeehiveManager.Services/Tasks/PinContentInNodeTask.cs
index c413978..eb250d3 100644
--- a/src/BeehiveManager.Services/Tasks/PinContentInNodeTask.cs
+++ b/src/BeehiveManager.Services/Tasks/PinContentInNodeTask.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Services.Utilities;
 using System.Collections.Generic;
diff --git a/src/BeehiveManager.Services/Tasks/Queues.cs b/src/BeehiveManager.Services/Tasks/Queues.cs
index 37714ad..c3eeade 100644
--- a/src/BeehiveManager.Services/Tasks/Queues.cs
+++ b/src/BeehiveManager.Services/Tasks/Queues.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 namespace Etherna.BeehiveManager.Services.Tasks
 {
diff --git a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
index 78040db..ec751e4 100644
--- a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
+++ b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain;
 using Etherna.BeehiveManager.Domain.Models;
diff --git a/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs b/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs
index c287edc..d5a811f 100644
--- a/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs
+++ b/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeehiveManager.Services.Utilities.Models;
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeAddresses.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeAddresses.cs
index 624fa43..882f2fe 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeAddresses.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeAddresses.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Nethereum.Util;
 using System;
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
index 797c2c2..89f931f 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeeNet;
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeSelectionMode.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeSelectionMode.cs
index 150784c..28249ca 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeSelectionMode.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeSelectionMode.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 namespace Etherna.BeehiveManager.Services.Utilities.Models
 {
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs
index 911b49c..4675628 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 using System.Collections.Generic;
diff --git a/src/BeehiveManager.Services/Utilities/Models/ChainState.cs b/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
index 442ed96..8d994db 100644
--- a/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeeNet.DtoModels;
 using System;
diff --git a/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs b/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs
index fcadce7..1526a1e 100644
--- a/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs
+++ b/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/ChainController.cs b/src/BeehiveManager/Areas/Api/Controllers/ChainController.cs
index b7fcf38..a2a1c4c 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/ChainController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/ChainController.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.Services;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/EtherAddressesController.cs b/src/BeehiveManager/Areas/Api/Controllers/EtherAddressesController.cs
index 5905a21..949e711 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/EtherAddressesController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/EtherAddressesController.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Attributes;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs b/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
index 10a7b79..110cd94 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.Services;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs b/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs
index 0d4d1d9..fff1ff6 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.InputModels;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs b/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
index fa29e7c..1d41c2b 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.Services;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs b/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
index bef6eb4..3d4930f 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.Services;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
index 8abdfcb..8ac6afb 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using System;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs
index a372c48..20b2a8f 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Services.Utilities.Models;
 using System;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs
index e405a2d..6d22a3c 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Services.Utilities.Models;
 using System;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/EtherAddressDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/EtherAddressDto.cs
index f23e3ee..edbe9f9 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/EtherAddressDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/EtherAddressDto.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs
index 6dc80ac..1890768 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 namespace Etherna.BeehiveManager.Areas.Api.DtoModels
 {
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
index f51235d..6d8308c 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs
index 7807a02..23ea544 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 namespace Etherna.BeehiveManager.Areas.Api.DtoModels
 {
diff --git a/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs b/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs
index a666130..2043533 100644
--- a/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs
+++ b/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System.ComponentModel.DataAnnotations;
 
diff --git a/src/BeehiveManager/Areas/Api/InputModels/UpdateNodeConfigInput.cs b/src/BeehiveManager/Areas/Api/InputModels/UpdateNodeConfigInput.cs
index d33a950..ee507a2 100644
--- a/src/BeehiveManager/Areas/Api/InputModels/UpdateNodeConfigInput.cs
+++ b/src/BeehiveManager/Areas/Api/InputModels/UpdateNodeConfigInput.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 namespace Etherna.BeehiveManager.Areas.Api.InputModels
 {
diff --git a/src/BeehiveManager/Areas/Api/Services/ChainControllerService.cs b/src/BeehiveManager/Areas/Api/Services/ChainControllerService.cs
index 1d2a4d8..a3af86e 100644
--- a/src/BeehiveManager/Areas/Api/Services/ChainControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/ChainControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Services.Utilities;
diff --git a/src/BeehiveManager/Areas/Api/Services/IChainControllerService.cs b/src/BeehiveManager/Areas/Api/Services/IChainControllerService.cs
index 7a0e848..bfbb274 100644
--- a/src/BeehiveManager/Areas/Api/Services/IChainControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/IChainControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 
diff --git a/src/BeehiveManager/Areas/Api/Services/ILoadBalancerControllerService.cs b/src/BeehiveManager/Areas/Api/Services/ILoadBalancerControllerService.cs
index 26848e2..3c348b5 100644
--- a/src/BeehiveManager/Areas/Api/Services/ILoadBalancerControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/ILoadBalancerControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs b/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs
index 2d43a7f..3a8e368 100644
--- a/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.InputModels;
diff --git a/src/BeehiveManager/Areas/Api/Services/IPinningControllerService.cs b/src/BeehiveManager/Areas/Api/Services/IPinningControllerService.cs
index 608fcce..1d797b4 100644
--- a/src/BeehiveManager/Areas/Api/Services/IPinningControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/IPinningControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using System.Collections.Generic;
diff --git a/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs b/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs
index 11f4050..b94b28f 100644
--- a/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager/Areas/Api/Services/LoadBalancerControllerService.cs b/src/BeehiveManager/Areas/Api/Services/LoadBalancerControllerService.cs
index aadc7f2..0f5133d 100644
--- a/src/BeehiveManager/Areas/Api/Services/LoadBalancerControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/LoadBalancerControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Domain;
diff --git a/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs b/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
index baee6fe..81213f9 100644
--- a/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.InputModels;
diff --git a/src/BeehiveManager/Areas/Api/Services/PinningControllerService.cs b/src/BeehiveManager/Areas/Api/Services/PinningControllerService.cs
index 8513f7c..b3fa08e 100644
--- a/src/BeehiveManager/Areas/Api/Services/PinningControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/PinningControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Domain;
diff --git a/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs b/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs
index 3cd1acc..cfc1d61 100644
--- a/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Services.Utilities;
diff --git a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
index 2bc65d6..e118a5a 100644
--- a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
+++ b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeeNet.Exceptions;
 using Etherna.MongODM.Core.Exceptions;
diff --git a/src/BeehiveManager/Attributes/SwarmResourceValidationAttribute.cs b/src/BeehiveManager/Attributes/SwarmResourceValidationAttribute.cs
index be5d17e..52a3ead 100644
--- a/src/BeehiveManager/Attributes/SwarmResourceValidationAttribute.cs
+++ b/src/BeehiveManager/Attributes/SwarmResourceValidationAttribute.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System.ComponentModel.DataAnnotations;
 using System.Text.RegularExpressions;
diff --git a/src/BeehiveManager/Configs/CommonConsts.cs b/src/BeehiveManager/Configs/CommonConsts.cs
index 47ff89b..1974813 100644
--- a/src/BeehiveManager/Configs/CommonConsts.cs
+++ b/src/BeehiveManager/Configs/CommonConsts.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 namespace Etherna.BeehiveManager.Configs
 {
diff --git a/src/BeehiveManager/Configs/Hangfire/AllowAllFilter.cs b/src/BeehiveManager/Configs/Hangfire/AllowAllFilter.cs
index f6725b1..5d3ad5e 100644
--- a/src/BeehiveManager/Configs/Hangfire/AllowAllFilter.cs
+++ b/src/BeehiveManager/Configs/Hangfire/AllowAllFilter.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Hangfire.Annotations;
 using Hangfire.Dashboard;
diff --git a/src/BeehiveManager/Configs/MongODM/AllowAllFilter.cs b/src/BeehiveManager/Configs/MongODM/AllowAllFilter.cs
index 2bb6292..06b9b8c 100644
--- a/src/BeehiveManager/Configs/MongODM/AllowAllFilter.cs
+++ b/src/BeehiveManager/Configs/MongODM/AllowAllFilter.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.MongODM.AspNetCore.UI.Auth.Filters;
 using Microsoft.AspNetCore.Http;
diff --git a/src/BeehiveManager/Configs/Swagger/ConfigureSwaggerOptions.cs b/src/BeehiveManager/Configs/Swagger/ConfigureSwaggerOptions.cs
index 83656cb..0f9c33f 100644
--- a/src/BeehiveManager/Configs/Swagger/ConfigureSwaggerOptions.cs
+++ b/src/BeehiveManager/Configs/Swagger/ConfigureSwaggerOptions.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs b/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs
index 8c422d8..ed2d15d 100644
--- a/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs
+++ b/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.OpenApi.Any;
diff --git a/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs b/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs
index 819f042..78630ae 100644
--- a/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs
+++ b/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.MongODM.Core.Options;
 using Microsoft.AspNetCore.DataProtection.Repositories;
diff --git a/src/BeehiveManager/Exceptions/ServiceConfigurationException.cs b/src/BeehiveManager/Exceptions/ServiceConfigurationException.cs
index 974fd3e..b810296 100644
--- a/src/BeehiveManager/Exceptions/ServiceConfigurationException.cs
+++ b/src/BeehiveManager/Exceptions/ServiceConfigurationException.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 
diff --git a/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs b/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs
index 6a809c7..2c75f0c 100644
--- a/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Services.Utilities;
 using Microsoft.AspNetCore.Builder;
diff --git a/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs b/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs
index 3ca4e60..61b5db6 100644
--- a/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs
+++ b/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Configs.SystemStore;
 using Etherna.MongODM.Core.Options;
diff --git a/src/BeehiveManager/Pages/Index.cshtml.cs b/src/BeehiveManager/Pages/Index.cshtml.cs
index d052830..8923bc7 100644
--- a/src/BeehiveManager/Pages/Index.cshtml.cs
+++ b/src/BeehiveManager/Pages/Index.cshtml.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
diff --git a/src/BeehiveManager/Program.cs b/src/BeehiveManager/Program.cs
index 4afd6e7..0aff53a 100644
--- a/src/BeehiveManager/Program.cs
+++ b/src/BeehiveManager/Program.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.ACR.Middlewares.DebugPages;
 using Etherna.BeehiveManager.Configs;
diff --git a/src/BeehiveManager/Properties/AssemblyInfo.cs b/src/BeehiveManager/Properties/AssemblyInfo.cs
index 0bb23d3..0d5e509 100644
--- a/src/BeehiveManager/Properties/AssemblyInfo.cs
+++ b/src/BeehiveManager/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 
diff --git a/src/BeehiveManager/Properties/GlobalSuppressions.cs b/src/BeehiveManager/Properties/GlobalSuppressions.cs
index 06d9a3b..8aad6f8 100644
--- a/src/BeehiveManager/Properties/GlobalSuppressions.cs
+++ b/src/BeehiveManager/Properties/GlobalSuppressions.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 // This file is used by Code Analysis to maintain SuppressMessage
 // attributes that are applied to this project.
diff --git a/src/BeehiveManager/Settings/SeedDbSettings.cs b/src/BeehiveManager/Settings/SeedDbSettings.cs
index 13f57af..5928917 100644
--- a/src/BeehiveManager/Settings/SeedDbSettings.cs
+++ b/src/BeehiveManager/Settings/SeedDbSettings.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 
diff --git a/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs b/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs
index 067867f..b3db271 100644
--- a/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs
+++ b/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.ExecContext.AsyncLocal;
 using Etherna.MongoDB.Bson.Serialization;
diff --git a/test/BeehiveManager.Persistence.Tests/Helpers/DeserializationTestElement.cs b/test/BeehiveManager.Persistence.Tests/Helpers/DeserializationTestElement.cs
index 9742b8c..df96d89 100644
--- a/test/BeehiveManager.Persistence.Tests/Helpers/DeserializationTestElement.cs
+++ b/test/BeehiveManager.Persistence.Tests/Helpers/DeserializationTestElement.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain;
 using Etherna.MongoDB.Driver;
diff --git a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
index 6c8b42e..618cf31 100644
--- a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
+++ b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeehiveManager.Persistence.Helpers;
diff --git a/test/BeehiveManager.Persistence.Tests/Properties/AssemblyInfo.cs b/test/BeehiveManager.Persistence.Tests/Properties/AssemblyInfo.cs
index 97fe72b..0d3ef7c 100644
--- a/test/BeehiveManager.Persistence.Tests/Properties/AssemblyInfo.cs
+++ b/test/BeehiveManager.Persistence.Tests/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
-//   Copyright 2021-present Etherna SA
+// Copyright 2021-present Etherna SA
 // 
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 // 
-//       http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 // 
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 

From 9ab58cf683cf488a2ecaaca6266820ade72a10b5 Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Fri, 8 Mar 2024 20:00:45 +0100
Subject: [PATCH 06/13] add api exception logging

---
 .../Attributes/SimpleExceptionFilterAttribute.cs              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
index e118a5a..e111ff8 100644
--- a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
+++ b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
@@ -16,6 +16,7 @@
 using Etherna.MongODM.Core.Exceptions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Serilog;
 using System;
 using System.Collections.Generic;
 
@@ -27,6 +28,9 @@ public override void OnException(ExceptionContext context)
         {
             if (context is null)
                 throw new ArgumentNullException(nameof(context));
+            
+            // Log exception.
+            Log.Warning(context.Exception, "API exception");
 
             context.Result = context.Exception switch
             {

From 16aa23c182cdbea0246bf1e72ef4e4ceae6fb468 Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Fri, 8 Mar 2024 20:26:09 +0100
Subject: [PATCH 07/13] handle 404 from bee

---
 .../Attributes/SimpleExceptionFilterAttribute.cs              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
index e111ff8..60cf9cd 100644
--- a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
+++ b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
@@ -28,7 +28,7 @@ public override void OnException(ExceptionContext context)
         {
             if (context is null)
                 throw new ArgumentNullException(nameof(context));
-            
+
             // Log exception.
             Log.Warning(context.Exception, "API exception");
 
@@ -44,6 +44,8 @@ InvalidOperationException _ or
                 UnauthorizedAccessException _ => new UnauthorizedResult(),
 
                 // Error code 404.
+                BeeNetDebugApiException { StatusCode: 404 } _ or
+                BeeNetGatewayApiException { StatusCode: 404 } _ or
                 KeyNotFoundException _ or
                 MongodmEntityNotFoundException _ => new NotFoundObjectResult(context.Exception.Message),
 

From 4ffffd1b2693257e0b80caae36444d983cc884ce Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Tue, 28 May 2024 19:46:11 +0200
Subject: [PATCH 08/13] update dependencies

---
 src/BeehiveManager.Domain/BeehiveManager.Domain.csproj      | 2 +-
 src/BeehiveManager.Services/BeehiveManager.Services.csproj  | 2 +-
 src/BeehiveManager/BeehiveManager.csproj                    | 4 ++--
 .../BeehiveManager.Persistence.Tests.csproj                 | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
index 4f9a53c..b56f1c0 100644
--- a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
+++ b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="Etherna.DomainEvents" Version="1.4.0" />
     <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.101" />
-    <PackageReference Include="Nethereum.Web3" Version="4.19.0" />
+    <PackageReference Include="Nethereum.Web3" Version="4.20.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BeehiveManager.Services/BeehiveManager.Services.csproj b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
index a381bd1..158c677 100644
--- a/src/BeehiveManager.Services/BeehiveManager.Services.csproj
+++ b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Bee.Net" Version="0.2.0-alpha.218" />
     <PackageReference Include="Etherna.DomainEvents.AspNetCore" Version="1.4.0" />
     <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.101" />
-    <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.19.0" />
+    <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.20.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 
diff --git a/src/BeehiveManager/BeehiveManager.csproj b/src/BeehiveManager/BeehiveManager.csproj
index 05104b7..e343396 100644
--- a/src/BeehiveManager/BeehiveManager.csproj
+++ b/src/BeehiveManager/BeehiveManager.csproj
@@ -27,8 +27,8 @@
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
-    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj b/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
index 9f08905..146a043 100644
--- a/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
+++ b/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
@@ -15,10 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From d385505be5ee631acf9745694a98e4ea89ca18d5 Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Tue, 28 May 2024 20:23:05 +0200
Subject: [PATCH 09/13] update Bee.Net

---
 src/BeehiveManager.Domain/Models/BeeNode.cs   |  8 ---
 .../BeehiveDbContext.cs                       |  2 -
 .../ModelMaps/BeeNodeMap.cs                   |  1 -
 .../BeehiveManager.Services.csproj            |  2 +-
 .../Extensions/LoggerExtensions.cs            | 10 +--
 .../Tasks/CashoutAllNodesChequesTask.cs       | 15 ++---
 .../Tasks/NodesChequebookMaintainerTask.cs    |  9 +--
 .../Utilities/BeeNodeLiveManager.cs           |  4 +-
 .../Utilities/Models/BeeNodeLiveInstance.cs   | 61 ++++++-------------
 .../Utilities/Models/ChainState.cs            |  3 +-
 .../Api/Controllers/LoadBalancerController.cs |  1 -
 .../Api/Controllers/PinningController.cs      |  1 -
 .../Api/Controllers/PostageController.cs      |  1 -
 .../Areas/Api/DtoModels/BeeNodeDto.cs         |  2 -
 .../Areas/Api/DtoModels/PostageBatchDto.cs    |  3 +-
 .../Areas/Api/InputModels/BeeNodeInput.cs     |  3 -
 .../Api/Services/NodesControllerService.cs    | 14 ++---
 .../SimpleExceptionFilterAttribute.cs         |  6 +-
 src/BeehiveManager/Program.cs                 |  2 +-
 src/BeehiveManager/Settings/SeedDbSettings.cs |  1 -
 .../BeehiveDbContextDeserializationTest.cs    |  3 -
 21 files changed, 47 insertions(+), 105 deletions(-)

diff --git a/src/BeehiveManager.Domain/Models/BeeNode.cs b/src/BeehiveManager.Domain/Models/BeeNode.cs
index 5c7add7..0b1ed5d 100644
--- a/src/BeehiveManager.Domain/Models/BeeNode.cs
+++ b/src/BeehiveManager.Domain/Models/BeeNode.cs
@@ -21,20 +21,14 @@ public class BeeNode : EntityModelBase<string>
         // Constructors.
         public BeeNode(
             string connectionScheme,
-            int debugPort,
             int gatewayPort,
             string hostname,
             bool enableBatchCreation)
         {
-            if (debugPort is < 1 or > 65535)
-                throw new ArgumentOutOfRangeException(nameof(debugPort), "Debug port is not a valid port");
             if (gatewayPort is < 1 or > 65535)
                 throw new ArgumentOutOfRangeException(nameof(gatewayPort), "Gateway port is not a valid port");
-            if (gatewayPort == debugPort)
-                throw new ArgumentException("Gateway and debug ports can't be the same");
 
             ConnectionScheme = connectionScheme;
-            DebugPort = debugPort;
             GatewayPort = gatewayPort;
             Hostname = hostname;
             IsBatchCreationEnabled = enableBatchCreation;
@@ -46,8 +40,6 @@ protected BeeNode() { }
         // Properties.
         public virtual Uri BaseUrl => new($"{ConnectionScheme}://{Hostname}");
         public virtual string ConnectionScheme { get; set; }
-        public virtual int DebugPort { get; set; }
-        public virtual Uri DebugUrl => new($"{ConnectionScheme}://{Hostname}:{DebugPort}");
         public virtual int GatewayPort { get; set; }
         public virtual Uri GatewayUrl => new($"{ConnectionScheme}://{Hostname}:{GatewayPort}");
         public virtual string Hostname { get; set; }
diff --git a/src/BeehiveManager.Persistence/BeehiveDbContext.cs b/src/BeehiveManager.Persistence/BeehiveDbContext.cs
index 8cad874..74d23e2 100644
--- a/src/BeehiveManager.Persistence/BeehiveDbContext.cs
+++ b/src/BeehiveManager.Persistence/BeehiveDbContext.cs
@@ -53,8 +53,6 @@ public BeehiveDbContext(
             {
                 IndexBuilders = new[]
                 {
-                    (Builders<BeeNode>.IndexKeys.Ascending(n => n.DebugPort)
-                                                .Ascending(n => n.Hostname), new CreateIndexOptions<BeeNode> { Unique = true }),
                     (Builders<BeeNode>.IndexKeys.Ascending(n => n.GatewayPort)
                                                 .Ascending(n => n.Hostname), new CreateIndexOptions<BeeNode> { Unique = true })
                 }
diff --git a/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs b/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
index 85856cc..0272b14 100644
--- a/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
+++ b/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
@@ -69,7 +69,6 @@ public static ReferenceSerializer<BeeNode, string> ConnectionInfoSerializer(
                 config.AddModelMap<BeeNode>("a833d25f-4613-4cbc-b36a-4cdfa62501f4", mm =>
                 {
                     mm.MapMember(n => n.ConnectionScheme);
-                    mm.MapMember(n => n.DebugPort);
                     mm.MapMember(n => n.GatewayPort);
                     mm.MapMember(n => n.Hostname);
                 });
diff --git a/src/BeehiveManager.Services/BeehiveManager.Services.csproj b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
index 158c677..9df3b9d 100644
--- a/src/BeehiveManager.Services/BeehiveManager.Services.csproj
+++ b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bee.Net" Version="0.2.0-alpha.218" />
+    <PackageReference Include="Bee.Net" Version="0.2.0-alpha.255" />
     <PackageReference Include="Etherna.DomainEvents.AspNetCore" Version="1.4.0" />
     <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.101" />
     <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.20.0" />
diff --git a/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs b/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
index d387ede..eb88645 100644
--- a/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
+++ b/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
@@ -40,11 +40,11 @@ public static class LoggerExtensions
                 new EventId(7, nameof(NodeConfigurationUpdated)),
                 "Node {BeeNodeId} updated configuration. EnableBatchCreation: {EnableBatchCreation}");
 
-        private static readonly Action<ILogger, string, Uri, int, int, bool, Exception> _nodeRegistered =
-            LoggerMessage.Define<string, Uri, int, int, bool>(
+        private static readonly Action<ILogger, string, Uri, int, bool, Exception> _nodeRegistered =
+            LoggerMessage.Define<string, Uri, int, bool>(
                 LogLevel.Information,
                 new EventId(5, nameof(NodeRegistered)),
-                "Node {BeeNodeId} registered on url {NodeUrl} on gateway port {GatewayPort} and debug port {DebugPort}. Batch creation enabled: {IsBatchCreationEnabled}");
+                "Node {BeeNodeId} registered on url {NodeUrl} on port {GatewayPort}. Batch creation enabled: {IsBatchCreationEnabled}");
 
         private static readonly Action<ILogger, string, Exception> _nodeRemoved =
             LoggerMessage.Define<string>(
@@ -122,8 +122,8 @@ public static void NodeCashedOut(this ILogger logger, string beeNodeId, decimal
         public static void NodeConfigurationUpdated(this ILogger logger, string beeNodeid, bool enableBatchCreation) =>
             _nodeConfigurationUpdated(logger, beeNodeid, enableBatchCreation, null!);
 
-        public static void NodeRegistered(this ILogger logger, string beeNodeId, Uri nodeUrl, int gatewayPort, int debugPort, bool isBatchCreationEnabled) =>
-            _nodeRegistered(logger, beeNodeId, nodeUrl, gatewayPort, debugPort, isBatchCreationEnabled, null!);
+        public static void NodeRegistered(this ILogger logger, string beeNodeId, Uri nodeUrl, int gatewayPort, bool isBatchCreationEnabled) =>
+            _nodeRegistered(logger, beeNodeId, nodeUrl, gatewayPort, isBatchCreationEnabled, null!);
 
         public static void NodeRemoved(this ILogger logger, string beeNodeId) =>
             _nodeRemoved(logger, beeNodeId, null!);
diff --git a/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs b/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
index 6cc0545..0783fc8 100644
--- a/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
+++ b/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
@@ -58,39 +58,36 @@ public async Task RunAsync()
         {
             foreach (var node in liveManager.AllNodes)
             {
-                if (node.Client.DebugClient is null)
-                    continue;
-
                 decimal totalBzzCashedOut = 0;
                 var txs = new List<string>();
                 try
                 {
                     // Enumerate peers.
-                    var cheques = await node.Client.DebugClient.GetAllChequeBookChequesAsync();
+                    var cheques = await node.Client.GetAllChequeBookChequesAsync();
                     foreach (var peer in cheques.Select(c => c.Peer))
                     {
                         decimal? uncashedBzzAmount = null;
                         try
                         {
-                            var cashoutResponse = await node.Client.DebugClient.GetChequeBookCashoutForPeerAsync(peer);
+                            var cashoutResponse = await node.Client.GetChequeBookCashoutForPeerAsync(peer);
                             uncashedBzzAmount = Web3.Convert.FromWei(cashoutResponse.UncashedAmount, BzzDecimalPlaces);
                         }
-                        catch (BeeNetDebugApiException) { }
+                        catch (BeeNetApiException) { }
 
                         // Cashout.
                         if (uncashedBzzAmount >= options.BzzMaxTrigger)
                         {
                             try
                             {
-                                var txHash = await node.Client.DebugClient.CashoutChequeForPeerAsync(peer);
+                                var txHash = await node.Client.CashoutChequeForPeerAsync(peer);
                                 totalBzzCashedOut += uncashedBzzAmount.Value;
                                 txs.Add(txHash);
                             }
-                            catch (BeeNetDebugApiException) { }
+                            catch (BeeNetApiException) { }
                         }
                     }
                 }
-                catch (BeeNetDebugApiException) { return; } //issues contacting the node instance api
+                catch (BeeNetApiException) { return; } //issues contacting the node instance api
                 catch (HttpRequestException) { return; }
 
                 // Add log.
diff --git a/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
index 79ec52f..d81f228 100644
--- a/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
@@ -62,13 +62,10 @@ public async Task RunAsync()
 
             foreach (var node in liveManager.AllNodes)
             {
-                if (node.Client.DebugClient is null)
-                    continue;
-
                 decimal? availableBzzBalance = null;
                 try
                 {
-                    var chequebookBalanceDto = await node.Client.DebugClient.GetChequeBookBalanceAsync();
+                    var chequebookBalanceDto = await node.Client.GetChequeBookBalanceAsync();
                     availableBzzBalance = Web3.Convert.FromWei(chequebookBalanceDto.AvailableBalance, BzzDecimalPlaces);
                 }
                 catch { }
@@ -81,7 +78,7 @@ public async Task RunAsync()
 
                     try
                     {
-                        var tx = await node.Client.DebugClient.DepositIntoChequeBookAsync((long)Web3.Convert.ToWei(bzzDepositAmount, BzzDecimalPlaces));
+                        var tx = await node.Client.DepositIntoChequeBookAsync((long)Web3.Convert.ToWei(bzzDepositAmount, BzzDecimalPlaces));
                         logger.SuccededToDepositBzzOnNodeChequeBook(node.Id, bzzDepositAmount, tx);
                     }
                     catch (Exception ex)
@@ -98,7 +95,7 @@ public async Task RunAsync()
 
                     try
                     {
-                        var tx = await node.Client.DebugClient.WithdrawFromChequeBookAsync((long)Web3.Convert.ToWei(bzzWithdrawAmount, BzzDecimalPlaces));
+                        var tx = await node.Client.WithdrawFromChequeBookAsync((long)Web3.Convert.ToWei(bzzWithdrawAmount, BzzDecimalPlaces));
                         logger.SuccededToWithdrawBzzOnNodeChequeBook(node.Id, bzzWithdrawAmount, tx);
                     }
                     catch (Exception ex)
diff --git a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
index ec751e4..4b9d6f2 100644
--- a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
+++ b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
@@ -195,10 +195,10 @@ private async Task HeartbeatCallbackAsync()
             {
                 try
                 {
-                    ChainState = new ChainState(node.Id, await node.Client.DebugClient!.GetChainStateAsync());
+                    ChainState = new ChainState(node.Id, await node.Client.GetChainStateAsync());
                 }
                 catch (Exception e) when (
-                    e is BeeNetDebugApiException ||
+                    e is BeeNetApiException ||
                     e is HttpRequestException ||
                     e is SocketException)
                 { }
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
index 89f931f..f0cc8f5 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
@@ -14,8 +14,7 @@
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeeNet;
-using Etherna.BeeNet.Clients.DebugApi;
-using Etherna.BeeNet.Clients.GatewayApi;
+using Etherna.BeeNet.Clients;
 using Etherna.BeeNet.Exceptions;
 using System;
 using System.Collections.Concurrent;
@@ -37,14 +36,14 @@ internal BeeNodeLiveInstance(
             BeeNode beeNode)
         {
             Id = beeNode.Id;
-            Client = new BeeNodeClient(beeNode.BaseUrl.AbsoluteUri, beeNode.GatewayPort, beeNode.DebugPort);
+            Client = new BeeClient(beeNode.BaseUrl.AbsoluteUri, beeNode.GatewayPort);
             IsBatchCreationEnabled = beeNode.IsBatchCreationEnabled;
             Status = new BeeNodeStatus();
         }
 
         // Properties.
         public string Id { get; }
-        public BeeNodeClient Client { get; }
+        public BeeClient Client { get; }
         public IEnumerable<string> InProgressPins => _inProgressPins.Keys;
         public bool IsBatchCreationEnabled { get; set; }
         public BeeNodeStatus Status { get; }
@@ -52,7 +51,7 @@ internal BeeNodeLiveInstance(
         // Public methods.
         public async Task<string> BuyPostageBatchAsync(long amount, int depth, string? label, bool immutable)
         {
-            var batchId = await Client.DebugClient!.BuyPostageBatchAsync(amount, depth, label, immutable);
+            var batchId = await Client.BuyPostageBatchAsync(amount, depth, label, immutable);
 
             //immediately add the batch to the node status
             Status.AddPostageBatchId(batchId);
@@ -61,16 +60,16 @@ public async Task<string> BuyPostageBatchAsync(long amount, int depth, string? l
         }
 
         public Task<string> DilutePostageBatchAsync(string batchId, int depth) =>
-            Client.DebugClient!.DilutePostageBatchAsync(batchId, depth);
+            Client.DilutePostageBatchAsync(batchId, depth);
 
         public async Task<bool> IsPinningResourceAsync(string hash)
         {
             try
             {
-                await Client.GatewayClient!.GetPinStatusAsync(hash);
+                await Client.GetPinStatusAsync(hash);
                 return true;
             }
-            catch (BeeNetGatewayApiException e) when (e.StatusCode == 404)
+            catch (BeeNetApiException e) when (e.StatusCode == 404)
             {
                 return false;
             }
@@ -88,10 +87,10 @@ public async Task PinResourceAsync(string hash)
 
             try
             {
-                await Client.GatewayClient!.CreatePinAsync(hash);
+                await Client.CreatePinAsync(hash);
                 Status.AddPinnedHash(hash);
             }
-            catch (BeeNetGatewayApiException e) when (e.StatusCode == 404)
+            catch (BeeNetApiException e) when (e.StatusCode == 404)
             {
                 throw new KeyNotFoundException();
             }
@@ -105,17 +104,17 @@ public async Task RemovePinnedResourceAsync(string hash)
         {
             try
             {
-                await Client.GatewayClient!.DeletePinAsync(hash);
+                await Client.DeletePinAsync(hash);
                 Status.RemovePinnedHash(hash);
             }
-            catch (BeeNetGatewayApiException e) when(e.StatusCode == 404)
+            catch (BeeNetApiException e) when(e.StatusCode == 404)
             {
                 throw new KeyNotFoundException();
             }
         }
 
         public Task<string> TopUpPostageBatchAsync(string batchId, long amount) =>
-            Client.DebugClient!.TopUpPostageBatchAsync(batchId, amount);
+            Client.TopUpPostageBatchAsync(batchId, amount);
 
         /// <summary>
         /// Try to refresh node live status
@@ -130,9 +129,9 @@ public async Task<bool> TryRefreshStatusAsync(bool forceFullRefresh = false)
             try
             {
                 //health
-                var healthResult = await Client.DebugClient!.GetHealthAsync();
+                var healthResult = await Client.GetHealthAsync();
 
-                if (healthResult.Status != BeeNet.DtoModels.StatusEnumDto.Ok)
+                if (healthResult.Status != BeeNet.Models.StatusValues.Ok)
                 {
                     Status.FailedHeartbeatAttempt(
                         new[] { "Node is not healthy" },
@@ -140,30 +139,8 @@ public async Task<bool> TryRefreshStatusAsync(bool forceFullRefresh = false)
                     return false;
                 }
 
-                /* Verify and update api version.
-                 * 
-                 * If the version is not recognized (switch default case) use the last version available.
-                 * This because is more probable that the actual version is more advanced than the recognized one,
-                 * and so APIs are more similar to the last version than the older versions.
-                 */
-                var currentGatewayApiVersion = healthResult.ApiVersion switch
-                {
-                    "5.0.0" => GatewayApiVersion.v5_0_0,
-                    _ => Enum.GetValues<GatewayApiVersion>().OrderByDescending(e => e.ToString()).First()
-                };
-                var currentDebugApiVersion = healthResult.DebugApiVersion switch
-                {
-                    "5.0.0" => DebugApiVersion.v5_0_0,
-                    _ => Enum.GetValues<DebugApiVersion>().OrderByDescending(e => e.ToString()).First()
-                };
-
-                if (Client.GatewayClient!.CurrentApiVersion != currentGatewayApiVersion)
-                    Client.GatewayClient.CurrentApiVersion = currentGatewayApiVersion;
-                if (Client.DebugClient!.CurrentApiVersion != currentDebugApiVersion)
-                    Client.DebugClient.CurrentApiVersion = currentDebugApiVersion;
-
                 //readiness
-                var isReady = await Client.DebugClient!.GetReadinessAsync();
+                var isReady = await Client.GetReadinessAsync();
 
                 if (!isReady)
                 {
@@ -174,7 +151,7 @@ public async Task<bool> TryRefreshStatusAsync(bool forceFullRefresh = false)
                 }
             }
             catch (Exception e) when (
-                e is BeeNetDebugApiException ||
+                e is BeeNetApiException ||
                 e is HttpRequestException ||
                 e is SocketException)
             {
@@ -195,7 +172,7 @@ e is HttpRequestException ||
             {
                 try
                 {
-                    var response = await Client.DebugClient!.GetAddressesAsync();
+                    var response = await Client.GetAddressesAsync();
                     Status.InitializeAddresses(new BeeNodeAddresses(
                         response.Ethereum,
                         response.Overlay,
@@ -215,14 +192,14 @@ e is HttpRequestException ||
                 //pinned hashes
                 try
                 {
-                    refreshedPinnedHashes = await Client.GatewayClient!.GetAllPinsAsync();
+                    refreshedPinnedHashes = await Client.GetAllPinsAsync();
                 }
                 catch { errors.Add("Can't read pinned hashes"); }
 
                 //postage batches
                 try
                 {
-                    var batches = await Client.DebugClient!.GetOwnedPostageBatchesByNodeAsync();
+                    var batches = await Client.GetOwnedPostageBatchesByNodeAsync();
                     refreshedPostageBatchesId = batches.Select(b => b.Id);
                 }
                 catch { errors.Add("Can't read postage batches"); }
diff --git a/src/BeehiveManager.Services/Utilities/Models/ChainState.cs b/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
index 8d994db..011b1b6 100644
--- a/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Etherna.BeeNet.DtoModels;
 using System;
 
 namespace Etherna.BeehiveManager.Services.Utilities.Models
 {
     public class ChainState
     {
-        public ChainState(string nodeId, ChainStateDto chainStateDto)
+        public ChainState(string nodeId, Etherna.BeeNet.Models.ChainState chainStateDto)
         {
             if (chainStateDto is null)
                 throw new ArgumentNullException(nameof(chainStateDto));
diff --git a/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs b/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
index 110cd94..34de475 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
@@ -110,7 +110,6 @@ public async Task<BeeNodeDto> SelectSocNodeAsync()
         private void WriteNodeInfoInHeaders(BeeNodeDto beeNode)
         {
             HttpContext.Response.Headers.Add("bee-node-id", beeNode.Id);
-            HttpContext.Response.Headers.Add("bee-node-debug-port", beeNode.DebugPort.ToString(CultureInfo.InvariantCulture));
             HttpContext.Response.Headers.Add("bee-node-gateway-port", beeNode.GatewayPort.ToString(CultureInfo.InvariantCulture));
             HttpContext.Response.Headers.Add("bee-node-hostname", beeNode.Hostname.ToString(CultureInfo.InvariantCulture));
             HttpContext.Response.Headers.Add("bee-node-scheme", beeNode.ConnectionScheme);
diff --git a/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs b/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
index 1d41c2b..a8be4de 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
@@ -59,7 +59,6 @@ public async Task<IEnumerable<BeeNodeDto>> FindBeeNodesPinningContentAsync(
 
             // Copy response in headers (Nginx optimization).
             HttpContext.Response.Headers.Add("bee-node-id", beeNodes.Select(n => n.Id).ToArray());
-            HttpContext.Response.Headers.Add("bee-node-debug-port", beeNodes.Select(n => n.DebugPort.ToString(CultureInfo.InvariantCulture)).ToArray());
             HttpContext.Response.Headers.Add("bee-node-gateway-port", beeNodes.Select(n => n.GatewayPort.ToString(CultureInfo.InvariantCulture)).ToArray());
             HttpContext.Response.Headers.Add("bee-node-hostname", beeNodes.Select(n => n.Hostname.ToString(CultureInfo.InvariantCulture)).ToArray());
             HttpContext.Response.Headers.Add("bee-node-scheme", beeNodes.Select(n => n.ConnectionScheme).ToArray());
diff --git a/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs b/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
index 3d4930f..fcdeb27 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
@@ -62,7 +62,6 @@ public async Task<BeeNodeDto> FindBeeNodeOwnerOfPostageBatchAsync(
 
             // Copy response in headers (Nginx optimization).
             HttpContext.Response.Headers.Add("bee-node-id", beeNodeInfo.Id);
-            HttpContext.Response.Headers.Add("bee-node-debug-port", beeNodeInfo.DebugPort.ToString(CultureInfo.InvariantCulture));
             HttpContext.Response.Headers.Add("bee-node-gateway-port", beeNodeInfo.GatewayPort.ToString(CultureInfo.InvariantCulture));
             HttpContext.Response.Headers.Add("bee-node-hostname", beeNodeInfo.Hostname.ToString(CultureInfo.InvariantCulture));
             HttpContext.Response.Headers.Add("bee-node-scheme", beeNodeInfo.ConnectionScheme);
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
index 8ac6afb..9f89b56 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
@@ -27,7 +27,6 @@ public BeeNodeDto(BeeNode beeNode)
 
             Id = beeNode.Id;
             ConnectionScheme = beeNode.ConnectionScheme;
-            DebugPort = beeNode.DebugPort;
             GatewayPort = beeNode.GatewayPort;
             Hostname = beeNode.Hostname;
             IsBatchCreationEnabled = beeNode.IsBatchCreationEnabled;
@@ -36,7 +35,6 @@ public BeeNodeDto(BeeNode beeNode)
         // Properties.
         public string Id { get; }
         public string ConnectionScheme { get; }
-        public int DebugPort { get; }
         public int GatewayPort { get; }
         public string Hostname { get; }
         public bool IsBatchCreationEnabled { get; }
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
index 6d8308c..5e77cc7 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
@@ -19,7 +19,7 @@ namespace Etherna.BeehiveManager.Areas.Api.DtoModels
     public class PostageBatchDto
     {
         // Constructors.
-        public PostageBatchDto(BeeNet.DtoModels.PostageBatchDto postageBatch)
+        public PostageBatchDto(BeeNet.Models.PostageBatch postageBatch)
         {
             if (postageBatch is null)
                 throw new ArgumentNullException(nameof(postageBatch));
@@ -46,7 +46,6 @@ public PostageBatchDto(BeeNet.DtoModels.PostageBatchDto postageBatch)
         public bool Exists { get; }
         public bool ImmutableFlag { get; }
         public string? Label { get; }
-        public long NormalisedBalance { get; }
         public bool Usable { get; }
         public int? Utilization { get; }
         public long? Value { get; }
diff --git a/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs b/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs
index 2043533..1a54f55 100644
--- a/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs
+++ b/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs
@@ -20,9 +20,6 @@ public class BeeNodeInput
     {
         public string ConnectionScheme { get; set; } = "http";
 
-        [Range(1, 65535)]
-        public int DebugApiPort { get; set; }
-
         public bool EnableBatchCreation { get; set; } = true;
 
         [Range(1, 65535)]
diff --git a/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs b/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
index 81213f9..37a9a2c 100644
--- a/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
@@ -57,7 +57,6 @@ public async Task<BeeNodeDto> AddBeeNodeAsync(BeeNodeInput input)
             // Create node.
             var node = new BeeNode(
                 input.ConnectionScheme,
-                input.DebugApiPort,
                 input.GatewayApiPort,
                 input.Hostname,
                 input.EnableBatchCreation);
@@ -67,7 +66,6 @@ public async Task<BeeNodeDto> AddBeeNodeAsync(BeeNodeInput input)
                 node.Id,
                 node.BaseUrl,
                 node.GatewayPort,
-                node.DebugPort,
                 node.IsBatchCreationEnabled);
 
             return new BeeNodeDto(node);
@@ -81,7 +79,7 @@ public async Task<bool> CheckResourceAvailabilityFromNodeAsync(string id, string
                 throw new ArgumentNullException(nameof(hash));
 
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
-            var result = await beeNodeInstance.Client.GatewayClient!.CheckIsContentAvailableAsync(hash);
+            var result = await beeNodeInstance.Client.CheckIsContentAvailableAsync(hash);
 
             return result.IsRetrievable;
         }
@@ -131,7 +129,7 @@ public async Task<PinnedResourceDto> GetPinDetailsAsync(string id, string hash)
         public async Task<IEnumerable<string>> GetPinsByNodeAsync(string id)
         {
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
-            var readyPins = await beeNodeInstance.Client.GatewayClient!.GetAllPinsAsync();
+            var readyPins = await beeNodeInstance.Client.GetAllPinsAsync();
             var inProgressPins = beeNodeInstance.InProgressPins;
             return readyPins.Union(inProgressPins);
         }
@@ -141,10 +139,10 @@ public async Task<PostageBatchDto> GetPostageBatchDetailsAsync(string id, string
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
             try
             {
-                var postageBatch = await beeNodeInstance.Client.DebugClient!.GetPostageBatchAsync(batchId);
+                var postageBatch = await beeNodeInstance.Client.GetPostageBatchAsync(batchId);
                 return new PostageBatchDto(postageBatch);
             }
-            catch (BeeNetDebugApiException ex) when (ex.StatusCode == 400)
+            catch (BeeNetApiException ex) when (ex.StatusCode == 400)
             {
                 throw new KeyNotFoundException();
             }
@@ -153,7 +151,7 @@ public async Task<PostageBatchDto> GetPostageBatchDetailsAsync(string id, string
         public async Task<IEnumerable<PostageBatchDto>> GetPostageBatchesByNodeAsync(string id)
         {
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
-            var batches = await beeNodeInstance.Client.DebugClient!.GetOwnedPostageBatchesByNodeAsync();
+            var batches = await beeNodeInstance.Client.GetOwnedPostageBatchesByNodeAsync();
             return batches.Select(b => new PostageBatchDto(b));
         }
 
@@ -181,7 +179,7 @@ public async Task ReuploadResourceToNetworkFromNodeAsync(string id, string hash)
                 throw new ArgumentNullException(nameof(hash));
 
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
-            await beeNodeInstance.Client.GatewayClient!.ReuploadContentAsync(hash);
+            await beeNodeInstance.Client.ReuploadContentAsync(hash);
         }
 
         public async Task UpdateNodeConfigAsync(string id, UpdateNodeConfigInput config)
diff --git a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
index 60cf9cd..a683dd9 100644
--- a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
+++ b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
@@ -44,14 +44,12 @@ InvalidOperationException _ or
                 UnauthorizedAccessException _ => new UnauthorizedResult(),
 
                 // Error code 404.
-                BeeNetDebugApiException { StatusCode: 404 } _ or
-                BeeNetGatewayApiException { StatusCode: 404 } _ or
+                BeeNetApiException { StatusCode: 404 } _ or
                 KeyNotFoundException _ or
                 MongodmEntityNotFoundException _ => new NotFoundObjectResult(context.Exception.Message),
 
                 // Error code 503.
-                BeeNetDebugApiException _ or
-                BeeNetGatewayApiException _ => new StatusCodeResult(503),
+                BeeNetApiException _ => new StatusCodeResult(503),
 
                 // Error code 500.
                 _ => new StatusCodeResult(500),
diff --git a/src/BeehiveManager/Program.cs b/src/BeehiveManager/Program.cs
index 0aff53a..9fd203d 100644
--- a/src/BeehiveManager/Program.cs
+++ b/src/BeehiveManager/Program.cs
@@ -215,7 +215,7 @@ private static void ConfigureServices(WebApplicationBuilder builder)
                     return new BeehiveDbContext(
                         eventDispatcher,
                         seedDbSettings.BeeNodes.Where(n => n is not null)
-                                               .Select(n => new BeeNode(n.Scheme, n.DebugPort, n.GatewayPort, n.Hostname, n.EnableBatchCreation)));
+                                               .Select(n => new BeeNode(n.Scheme, n.GatewayPort, n.Hostname, n.EnableBatchCreation)));
                 },
                 options =>
                 {
diff --git a/src/BeehiveManager/Settings/SeedDbSettings.cs b/src/BeehiveManager/Settings/SeedDbSettings.cs
index 5928917..fdb14a4 100644
--- a/src/BeehiveManager/Settings/SeedDbSettings.cs
+++ b/src/BeehiveManager/Settings/SeedDbSettings.cs
@@ -23,7 +23,6 @@ public class SeedDbSettings
         // Internal classes.
         public class BeeNode
         {
-            public int DebugPort { get; set; } = 1635;
             public bool EnableBatchCreation { get; set; } = true;
             public int GatewayPort { get; set; } = 1633;
             public string Hostname { get; set; } = "localhost";
diff --git a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
index 618cf31..5ae77f4 100644
--- a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
+++ b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
@@ -75,7 +75,6 @@ public static IEnumerable<object[]> BeeNodeDeserializationTests
                     expectedNodeMock.Setup(n => n.Id).Returns("62d9e1ab5b300b294022c2c6");
                     expectedNodeMock.Setup(n => n.CreationDateTime).Returns(new DateTime(2022, 07, 21, 23, 47, 54, 036));
                     expectedNodeMock.Setup(n => n.ConnectionScheme).Returns("http");
-                    expectedNodeMock.Setup(n => n.DebugPort).Returns(1635);
                     expectedNodeMock.Setup(n => n.GatewayPort).Returns(1633);
                     expectedNodeMock.Setup(n => n.Hostname).Returns("127.0.0.1");
                     expectedNodeMock.Setup(n => n.IsBatchCreationEnabled).Returns(true);
@@ -108,7 +107,6 @@ public static IEnumerable<object[]> BeeNodeDeserializationTests
                     expectedNodeMock.Setup(n => n.Id).Returns("62d9e1ab5b300b294022c2c6");
                     expectedNodeMock.Setup(n => n.CreationDateTime).Returns(new DateTime(2022, 07, 21, 23, 47, 54, 036));
                     expectedNodeMock.Setup(n => n.ConnectionScheme).Returns("http");
-                    expectedNodeMock.Setup(n => n.DebugPort).Returns(1635);
                     expectedNodeMock.Setup(n => n.GatewayPort).Returns(1633);
                     expectedNodeMock.Setup(n => n.Hostname).Returns("127.0.0.1");
                     expectedNodeMock.Setup(n => n.IsBatchCreationEnabled).Returns(false);
@@ -141,7 +139,6 @@ public void BeeNodeDeserialization(DeserializationTestElement<BeeNode> testEleme
             Assert.Equal(testElement.ExpectedModel.Id, result.Id);
             Assert.Equal(testElement.ExpectedModel.CreationDateTime, result.CreationDateTime);
             Assert.Equal(testElement.ExpectedModel.ConnectionScheme, result.ConnectionScheme);
-            Assert.Equal(testElement.ExpectedModel.DebugPort, result.DebugPort);
             Assert.Equal(testElement.ExpectedModel.GatewayPort, result.GatewayPort);
             Assert.Equal(testElement.ExpectedModel.Hostname, result.Hostname);
             Assert.Equal(testElement.ExpectedModel.IsBatchCreationEnabled, result.IsBatchCreationEnabled);

From 3825ab978b59fd9c00bec6c56a1a870e2ebb2824 Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Tue, 28 May 2024 20:27:11 +0200
Subject: [PATCH 10/13] update mongodm

---
 src/BeehiveManager.Domain/BeehiveManager.Domain.csproj        | 2 +-
 src/BeehiveManager.Services/BeehiveManager.Services.csproj    | 2 +-
 src/BeehiveManager/BeehiveManager.csproj                      | 4 ++--
 .../ModelMaps/BeehiveDbContextDeserializationTest.cs          | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
index b56f1c0..34c170c 100644
--- a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
+++ b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Etherna.DomainEvents" Version="1.4.0" />
-    <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.101" />
+    <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.110" />
     <PackageReference Include="Nethereum.Web3" Version="4.20.0" />
   </ItemGroup>
 
diff --git a/src/BeehiveManager.Services/BeehiveManager.Services.csproj b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
index 9df3b9d..fe17677 100644
--- a/src/BeehiveManager.Services/BeehiveManager.Services.csproj
+++ b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="Bee.Net" Version="0.2.0-alpha.255" />
     <PackageReference Include="Etherna.DomainEvents.AspNetCore" Version="1.4.0" />
-    <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.101" />
+    <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.110" />
     <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.20.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
diff --git a/src/BeehiveManager/BeehiveManager.csproj b/src/BeehiveManager/BeehiveManager.csproj
index e343396..cdf16b0 100644
--- a/src/BeehiveManager/BeehiveManager.csproj
+++ b/src/BeehiveManager/BeehiveManager.csproj
@@ -22,8 +22,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
-    <PackageReference Include="MongODM" Version="0.24.0-alpha.101" />
-    <PackageReference Include="MongODM.AspNetCore.UI" Version="0.24.0-alpha.101" />
+    <PackageReference Include="MongODM" Version="0.24.0-alpha.110" />
+    <PackageReference Include="MongODM.AspNetCore.UI" Version="0.24.0-alpha.110" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
diff --git a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
index 5ae77f4..b996554 100644
--- a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
+++ b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
@@ -23,11 +23,13 @@
 using Moq;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Xunit;
 
 namespace Etherna.BeehiveManager.Persistence.ModelMaps
 {
+    [SuppressMessage("Design", "CA1001:Types that own disposable fields should be disposable")]
     public class BeehiveDbContextDeserializationTest
     {
         // Fields.

From cb78a25e3675693ddadd4f78306d47e031f1b319 Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Tue, 8 Oct 2024 18:20:17 +0200
Subject: [PATCH 11/13] global project update

---
 BeehiveManager.sln                            | 14 ++--
 Dockerfile                                    |  4 +-
 .../BeehiveManager.Domain.csproj              |  6 +-
 .../BeehiveManager.Persistence.csproj         |  2 +-
 .../Repositories/DomainRepository.cs          |  9 +--
 .../BeehiveManager.Services.csproj            |  8 +--
 .../Extensions/IEnumerableExtensions.cs       |  6 +-
 .../Extensions/LoggerExtensions.cs            | 55 ++++++++--------
 .../CashoutAllNodesChequesSettings.cs         |  4 +-
 .../Tasks/CashoutAllNodesChequesTask.cs       | 16 ++---
 .../Tasks/NodesAddressMaintainerTask.cs       |  3 +-
 .../Tasks/NodesChequebookMaintainerTask.cs    | 16 ++---
 .../Utilities/BeeNodeLiveManager.cs           | 19 +++---
 .../Utilities/IBeeNodeLiveManager.cs          |  4 +-
 .../Utilities/Models/BeeNodeLiveInstance.cs   | 29 ++++----
 .../Utilities/Models/BeeNodeStatus.cs         | 19 +++---
 .../Utilities/Models/ChainState.cs            |  8 +--
 .../Areas/Api/ApiHostingStartup.cs            |  3 +-
 .../Api/Controllers/LoadBalancerController.cs |  8 +--
 .../Areas/Api/Controllers/NodesController.cs  |  5 +-
 .../Api/Controllers/PinningController.cs      |  8 +--
 .../Api/Controllers/PostageController.cs      | 19 +++---
 .../Areas/Api/DtoModels/BeeNodeDto.cs         |  3 +-
 .../Areas/Api/DtoModels/BeeNodeStatusDto.cs   |  8 +--
 .../Areas/Api/DtoModels/ChainStateDto.cs      |  7 +-
 .../Areas/Api/DtoModels/PinnedResourceDto.cs  | 23 +++----
 .../Areas/Api/DtoModels/PostageBatchDto.cs    | 20 +++---
 .../Areas/Api/DtoModels/PostageBatchRefDto.cs | 18 ++---
 .../Api/Services/INodesControllerService.cs   | 15 +++--
 .../Api/Services/IPostageControllerService.cs |  7 +-
 .../Api/Services/NodesControllerService.cs    | 66 +++++++------------
 .../Api/Services/PostageControllerService.cs  |  7 +-
 .../SimpleExceptionFilterAttribute.cs         |  3 +-
 src/BeehiveManager/BeehiveManager.csproj      | 12 ++--
 .../Configs/Swagger/SwaggerDefaultValues.cs   |  6 +-
 .../Configs/SystemStore/XmlRepository.cs      |  6 +-
 .../ApplicationBuilderExtensions.cs           |  3 +-
 .../DataProtectionBuilderExtensions.cs        |  3 +-
 .../Properties/launchSettings.json            |  7 --
 .../BeehiveManager.Persistence.Tests.csproj   | 10 +--
 .../Helpers/DbContextMockHelper.cs            | 12 ++--
 .../BeehiveDbContextDeserializationTest.cs    |  3 +-
 42 files changed, 222 insertions(+), 282 deletions(-)

diff --git a/BeehiveManager.sln b/BeehiveManager.sln
index 3e6a582..851232c 100644
--- a/BeehiveManager.sln
+++ b/BeehiveManager.sln
@@ -18,10 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1CD13F83-9A79-4873-A8E3-77A2D432D706}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "domain", "domain", "{873FF005-8941-4971-A051-55D8434DC8F9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "infrastructure", "infrastructure", "{11FCB662-8945-484F-9459-C2C5823045E7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Domain", "src\BeehiveManager.Domain\BeehiveManager.Domain.csproj", "{125AB1B7-31FD-4BA5-8282-6AC48C3522BB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Services", "src\BeehiveManager.Services\BeehiveManager.Services.csproj", "{36854E0C-B2C5-4F32-95BB-8FB0EE57EFF0}"
@@ -77,15 +73,13 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E14D105A-A294-4F67-BC95-58C5178E2818} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
-		{873FF005-8941-4971-A051-55D8434DC8F9} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
-		{11FCB662-8945-484F-9459-C2C5823045E7} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
-		{125AB1B7-31FD-4BA5-8282-6AC48C3522BB} = {873FF005-8941-4971-A051-55D8434DC8F9}
-		{36854E0C-B2C5-4F32-95BB-8FB0EE57EFF0} = {873FF005-8941-4971-A051-55D8434DC8F9}
-		{74960F98-A78D-40A5-8CD1-20E05DB4DD35} = {11FCB662-8945-484F-9459-C2C5823045E7}
 		{791D69C2-725F-4E7A-B2F9-30CDC151A0C5} = {2100F089-0589-448E-93E0-45B069DDCE64}
 		{74F4D982-085D-42F4-9E61-C288B25E64CB} = {CE10A1ED-2695-44EC-97F1-CB91FC5412D8}
 		{9EEC390E-0D81-4379-A02A-C1A7B55CF431} = {61C3814F-A839-44D7-8335-0F365D3FFA8C}
+		{125AB1B7-31FD-4BA5-8282-6AC48C3522BB} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
+		{36854E0C-B2C5-4F32-95BB-8FB0EE57EFF0} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
+		{74960F98-A78D-40A5-8CD1-20E05DB4DD35} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
+		{E14D105A-A294-4F67-BC95-58C5178E2818} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {67056C24-38A7-45E5-A31A-0CF654008257}
diff --git a/Dockerfile b/Dockerfile
index 29ac24d..7636dba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY . .
 RUN dotnet restore "BeehiveManager.sln"
diff --git a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
index 34c170c..90e4ba8 100644
--- a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
+++ b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager.Domain</RootNamespace>
 
     <Authors>Etherna Sagl</Authors>
@@ -14,8 +14,8 @@
 
   <ItemGroup>
     <PackageReference Include="Etherna.DomainEvents" Version="1.4.0" />
-    <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.110" />
-    <PackageReference Include="Nethereum.Web3" Version="4.20.0" />
+    <PackageReference Include="MongODM.Core" Version="0.24.0" />
+    <PackageReference Include="Nethereum.Web3" Version="4.26.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BeehiveManager.Persistence/BeehiveManager.Persistence.csproj b/src/BeehiveManager.Persistence/BeehiveManager.Persistence.csproj
index b50066e..b4748dc 100644
--- a/src/BeehiveManager.Persistence/BeehiveManager.Persistence.csproj
+++ b/src/BeehiveManager.Persistence/BeehiveManager.Persistence.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager.Persistence</RootNamespace>
 
     <Authors>Etherna Sagl</Authors>
diff --git a/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs b/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
index 2b56f92..a4525a5 100644
--- a/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
+++ b/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
@@ -44,8 +44,7 @@ public DomainRepository(RepositoryOptions<TModel> options)
         // Methods.
         public override async Task CreateAsync(IEnumerable<TModel> models, CancellationToken cancellationToken = default)
         {
-            if (models is null)
-                throw new ArgumentNullException(nameof(models));
+            ArgumentNullException.ThrowIfNull(models, nameof(models));
 
             // Create entity.
             await base.CreateAsync(models, cancellationToken);
@@ -67,8 +66,7 @@ public override async Task CreateAsync(IEnumerable<TModel> models, CancellationT
 
         public override async Task CreateAsync(TModel model, CancellationToken cancellationToken = default)
         {
-            if (model is null)
-                throw new ArgumentNullException(nameof(model));
+            ArgumentNullException.ThrowIfNull(model, nameof(model));
 
             // Create entity.
             await base.CreateAsync(model, cancellationToken);
@@ -87,8 +85,7 @@ public override async Task CreateAsync(TModel model, CancellationToken cancellat
 
         public override async Task DeleteAsync(TModel model, CancellationToken cancellationToken = default)
         {
-            if (model is null)
-                throw new ArgumentNullException(nameof(model));
+            ArgumentNullException.ThrowIfNull(model, nameof(model));
 
             // Dispatch custom events.
             if (EventDispatcher != null)
diff --git a/src/BeehiveManager.Services/BeehiveManager.Services.csproj b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
index fe17677..8f68f2f 100644
--- a/src/BeehiveManager.Services/BeehiveManager.Services.csproj
+++ b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager.Services</RootNamespace>
 
     <Authors>Etherna Sagl</Authors>
@@ -13,10 +13,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bee.Net" Version="0.2.0-alpha.255" />
+    <PackageReference Include="Bee.Net.Client" Version="0.4.0-alpha.55" />
     <PackageReference Include="Etherna.DomainEvents.AspNetCore" Version="1.4.0" />
-    <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.110" />
-    <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.20.0" />
+    <PackageReference Include="MongODM.Hangfire" Version="0.24.0" />
+    <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.26.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 
diff --git a/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs b/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs
index e6ae62d..ef94ef9 100644
--- a/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs
+++ b/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs
@@ -24,10 +24,8 @@ public static IAsyncEnumerable<TSource> Where<TSource>(
             this IEnumerable<TSource> source,
             Func<TSource, Task<bool>> predicate)
         {
-            if (source == null)
-                throw new ArgumentNullException(nameof(source));
-            if (predicate == null)
-                throw new ArgumentNullException(nameof(predicate));
+            ArgumentNullException.ThrowIfNull(source, nameof(source));
+            ArgumentNullException.ThrowIfNull(predicate, nameof(predicate));
 
             return WhereImpl(source, predicate);
         }
diff --git a/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs b/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
index eb88645..1f4a261 100644
--- a/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
+++ b/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using Etherna.BeeNet.Models;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -28,8 +29,8 @@ public static class LoggerExtensions
         //*** DEBUG LOGS ***
 
         //*** INFORMATION LOGS ***
-        private static readonly Action<ILogger, string, decimal, IEnumerable<string>, Exception> _nodeCashedOut =
-            LoggerMessage.Define<string, decimal, IEnumerable<string>>(
+        private static readonly Action<ILogger, string, BzzBalance, IEnumerable<string>, Exception> _nodeCashedOut =
+            LoggerMessage.Define<string, BzzBalance, IEnumerable<string>>(
                 LogLevel.Information,
                 new EventId(0, nameof(NodeCashedOut)),
                 "Node {BeeNodeId} cashed out {BzzCashedOut} BZZ with tx hashes {TxHashes}");
@@ -52,26 +53,26 @@ public static class LoggerExtensions
                 new EventId(6, nameof(NodeRemoved)),
                 "Node {BeeNodeId} has been removed");
 
-        private static readonly Action<ILogger, string, decimal, string, Exception> _succededToDepositBzzOnNodeChequeBook =
-            LoggerMessage.Define<string, decimal, string>(
+        private static readonly Action<ILogger, string, BzzBalance, string, Exception> _succededToDepositBzzOnNodeChequeBook =
+            LoggerMessage.Define<string, BzzBalance, string>(
                 LogLevel.Information,
                 new EventId(8, nameof(SuccededToDepositBzzOnNodeChequeBook)),
                 "Node {BeeNodeId} chequebook received deposit of {BzzAmount} BZZ with tx hash {TxHash}");
 
-        private static readonly Action<ILogger, string, decimal, decimal, string, Exception> _succededToFundBzzOnNodeAddress =
-            LoggerMessage.Define<string, decimal, decimal, string>(
+        private static readonly Action<ILogger, string, BzzBalance, BzzBalance, string, Exception> _succededToFundBzzOnNodeAddress =
+            LoggerMessage.Define<string, BzzBalance, BzzBalance, string>(
                 LogLevel.Information,
                 new EventId(1, nameof(SuccededToFundBzzOnNodeAddress)),
                 "Node {BeeNodeId} address funded with {BzzFunded} BZZ to total {BzzTotal} BZZ. Tx hash {TxHash}");
 
-        private static readonly Action<ILogger, string, decimal, decimal, string, Exception> _succededToFundXDaiOnNodeAddress =
-            LoggerMessage.Define<string, decimal, decimal, string>(
+        private static readonly Action<ILogger, string, XDaiBalance, XDaiBalance, string, Exception> _succededToFundXDaiOnNodeAddress =
+            LoggerMessage.Define<string, XDaiBalance, XDaiBalance, string>(
                 LogLevel.Information,
                 new EventId(3, nameof(SuccededToFundXDaiOnNodeAddress)),
                 "Node {BeeNodeId} address funded with {XDaiFunded} xDai to total {XDaiTotal} xDai. Tx hash {TxHash}");
 
-        private static readonly Action<ILogger, string, decimal, string, Exception> _succededToWithdrawBzzOnNodeChequeBook =
-            LoggerMessage.Define<string, decimal, string>(
+        private static readonly Action<ILogger, string, BzzBalance, string, Exception> _succededToWithdrawBzzOnNodeChequeBook =
+            LoggerMessage.Define<string, BzzBalance, string>(
                 LogLevel.Information,
                 new EventId(10, nameof(SuccededToWithdrawBzzOnNodeChequeBook)),
                 "Node {BeeNodeId} chequebook sent withdraw of {BzzAmount} BZZ with tx hash {TxHash}");
@@ -79,44 +80,44 @@ public static class LoggerExtensions
         //*** WARNING LOGS ***
 
         //*** ERROR LOGS ***
-        private static readonly Action<ILogger, string, decimal, Exception> _failedToDepositBzzOnNodeChequeBook =
-            LoggerMessage.Define<string, decimal>(
+        private static readonly Action<ILogger, string, BzzBalance, Exception> _failedToDepositBzzOnNodeChequeBook =
+            LoggerMessage.Define<string, BzzBalance>(
                 LogLevel.Error,
                 new EventId(9, nameof(FailedToDepositBzzOnNodeChequeBook)),
                 "Deposit on node {BeeNodeId} chequebook failed with {BzzAmount} BZZ");
 
-        private static readonly Action<ILogger, string, decimal, string?, Exception> _failedToFundBzzOnNodeAddress =
-            LoggerMessage.Define<string, decimal, string?>(
+        private static readonly Action<ILogger, string, BzzBalance, string?, Exception> _failedToFundBzzOnNodeAddress =
+            LoggerMessage.Define<string, BzzBalance, string?>(
                 LogLevel.Error,
                 new EventId(2, nameof(FailedToFundBzzOnNodeAddress)),
                 "Funding on node {BeeNodeId} address failed with {BzzAmount} BZZ. Tx hash {TxHash}");
 
-        private static readonly Action<ILogger, string, decimal, string?, Exception> _failedToFundXDaiOnNodeAddress =
-            LoggerMessage.Define<string, decimal, string?>(
+        private static readonly Action<ILogger, string, XDaiBalance, string?, Exception> _failedToFundXDaiOnNodeAddress =
+            LoggerMessage.Define<string, XDaiBalance, string?>(
                 LogLevel.Error,
                 new EventId(4, nameof(FailedToFundXDaiOnNodeAddress)),
                 "Funding on node {BeeNodeId} address failed with {XDaiAmount} xDai. Tx hash {TxHash}");
 
-        private static readonly Action<ILogger, string, decimal, Exception> _failedToWithdrawBzzOnNodeChequeBook =
-            LoggerMessage.Define<string, decimal>(
+        private static readonly Action<ILogger, string, BzzBalance, Exception> _failedToWithdrawBzzOnNodeChequeBook =
+            LoggerMessage.Define<string, BzzBalance>(
                 LogLevel.Error,
                 new EventId(11, nameof(FailedToWithdrawBzzOnNodeChequeBook)),
                 "Withdraw on node {BeeNodeId} chequebook failed with {BzzAmount} BZZ");
 
         // Methods.
-        public static void FailedToDepositBzzOnNodeChequeBook(this ILogger logger, string nodeId, decimal bzzDeposit, Exception exception) =>
+        public static void FailedToDepositBzzOnNodeChequeBook(this ILogger logger, string nodeId, BzzBalance bzzDeposit, Exception exception) =>
             _failedToDepositBzzOnNodeChequeBook(logger, nodeId, bzzDeposit, exception);
 
-        public static void FailedToFundBzzOnNodeAddress(this ILogger logger, string nodeId, decimal bzzFundAmount, string? txHash, Exception? exception) =>
+        public static void FailedToFundBzzOnNodeAddress(this ILogger logger, string nodeId, BzzBalance bzzFundAmount, string? txHash, Exception? exception) =>
             _failedToFundBzzOnNodeAddress(logger, nodeId, bzzFundAmount, txHash, exception!);
 
-        public static void FailedToFundXDaiOnNodeAddress(this ILogger logger, string nodeId, decimal xDaiFundAmount, string? txHash, Exception? exception) =>
+        public static void FailedToFundXDaiOnNodeAddress(this ILogger logger, string nodeId, XDaiBalance xDaiFundAmount, string? txHash, Exception? exception) =>
             _failedToFundXDaiOnNodeAddress(logger, nodeId, xDaiFundAmount, txHash, exception!);
 
-        public static void FailedToWithdrawBzzOnNodeChequeBook(this ILogger logger, string nodeId, decimal bzzWithdraw, Exception exception) =>
+        public static void FailedToWithdrawBzzOnNodeChequeBook(this ILogger logger, string nodeId, BzzBalance bzzWithdraw, Exception exception) =>
             _failedToWithdrawBzzOnNodeChequeBook(logger, nodeId, bzzWithdraw, exception);
 
-        public static void NodeCashedOut(this ILogger logger, string beeNodeId, decimal bzzCashedOut, IEnumerable<string> txHashes) =>
+        public static void NodeCashedOut(this ILogger logger, string beeNodeId, BzzBalance bzzCashedOut, IEnumerable<string> txHashes) =>
             _nodeCashedOut(logger, beeNodeId, bzzCashedOut, txHashes, null!);
 
         public static void NodeConfigurationUpdated(this ILogger logger, string beeNodeid, bool enableBatchCreation) =>
@@ -128,16 +129,16 @@ public static void NodeRegistered(this ILogger logger, string beeNodeId, Uri nod
         public static void NodeRemoved(this ILogger logger, string beeNodeId) =>
             _nodeRemoved(logger, beeNodeId, null!);
 
-        public static void SuccededToDepositBzzOnNodeChequeBook(this ILogger logger, string nodeId, decimal bzzDeposit, string txHash) =>
+        public static void SuccededToDepositBzzOnNodeChequeBook(this ILogger logger, string nodeId, BzzBalance bzzDeposit, string txHash) =>
             _succededToDepositBzzOnNodeChequeBook(logger, nodeId, bzzDeposit, txHash, null!);
 
-        public static void SuccededToFundBzzOnNodeAddress(this ILogger logger, string nodeId, decimal bzzFunded, decimal bzzTotal, string txHash) =>
+        public static void SuccededToFundBzzOnNodeAddress(this ILogger logger, string nodeId, BzzBalance bzzFunded, BzzBalance bzzTotal, string txHash) =>
             _succededToFundBzzOnNodeAddress(logger, nodeId, bzzFunded, bzzTotal, txHash, null!);
 
-        public static void SuccededToFundXDaiOnNodeAddress(this ILogger logger, string nodeId, decimal xDaiFunded, decimal xDaiTotal, string txHash) =>
+        public static void SuccededToFundXDaiOnNodeAddress(this ILogger logger, string nodeId, XDaiBalance xDaiFunded, XDaiBalance xDaiTotal, string txHash) =>
             _succededToFundXDaiOnNodeAddress(logger, nodeId, xDaiFunded, xDaiTotal, txHash, null!);
 
-        public static void SuccededToWithdrawBzzOnNodeChequeBook(this ILogger logger, string nodeid, decimal bzzWithdraw, string txHash) =>
+        public static void SuccededToWithdrawBzzOnNodeChequeBook(this ILogger logger, string nodeid, BzzBalance bzzWithdraw, string txHash) =>
             _succededToWithdrawBzzOnNodeChequeBook(logger, nodeid, bzzWithdraw, txHash, null!);
     }
 }
diff --git a/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs b/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs
index 28c7be0..1798a7f 100644
--- a/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs
+++ b/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using Etherna.BeeNet.Models;
+
 namespace Etherna.BeehiveManager.Services.Settings
 {
     public class CashoutAllNodesChequesSettings
@@ -20,6 +22,6 @@ public class CashoutAllNodesChequesSettings
         public const string ConfigPosition = "CashoutCheques";
 
         // Properties.
-        public decimal BzzMaxTrigger { get; set; } = 1;
+        public BzzBalance BzzMaxTrigger { get; set; } = 1;
     }
 }
diff --git a/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs b/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
index 0783fc8..2fd93b4 100644
--- a/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
+++ b/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
@@ -16,6 +16,7 @@
 using Etherna.BeehiveManager.Services.Settings;
 using Etherna.BeehiveManager.Services.Utilities;
 using Etherna.BeeNet.Exceptions;
+using Etherna.BeeNet.Models;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Nethereum.Web3;
@@ -32,8 +33,6 @@ public class CashoutAllNodesChequesTask : ICashoutAllNodesChequesTask
         // Consts.
         public const string TaskId = "cashoutAllNodesTask";
 
-        private const int BzzDecimalPlaces = 16;
-
         // Fields.
         private readonly IBeeNodeLiveManager liveManager;
         private readonly ILogger<CashoutAllNodesChequesTask> logger;
@@ -45,8 +44,7 @@ public CashoutAllNodesChequesTask(
             ILogger<CashoutAllNodesChequesTask> logger,
             IOptions<CashoutAllNodesChequesSettings> options)
         {
-            if (options is null)
-                throw new ArgumentNullException(nameof(options));
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
 
             this.liveManager = liveManager;
             this.logger = logger;
@@ -58,19 +56,19 @@ public async Task RunAsync()
         {
             foreach (var node in liveManager.AllNodes)
             {
-                decimal totalBzzCashedOut = 0;
+                BzzBalance totalBzzCashedOut = 0;
                 var txs = new List<string>();
                 try
                 {
                     // Enumerate peers.
-                    var cheques = await node.Client.GetAllChequeBookChequesAsync();
+                    var cheques = await node.Client.GetAllChequebookChequesAsync();
                     foreach (var peer in cheques.Select(c => c.Peer))
                     {
-                        decimal? uncashedBzzAmount = null;
+                        BzzBalance? uncashedBzzAmount = null;
                         try
                         {
-                            var cashoutResponse = await node.Client.GetChequeBookCashoutForPeerAsync(peer);
-                            uncashedBzzAmount = Web3.Convert.FromWei(cashoutResponse.UncashedAmount, BzzDecimalPlaces);
+                            var cashoutResponse = await node.Client.GetChequebookCashoutForPeerAsync(peer);
+                            uncashedBzzAmount = cashoutResponse.UncashedAmount;
                         }
                         catch (BeeNetApiException) { }
 
diff --git a/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs
index 025cc49..b34608d 100644
--- a/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs
@@ -52,8 +52,7 @@ public NodesAddressMaintainerTask(
             ILogger<NodesAddressMaintainerTask> logger,
             IOptions<NodesAddressMaintainerSettings> options)
         {
-            if (options is null)
-                throw new ArgumentNullException(nameof(options));
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
 
             this.liveManager = liveManager;
             this.logger = logger;
diff --git a/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
index d81f228..205f26c 100644
--- a/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
@@ -15,6 +15,7 @@
 using Etherna.BeehiveManager.Services.Extensions;
 using Etherna.BeehiveManager.Services.Settings;
 using Etherna.BeehiveManager.Services.Utilities;
+using Etherna.BeeNet.Models;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Nethereum.Web3;
@@ -29,8 +30,6 @@ public class NodesChequebookMaintainerTask : INodesChequebookMaintainerTask
         // Consts.
         public const string TaskId = "nodesChequebookMaintainerTask";
 
-        private const int BzzDecimalPlaces = 16;
-
         // Fields.
         private readonly bool isEnabled;
         private readonly IBeeNodeLiveManager liveManager;
@@ -43,8 +42,7 @@ public NodesChequebookMaintainerTask(
             ILogger<NodesChequebookMaintainerTask> logger,
             IOptions<NodesChequebookMaintainerSettings> options)
         {
-            if (options is null)
-                throw new ArgumentNullException(nameof(options));
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
 
             this.liveManager = liveManager;
             this.logger = logger;
@@ -62,11 +60,11 @@ public async Task RunAsync()
 
             foreach (var node in liveManager.AllNodes)
             {
-                decimal? availableBzzBalance = null;
+                BzzBalance? availableBzzBalance = null;
                 try
                 {
-                    var chequebookBalanceDto = await node.Client.GetChequeBookBalanceAsync();
-                    availableBzzBalance = Web3.Convert.FromWei(chequebookBalanceDto.AvailableBalance, BzzDecimalPlaces);
+                    var chequebookBalanceDto = await node.Client.GetChequebookBalanceAsync();
+                    availableBzzBalance = chequebookBalanceDto.AvailableBalance;
                 }
                 catch { }
 
@@ -78,7 +76,7 @@ public async Task RunAsync()
 
                     try
                     {
-                        var tx = await node.Client.DepositIntoChequeBookAsync((long)Web3.Convert.ToWei(bzzDepositAmount, BzzDecimalPlaces));
+                        var tx = await node.Client.DepositIntoChequebookAsync(bzzDepositAmount);
                         logger.SuccededToDepositBzzOnNodeChequeBook(node.Id, bzzDepositAmount, tx);
                     }
                     catch (Exception ex)
@@ -95,7 +93,7 @@ public async Task RunAsync()
 
                     try
                     {
-                        var tx = await node.Client.WithdrawFromChequeBookAsync((long)Web3.Convert.ToWei(bzzWithdrawAmount, BzzDecimalPlaces));
+                        var tx = await node.Client.WithdrawFromChequebookAsync(bzzWithdrawAmount);
                         logger.SuccededToWithdrawBzzOnNodeChequeBook(node.Id, bzzWithdrawAmount, tx);
                     }
                     catch (Exception ex)
diff --git a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
index 4b9d6f2..d9631f2 100644
--- a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
+++ b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
@@ -17,6 +17,7 @@
 using Etherna.BeehiveManager.Services.Extensions;
 using Etherna.BeehiveManager.Services.Utilities.Models;
 using Etherna.BeeNet.Exceptions;
+using Etherna.BeeNet.Models;
 using Etherna.MongoDB.Driver;
 using System;
 using System.Collections.Concurrent;
@@ -26,29 +27,25 @@
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
+using ChainState = Etherna.BeehiveManager.Services.Utilities.Models.ChainState;
 
 namespace Etherna.BeehiveManager.Services.Utilities
 {
     /// <summary>
     /// Manage live instances of bee nodes
     /// </summary>
-    internal sealed class BeeNodeLiveManager : IBeeNodeLiveManager, IDisposable
+    internal sealed class BeeNodeLiveManager(IBeehiveDbContext dbContext)
+        : IBeeNodeLiveManager, IDisposable
     {
         // Consts.
         private const int HeartbeatPeriod = 10000; //10s
 
         // Fields.
-        private readonly IBeehiveDbContext dbContext;
         private Timer? heartbeatTimer;
         private readonly Dictionary<string, BeeNodeLiveInstance?> lastSelectedNodesRoundRobin = new(); //selectionContext -> lastSelectedNodeRoundRobin
         private readonly ConcurrentDictionary<string, BeeNodeLiveInstance> beeNodeInstances = new(); //Id -> Live instance
 
-        // Constructor and dispose.
-        public BeeNodeLiveManager(
-            IBeehiveDbContext dbContext)
-        {
-            this.dbContext = dbContext;
-        }
+        // Dispose.
         public void Dispose()
         {
             heartbeatTimer?.Dispose();
@@ -82,7 +79,7 @@ public async Task<BeeNodeLiveInstance> GetBeeNodeLiveInstanceAsync(string nodeId
             return await AddBeeNodeAsync(beeNode);
         }
 
-        public BeeNodeLiveInstance GetBeeNodeLiveInstanceByOwnedPostageBatch(string batchId) =>
+        public BeeNodeLiveInstance GetBeeNodeLiveInstanceByOwnedPostageBatch(PostageBatchId batchId) =>
             AllNodes.First(n => n.Status.PostageBatchesId.Contains(batchId));
 
         public IEnumerable<BeeNodeLiveInstance> GetBeeNodeLiveInstancesByPinnedContent(string hash, bool requireAliveNodes) =>
@@ -120,7 +117,7 @@ public void StopHealthHeartbeat() =>
                 case BeeNodeSelectionMode.Random:
                     var availableNodes = beeNodeInstances.Values.Where(instance => instance.Status.IsAlive).ToList();
 
-                    while (availableNodes.Any())
+                    while (availableNodes.Count > 0)
                     {
 #pragma warning disable CA5394 // Do not use insecure randomness
                         int takeIndex = Random.Shared.Next(0, availableNodes.Count);
@@ -154,7 +151,7 @@ public void StopHealthHeartbeat() =>
                             .Where(g => g.node == lastNode)
                             .ToList();
 
-                        if (lastSelectedNodeWithIndexList.Any()) //if prev node still exists
+                        if (lastSelectedNodeWithIndexList.Count > 0) //if prev node still exists
                         {
                             selectedNode = await beeNodeInstances.Values
                                 .Skip(lastSelectedNodeWithIndexList.First().index + 1)
diff --git a/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs b/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs
index d5a811f..b412504 100644
--- a/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs
+++ b/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs
@@ -14,9 +14,11 @@
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeehiveManager.Services.Utilities.Models;
+using Etherna.BeeNet.Models;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using ChainState = Etherna.BeehiveManager.Services.Utilities.Models.ChainState;
 
 namespace Etherna.BeehiveManager.Services.Utilities
 {
@@ -30,7 +32,7 @@ public interface IBeeNodeLiveManager
         // Methods.
         Task<BeeNodeLiveInstance> AddBeeNodeAsync(BeeNode beeNode);
         Task<BeeNodeLiveInstance> GetBeeNodeLiveInstanceAsync(string nodeId);
-        BeeNodeLiveInstance GetBeeNodeLiveInstanceByOwnedPostageBatch(string batchId);
+        BeeNodeLiveInstance GetBeeNodeLiveInstanceByOwnedPostageBatch(PostageBatchId batchId);
         IEnumerable<BeeNodeLiveInstance> GetBeeNodeLiveInstancesByPinnedContent(string hash, bool requireAliveNodes);
         Task LoadAllNodesAsync();
         bool RemoveBeeNode(string nodeId);
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
index f0cc8f5..1eb4254 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
@@ -16,6 +16,7 @@
 using Etherna.BeeNet;
 using Etherna.BeeNet.Clients;
 using Etherna.BeeNet.Exceptions;
+using Etherna.BeeNet.Models;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -29,7 +30,7 @@ namespace Etherna.BeehiveManager.Services.Utilities.Models
     public class BeeNodeLiveInstance
     {
         // Fields.
-        private readonly ConcurrentDictionary<string, bool> _inProgressPins = new(); //content hash -> (irrelevant). Needed for concurrency
+        private readonly ConcurrentDictionary<SwarmHash, bool> _inProgressPins = new(); //content hash -> (irrelevant). Needed for concurrency
 
         // Constructor.
         internal BeeNodeLiveInstance(
@@ -44,12 +45,12 @@ internal BeeNodeLiveInstance(
         // Properties.
         public string Id { get; }
         public BeeClient Client { get; }
-        public IEnumerable<string> InProgressPins => _inProgressPins.Keys;
+        public IEnumerable<SwarmHash> InProgressPins => _inProgressPins.Keys;
         public bool IsBatchCreationEnabled { get; set; }
         public BeeNodeStatus Status { get; }
 
         // Public methods.
-        public async Task<string> BuyPostageBatchAsync(long amount, int depth, string? label, bool immutable)
+        public async Task<PostageBatchId> BuyPostageBatchAsync(BzzBalance amount, int depth, string? label, bool immutable)
         {
             var batchId = await Client.BuyPostageBatchAsync(amount, depth, label, immutable);
 
@@ -59,10 +60,10 @@ public async Task<string> BuyPostageBatchAsync(long amount, int depth, string? l
             return batchId;
         }
 
-        public Task<string> DilutePostageBatchAsync(string batchId, int depth) =>
+        public Task<PostageBatchId> DilutePostageBatchAsync(PostageBatchId batchId, int depth) =>
             Client.DilutePostageBatchAsync(batchId, depth);
 
-        public async Task<bool> IsPinningResourceAsync(string hash)
+        public async Task<bool> IsPinningResourceAsync(SwarmHash hash)
         {
             try
             {
@@ -75,7 +76,7 @@ public async Task<bool> IsPinningResourceAsync(string hash)
             }
         }
 
-        public void NotifyPinnedResource(string hash)
+        public void NotifyPinnedResource(SwarmHash hash)
         {
             //immediately add the pin to the node status
             Status.AddPinnedHash(hash);
@@ -100,7 +101,7 @@ public async Task PinResourceAsync(string hash)
             }
         }
 
-        public async Task RemovePinnedResourceAsync(string hash)
+        public async Task RemovePinnedResourceAsync(SwarmHash hash)
         {
             try
             {
@@ -113,7 +114,7 @@ public async Task RemovePinnedResourceAsync(string hash)
             }
         }
 
-        public Task<string> TopUpPostageBatchAsync(string batchId, long amount) =>
+        public Task<PostageBatchId> TopUpPostageBatchAsync(PostageBatchId batchId, BzzBalance amount) =>
             Client.TopUpPostageBatchAsync(batchId, amount);
 
         /// <summary>
@@ -131,10 +132,10 @@ public async Task<bool> TryRefreshStatusAsync(bool forceFullRefresh = false)
                 //health
                 var healthResult = await Client.GetHealthAsync();
 
-                if (healthResult.Status != BeeNet.Models.StatusValues.Ok)
+                if (!healthResult.IsStatusOk)
                 {
                     Status.FailedHeartbeatAttempt(
-                        new[] { "Node is not healthy" },
+                        ["Node is not healthy"],
                         heartbeatTimeStamp);
                     return false;
                 }
@@ -145,7 +146,7 @@ public async Task<bool> TryRefreshStatusAsync(bool forceFullRefresh = false)
                 if (!isReady)
                 {
                     Status.FailedHeartbeatAttempt(
-                        new[] { "Node is not ready" },
+                        ["Node is not ready"],
                         heartbeatTimeStamp);
                     return false;
                 }
@@ -156,7 +157,7 @@ e is HttpRequestException ||
                 e is SocketException)
             {
                 Status.FailedHeartbeatAttempt(
-                    new[] { "Exception invoking node API" },
+                    ["Exception invoking node API"],
                     heartbeatTimeStamp);
                 return false;
             }
@@ -184,8 +185,8 @@ e is HttpRequestException ||
 
             // Full refresh if is required (or if is forced).
             var errors = new List<string>();
-            IEnumerable<string>? refreshedPinnedHashes = null;
-            IEnumerable<string>? refreshedPostageBatchesId = null;
+            IEnumerable<SwarmHash>? refreshedPinnedHashes = null;
+            IEnumerable<PostageBatchId>? refreshedPostageBatchesId = null;
 
             if (Status.RequireFullRefresh || forceFullRefresh)
             {
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs
index 4675628..f47470d 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using Etherna.BeeNet.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -22,8 +23,8 @@ public class BeeNodeStatus
     {
         // Fields.
         private readonly List<string> _errors = new();
-        private readonly HashSet<string> _pinnedHashes = new();
-        private readonly HashSet<string> _postageBatchesId = new();
+        private readonly HashSet<SwarmHash> _pinnedHashes = new();
+        private readonly HashSet<PostageBatchId> _postageBatchesId = new();
 
         // Constructor.
         public BeeNodeStatus()
@@ -36,18 +37,18 @@ public BeeNodeStatus()
         public IEnumerable<string> Errors => _errors;
         public DateTime HeartbeatTimeStamp { get; private set; }
         public bool IsAlive { get; private set; }
-        public IEnumerable<string> PinnedHashes => _pinnedHashes;
-        public IEnumerable<string> PostageBatchesId => _postageBatchesId;
+        public IEnumerable<SwarmHash> PinnedHashes => _pinnedHashes;
+        public IEnumerable<PostageBatchId> PostageBatchesId => _postageBatchesId;
         public bool RequireFullRefresh { get; private set; }
 
         // Internal methods.
-        internal void AddPinnedHash(string hash)
+        internal void AddPinnedHash(SwarmHash hash)
         {
             lock (_pinnedHashes)
                 _pinnedHashes.Add(hash);
         }
 
-        internal void AddPostageBatchId(string batchId)
+        internal void AddPostageBatchId(PostageBatchId batchId)
         {
             lock (_postageBatchesId)
                 _postageBatchesId.Add(batchId);
@@ -71,7 +72,7 @@ internal void InitializeAddresses(BeeNodeAddresses addresses)
             Addresses = addresses;
         }
 
-        internal void RemovePinnedHash(string hash)
+        internal void RemovePinnedHash(SwarmHash hash)
         {
             lock (_pinnedHashes)
                 _pinnedHashes.Remove(hash);
@@ -80,8 +81,8 @@ internal void RemovePinnedHash(string hash)
         internal void SucceededHeartbeatAttempt(
             IEnumerable<string> errors,
             DateTime timestamp,
-            IEnumerable<string>? refreshedPinnedHashes,
-            IEnumerable<string>? refreshedPostageBatchesId)
+            IEnumerable<SwarmHash>? refreshedPinnedHashes,
+            IEnumerable<PostageBatchId>? refreshedPostageBatchesId)
         {
             lock (_errors)
             {
diff --git a/src/BeehiveManager.Services/Utilities/Models/ChainState.cs b/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
index 011b1b6..ad3b153 100644
--- a/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using Etherna.BeeNet.Models;
 using System;
 
 namespace Etherna.BeehiveManager.Services.Utilities.Models
@@ -20,8 +21,7 @@ public class ChainState
     {
         public ChainState(string nodeId, Etherna.BeeNet.Models.ChainState chainStateDto)
         {
-            if (chainStateDto is null)
-                throw new ArgumentNullException(nameof(chainStateDto));
+            ArgumentNullException.ThrowIfNull(chainStateDto, nameof(chainStateDto));
 
             Block = chainStateDto.Block;
             CurrentPrice = chainStateDto.CurrentPrice;
@@ -31,9 +31,9 @@ public ChainState(string nodeId, Etherna.BeeNet.Models.ChainState chainStateDto)
         }
 
         public long Block { get; }
-        public long CurrentPrice { get; }
+        public BzzBalance CurrentPrice { get; }
         public string SourceNodeId { get; }
         public DateTime TimeStamp { get; }
-        public long TotalAmount { get; }
+        public BzzBalance TotalAmount { get; }
     }
 }
diff --git a/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs b/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs
index 1526a1e..6fdb34e 100644
--- a/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs
+++ b/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs
@@ -27,8 +27,7 @@ public class ApiHostingStartup : IHostingStartup
 
         public void Configure(IWebHostBuilder builder)
         {
-            if (builder is null)
-                throw new ArgumentNullException(nameof(builder));
+            ArgumentNullException.ThrowIfNull(builder, nameof(builder));
 
             builder.ConfigureServices((context, services) => {
 
diff --git a/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs b/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
index 34de475..c2fe365 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
@@ -109,10 +109,10 @@ public async Task<BeeNodeDto> SelectSocNodeAsync()
         // Helpers.
         private void WriteNodeInfoInHeaders(BeeNodeDto beeNode)
         {
-            HttpContext.Response.Headers.Add("bee-node-id", beeNode.Id);
-            HttpContext.Response.Headers.Add("bee-node-gateway-port", beeNode.GatewayPort.ToString(CultureInfo.InvariantCulture));
-            HttpContext.Response.Headers.Add("bee-node-hostname", beeNode.Hostname.ToString(CultureInfo.InvariantCulture));
-            HttpContext.Response.Headers.Add("bee-node-scheme", beeNode.ConnectionScheme);
+            HttpContext.Response.Headers.Append("bee-node-id", beeNode.Id);
+            HttpContext.Response.Headers.Append("bee-node-gateway-port", beeNode.GatewayPort.ToString(CultureInfo.InvariantCulture));
+            HttpContext.Response.Headers.Append("bee-node-hostname", beeNode.Hostname.ToString(CultureInfo.InvariantCulture));
+            HttpContext.Response.Headers.Append("bee-node-scheme", beeNode.ConnectionScheme);
         }
     }
 }
diff --git a/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs b/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs
index fff1ff6..4c0b4d0 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs
@@ -20,6 +20,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Etherna.BeehiveManager.Areas.Api.Controllers
@@ -108,9 +109,9 @@ public Task<PostageBatchDto> GetPostageBatchDetailsAsync(
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public Task<IEnumerable<string>> GetPinsByNodeAsync(
+        public async Task<IEnumerable<string>> GetPinsByNodeAsync(
             [Required] string id) =>
-            service.GetPinsByNodeAsync(id);
+            (await service.GetPinsByNodeAsync(id)).Select(h => h.ToString());
 
         /// <summary>
         /// Get details of a pinned resource on a node
diff --git a/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs b/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
index a8be4de..2e0594d 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
@@ -58,10 +58,10 @@ public async Task<IEnumerable<BeeNodeDto>> FindBeeNodesPinningContentAsync(
             var beeNodes = await service.FindBeeNodesPinningContentAsync(hash, requireAliveNodes);
 
             // Copy response in headers (Nginx optimization).
-            HttpContext.Response.Headers.Add("bee-node-id", beeNodes.Select(n => n.Id).ToArray());
-            HttpContext.Response.Headers.Add("bee-node-gateway-port", beeNodes.Select(n => n.GatewayPort.ToString(CultureInfo.InvariantCulture)).ToArray());
-            HttpContext.Response.Headers.Add("bee-node-hostname", beeNodes.Select(n => n.Hostname.ToString(CultureInfo.InvariantCulture)).ToArray());
-            HttpContext.Response.Headers.Add("bee-node-scheme", beeNodes.Select(n => n.ConnectionScheme).ToArray());
+            HttpContext.Response.Headers.Append("bee-node-id", beeNodes.Select(n => n.Id).ToArray());
+            HttpContext.Response.Headers.Append("bee-node-gateway-port", beeNodes.Select(n => n.GatewayPort.ToString(CultureInfo.InvariantCulture)).ToArray());
+            HttpContext.Response.Headers.Append("bee-node-hostname", beeNodes.Select(n => n.Hostname.ToString(CultureInfo.InvariantCulture)).ToArray());
+            HttpContext.Response.Headers.Append("bee-node-scheme", beeNodes.Select(n => n.ConnectionScheme).ToArray());
 
             return beeNodes;
         }
diff --git a/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs b/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
index fcdeb27..4204936 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
@@ -15,6 +15,7 @@
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.Services;
 using Etherna.BeehiveManager.Attributes;
+using Etherna.BeeNet.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System;
@@ -61,10 +62,10 @@ public async Task<BeeNodeDto> FindBeeNodeOwnerOfPostageBatchAsync(
             var beeNodeInfo = await loadBalancerService.FindBeeNodeOwnerOfPostageBatchAsync(id);
 
             // Copy response in headers (Nginx optimization).
-            HttpContext.Response.Headers.Add("bee-node-id", beeNodeInfo.Id);
-            HttpContext.Response.Headers.Add("bee-node-gateway-port", beeNodeInfo.GatewayPort.ToString(CultureInfo.InvariantCulture));
-            HttpContext.Response.Headers.Add("bee-node-hostname", beeNodeInfo.Hostname.ToString(CultureInfo.InvariantCulture));
-            HttpContext.Response.Headers.Add("bee-node-scheme", beeNodeInfo.ConnectionScheme);
+            HttpContext.Response.Headers.Append("bee-node-id", beeNodeInfo.Id);
+            HttpContext.Response.Headers.Append("bee-node-gateway-port", beeNodeInfo.GatewayPort.ToString(CultureInfo.InvariantCulture));
+            HttpContext.Response.Headers.Append("bee-node-hostname", beeNodeInfo.Hostname.ToString(CultureInfo.InvariantCulture));
+            HttpContext.Response.Headers.Append("bee-node-scheme", beeNodeInfo.ConnectionScheme);
 
             return beeNodeInfo;
         }
@@ -91,7 +92,7 @@ public Task<PostageBatchRefDto> BuyPostageBatchAsync(
             bool immutable = false,
             string? label = null,
             string? nodeId = null) =>
-            service.BuyPostageBatchAsync(amount, depth, immutable, label, nodeId);
+            service.BuyPostageBatchAsync(BzzBalance.FromPlurLong(amount), depth, immutable, label, nodeId);
 
         // Put.
 
@@ -103,10 +104,10 @@ public Task<PostageBatchRefDto> BuyPostageBatchAsync(
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public Task<string> DilutePostageBatchAsync(
+        public async Task<string> DilutePostageBatchAsync(
             [Required] string id,
             [Required] int depth) =>
-            service.DilutePostageBatchAsync(id, depth);
+            (await service.DilutePostageBatchAsync(id, depth)).ToString();
 
         [HttpPatch("batches/{id}/topup/{amount}")]
         [SimpleExceptionFilter]
@@ -114,10 +115,10 @@ public Task<string> DilutePostageBatchAsync(
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public Task<string> TopUpPostageBatchAsync(
+        public async Task<string> TopUpPostageBatchAsync(
             [Required] string id,
             [Required] long amount) =>
-            service.TopUpPostageBatchAsync(id, amount);
+            (await service.TopUpPostageBatchAsync(id, BzzBalance.FromPlurLong(amount))).ToString();
 
         // Delete.
     }
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
index 9f89b56..e72939c 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
@@ -22,8 +22,7 @@ public class BeeNodeDto
         // Constructors.
         public BeeNodeDto(BeeNode beeNode)
         {
-            if (beeNode is null)
-                throw new ArgumentNullException(nameof(beeNode));
+            ArgumentNullException.ThrowIfNull(beeNode, nameof(beeNode));
 
             Id = beeNode.Id;
             ConnectionScheme = beeNode.ConnectionScheme;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs
index 20b2a8f..abc3123 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs
@@ -15,6 +15,7 @@
 using Etherna.BeehiveManager.Services.Utilities.Models;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Etherna.BeehiveManager.Areas.Api.DtoModels
 {
@@ -23,8 +24,7 @@ public class BeeNodeStatusDto
         // Constructor.
         public BeeNodeStatusDto(string id, BeeNodeStatus status)
         {
-            if (status is null)
-                throw new ArgumentNullException(nameof(status));
+            ArgumentNullException.ThrowIfNull(status, nameof(status));
 
             Id = id;
             Errors = status.Errors;
@@ -32,8 +32,8 @@ public BeeNodeStatusDto(string id, BeeNodeStatus status)
             HeartbeatTimeStamp = status.HeartbeatTimeStamp;
             IsAlive = status.IsAlive;
             OverlayAddress = status.Addresses?.Overlay;
-            PinnedHashes = status.PinnedHashes;
-            PostageBatchesId = status.PostageBatchesId;
+            PinnedHashes = status.PinnedHashes.Select(h => h.ToString());
+            PostageBatchesId = status.PostageBatchesId.Select(b => b.ToString());
             PssPublicKey = status.Addresses?.PssPublicKey;
             PublicKey = status.Addresses?.PublicKey;
         }
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs
index 6d22a3c..67dc69e 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs
@@ -21,14 +21,13 @@ public class ChainStateDto
     {
         public ChainStateDto(ChainState chainState)
         {
-            if (chainState is null)
-                throw new ArgumentNullException(nameof(chainState));
+            ArgumentNullException.ThrowIfNull(chainState, nameof(chainState));
 
             Block = chainState.Block;
-            CurrentPrice = chainState.CurrentPrice;
+            CurrentPrice = chainState.CurrentPrice.ToPlurLong();
             SourceNodeId = chainState.SourceNodeId;
             TimeStamp = chainState.TimeStamp;
-            TotalAmount = chainState.TotalAmount;
+            TotalAmount = chainState.TotalAmount.ToPlurLong();
         }
 
         public long Block { get; }
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs
index 1890768..021998b 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using Etherna.BeeNet.Models;
+
 namespace Etherna.BeehiveManager.Areas.Api.DtoModels
 {
     public enum PinnedResourceStatusDto
@@ -21,20 +23,13 @@ public enum PinnedResourceStatusDto
         Pinned
     }
 
-    public class PinnedResourceDto
+    public class PinnedResourceDto(
+        SwarmHash hash,
+        string nodeId,
+        PinnedResourceStatusDto status)
     {
-        public PinnedResourceDto(
-            string hash,
-            string nodeId,
-            PinnedResourceStatusDto status)
-        {
-            Hash = hash;
-            NodeId = nodeId;
-            Status = status;
-        }
-
-        public string Hash { get; }
-        public string NodeId { get; }
-        public PinnedResourceStatusDto Status { get; }
+        public SwarmHash Hash { get; } = hash;
+        public string NodeId { get; } = nodeId;
+        public PinnedResourceStatusDto Status { get; } = status;
     }
 }
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
index 5e77cc7..dee1849 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using Etherna.BeeNet.Models;
 using System;
 
 namespace Etherna.BeehiveManager.Areas.Api.DtoModels
@@ -19,21 +20,20 @@ namespace Etherna.BeehiveManager.Areas.Api.DtoModels
     public class PostageBatchDto
     {
         // Constructors.
-        public PostageBatchDto(BeeNet.Models.PostageBatch postageBatch)
+        public PostageBatchDto(PostageBatch postageBatch)
         {
-            if (postageBatch is null)
-                throw new ArgumentNullException(nameof(postageBatch));
+            ArgumentNullException.ThrowIfNull(postageBatch, nameof(postageBatch));
 
-            Id = postageBatch.Id;
-            Value = postageBatch.AmountPaid;
-            BatchTTL = postageBatch.BatchTTL;
+            Id = postageBatch.Id.ToString();
+            Value = postageBatch.Amount.ToPlurLong();
+            BatchTTL = (long)postageBatch.Ttl.TotalSeconds;
             BlockNumber = postageBatch.BlockNumber;
-            BucketDepth = postageBatch.BucketDepth;
+            BucketDepth = PostageBatch.BucketDepth;
             Depth = postageBatch.Depth;
             Exists = postageBatch.Exists;
-            ImmutableFlag = postageBatch.ImmutableFlag;
+            ImmutableFlag = postageBatch.IsImmutable;
             Label = postageBatch.Label;
-            Usable = postageBatch.Usable;
+            Usable = postageBatch.IsUsable;
             Utilization = postageBatch.Utilization;
         }
 
@@ -47,7 +47,7 @@ public PostageBatchDto(BeeNet.Models.PostageBatch postageBatch)
         public bool ImmutableFlag { get; }
         public string? Label { get; }
         public bool Usable { get; }
-        public int? Utilization { get; }
+        public uint? Utilization { get; }
         public long? Value { get; }
     }
 }
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs
index 23ea544..ac3fcfa 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs
@@ -12,19 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using Etherna.BeeNet.Models;
+
 namespace Etherna.BeehiveManager.Areas.Api.DtoModels
 {
-    public class PostageBatchRefDto
+    public class PostageBatchRefDto(
+        PostageBatchId batchId,
+        string nodeId)
     {
-        public PostageBatchRefDto(
-            string batchId,
-            string nodeId)
-        {
-            BatchId = batchId;
-            NodeId = nodeId;
-        }
-
-        public string BatchId { get; }
-        public string NodeId { get; }
+        public string BatchId { get; } = batchId.ToString();
+        public string NodeId { get; } = nodeId;
     }
 }
diff --git a/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs b/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs
index 3a8e368..bb7c2a1 100644
--- a/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs
@@ -14,6 +14,7 @@
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.InputModels;
+using Etherna.BeeNet.Models;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -22,20 +23,20 @@ namespace Etherna.BeehiveManager.Areas.Api.Services
     public interface INodesControllerService
     {
         Task<BeeNodeDto> AddBeeNodeAsync(BeeNodeInput input);
-        Task<bool> CheckResourceAvailabilityFromNodeAsync(string id, string hash);
-        Task DeletePinAsync(string id, string hash);
+        Task<bool> CheckResourceAvailabilityFromNodeAsync(string id, SwarmHash hash);
+        Task DeletePinAsync(string id, SwarmHash hash);
         Task<BeeNodeDto> FindByIdAsync(string id);
         Task<bool> ForceFullStatusRefreshAsync(string id);
         IEnumerable<BeeNodeStatusDto> GetAllBeeNodeLiveStatus();
         Task<BeeNodeStatusDto> GetBeeNodeLiveStatusAsync(string id);
         Task<IEnumerable<BeeNodeDto>> GetBeeNodesAsync(int page, int take);
-        Task<PinnedResourceDto> GetPinDetailsAsync(string id, string hash);
-        Task<IEnumerable<string>> GetPinsByNodeAsync(string id);
-        Task<PostageBatchDto> GetPostageBatchDetailsAsync(string id, string batchId);
+        Task<PinnedResourceDto> GetPinDetailsAsync(string id, SwarmHash hash);
+        Task<IEnumerable<SwarmHash>> GetPinsByNodeAsync(string id);
+        Task<PostageBatchDto> GetPostageBatchDetailsAsync(string id, PostageBatchId batchId);
         Task<IEnumerable<PostageBatchDto>> GetPostageBatchesByNodeAsync(string id);
-        Task NotifyPinningOfUploadedContentAsync(string id, string hash);
+        Task NotifyPinningOfUploadedContentAsync(string id, SwarmHash hash);
         Task RemoveBeeNodeAsync(string id);
-        Task ReuploadResourceToNetworkFromNodeAsync(string id, string hash);
+        Task ReuploadResourceToNetworkFromNodeAsync(string id, SwarmHash hash);
         Task UpdateNodeConfigAsync(string id, UpdateNodeConfigInput config);
     }
 }
\ No newline at end of file
diff --git a/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs b/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs
index b94b28f..2d3df7f 100644
--- a/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
+using Etherna.BeeNet.Models;
 using System.Threading.Tasks;
 
 namespace Etherna.BeehiveManager.Areas.Api.Services
@@ -20,12 +21,12 @@ namespace Etherna.BeehiveManager.Areas.Api.Services
     public interface IPostageControllerService
     {
         Task<PostageBatchRefDto> BuyPostageBatchAsync(
-            long amount,
+            BzzBalance amount,
             int depth,
             bool immutable,
             string? label,
             string? nodeId);
-        Task<string> DilutePostageBatchAsync(string batchId, int depth);
-        Task<string> TopUpPostageBatchAsync(string batchId, long amount);
+        Task<PostageBatchId> DilutePostageBatchAsync(PostageBatchId batchId, int depth);
+        Task<PostageBatchId> TopUpPostageBatchAsync(PostageBatchId batchId, BzzBalance amount);
     }
 }
\ No newline at end of file
diff --git a/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs b/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
index 37a9a2c..ddb2ffb 100644
--- a/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
@@ -19,10 +19,10 @@
 using Etherna.BeehiveManager.Services.Extensions;
 using Etherna.BeehiveManager.Services.Utilities;
 using Etherna.BeeNet.Exceptions;
+using Etherna.BeeNet.Models;
 using Etherna.MongoDB.Driver;
 using Etherna.MongODM.Core.Extensions;
 using Microsoft.Extensions.Logging;
-using MongoDB.Driver;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -30,29 +30,16 @@
 
 namespace Etherna.BeehiveManager.Areas.Api.Services
 {
-    public class NodesControllerService : INodesControllerService
+    public class NodesControllerService(
+        IBeehiveDbContext beehiveDbContext,
+        IBeeNodeLiveManager beeNodeLiveManager,
+        ILogger<NodesControllerService> logger)
+        : INodesControllerService
     {
-        // Fields.
-        private readonly IBeehiveDbContext beehiveDbContext;
-        private readonly IBeeNodeLiveManager beeNodeLiveManager;
-        private readonly ILogger<NodesControllerService> logger;
-
-        // Constructor.
-        public NodesControllerService(
-            IBeehiveDbContext beehiveDbContext,
-            IBeeNodeLiveManager beeNodeLiveManager,
-            ILogger<NodesControllerService> logger)
-        {
-            this.beehiveDbContext = beehiveDbContext;
-            this.beeNodeLiveManager = beeNodeLiveManager;
-            this.logger = logger;
-        }
-
         // Methods.
         public async Task<BeeNodeDto> AddBeeNodeAsync(BeeNodeInput input)
         {
-            if (input is null)
-                throw new ArgumentNullException(nameof(input));
+            ArgumentNullException.ThrowIfNull(input, nameof(input));
 
             // Create node.
             var node = new BeeNode(
@@ -71,20 +58,16 @@ public async Task<BeeNodeDto> AddBeeNodeAsync(BeeNodeInput input)
             return new BeeNodeDto(node);
         }
 
-        public async Task<bool> CheckResourceAvailabilityFromNodeAsync(string id, string hash)
+        public async Task<bool> CheckResourceAvailabilityFromNodeAsync(string id, SwarmHash hash)
         {
-            if (id is null)
-                throw new ArgumentNullException(nameof(id));
-            if (hash is null)
-                throw new ArgumentNullException(nameof(hash));
+            ArgumentNullException.ThrowIfNull(id, nameof(id));
+            ArgumentNullException.ThrowIfNull(hash, nameof(hash));
 
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
-            var result = await beeNodeInstance.Client.CheckIsContentAvailableAsync(hash);
-
-            return result.IsRetrievable;
+            return await beeNodeInstance.Client.IsContentRetrievableAsync(hash);
         }
 
-        public async Task DeletePinAsync(string id, string hash)
+        public async Task DeletePinAsync(string id, SwarmHash hash)
         {
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
             await beeNodeInstance.RemovePinnedResourceAsync(hash);
@@ -114,7 +97,7 @@ public async Task<IEnumerable<BeeNodeDto>> GetBeeNodesAsync(int page, int take)
                         .ToListAsync()))
             .Select(n => new BeeNodeDto(n));
 
-        public async Task<PinnedResourceDto> GetPinDetailsAsync(string id, string hash)
+        public async Task<PinnedResourceDto> GetPinDetailsAsync(string id, SwarmHash hash)
         {
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
 
@@ -126,7 +109,7 @@ public async Task<PinnedResourceDto> GetPinDetailsAsync(string id, string hash)
                 return new PinnedResourceDto(hash, id, PinnedResourceStatusDto.NotPinned);
         }
 
-        public async Task<IEnumerable<string>> GetPinsByNodeAsync(string id)
+        public async Task<IEnumerable<SwarmHash>> GetPinsByNodeAsync(string id)
         {
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
             var readyPins = await beeNodeInstance.Client.GetAllPinsAsync();
@@ -134,7 +117,7 @@ public async Task<IEnumerable<string>> GetPinsByNodeAsync(string id)
             return readyPins.Union(inProgressPins);
         }
 
-        public async Task<PostageBatchDto> GetPostageBatchDetailsAsync(string id, string batchId)
+        public async Task<PostageBatchDto> GetPostageBatchDetailsAsync(string id, PostageBatchId batchId)
         {
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
             try
@@ -155,7 +138,7 @@ public async Task<IEnumerable<PostageBatchDto>> GetPostageBatchesByNodeAsync(str
             return batches.Select(b => new PostageBatchDto(b));
         }
 
-        public async Task NotifyPinningOfUploadedContentAsync(string id, string hash)
+        public async Task NotifyPinningOfUploadedContentAsync(string id, SwarmHash hash)
         {
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
             beeNodeInstance.NotifyPinnedResource(hash);
@@ -163,20 +146,17 @@ public async Task NotifyPinningOfUploadedContentAsync(string id, string hash)
 
         public async Task RemoveBeeNodeAsync(string id)
         {
-            if (id is null)
-                throw new ArgumentNullException(nameof(id));
+            ArgumentNullException.ThrowIfNull(id, nameof(id));
 
             await beehiveDbContext.BeeNodes.DeleteAsync(id);
 
             logger.NodeRemoved(id);
         }
 
-        public async Task ReuploadResourceToNetworkFromNodeAsync(string id, string hash)
+        public async Task ReuploadResourceToNetworkFromNodeAsync(string id, SwarmHash hash)
         {
-            if (id is null)
-                throw new ArgumentNullException(nameof(id));
-            if (hash is null)
-                throw new ArgumentNullException(nameof(hash));
+            ArgumentNullException.ThrowIfNull(id, nameof(id));
+            ArgumentNullException.ThrowIfNull(hash, nameof(hash));
 
             var beeNodeInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
             await beeNodeInstance.Client.ReuploadContentAsync(hash);
@@ -184,10 +164,8 @@ public async Task ReuploadResourceToNetworkFromNodeAsync(string id, string hash)
 
         public async Task UpdateNodeConfigAsync(string id, UpdateNodeConfigInput config)
         {
-            if (id is null)
-                throw new ArgumentNullException(nameof(id));
-            if (config is null)
-                throw new ArgumentNullException(nameof(config));
+            ArgumentNullException.ThrowIfNull(id, nameof(id));
+            ArgumentNullException.ThrowIfNull(config, nameof(config));
 
             // Update live instance.
             var nodeLiveInstance = await beeNodeLiveManager.GetBeeNodeLiveInstanceAsync(id);
diff --git a/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs b/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs
index cfc1d61..0818c33 100644
--- a/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs
@@ -15,6 +15,7 @@
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Services.Utilities;
 using Etherna.BeehiveManager.Services.Utilities.Models;
+using Etherna.BeeNet.Models;
 using System;
 using System.Threading.Tasks;
 
@@ -34,7 +35,7 @@ public PostageControllerService(
 
         // Methods.
         public async Task<PostageBatchRefDto> BuyPostageBatchAsync(
-            long amount,
+            BzzBalance amount,
             int depth,
             bool immutable,
             string? label,
@@ -66,7 +67,7 @@ public async Task<PostageBatchRefDto> BuyPostageBatchAsync(
             return new PostageBatchRefDto(batchId, beeNodeInstance.Id);
         }
 
-        public async Task<string> DilutePostageBatchAsync(string batchId, int depth)
+        public async Task<PostageBatchId> DilutePostageBatchAsync(PostageBatchId batchId, int depth)
         {
             var beeNodeLiveInstance = beeNodeLiveManager.GetBeeNodeLiveInstanceByOwnedPostageBatch(batchId);
 
@@ -74,7 +75,7 @@ public async Task<string> DilutePostageBatchAsync(string batchId, int depth)
             return await beeNodeLiveInstance.DilutePostageBatchAsync(batchId, depth);
         }
 
-        public async Task<string> TopUpPostageBatchAsync(string batchId, long amount)
+        public async Task<PostageBatchId> TopUpPostageBatchAsync(PostageBatchId batchId, BzzBalance amount)
         {
             var beeNodeLiveInstance = beeNodeLiveManager.GetBeeNodeLiveInstanceByOwnedPostageBatch(batchId);
 
diff --git a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
index a683dd9..b0add55 100644
--- a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
+++ b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
@@ -26,8 +26,7 @@ public sealed class SimpleExceptionFilterAttribute : ExceptionFilterAttribute
     {
         public override void OnException(ExceptionContext context)
         {
-            if (context is null)
-                throw new ArgumentNullException(nameof(context));
+            ArgumentNullException.ThrowIfNull(context, nameof(context));
 
             // Log exception.
             Log.Warning(context.Exception, "API exception");
diff --git a/src/BeehiveManager/BeehiveManager.csproj b/src/BeehiveManager/BeehiveManager.csproj
index cdf16b0..e43b45b 100644
--- a/src/BeehiveManager/BeehiveManager.csproj
+++ b/src/BeehiveManager/BeehiveManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager</RootNamespace>
     
     <Authors>Etherna Sagl</Authors>
@@ -22,13 +22,13 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
-    <PackageReference Include="MongODM" Version="0.24.0-alpha.110" />
-    <PackageReference Include="MongODM.AspNetCore.UI" Version="0.24.0-alpha.110" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
-    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
+    <PackageReference Include="MongODM" Version="0.24.0" />
+    <PackageReference Include="MongODM.AspNetCore.UI" Version="0.24.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs b/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs
index ed2d15d..b0abd31 100644
--- a/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs
+++ b/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs
@@ -35,10 +35,8 @@ public class SwaggerDefaultValues : IOperationFilter
         /// <param name="context">The current operation filter context.</param>
         public void Apply(OpenApiOperation operation, OperationFilterContext context)
         {
-            if (context is null)
-                throw new ArgumentNullException(nameof(context));
-            if (operation is null)
-                throw new ArgumentNullException(nameof(operation));
+            ArgumentNullException.ThrowIfNull(context, nameof(context));
+            ArgumentNullException.ThrowIfNull(operation, nameof(operation));
 
             var apiDescription = context.ApiDescription;
 
diff --git a/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs b/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs
index 78630ae..ed6a6af 100644
--- a/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs
+++ b/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs
@@ -36,8 +36,7 @@ public class XmlRepository : IXmlRepository
         // Constructors.
         public XmlRepository(DbContextOptions options)
         {
-            if (options is null)
-                throw new ArgumentNullException(nameof(options));
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
 
             // Initialize MongoDB driver.
             var client = new MongoClient(options.ConnectionString);
@@ -61,8 +60,7 @@ public IReadOnlyCollection<XElement> GetAllElements()
 
         public void StoreElement(XElement element, string friendlyName)
         {
-            if (element is null)
-                throw new ArgumentNullException(nameof(element));
+            ArgumentNullException.ThrowIfNull(element, nameof(element));
 
             //remove all comments. Json doesn't support it, but Json.NET serialize them anyway
             element.DescendantNodes().Where(x => x.NodeType == XmlNodeType.Comment).Remove();
diff --git a/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs b/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs
index 2c75f0c..a9cb9c0 100644
--- a/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs
@@ -23,8 +23,7 @@ public static class ApplicationBuilderExtensions
     {
         public static void StartBeeNodeLiveManager(this IApplicationBuilder appBuilder)
         {
-            if (appBuilder is null)
-                throw new ArgumentNullException(nameof(appBuilder));
+            ArgumentNullException.ThrowIfNull(appBuilder, nameof(appBuilder));
 
             var beeNodeLiveManager = appBuilder.ApplicationServices.GetRequiredService<IBeeNodeLiveManager>();
 
diff --git a/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs b/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs
index 61b5db6..5b18f42 100644
--- a/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs
+++ b/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs
@@ -33,8 +33,7 @@ public static IDataProtectionBuilder PersistKeysToDbContext(
             this IDataProtectionBuilder builder,
             DbContextOptions dbContextOptions)
         {
-            if (builder is null)
-                throw new ArgumentNullException(nameof(builder));
+            ArgumentNullException.ThrowIfNull(builder, nameof(builder));
 
             builder.Services.Configure<KeyManagementOptions>(options =>
             {
diff --git a/src/BeehiveManager/Properties/launchSettings.json b/src/BeehiveManager/Properties/launchSettings.json
index d5a74d8..1a15e31 100644
--- a/src/BeehiveManager/Properties/launchSettings.json
+++ b/src/BeehiveManager/Properties/launchSettings.json
@@ -8,13 +8,6 @@
     }
   },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "BeehiveManager": {
       "commandName": "Project",
       "launchBrowser": true,
diff --git a/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj b/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
index 146a043..5126dbd 100644
--- a/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
+++ b/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager.Persistence</RootNamespace>
 
     <Authors>Etherna Sagl</Authors>
@@ -15,10 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs b/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs
index b3db271..235b776 100644
--- a/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs
+++ b/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs
@@ -38,8 +38,7 @@ public static class DbContextMockHelper
         [SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Need to keep objects after test construction")]
         public static void InitializeDbContextMock(DbContext dbContext, Mock<IMongoDatabase>? mongoDatabaseMock = null)
         {
-            if (dbContext is null)
-                throw new ArgumentNullException(nameof(dbContext));
+            ArgumentNullException.ThrowIfNull(dbContext, nameof(dbContext));
 
             // Setup dbcontext dependencies for initialization.
             Mock<IDbDependencies> dbDependenciesMock = new();
@@ -85,10 +84,8 @@ public static Mock<IMongoCollection<TModel>> SetupCollectionMock<TModel, TKey>(
             IRepository<TModel, TKey> collection)
              where TModel : class, IEntityModel<TKey>
         {
-            if (mongoDatabaseMock is null)
-                throw new ArgumentNullException(nameof(mongoDatabaseMock));
-            if (collection is null)
-                throw new ArgumentNullException(nameof(collection));
+            ArgumentNullException.ThrowIfNull(mongoDatabaseMock, nameof(mongoDatabaseMock));
+            ArgumentNullException.ThrowIfNull(collection, nameof(collection));
 
             var collectionMock = new Mock<IMongoCollection<TModel>>();
 
@@ -102,8 +99,7 @@ public static void SetupFindWithPredicate<TModel>(
             Mock<IMongoCollection<TModel>> collectionMock,
             Func<FilterDefinition<TModel>, IEnumerable<TModel>> modelSelector)
         {
-            if (collectionMock is null)
-                throw new ArgumentNullException(nameof(collectionMock));
+            ArgumentNullException.ThrowIfNull(collectionMock, nameof(collectionMock));
 
             // Setup collection.
             collectionMock.Setup(c => c.FindAsync(
diff --git a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
index b996554..7467e69 100644
--- a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
+++ b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
@@ -124,8 +124,7 @@ public static IEnumerable<object[]> BeeNodeDeserializationTests
         [Theory, MemberData(nameof(BeeNodeDeserializationTests))]
         public void BeeNodeDeserialization(DeserializationTestElement<BeeNode> testElement)
         {
-            if (testElement is null)
-                throw new ArgumentNullException(nameof(testElement));
+            ArgumentNullException.ThrowIfNull(testElement, nameof(testElement));
 
             // Setup.
             using var documentReader = new JsonReader(testElement.SourceDocument);

From 5574e554714f8694c2af2b22280f8dcc243c9faa Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Tue, 8 Oct 2024 18:33:08 +0200
Subject: [PATCH 12/13] update license

---
 BeehiveManager.sln                            |   1 -
 BeehiveManager.sln.DotSettings                |  18 +-
 COPYING                                       | 661 ++++++++++++++++++
 LICENSE                                       | 201 ------
 README.md                                     |  22 +-
 .../BeehiveManager.Domain.csproj              |   2 +-
 .../Events/SetBeeNodeAddressesEvent.cs        |  18 +-
 .../IBeehiveDbContext.cs                      |  18 +-
 src/BeehiveManager.Domain/Models/BeeNode.cs   |  18 +-
 .../Models/EntityModelBase.cs                 |  18 +-
 src/BeehiveManager.Domain/Models/ModelBase.cs |  18 +-
 .../Properties/AssemblyInfo.cs                |  18 +-
 .../BeehiveDbContext.cs                       |  18 +-
 .../BeehiveManager.Persistence.csproj         |   2 +-
 .../IEventDispatcherDbContext.cs              |  18 +-
 .../ModelMaps/BeeNodeMap.cs                   |  18 +-
 .../ModelMaps/ModelBaseMap.cs                 |  18 +-
 .../Properties/AssemblyInfo.cs                |  18 +-
 .../Repositories/DomainRepository.cs          |  18 +-
 .../BeehiveManager.Services.csproj            |   2 +-
 .../Domain/BeeNodeService.cs                  |  18 +-
 .../Domain/IBeeNodeService.cs                 |  18 +-
 ...nBeeNodeCreatedThenAddNodeStatusHandler.cs |  18 +-
 ...eNodeDeletedThenRemoveNodeStatusHandler.cs |  18 +-
 .../Extensions/IEnumerableExtensions.cs       |  18 +-
 .../Extensions/LoggerExtensions.cs            |  18 +-
 .../Properties/AssemblyInfo.cs                |  18 +-
 .../ServiceCollectionExtensions.cs            |  18 +-
 .../CashoutAllNodesChequesSettings.cs         |  18 +-
 .../NodesAddressMaintainerSettings.cs         |  18 +-
 .../NodesChequebookMaintainerSettings.cs      |  18 +-
 .../Tasks/CashoutAllNodesChequesTask.cs       |  18 +-
 .../Tasks/ICashoutAllNodesChequesTask.cs      |  18 +-
 .../Tasks/INodesAddressMaintainerTask.cs      |  18 +-
 .../Tasks/INodesChequebookMaintainerTask.cs   |  18 +-
 .../Tasks/IPinContentInNodeTask.cs            |  18 +-
 .../Tasks/NodesAddressMaintainerTask.cs       |  18 +-
 .../Tasks/NodesChequebookMaintainerTask.cs    |  18 +-
 .../Tasks/PinContentInNodeTask.cs             |  18 +-
 src/BeehiveManager.Services/Tasks/Queues.cs   |  18 +-
 .../Utilities/BeeNodeLiveManager.cs           |  18 +-
 .../Utilities/IBeeNodeLiveManager.cs          |  18 +-
 .../Utilities/Models/BeeNodeAddresses.cs      |  18 +-
 .../Utilities/Models/BeeNodeLiveInstance.cs   |  18 +-
 .../Utilities/Models/BeeNodeSelectionMode.cs  |  18 +-
 .../Utilities/Models/BeeNodeStatus.cs         |  18 +-
 .../Utilities/Models/ChainState.cs            |  18 +-
 .../Areas/Api/ApiHostingStartup.cs            |  18 +-
 .../Areas/Api/Controllers/ChainController.cs  |  18 +-
 .../Controllers/EtherAddressesController.cs   |  18 +-
 .../Api/Controllers/LoadBalancerController.cs |  18 +-
 .../Areas/Api/Controllers/NodesController.cs  |  18 +-
 .../Api/Controllers/PinningController.cs      |  18 +-
 .../Api/Controllers/PostageController.cs      |  18 +-
 .../Areas/Api/DtoModels/BeeNodeDto.cs         |  18 +-
 .../Areas/Api/DtoModels/BeeNodeStatusDto.cs   |  18 +-
 .../Areas/Api/DtoModels/ChainStateDto.cs      |  18 +-
 .../Areas/Api/DtoModels/EtherAddressDto.cs    |  18 +-
 .../Areas/Api/DtoModels/PinnedResourceDto.cs  |  18 +-
 .../Areas/Api/DtoModels/PostageBatchDto.cs    |  18 +-
 .../Areas/Api/DtoModels/PostageBatchRefDto.cs |  18 +-
 .../Areas/Api/InputModels/BeeNodeInput.cs     |  18 +-
 .../Api/InputModels/UpdateNodeConfigInput.cs  |  18 +-
 .../Api/Services/ChainControllerService.cs    |  18 +-
 .../Api/Services/IChainControllerService.cs   |  18 +-
 .../ILoadBalancerControllerService.cs         |  18 +-
 .../Api/Services/INodesControllerService.cs   |  18 +-
 .../Api/Services/IPinningControllerService.cs |  18 +-
 .../Api/Services/IPostageControllerService.cs |  18 +-
 .../Services/LoadBalancerControllerService.cs |  18 +-
 .../Api/Services/NodesControllerService.cs    |  18 +-
 .../Api/Services/PinningControllerService.cs  |  18 +-
 .../Api/Services/PostageControllerService.cs  |  18 +-
 .../SimpleExceptionFilterAttribute.cs         |  18 +-
 .../SwarmResourceValidationAttribute.cs       |  18 +-
 src/BeehiveManager/BeehiveManager.csproj      |   7 +-
 src/BeehiveManager/Configs/CommonConsts.cs    |  18 +-
 .../Configs/Hangfire/AllowAllFilter.cs        |  18 +-
 .../Configs/MongODM/AllowAllFilter.cs         |  18 +-
 .../Swagger/ConfigureSwaggerOptions.cs        |  18 +-
 .../Configs/Swagger/SwaggerDefaultValues.cs   |  18 +-
 .../Configs/SystemStore/XmlRepository.cs      |  18 +-
 .../ServiceConfigurationException.cs          |  18 +-
 .../ApplicationBuilderExtensions.cs           |  18 +-
 .../DataProtectionBuilderExtensions.cs        |  18 +-
 src/BeehiveManager/Pages/Index.cshtml         |  17 +-
 src/BeehiveManager/Pages/Index.cshtml.cs      |  18 +-
 .../Pages/Shared/_Layout.cshtml               |  17 +-
 .../Shared/_ValidationScriptsPartial.cshtml   |  17 +-
 src/BeehiveManager/Pages/_ViewImports.cshtml  |  17 +-
 src/BeehiveManager/Pages/_ViewStart.cshtml    |  17 +-
 src/BeehiveManager/Program.cs                 |  18 +-
 src/BeehiveManager/Properties/AssemblyInfo.cs |  18 +-
 .../Properties/GlobalSuppressions.cs          |  18 +-
 src/BeehiveManager/Settings/SeedDbSettings.cs |  18 +-
 .../BeehiveManager.Persistence.Tests.csproj   |   2 +-
 .../Helpers/DbContextMockHelper.cs            |  18 +-
 .../Helpers/DeserializationTestElement.cs     |  18 +-
 .../BeehiveDbContextDeserializationTest.cs    |  18 +-
 .../Properties/AssemblyInfo.cs                |  18 +-
 100 files changed, 1462 insertions(+), 1071 deletions(-)
 create mode 100644 COPYING
 delete mode 100644 LICENSE

diff --git a/BeehiveManager.sln b/BeehiveManager.sln
index 851232c..ddb8b4f 100644
--- a/BeehiveManager.sln
+++ b/BeehiveManager.sln
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		Dockerfile = Dockerfile
-		LICENSE = LICENSE
 		nuget.config = nuget.config
 		README.md = README.md
 	EndProjectSection
diff --git a/BeehiveManager.sln.DotSettings b/BeehiveManager.sln.DotSettings
index 8f4a067..2b4f784 100644
--- a/BeehiveManager.sln.DotSettings
+++ b/BeehiveManager.sln.DotSettings
@@ -1,15 +1,15 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright 2021-present Etherna SA
+This file is part of BeehiveManager.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+GNU Affero General Public License as published by the Free Software Foundation,
+either version 3 of the License, or (at your option) any later version.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Affero General Public License for more details.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.</s:String>
+You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+If not, see &lt;https://www.gnu.org/licenses/&gt;.</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..bae94e1
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/README.md b/README.md
index 8c4d1ca..db3ef75 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-Beehive Manager
-===============
+# Beehive Manager
 
-Overview
---------
+## Overview
 
 Beehive Manager is an utility for manage a cluster of [Bee Swarm](https://github.com/ethersphere/bee) nodes.
 
@@ -11,21 +9,25 @@ It runs also an async task engine that can run cron operations, like automatic s
 
 It uses a MongoDB instance for keep cluster configuration.
 
-Docker images
--------------
+## Docker images
 
 You can get latest stable and unstable releases from our [Docker Hub repository](https://hub.docker.com/r/etherna/beehive-manager).
 
 You can find a sample on how to run with Docker Compose [here](samples/docker-beehive-sample)
 
-Issue reports
--------------
+## Issue reports
 
 If you've discovered a bug, or have an idea for a new feature, please report it to our issue manager based on Jira https://etherna.atlassian.net/projects/BHM.
 
 Detailed reports with stack traces, actual and expected behaviours are welcome.
 
-Questions? Problems?
----------------------
+## Questions? Problems?
 
 For questions or problems please write an email to [info@etherna.io](mailto:info@etherna.io).
+
+## License
+
+![AGPL Logo](https://www.gnu.org/graphics/agplv3-with-text-162x68.png)
+
+We use the GNU Affero General Public License v3 (AGPL-3.0) for this project.
+If you require a custom license, you can contact us at [license@etherna.io](mailto:license@etherna.io).
diff --git a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
index 90e4ba8..2206e7e 100644
--- a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
+++ b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager.Domain</RootNamespace>
 
-    <Authors>Etherna Sagl</Authors>
+    <Authors>Etherna SA</Authors>
     
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
diff --git a/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs b/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs
index 5349713..ddef7c8 100644
--- a/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs
+++ b/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.DomainEvents;
diff --git a/src/BeehiveManager.Domain/IBeehiveDbContext.cs b/src/BeehiveManager.Domain/IBeehiveDbContext.cs
index 3719f79..07c7fdf 100644
--- a/src/BeehiveManager.Domain/IBeehiveDbContext.cs
+++ b/src/BeehiveManager.Domain/IBeehiveDbContext.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.DomainEvents;
diff --git a/src/BeehiveManager.Domain/Models/BeeNode.cs b/src/BeehiveManager.Domain/Models/BeeNode.cs
index 0b1ed5d..5ae790c 100644
--- a/src/BeehiveManager.Domain/Models/BeeNode.cs
+++ b/src/BeehiveManager.Domain/Models/BeeNode.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 
diff --git a/src/BeehiveManager.Domain/Models/EntityModelBase.cs b/src/BeehiveManager.Domain/Models/EntityModelBase.cs
index cb6b90d..6ef5669 100644
--- a/src/BeehiveManager.Domain/Models/EntityModelBase.cs
+++ b/src/BeehiveManager.Domain/Models/EntityModelBase.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.DomainEvents;
 using Etherna.MongODM.Core.Domain.Models;
diff --git a/src/BeehiveManager.Domain/Models/ModelBase.cs b/src/BeehiveManager.Domain/Models/ModelBase.cs
index 273adf1..a7312e1 100644
--- a/src/BeehiveManager.Domain/Models/ModelBase.cs
+++ b/src/BeehiveManager.Domain/Models/ModelBase.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.MongODM.Core.Domain.Models;
 using System.Collections.Generic;
diff --git a/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs b/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs
index e4e2051..3b34773 100644
--- a/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs
+++ b/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 using System.Runtime.CompilerServices;
diff --git a/src/BeehiveManager.Persistence/BeehiveDbContext.cs b/src/BeehiveManager.Persistence/BeehiveDbContext.cs
index 74d23e2..0b9cd3f 100644
--- a/src/BeehiveManager.Persistence/BeehiveDbContext.cs
+++ b/src/BeehiveManager.Persistence/BeehiveDbContext.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain;
 using Etherna.BeehiveManager.Domain.Models;
diff --git a/src/BeehiveManager.Persistence/BeehiveManager.Persistence.csproj b/src/BeehiveManager.Persistence/BeehiveManager.Persistence.csproj
index b4748dc..f26b76b 100644
--- a/src/BeehiveManager.Persistence/BeehiveManager.Persistence.csproj
+++ b/src/BeehiveManager.Persistence/BeehiveManager.Persistence.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager.Persistence</RootNamespace>
 
-    <Authors>Etherna Sagl</Authors>
+    <Authors>Etherna SA</Authors>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
diff --git a/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs b/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs
index 2008698..aae87b0 100644
--- a/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs
+++ b/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.DomainEvents;
 using Etherna.MongODM.Core;
diff --git a/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs b/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
index 0272b14..3facc1b 100644
--- a/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
+++ b/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.MongoDB.Bson;
diff --git a/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs b/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs
index bef29c0..ce2583c 100644
--- a/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs
+++ b/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.MongoDB.Bson;
diff --git a/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs b/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs
index 0d5e509..eeab798 100644
--- a/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs
+++ b/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 
diff --git a/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs b/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
index a4525a5..7220e1f 100644
--- a/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
+++ b/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.DomainEvents;
diff --git a/src/BeehiveManager.Services/BeehiveManager.Services.csproj b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
index 8f68f2f..cd91ff8 100644
--- a/src/BeehiveManager.Services/BeehiveManager.Services.csproj
+++ b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager.Services</RootNamespace>
 
-    <Authors>Etherna Sagl</Authors>
+    <Authors>Etherna SA</Authors>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
diff --git a/src/BeehiveManager.Services/Domain/BeeNodeService.cs b/src/BeehiveManager.Services/Domain/BeeNodeService.cs
index 566b276..660ac91 100644
--- a/src/BeehiveManager.Services/Domain/BeeNodeService.cs
+++ b/src/BeehiveManager.Services/Domain/BeeNodeService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain;
 using Etherna.BeehiveManager.Domain.Models;
diff --git a/src/BeehiveManager.Services/Domain/IBeeNodeService.cs b/src/BeehiveManager.Services/Domain/IBeeNodeService.cs
index 6b7b58d..ad50853 100644
--- a/src/BeehiveManager.Services/Domain/IBeeNodeService.cs
+++ b/src/BeehiveManager.Services/Domain/IBeeNodeService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs
index 15d0d7b..a1a7477 100644
--- a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs
+++ b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeehiveManager.Services.Utilities;
diff --git a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs
index 128b9ff..1fff205 100644
--- a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs
+++ b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeehiveManager.Services.Utilities;
diff --git a/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs b/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs
index ef94ef9..10f4c66 100644
--- a/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs
+++ b/src/BeehiveManager.Services/Extensions/IEnumerableExtensions.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 using System.Collections.Generic;
diff --git a/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs b/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
index 1f4a261..840dfb0 100644
--- a/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
+++ b/src/BeehiveManager.Services/Extensions/LoggerExtensions.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
 using Microsoft.Extensions.Logging;
diff --git a/src/BeehiveManager.Services/Properties/AssemblyInfo.cs b/src/BeehiveManager.Services/Properties/AssemblyInfo.cs
index 0d5e509..eeab798 100644
--- a/src/BeehiveManager.Services/Properties/AssemblyInfo.cs
+++ b/src/BeehiveManager.Services/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 
diff --git a/src/BeehiveManager.Services/ServiceCollectionExtensions.cs b/src/BeehiveManager.Services/ServiceCollectionExtensions.cs
index 12c4c79..012aab7 100644
--- a/src/BeehiveManager.Services/ServiceCollectionExtensions.cs
+++ b/src/BeehiveManager.Services/ServiceCollectionExtensions.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Services.Domain;
 using Etherna.BeehiveManager.Services.Tasks;
diff --git a/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs b/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs
index 1798a7f..0dcb4fc 100644
--- a/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs
+++ b/src/BeehiveManager.Services/Settings/CashoutAllNodesChequesSettings.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
 
diff --git a/src/BeehiveManager.Services/Settings/NodesAddressMaintainerSettings.cs b/src/BeehiveManager.Services/Settings/NodesAddressMaintainerSettings.cs
index 9d57c3c..df1b36c 100644
--- a/src/BeehiveManager.Services/Settings/NodesAddressMaintainerSettings.cs
+++ b/src/BeehiveManager.Services/Settings/NodesAddressMaintainerSettings.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 namespace Etherna.BeehiveManager.Services.Settings
 {
diff --git a/src/BeehiveManager.Services/Settings/NodesChequebookMaintainerSettings.cs b/src/BeehiveManager.Services/Settings/NodesChequebookMaintainerSettings.cs
index 3f578be..f5ba8c2 100644
--- a/src/BeehiveManager.Services/Settings/NodesChequebookMaintainerSettings.cs
+++ b/src/BeehiveManager.Services/Settings/NodesChequebookMaintainerSettings.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 namespace Etherna.BeehiveManager.Services.Settings
 {
diff --git a/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs b/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
index 2fd93b4..bad4ba2 100644
--- a/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
+++ b/src/BeehiveManager.Services/Tasks/CashoutAllNodesChequesTask.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Services.Extensions;
 using Etherna.BeehiveManager.Services.Settings;
diff --git a/src/BeehiveManager.Services/Tasks/ICashoutAllNodesChequesTask.cs b/src/BeehiveManager.Services/Tasks/ICashoutAllNodesChequesTask.cs
index c42e241..8542b12 100644
--- a/src/BeehiveManager.Services/Tasks/ICashoutAllNodesChequesTask.cs
+++ b/src/BeehiveManager.Services/Tasks/ICashoutAllNodesChequesTask.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Hangfire;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/Tasks/INodesAddressMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/INodesAddressMaintainerTask.cs
index 19bbd45..7b5c9fe 100644
--- a/src/BeehiveManager.Services/Tasks/INodesAddressMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/INodesAddressMaintainerTask.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Hangfire;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/Tasks/INodesChequebookMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/INodesChequebookMaintainerTask.cs
index a29ce69..5ae4ee8 100644
--- a/src/BeehiveManager.Services/Tasks/INodesChequebookMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/INodesChequebookMaintainerTask.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Hangfire;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/Tasks/IPinContentInNodeTask.cs b/src/BeehiveManager.Services/Tasks/IPinContentInNodeTask.cs
index 4baa1d6..39e75e5 100644
--- a/src/BeehiveManager.Services/Tasks/IPinContentInNodeTask.cs
+++ b/src/BeehiveManager.Services/Tasks/IPinContentInNodeTask.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Hangfire;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs
index b34608d..9dcc85c 100644
--- a/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/NodesAddressMaintainerTask.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Services.Extensions;
 using Etherna.BeehiveManager.Services.Settings;
diff --git a/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs b/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
index 205f26c..bc73b99 100644
--- a/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
+++ b/src/BeehiveManager.Services/Tasks/NodesChequebookMaintainerTask.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Services.Extensions;
 using Etherna.BeehiveManager.Services.Settings;
diff --git a/src/BeehiveManager.Services/Tasks/PinContentInNodeTask.cs b/src/BeehiveManager.Services/Tasks/PinContentInNodeTask.cs
index eb250d3..154275b 100644
--- a/src/BeehiveManager.Services/Tasks/PinContentInNodeTask.cs
+++ b/src/BeehiveManager.Services/Tasks/PinContentInNodeTask.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Services.Utilities;
 using System.Collections.Generic;
diff --git a/src/BeehiveManager.Services/Tasks/Queues.cs b/src/BeehiveManager.Services/Tasks/Queues.cs
index c3eeade..09c9032 100644
--- a/src/BeehiveManager.Services/Tasks/Queues.cs
+++ b/src/BeehiveManager.Services/Tasks/Queues.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 namespace Etherna.BeehiveManager.Services.Tasks
 {
diff --git a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
index d9631f2..f255280 100644
--- a/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
+++ b/src/BeehiveManager.Services/Utilities/BeeNodeLiveManager.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain;
 using Etherna.BeehiveManager.Domain.Models;
diff --git a/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs b/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs
index b412504..d6542fb 100644
--- a/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs
+++ b/src/BeehiveManager.Services/Utilities/IBeeNodeLiveManager.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeehiveManager.Services.Utilities.Models;
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeAddresses.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeAddresses.cs
index 882f2fe..4b3cf53 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeAddresses.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeAddresses.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Nethereum.Util;
 using System;
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
index 1eb4254..9d277c0 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeLiveInstance.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeeNet;
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeSelectionMode.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeSelectionMode.cs
index 28249ca..d560038 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeSelectionMode.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeSelectionMode.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 namespace Etherna.BeehiveManager.Services.Utilities.Models
 {
diff --git a/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs b/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs
index f47470d..96c0b06 100644
--- a/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/BeeNodeStatus.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
 using System;
diff --git a/src/BeehiveManager.Services/Utilities/Models/ChainState.cs b/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
index ad3b153..5f5205d 100644
--- a/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
+++ b/src/BeehiveManager.Services/Utilities/Models/ChainState.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
 using System;
diff --git a/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs b/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs
index 6fdb34e..96cf26f 100644
--- a/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs
+++ b/src/BeehiveManager/Areas/Api/ApiHostingStartup.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/ChainController.cs b/src/BeehiveManager/Areas/Api/Controllers/ChainController.cs
index a2a1c4c..38ad68f 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/ChainController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/ChainController.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.Services;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/EtherAddressesController.cs b/src/BeehiveManager/Areas/Api/Controllers/EtherAddressesController.cs
index 949e711..b15e5db 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/EtherAddressesController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/EtherAddressesController.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Attributes;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs b/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
index c2fe365..bfcfbab 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/LoadBalancerController.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.Services;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs b/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs
index 4c0b4d0..755ad68 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/NodesController.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.InputModels;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs b/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
index 2e0594d..7228298 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/PinningController.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.Services;
diff --git a/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs b/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
index 4204936..cb39dea 100644
--- a/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
+++ b/src/BeehiveManager/Areas/Api/Controllers/PostageController.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.Services;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
index e72939c..43060c6 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeDto.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using System;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs
index abc3123..8dcd7a7 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/BeeNodeStatusDto.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Services.Utilities.Models;
 using System;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs
index 67dc69e..a75d201 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/ChainStateDto.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Services.Utilities.Models;
 using System;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/EtherAddressDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/EtherAddressDto.cs
index edbe9f9..920a1a8 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/EtherAddressDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/EtherAddressDto.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs
index 021998b..6a5deab 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PinnedResourceDto.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
 
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
index dee1849..50d1c33 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchDto.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
 using System;
diff --git a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs
index ac3fcfa..eb06290 100644
--- a/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs
+++ b/src/BeehiveManager/Areas/Api/DtoModels/PostageBatchRefDto.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
 
diff --git a/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs b/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs
index 1a54f55..1eb01c4 100644
--- a/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs
+++ b/src/BeehiveManager/Areas/Api/InputModels/BeeNodeInput.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System.ComponentModel.DataAnnotations;
 
diff --git a/src/BeehiveManager/Areas/Api/InputModels/UpdateNodeConfigInput.cs b/src/BeehiveManager/Areas/Api/InputModels/UpdateNodeConfigInput.cs
index ee507a2..856e559 100644
--- a/src/BeehiveManager/Areas/Api/InputModels/UpdateNodeConfigInput.cs
+++ b/src/BeehiveManager/Areas/Api/InputModels/UpdateNodeConfigInput.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 namespace Etherna.BeehiveManager.Areas.Api.InputModels
 {
diff --git a/src/BeehiveManager/Areas/Api/Services/ChainControllerService.cs b/src/BeehiveManager/Areas/Api/Services/ChainControllerService.cs
index a3af86e..1c317dd 100644
--- a/src/BeehiveManager/Areas/Api/Services/ChainControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/ChainControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Services.Utilities;
diff --git a/src/BeehiveManager/Areas/Api/Services/IChainControllerService.cs b/src/BeehiveManager/Areas/Api/Services/IChainControllerService.cs
index bfbb274..5d8aa8b 100644
--- a/src/BeehiveManager/Areas/Api/Services/IChainControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/IChainControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 
diff --git a/src/BeehiveManager/Areas/Api/Services/ILoadBalancerControllerService.cs b/src/BeehiveManager/Areas/Api/Services/ILoadBalancerControllerService.cs
index 3c348b5..59e47bd 100644
--- a/src/BeehiveManager/Areas/Api/Services/ILoadBalancerControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/ILoadBalancerControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using System.Threading.Tasks;
diff --git a/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs b/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs
index bb7c2a1..30a80d3 100644
--- a/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/INodesControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.InputModels;
diff --git a/src/BeehiveManager/Areas/Api/Services/IPinningControllerService.cs b/src/BeehiveManager/Areas/Api/Services/IPinningControllerService.cs
index 1d797b4..0f7afad 100644
--- a/src/BeehiveManager/Areas/Api/Services/IPinningControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/IPinningControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using System.Collections.Generic;
diff --git a/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs b/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs
index 2d3df7f..9b54a8e 100644
--- a/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/IPostageControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeeNet.Models;
diff --git a/src/BeehiveManager/Areas/Api/Services/LoadBalancerControllerService.cs b/src/BeehiveManager/Areas/Api/Services/LoadBalancerControllerService.cs
index 0f5133d..3c63c89 100644
--- a/src/BeehiveManager/Areas/Api/Services/LoadBalancerControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/LoadBalancerControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Domain;
diff --git a/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs b/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
index ddb2ffb..d04d507 100644
--- a/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/NodesControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Areas.Api.InputModels;
diff --git a/src/BeehiveManager/Areas/Api/Services/PinningControllerService.cs b/src/BeehiveManager/Areas/Api/Services/PinningControllerService.cs
index b3fa08e..e3e1aa3 100644
--- a/src/BeehiveManager/Areas/Api/Services/PinningControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/PinningControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Domain;
diff --git a/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs b/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs
index 0818c33..b01d5a5 100644
--- a/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs
+++ b/src/BeehiveManager/Areas/Api/Services/PostageControllerService.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Areas.Api.DtoModels;
 using Etherna.BeehiveManager.Services.Utilities;
diff --git a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
index b0add55..fc7a17f 100644
--- a/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
+++ b/src/BeehiveManager/Attributes/SimpleExceptionFilterAttribute.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Exceptions;
 using Etherna.MongODM.Core.Exceptions;
diff --git a/src/BeehiveManager/Attributes/SwarmResourceValidationAttribute.cs b/src/BeehiveManager/Attributes/SwarmResourceValidationAttribute.cs
index 52a3ead..291efe9 100644
--- a/src/BeehiveManager/Attributes/SwarmResourceValidationAttribute.cs
+++ b/src/BeehiveManager/Attributes/SwarmResourceValidationAttribute.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System.ComponentModel.DataAnnotations;
 using System.Text.RegularExpressions;
diff --git a/src/BeehiveManager/BeehiveManager.csproj b/src/BeehiveManager/BeehiveManager.csproj
index e43b45b..fb2418e 100644
--- a/src/BeehiveManager/BeehiveManager.csproj
+++ b/src/BeehiveManager/BeehiveManager.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager</RootNamespace>
     
-    <Authors>Etherna Sagl</Authors>
+    <Authors>Etherna SA</Authors>
     <Description>An utility for manage a cluster of Bee nodes</Description>
     
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -37,4 +37,9 @@
     <ProjectReference Include="..\BeehiveManager.Services\BeehiveManager.Services.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\..\COPYING" />
+    <None Include="..\..\README.md" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/BeehiveManager/Configs/CommonConsts.cs b/src/BeehiveManager/Configs/CommonConsts.cs
index 1974813..dce8fc2 100644
--- a/src/BeehiveManager/Configs/CommonConsts.cs
+++ b/src/BeehiveManager/Configs/CommonConsts.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 namespace Etherna.BeehiveManager.Configs
 {
diff --git a/src/BeehiveManager/Configs/Hangfire/AllowAllFilter.cs b/src/BeehiveManager/Configs/Hangfire/AllowAllFilter.cs
index 5d3ad5e..df5f329 100644
--- a/src/BeehiveManager/Configs/Hangfire/AllowAllFilter.cs
+++ b/src/BeehiveManager/Configs/Hangfire/AllowAllFilter.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Hangfire.Annotations;
 using Hangfire.Dashboard;
diff --git a/src/BeehiveManager/Configs/MongODM/AllowAllFilter.cs b/src/BeehiveManager/Configs/MongODM/AllowAllFilter.cs
index 06b9b8c..229ba61 100644
--- a/src/BeehiveManager/Configs/MongODM/AllowAllFilter.cs
+++ b/src/BeehiveManager/Configs/MongODM/AllowAllFilter.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.MongODM.AspNetCore.UI.Auth.Filters;
 using Microsoft.AspNetCore.Http;
diff --git a/src/BeehiveManager/Configs/Swagger/ConfigureSwaggerOptions.cs b/src/BeehiveManager/Configs/Swagger/ConfigureSwaggerOptions.cs
index 0f9c33f..16d7c90 100644
--- a/src/BeehiveManager/Configs/Swagger/ConfigureSwaggerOptions.cs
+++ b/src/BeehiveManager/Configs/Swagger/ConfigureSwaggerOptions.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs b/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs
index b0abd31..702c682 100644
--- a/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs
+++ b/src/BeehiveManager/Configs/Swagger/SwaggerDefaultValues.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.OpenApi.Any;
diff --git a/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs b/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs
index ed6a6af..c332280 100644
--- a/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs
+++ b/src/BeehiveManager/Configs/SystemStore/XmlRepository.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.MongODM.Core.Options;
 using Microsoft.AspNetCore.DataProtection.Repositories;
diff --git a/src/BeehiveManager/Exceptions/ServiceConfigurationException.cs b/src/BeehiveManager/Exceptions/ServiceConfigurationException.cs
index b810296..0939d41 100644
--- a/src/BeehiveManager/Exceptions/ServiceConfigurationException.cs
+++ b/src/BeehiveManager/Exceptions/ServiceConfigurationException.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 
diff --git a/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs b/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs
index a9cb9c0..2e2c643 100644
--- a/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/BeehiveManager/Extensions/ApplicationBuilderExtensions.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Services.Utilities;
 using Microsoft.AspNetCore.Builder;
diff --git a/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs b/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs
index 5b18f42..3a41746 100644
--- a/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs
+++ b/src/BeehiveManager/Extensions/DataProtectionBuilderExtensions.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Configs.SystemStore;
 using Etherna.MongODM.Core.Options;
diff --git a/src/BeehiveManager/Pages/Index.cshtml b/src/BeehiveManager/Pages/Index.cshtml
index 6e0441b..aed10b2 100644
--- a/src/BeehiveManager/Pages/Index.cshtml
+++ b/src/BeehiveManager/Pages/Index.cshtml
@@ -1,19 +1,4 @@
-@*   Copyright 2021-present Etherna Sagl
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *@
-
-@page
+@page
 @using Etherna.BeehiveManager.Configs
 @model IndexModel
 @{
diff --git a/src/BeehiveManager/Pages/Index.cshtml.cs b/src/BeehiveManager/Pages/Index.cshtml.cs
index 8923bc7..83cd042 100644
--- a/src/BeehiveManager/Pages/Index.cshtml.cs
+++ b/src/BeehiveManager/Pages/Index.cshtml.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
diff --git a/src/BeehiveManager/Pages/Shared/_Layout.cshtml b/src/BeehiveManager/Pages/Shared/_Layout.cshtml
index a3aee45..05bc694 100644
--- a/src/BeehiveManager/Pages/Shared/_Layout.cshtml
+++ b/src/BeehiveManager/Pages/Shared/_Layout.cshtml
@@ -1,19 +1,4 @@
-@*   Copyright 2021-present Etherna Sagl
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *@
-
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
diff --git a/src/BeehiveManager/Pages/Shared/_ValidationScriptsPartial.cshtml b/src/BeehiveManager/Pages/Shared/_ValidationScriptsPartial.cshtml
index dc5d586..5a16d80 100644
--- a/src/BeehiveManager/Pages/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/BeehiveManager/Pages/Shared/_ValidationScriptsPartial.cshtml
@@ -1,17 +1,2 @@
-@*   Copyright 2021-present Etherna Sagl
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *@
-
-<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
+<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
 <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
diff --git a/src/BeehiveManager/Pages/_ViewImports.cshtml b/src/BeehiveManager/Pages/_ViewImports.cshtml
index ec1302f..b982504 100644
--- a/src/BeehiveManager/Pages/_ViewImports.cshtml
+++ b/src/BeehiveManager/Pages/_ViewImports.cshtml
@@ -1,18 +1,3 @@
-@*   Copyright 2021-present Etherna Sagl
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *@
-
-@using Etherna.BeehiveManager
+@using Etherna.BeehiveManager
 @namespace Etherna.BeehiveManager.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/BeehiveManager/Pages/_ViewStart.cshtml b/src/BeehiveManager/Pages/_ViewStart.cshtml
index edd85d1..a5f1004 100644
--- a/src/BeehiveManager/Pages/_ViewStart.cshtml
+++ b/src/BeehiveManager/Pages/_ViewStart.cshtml
@@ -1,18 +1,3 @@
-@*   Copyright 2021-present Etherna Sagl
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *@
-
-@{
+@{
     Layout = "_Layout";
 }
diff --git a/src/BeehiveManager/Program.cs b/src/BeehiveManager/Program.cs
index 9fd203d..e60cb64 100644
--- a/src/BeehiveManager/Program.cs
+++ b/src/BeehiveManager/Program.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.ACR.Middlewares.DebugPages;
 using Etherna.BeehiveManager.Configs;
diff --git a/src/BeehiveManager/Properties/AssemblyInfo.cs b/src/BeehiveManager/Properties/AssemblyInfo.cs
index 0d5e509..eeab798 100644
--- a/src/BeehiveManager/Properties/AssemblyInfo.cs
+++ b/src/BeehiveManager/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 
diff --git a/src/BeehiveManager/Properties/GlobalSuppressions.cs b/src/BeehiveManager/Properties/GlobalSuppressions.cs
index 8aad6f8..6f7b63a 100644
--- a/src/BeehiveManager/Properties/GlobalSuppressions.cs
+++ b/src/BeehiveManager/Properties/GlobalSuppressions.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 // This file is used by Code Analysis to maintain SuppressMessage
 // attributes that are applied to this project.
diff --git a/src/BeehiveManager/Settings/SeedDbSettings.cs b/src/BeehiveManager/Settings/SeedDbSettings.cs
index fdb14a4..9dc8549 100644
--- a/src/BeehiveManager/Settings/SeedDbSettings.cs
+++ b/src/BeehiveManager/Settings/SeedDbSettings.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 
diff --git a/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj b/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
index 5126dbd..17649fc 100644
--- a/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
+++ b/test/BeehiveManager.Persistence.Tests/BeehiveManager.Persistence.Tests.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.BeehiveManager.Persistence</RootNamespace>
 
-    <Authors>Etherna Sagl</Authors>
+    <Authors>Etherna SA</Authors>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
diff --git a/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs b/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs
index 235b776..baafe9c 100644
--- a/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs
+++ b/test/BeehiveManager.Persistence.Tests/Helpers/DbContextMockHelper.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.ExecContext.AsyncLocal;
 using Etherna.MongoDB.Bson.Serialization;
diff --git a/test/BeehiveManager.Persistence.Tests/Helpers/DeserializationTestElement.cs b/test/BeehiveManager.Persistence.Tests/Helpers/DeserializationTestElement.cs
index df96d89..a9a8a19 100644
--- a/test/BeehiveManager.Persistence.Tests/Helpers/DeserializationTestElement.cs
+++ b/test/BeehiveManager.Persistence.Tests/Helpers/DeserializationTestElement.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain;
 using Etherna.MongoDB.Driver;
diff --git a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
index 7467e69..927591e 100644
--- a/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
+++ b/test/BeehiveManager.Persistence.Tests/ModelMaps/BeehiveDbContextDeserializationTest.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeehiveManager.Domain.Models;
 using Etherna.BeehiveManager.Persistence.Helpers;
diff --git a/test/BeehiveManager.Persistence.Tests/Properties/AssemblyInfo.cs b/test/BeehiveManager.Persistence.Tests/Properties/AssemblyInfo.cs
index 0d3ef7c..0d7a90c 100644
--- a/test/BeehiveManager.Persistence.Tests/Properties/AssemblyInfo.cs
+++ b/test/BeehiveManager.Persistence.Tests/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
 // Copyright 2021-present Etherna SA
+// This file is part of BeehiveManager.
 // 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+// GNU Affero General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
 // 
-//     http://www.apache.org/licenses/LICENSE-2.0
+// BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Affero General Public License for more details.
 // 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+// If not, see <https://www.gnu.org/licenses/>.
 
 using System;
 

From a611c2c00eb4fa147398ad0dff9fa1ea66a08844 Mon Sep 17 00:00:00 2001
From: Mirko Da Corte <mirko@etherna.io>
Date: Tue, 8 Oct 2024 18:39:44 +0200
Subject: [PATCH 13/13] Enable 'UseAllOfToExtendReferenceSchemas' in Swagger

---
 src/BeehiveManager/Program.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/BeehiveManager/Program.cs b/src/BeehiveManager/Program.cs
index e60cb64..6470973 100644
--- a/src/BeehiveManager/Program.cs
+++ b/src/BeehiveManager/Program.cs
@@ -178,6 +178,7 @@ private static void ConfigureServices(WebApplicationBuilder builder)
             services.AddSwaggerGen(options =>
             {
                 options.SupportNonNullableReferenceTypes();
+                options.UseAllOfToExtendReferenceSchemas();
                 options.UseInlineDefinitionsForEnums();
 
                 //add a custom operation filter which sets default values