diff --git a/src/Data/Repositories/UTXOTagRepository.cs b/src/Data/Repositories/UTXOTagRepository.cs
index a173bf7a..e8a90f24 100644
--- a/src/Data/Repositories/UTXOTagRepository.cs
+++ b/src/Data/Repositories/UTXOTagRepository.cs
@@ -33,11 +33,11 @@ public UTXOTagRepository(IRepository<UTXOTag> repository,
         return await applicationDbContext.UTXOTags.FirstOrDefaultAsync(x => x.Key == key && x.Outpoint == outpoint);
     }
 
-    public Task<List<UTXOTag>> GetByKeyValue(string key, string value)
+    public async Task<List<UTXOTag>> GetByKeyValue(string key, string value)
     {
-        using var applicationDbContext = _dbContextFactory.CreateDbContext();
+        await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();
         
-        return applicationDbContext.UTXOTags
+        return await applicationDbContext.UTXOTags
             .Where(x => x.Key == key && x.Value == value).ToListAsync();
     }
 
diff --git a/src/Migrations/20240628073255_UtxoFreezing.Designer.cs b/src/Migrations/20240628073255_UtxoFreezing.Designer.cs
new file mode 100644
index 00000000..843b8813
--- /dev/null
+++ b/src/Migrations/20240628073255_UtxoFreezing.Designer.cs
@@ -0,0 +1,1292 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodeGuard.Data;
+using NodeGuard.Helpers;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NodeGuard.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240628073255_UtxoFreezing")]
+    partial class UtxoFreezing
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("ApplicationUserNode", b =>
+                {
+                    b.Property<int>("NodesId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UsersId")
+                        .HasColumnType("text");
+
+                    b.HasKey("NodesId", "UsersId");
+
+                    b.HasIndex("UsersId");
+
+                    b.ToTable("ApplicationUserNode");
+                });
+
+            modelBuilder.Entity("ChannelOperationRequestFMUTXO", b =>
+                {
+                    b.Property<int>("ChannelOperationRequestsId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("UtxosId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("ChannelOperationRequestsId", "UtxosId");
+
+                    b.HasIndex("UtxosId");
+
+                    b.ToTable("ChannelOperationRequestFMUTXO");
+                });
+
+            modelBuilder.Entity("FMUTXOWalletWithdrawalRequest", b =>
+                {
+                    b.Property<int>("UTXOsId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("WalletWithdrawalRequestsId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("UTXOsId", "WalletWithdrawalRequestsId");
+
+                    b.HasIndex("WalletWithdrawalRequestsId");
+
+                    b.ToTable("FMUTXOWalletWithdrawalRequest");
+                });
+
+            modelBuilder.Entity("KeyWallet", b =>
+                {
+                    b.Property<int>("KeysId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("WalletsId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("KeysId", "WalletsId");
+
+                    b.HasIndex("WalletsId");
+
+                    b.ToTable("KeyWallet");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("character varying(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator<string>("Discriminator").HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.APIToken", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ExpirationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("IsBlocked")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TokenHash")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatorId");
+
+                    b.ToTable("ApiTokens");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Channel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("BtcCloseAddress")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("ChanId")
+                        .HasColumnType("numeric(20,0)");
+
+                    b.Property<bool>("CreatedByNodeGuard")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("DestinationNodeId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FundingTx")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("FundingTxOutputIndex")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("IsAutomatedLiquidityEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrivate")
+                        .HasColumnType("boolean");
+
+                    b.Property<long>("SatsAmount")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("SourceNodeId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DestinationNodeId");
+
+                    b.HasIndex("SourceNodeId");
+
+                    b.ToTable("Channels");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.ChannelOperationRequest", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AmountCryptoUnit")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("Changeless")
+                        .HasColumnType("boolean");
+
+                    b.Property<int?>("ChannelId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ClosingReason")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("DestNodeId")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal?>("FeeRate")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool>("IsChannelPrivate")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("MempoolRecommendedFeesType")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("integer");
+
+                    b.Property<long>("SatsAmount")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("SourceNodeId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<List<ChannelStatusLog>>("StatusLogs")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("TxId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("WalletId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChannelId");
+
+                    b.HasIndex("DestNodeId");
+
+                    b.HasIndex("SourceNodeId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("WalletId");
+
+                    b.ToTable("ChannelOperationRequests");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.ChannelOperationRequestPSBT", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ChannelOperationRequestId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsFinalisedPSBT")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsInternalWalletPSBT")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsTemplatePSBT")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PSBT")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("UserSignerId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChannelOperationRequestId");
+
+                    b.HasIndex("UserSignerId");
+
+                    b.ToTable("ChannelOperationRequestPSBTs");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.FMUTXO", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long>("OutputIndex")
+                        .HasColumnType("bigint");
+
+                    b.Property<long>("SatsAmount")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("TxId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("FMUTXOs");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.InternalWallet", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("DerivationPath")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("MasterFingerprint")
+                        .HasColumnType("text");
+
+                    b.Property<string>("MnemonicString")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("XPUB")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("InternalWallets");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Key", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("InternalWalletId")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsBIP39ImportedKey")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsCompromised")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("MasterFingerprint")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("XPUB")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InternalWalletId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Keys");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.LiquidityRule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ChannelId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsReverseSwapWalletRule")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("MinimumLocalBalance")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal?>("MinimumRemoteBalance")
+                        .HasColumnType("numeric");
+
+                    b.Property<int>("NodeId")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal?>("RebalanceTarget")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReverseSwapAddress")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ReverseSwapWalletId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("SwapWalletId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChannelId")
+                        .IsUnique();
+
+                    b.HasIndex("NodeId");
+
+                    b.HasIndex("ReverseSwapWalletId");
+
+                    b.HasIndex("SwapWalletId");
+
+                    b.ToTable("LiquidityRules");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Node", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AutosweepEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ChannelAdminMacaroon")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Endpoint")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsNodeDisabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PubKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ReturningFundsWalletId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PubKey")
+                        .IsUnique();
+
+                    b.HasIndex("ReturningFundsWalletId");
+
+                    b.ToTable("Nodes");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.UTXOTag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Outpoint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UTXOTags");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Wallet", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("BIP39Seedphrase")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ImportedOutputDescriptor")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("InternalWalletId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("InternalWalletMasterFingerprint")
+                        .HasColumnType("text");
+
+                    b.Property<string>("InternalWalletSubDerivationPath")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsBIP39Imported")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsCompromised")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsFinalised")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsHotWallet")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsUnSortedMultiSig")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("MofN")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("WalletAddressType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InternalWalletId");
+
+                    b.HasIndex("InternalWalletSubDerivationPath", "InternalWalletMasterFingerprint")
+                        .IsUnique();
+
+                    b.ToTable("Wallets");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.WalletWithdrawalRequest", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool>("Changeless")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<decimal?>("CustomFeeRate")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DestinationAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("MempoolRecommendedFeesType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("RejectCancelDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequestMetadata")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("TxId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("UserRequestorId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("WalletId")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("WithdrawAllFunds")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserRequestorId");
+
+                    b.HasIndex("WalletId");
+
+                    b.ToTable("WalletWithdrawalRequests");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.WalletWithdrawalRequestPSBT", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsFinalisedPSBT")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsInternalWalletPSBT")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsTemplatePSBT")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PSBT")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SignerId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("WalletWithdrawalRequestId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SignerId");
+
+                    b.HasIndex("WalletWithdrawalRequestId");
+
+                    b.ToTable("WalletWithdrawalRequestPSBTs");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("ApplicationUserNode", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.Node", null)
+                        .WithMany()
+                        .HasForeignKey("NodesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("NodeGuard.Data.Models.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UsersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("ChannelOperationRequestFMUTXO", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.ChannelOperationRequest", null)
+                        .WithMany()
+                        .HasForeignKey("ChannelOperationRequestsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("NodeGuard.Data.Models.FMUTXO", null)
+                        .WithMany()
+                        .HasForeignKey("UtxosId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("FMUTXOWalletWithdrawalRequest", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.FMUTXO", null)
+                        .WithMany()
+                        .HasForeignKey("UTXOsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("NodeGuard.Data.Models.WalletWithdrawalRequest", null)
+                        .WithMany()
+                        .HasForeignKey("WalletWithdrawalRequestsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("KeyWallet", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.Key", null)
+                        .WithMany()
+                        .HasForeignKey("KeysId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("NodeGuard.Data.Models.Wallet", null)
+                        .WithMany()
+                        .HasForeignKey("WalletsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.APIToken", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.ApplicationUser", "Creator")
+                        .WithMany()
+                        .HasForeignKey("CreatorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Channel", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.Node", "DestinationNode")
+                        .WithMany()
+                        .HasForeignKey("DestinationNodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("NodeGuard.Data.Models.Node", "SourceNode")
+                        .WithMany()
+                        .HasForeignKey("SourceNodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DestinationNode");
+
+                    b.Navigation("SourceNode");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.ChannelOperationRequest", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.Channel", "Channel")
+                        .WithMany("ChannelOperationRequests")
+                        .HasForeignKey("ChannelId");
+
+                    b.HasOne("NodeGuard.Data.Models.Node", "DestNode")
+                        .WithMany("ChannelOperationRequestsAsDestination")
+                        .HasForeignKey("DestNodeId");
+
+                    b.HasOne("NodeGuard.Data.Models.Node", "SourceNode")
+                        .WithMany("ChannelOperationRequestsAsSource")
+                        .HasForeignKey("SourceNodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("NodeGuard.Data.Models.ApplicationUser", "User")
+                        .WithMany("ChannelOperationRequests")
+                        .HasForeignKey("UserId");
+
+                    b.HasOne("NodeGuard.Data.Models.Wallet", "Wallet")
+                        .WithMany("ChannelOperationRequestsAsSource")
+                        .HasForeignKey("WalletId");
+
+                    b.Navigation("Channel");
+
+                    b.Navigation("DestNode");
+
+                    b.Navigation("SourceNode");
+
+                    b.Navigation("User");
+
+                    b.Navigation("Wallet");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.ChannelOperationRequestPSBT", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.ChannelOperationRequest", "ChannelOperationRequest")
+                        .WithMany("ChannelOperationRequestPsbts")
+                        .HasForeignKey("ChannelOperationRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("NodeGuard.Data.Models.ApplicationUser", "UserSigner")
+                        .WithMany()
+                        .HasForeignKey("UserSignerId");
+
+                    b.Navigation("ChannelOperationRequest");
+
+                    b.Navigation("UserSigner");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Key", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.InternalWallet", "InternalWallet")
+                        .WithMany()
+                        .HasForeignKey("InternalWalletId");
+
+                    b.HasOne("NodeGuard.Data.Models.ApplicationUser", "User")
+                        .WithMany("Keys")
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("InternalWallet");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.LiquidityRule", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.Channel", "Channel")
+                        .WithMany("LiquidityRules")
+                        .HasForeignKey("ChannelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("NodeGuard.Data.Models.Node", "Node")
+                        .WithMany()
+                        .HasForeignKey("NodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("NodeGuard.Data.Models.Wallet", "ReverseSwapWallet")
+                        .WithMany("LiquidityRulesAsReverseSwapWallet")
+                        .HasForeignKey("ReverseSwapWalletId");
+
+                    b.HasOne("NodeGuard.Data.Models.Wallet", "SwapWallet")
+                        .WithMany("LiquidityRulesAsSwapWallet")
+                        .HasForeignKey("SwapWalletId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Channel");
+
+                    b.Navigation("Node");
+
+                    b.Navigation("ReverseSwapWallet");
+
+                    b.Navigation("SwapWallet");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Node", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.Wallet", "ReturningFundsWallet")
+                        .WithMany()
+                        .HasForeignKey("ReturningFundsWalletId");
+
+                    b.Navigation("ReturningFundsWallet");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Wallet", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.InternalWallet", "InternalWallet")
+                        .WithMany()
+                        .HasForeignKey("InternalWalletId");
+
+                    b.Navigation("InternalWallet");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.WalletWithdrawalRequest", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.ApplicationUser", "UserRequestor")
+                        .WithMany("WalletWithdrawalRequests")
+                        .HasForeignKey("UserRequestorId");
+
+                    b.HasOne("NodeGuard.Data.Models.Wallet", "Wallet")
+                        .WithMany()
+                        .HasForeignKey("WalletId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("UserRequestor");
+
+                    b.Navigation("Wallet");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.WalletWithdrawalRequestPSBT", b =>
+                {
+                    b.HasOne("NodeGuard.Data.Models.ApplicationUser", "Signer")
+                        .WithMany()
+                        .HasForeignKey("SignerId");
+
+                    b.HasOne("NodeGuard.Data.Models.WalletWithdrawalRequest", "WalletWithdrawalRequest")
+                        .WithMany("WalletWithdrawalRequestPSBTs")
+                        .HasForeignKey("WalletWithdrawalRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Signer");
+
+                    b.Navigation("WalletWithdrawalRequest");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Channel", b =>
+                {
+                    b.Navigation("ChannelOperationRequests");
+
+                    b.Navigation("LiquidityRules");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.ChannelOperationRequest", b =>
+                {
+                    b.Navigation("ChannelOperationRequestPsbts");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Node", b =>
+                {
+                    b.Navigation("ChannelOperationRequestsAsDestination");
+
+                    b.Navigation("ChannelOperationRequestsAsSource");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.Wallet", b =>
+                {
+                    b.Navigation("ChannelOperationRequestsAsSource");
+
+                    b.Navigation("LiquidityRulesAsReverseSwapWallet");
+
+                    b.Navigation("LiquidityRulesAsSwapWallet");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.WalletWithdrawalRequest", b =>
+                {
+                    b.Navigation("WalletWithdrawalRequestPSBTs");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.ApplicationUser", b =>
+                {
+                    b.Navigation("ChannelOperationRequests");
+
+                    b.Navigation("Keys");
+
+                    b.Navigation("WalletWithdrawalRequests");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Migrations/20240628073255_UtxoFreezing.cs b/src/Migrations/20240628073255_UtxoFreezing.cs
new file mode 100644
index 00000000..a1c8cfcd
--- /dev/null
+++ b/src/Migrations/20240628073255_UtxoFreezing.cs
@@ -0,0 +1,40 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NodeGuard.Migrations
+{
+    /// <inheritdoc />
+    public partial class UtxoFreezing : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "UTXOTags",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    Key = table.Column<string>(type: "text", nullable: false),
+                    Value = table.Column<string>(type: "text", nullable: false),
+                    Outpoint = table.Column<string>(type: "text", nullable: false),
+                    CreationDatetime = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    UpdateDatetime = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_UTXOTags", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "UTXOTags");
+        }
+    }
+}
diff --git a/src/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Migrations/ApplicationDbContextModelSnapshot.cs
index 61f755d4..b45513aa 100644
--- a/src/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/src/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -19,7 +19,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("ProductVersion", "8.0.6")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -36,7 +36,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("UsersId");
 
-                    b.ToTable("ApplicationUserNode", (string)null);
+                    b.ToTable("ApplicationUserNode");
                 });
 
             modelBuilder.Entity("ChannelOperationRequestFMUTXO", b =>
@@ -51,7 +51,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("UtxosId");
 
-                    b.ToTable("ChannelOperationRequestFMUTXO", (string)null);
+                    b.ToTable("ChannelOperationRequestFMUTXO");
                 });
 
             modelBuilder.Entity("FMUTXOWalletWithdrawalRequest", b =>
@@ -66,7 +66,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("WalletWithdrawalRequestsId");
 
-                    b.ToTable("FMUTXOWalletWithdrawalRequest", (string)null);
+                    b.ToTable("FMUTXOWalletWithdrawalRequest");
                 });
 
             modelBuilder.Entity("KeyWallet", b =>
@@ -81,7 +81,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("WalletsId");
 
-                    b.ToTable("KeyWallet", (string)null);
+                    b.ToTable("KeyWallet");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
@@ -329,7 +329,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("CreatorId");
 
-                    b.ToTable("ApiTokens", (string)null);
+                    b.ToTable("ApiTokens");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.Channel", b =>
@@ -386,7 +386,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("SourceNodeId");
 
-                    b.ToTable("Channels", (string)null);
+                    b.ToTable("Channels");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.ChannelOperationRequest", b =>
@@ -466,7 +466,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("WalletId");
 
-                    b.ToTable("ChannelOperationRequests", (string)null);
+                    b.ToTable("ChannelOperationRequests");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.ChannelOperationRequestPSBT", b =>
@@ -508,7 +508,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("UserSignerId");
 
-                    b.ToTable("ChannelOperationRequestPSBTs", (string)null);
+                    b.ToTable("ChannelOperationRequestPSBTs");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.FMUTXO", b =>
@@ -537,7 +537,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
-                    b.ToTable("FMUTXOs", (string)null);
+                    b.ToTable("FMUTXOs");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.InternalWallet", b =>
@@ -569,7 +569,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
-                    b.ToTable("InternalWallets", (string)null);
+                    b.ToTable("InternalWallets");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.Key", b =>
@@ -624,7 +624,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("Keys", (string)null);
+                    b.ToTable("Keys");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.LiquidityRule", b =>
@@ -679,7 +679,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("SwapWalletId");
 
-                    b.ToTable("LiquidityRules", (string)null);
+                    b.ToTable("LiquidityRules");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.Node", b =>
@@ -729,7 +729,38 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("ReturningFundsWalletId");
 
-                    b.ToTable("Nodes", (string)null);
+                    b.ToTable("Nodes");
+                });
+
+            modelBuilder.Entity("NodeGuard.Data.Models.UTXOTag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreationDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Outpoint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdateDatetime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UTXOTags");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.Wallet", b =>
@@ -802,7 +833,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("InternalWalletSubDerivationPath", "InternalWalletMasterFingerprint")
                         .IsUnique();
 
-                    b.ToTable("Wallets", (string)null);
+                    b.ToTable("Wallets");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.WalletWithdrawalRequest", b =>
@@ -866,7 +897,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("WalletId");
 
-                    b.ToTable("WalletWithdrawalRequests", (string)null);
+                    b.ToTable("WalletWithdrawalRequests");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.WalletWithdrawalRequestPSBT", b =>
@@ -908,7 +939,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("WalletWithdrawalRequestId");
 
-                    b.ToTable("WalletWithdrawalRequestPSBTs", (string)null);
+                    b.ToTable("WalletWithdrawalRequestPSBTs");
                 });
 
             modelBuilder.Entity("NodeGuard.Data.Models.ApplicationUser", b =>